summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2018-06-25 21:12:13 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2018-06-25 21:12:13 +0200
commit059a62ee3c820a42fbce980c3256049adecc9100 (patch)
treee51eab94fd7d65459640ca227fb2257bb41d2acb /plugins
parent55778740c211992cc86ea87588ab62c6750f36d1 (diff)
parente8f4d7a9cdd37c5a9fb3b6991a4e9173829808da (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'plugins')
-rw-r--r--plugins/authenticator/shotwell-authenticator.h2
-rw-r--r--plugins/authenticator/shotwell-authenticator.vapi2
-rw-r--r--plugins/authenticator/shotwell/FacebookPublishingAuthenticator.c1569
-rw-r--r--plugins/authenticator/shotwell/FlickrPublishingAuthenticator.c1106
-rw-r--r--plugins/authenticator/shotwell/GoogleAuthenticator.c1880
-rw-r--r--plugins/authenticator/shotwell/OAuth1Authenticator.c339
-rw-r--r--plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.c199
-rw-r--r--plugins/authenticator/shotwell/TumblrAuthenticator.c847
-rw-r--r--plugins/common/BuilderPane.c271
-rw-r--r--plugins/common/OAuth1Support.c1265
-rw-r--r--plugins/common/RESTSupport.c4673
-rw-r--r--plugins/common/Resources.c281
-rw-r--r--plugins/common/WebAuthenticationPane.c272
-rw-r--r--plugins/shotwell-plugin-common.h277
-rw-r--r--plugins/shotwell-plugin-common.vapi2
-rw-r--r--plugins/shotwell-plugin-dev-1.0.h217
-rw-r--r--plugins/shotwell-plugin-dev-1.0.vapi2
-rw-r--r--plugins/shotwell-publishing-extras/GalleryConnector.c9011
-rw-r--r--plugins/shotwell-publishing-extras/RajcePublishing.c7431
-rw-r--r--plugins/shotwell-publishing-extras/YandexPublishing.c3283
-rw-r--r--plugins/shotwell-publishing-extras/shotwell-publishing-extras.c202
-rw-r--r--plugins/shotwell-publishing/FacebookPublishing.c6590
-rw-r--r--plugins/shotwell-publishing/FlickrPublishing.c4298
-rw-r--r--plugins/shotwell-publishing/PicasaPublishing.c4861
-rw-r--r--plugins/shotwell-publishing/PiwigoPublishing.c8702
-rw-r--r--plugins/shotwell-publishing/TumblrPublishing.c3738
-rw-r--r--plugins/shotwell-publishing/YouTubePublishing.c2338
-rw-r--r--plugins/shotwell-publishing/shotwell-publishing.c500
-rw-r--r--plugins/shotwell-transitions/BlindsEffect.c658
-rw-r--r--plugins/shotwell-transitions/ChessEffect.c621
-rw-r--r--plugins/shotwell-transitions/CircleEffect.c367
-rw-r--r--plugins/shotwell-transitions/CirclesEffect.c499
-rw-r--r--plugins/shotwell-transitions/ClockEffect.c500
-rw-r--r--plugins/shotwell-transitions/CrumbleEffect.c680
-rw-r--r--plugins/shotwell-transitions/FadeEffect.c336
-rw-r--r--plugins/shotwell-transitions/SlideEffect.c468
-rw-r--r--plugins/shotwell-transitions/SquaresEffect.c536
-rw-r--r--plugins/shotwell-transitions/StripesEffect.c568
-rw-r--r--plugins/shotwell-transitions/shotwell-transitions.c666
39 files changed, 37186 insertions, 32871 deletions
diff --git a/plugins/authenticator/shotwell-authenticator.h b/plugins/authenticator/shotwell-authenticator.h
index 67c3c36..969aca9 100644
--- a/plugins/authenticator/shotwell-authenticator.h
+++ b/plugins/authenticator/shotwell-authenticator.h
@@ -1,4 +1,4 @@
-/* shotwell-authenticator.h generated by valac 0.36.6, the Vala compiler, do not modify */
+/* shotwell-authenticator.h generated by valac 0.40.4, the Vala compiler, do not modify */
#ifndef __PLUGINS_AUTHENTICATOR_SHOTWELL_AUTHENTICATOR_H__
diff --git a/plugins/authenticator/shotwell-authenticator.vapi b/plugins/authenticator/shotwell-authenticator.vapi
index 8adc56c..7a1b202 100644
--- a/plugins/authenticator/shotwell-authenticator.vapi
+++ b/plugins/authenticator/shotwell-authenticator.vapi
@@ -1,4 +1,4 @@
-/* shotwell-authenticator.vapi generated by valac 0.36.6, do not modify. */
+/* shotwell-authenticator.vapi generated by valac 0.40.4, do not modify. */
namespace Publishing {
namespace Authenticator {
diff --git a/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.c b/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.c
index 480b915..d1e2389 100644
--- a/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.c
+++ b/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.c
@@ -1,4 +1,4 @@
-/* FacebookPublishingAuthenticator.c generated by valac 0.36.6, the Vala compiler
+/* FacebookPublishingAuthenticator.c generated by valac 0.40.4, the Vala compiler
* generated from FacebookPublishingAuthenticator.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>
@@ -30,6 +31,11 @@
typedef struct _PublishingAuthenticatorShotwellFacebookWebAuthenticationPane PublishingAuthenticatorShotwellFacebookWebAuthenticationPane;
typedef struct _PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneClass PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneClass;
typedef struct _PublishingAuthenticatorShotwellFacebookWebAuthenticationPanePrivate PublishingAuthenticatorShotwellFacebookWebAuthenticationPanePrivate;
+enum {
+ PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_0_PROPERTY,
+ PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_NUM_PROPERTIES
+};
+static GParamSpec* publishing_authenticator_shotwell_facebook_web_authentication_pane_properties[PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_NUM_PROPERTIES];
#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_TYPE_LOCALE_LOOKUP (publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_get_type ())
#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_LOCALE_LOOKUP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_TYPE_LOCALE_LOOKUP, PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup))
@@ -50,9 +56,9 @@ typedef struct _PublishingAuthenticatorShotwellFacebookWebAuthenticationPanePara
enum {
PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_LOGIN_SUCCEEDED_SIGNAL,
PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_LOGIN_FAILED_SIGNAL,
- PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_LAST_SIGNAL
+ PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_NUM_SIGNALS
};
-static guint publishing_authenticator_shotwell_facebook_web_authentication_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_LAST_SIGNAL] = {0};
+static guint publishing_authenticator_shotwell_facebook_web_authentication_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_NUM_SIGNALS] = {0};
#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_TYPE_FACEBOOK (publishing_authenticator_shotwell_facebook_facebook_get_type ())
#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_FACEBOOK(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_TYPE_FACEBOOK, PublishingAuthenticatorShotwellFacebookFacebook))
@@ -64,6 +70,11 @@ static guint publishing_authenticator_shotwell_facebook_web_authentication_pane_
typedef struct _PublishingAuthenticatorShotwellFacebookFacebook PublishingAuthenticatorShotwellFacebookFacebook;
typedef struct _PublishingAuthenticatorShotwellFacebookFacebookClass PublishingAuthenticatorShotwellFacebookFacebookClass;
typedef struct _PublishingAuthenticatorShotwellFacebookFacebookPrivate PublishingAuthenticatorShotwellFacebookFacebookPrivate;
+enum {
+ PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_FACEBOOK_0_PROPERTY,
+ PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_FACEBOOK_NUM_PROPERTIES
+};
+static GParamSpec* publishing_authenticator_shotwell_facebook_facebook_properties[PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_FACEBOOK_NUM_PROPERTIES];
#define _g_hash_table_unref0(var) ((var == NULL) ? NULL : (var = (g_hash_table_unref (var), NULL)))
#define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
#define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; }
@@ -130,34 +141,42 @@ static SpitPublishingAuthenticatorIface * publishing_authenticator_shotwell_face
#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_APPLICATION_ID "1612018629063184"
GType publishing_authenticator_shotwell_facebook_web_authentication_pane_get_type (void) G_GNUC_CONST;
-enum {
- PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_DUMMY_PROPERTY
-};
static gpointer publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_ref (gpointer instance);
static void publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_unref (gpointer instance);
-static GParamSpec* publishing_authenticator_shotwell_facebook_web_authentication_pane_param_spec_locale_lookup (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) G_GNUC_UNUSED;
-static void publishing_authenticator_shotwell_facebook_web_authentication_pane_value_set_locale_lookup (GValue* value, gpointer v_object) G_GNUC_UNUSED;
-static void publishing_authenticator_shotwell_facebook_web_authentication_pane_value_take_locale_lookup (GValue* value, gpointer v_object) G_GNUC_UNUSED;
+static GParamSpec* publishing_authenticator_shotwell_facebook_web_authentication_pane_param_spec_locale_lookup (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags) G_GNUC_UNUSED;
+static void publishing_authenticator_shotwell_facebook_web_authentication_pane_value_set_locale_lookup (GValue* value,
+ gpointer v_object) G_GNUC_UNUSED;
+static void publishing_authenticator_shotwell_facebook_web_authentication_pane_value_take_locale_lookup (GValue* value,
+ gpointer v_object) G_GNUC_UNUSED;
static gpointer publishing_authenticator_shotwell_facebook_web_authentication_pane_value_get_locale_lookup (const GValue* value) G_GNUC_UNUSED;
static GType publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
-static PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_new (const gchar* prefix, const gchar* translation, const gchar* exception_code, const gchar* exception_translation, const gchar* exception_code_2, const gchar* exception_translation_2);
-static PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_construct (GType object_type, const gchar* prefix, const gchar* translation, const gchar* exception_code, const gchar* exception_translation, const gchar* exception_code_2, const gchar* exception_translation_2);
+static PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_new (const gchar* prefix,
+ const gchar* translation,
+ const gchar* exception_code,
+ const gchar* exception_translation,
+ const gchar* exception_code_2,
+ const gchar* exception_translation_2);
+static PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_construct (GType object_type,
+ const gchar* prefix,
+ const gchar* translation,
+ const gchar* exception_code,
+ const gchar* exception_translation,
+ const gchar* exception_code_2,
+ const gchar* exception_translation_2);
PublishingAuthenticatorShotwellFacebookWebAuthenticationPane* publishing_authenticator_shotwell_facebook_web_authentication_pane_new (void);
PublishingAuthenticatorShotwellFacebookWebAuthenticationPane* publishing_authenticator_shotwell_facebook_web_authentication_pane_construct (GType object_type);
static gchar* publishing_authenticator_shotwell_facebook_web_authentication_pane_get_login_url (void);
static gchar* publishing_authenticator_shotwell_facebook_web_authentication_pane_get_system_locale_as_facebook_locale (void);
static void publishing_authenticator_shotwell_facebook_web_authentication_pane_real_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* base);
gboolean publishing_authenticator_shotwell_facebook_web_authentication_pane_is_cache_dirty (void);
-enum {
- PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_LOCALE_LOOKUP_DUMMY_PROPERTY
-};
static void publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_finalize (PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup * obj);
static void publishing_authenticator_shotwell_facebook_web_authentication_pane_finalize (GObject * obj);
GType publishing_authenticator_shotwell_facebook_facebook_get_type (void) G_GNUC_CONST;
#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_FACEBOOK_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_TYPE_FACEBOOK, PublishingAuthenticatorShotwellFacebookFacebookPrivate))
-enum {
- PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_FACEBOOK_DUMMY_PROPERTY
-};
#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_FACEBOOK_SERVICE_WELCOME_MESSAGE _ ("You are not currently logged into Facebook.\n" \
"\n" \
"If you don’t yet have a Facebook account, you can create one during th" \
@@ -169,7 +188,8 @@ enum {
"To continue publishing to Facebook, quit and restart Shotwell, then tr" \
"y publishing again.")
PublishingAuthenticatorShotwellFacebookFacebook* publishing_authenticator_shotwell_facebook_facebook_new (SpitPublishingPluginHost* host);
-PublishingAuthenticatorShotwellFacebookFacebook* publishing_authenticator_shotwell_facebook_facebook_construct (GType object_type, SpitPublishingPluginHost* host);
+PublishingAuthenticatorShotwellFacebookFacebook* publishing_authenticator_shotwell_facebook_facebook_construct (GType object_type,
+ SpitPublishingPluginHost* host);
static void _g_free0_ (gpointer var);
static void _g_variant_unref0_ (gpointer var);
static void publishing_authenticator_shotwell_facebook_facebook_real_authenticate (SpitPublishingAuthenticator* base);
@@ -179,24 +199,36 @@ static void publishing_authenticator_shotwell_facebook_facebook_do_show_service_
static gboolean publishing_authenticator_shotwell_facebook_facebook_real_can_logout (SpitPublishingAuthenticator* base);
static GHashTable* publishing_authenticator_shotwell_facebook_facebook_real_get_authentication_parameter (SpitPublishingAuthenticator* base);
void publishing_authenticator_shotwell_facebook_facebook_invalidate_persistent_session (PublishingAuthenticatorShotwellFacebookFacebook* self);
-static void publishing_authenticator_shotwell_facebook_facebook_set_persistent_access_token (PublishingAuthenticatorShotwellFacebookFacebook* self, const gchar* access_token);
+static void publishing_authenticator_shotwell_facebook_facebook_set_persistent_access_token (PublishingAuthenticatorShotwellFacebookFacebook* self,
+ const gchar* access_token);
static void publishing_authenticator_shotwell_facebook_facebook_real_logout (SpitPublishingAuthenticator* base);
static void publishing_authenticator_shotwell_facebook_facebook_real_refresh (SpitPublishingAuthenticator* base);
static void publishing_authenticator_shotwell_facebook_facebook_on_login_clicked (PublishingAuthenticatorShotwellFacebookFacebook* self);
static void _publishing_authenticator_shotwell_facebook_facebook_on_login_clicked_spit_publishing_login_callback (gpointer self);
static void publishing_authenticator_shotwell_facebook_facebook_do_hosted_web_authentication (PublishingAuthenticatorShotwellFacebookFacebook* self);
-static void publishing_authenticator_shotwell_facebook_facebook_on_web_auth_pane_login_succeeded (PublishingAuthenticatorShotwellFacebookFacebook* self, const gchar* success_url);
-static void _publishing_authenticator_shotwell_facebook_facebook_on_web_auth_pane_login_succeeded_publishing_authenticator_shotwell_facebook_web_authentication_pane_login_succeeded (PublishingAuthenticatorShotwellFacebookWebAuthenticationPane* _sender, const gchar* success_url, gpointer self);
+static void publishing_authenticator_shotwell_facebook_facebook_on_web_auth_pane_login_succeeded (PublishingAuthenticatorShotwellFacebookFacebook* self,
+ const gchar* success_url);
+static void _publishing_authenticator_shotwell_facebook_facebook_on_web_auth_pane_login_succeeded_publishing_authenticator_shotwell_facebook_web_authentication_pane_login_succeeded (PublishingAuthenticatorShotwellFacebookWebAuthenticationPane* _sender,
+ const gchar* success_url,
+ gpointer self);
static void publishing_authenticator_shotwell_facebook_facebook_on_web_auth_pane_login_failed (PublishingAuthenticatorShotwellFacebookFacebook* self);
-static void _publishing_authenticator_shotwell_facebook_facebook_on_web_auth_pane_login_failed_publishing_authenticator_shotwell_facebook_web_authentication_pane_login_failed (PublishingAuthenticatorShotwellFacebookWebAuthenticationPane* _sender, gpointer self);
-static void publishing_authenticator_shotwell_facebook_facebook_do_authenticate_session (PublishingAuthenticatorShotwellFacebookFacebook* self, const gchar* good_login_uri);
+static void _publishing_authenticator_shotwell_facebook_facebook_on_web_auth_pane_login_failed_publishing_authenticator_shotwell_facebook_web_authentication_pane_login_failed (PublishingAuthenticatorShotwellFacebookWebAuthenticationPane* _sender,
+ gpointer self);
+static void publishing_authenticator_shotwell_facebook_facebook_do_authenticate_session (PublishingAuthenticatorShotwellFacebookFacebook* self,
+ const gchar* good_login_uri);
static void publishing_authenticator_shotwell_facebook_facebook_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 gint _vala_array_length (gpointer array);
-PublishingAuthenticatorShotwellFacebookWebAuthenticationPane* publishing_authenticator_shotwell_facebook_web_authentication_pane_construct (GType object_type) {
+PublishingAuthenticatorShotwellFacebookWebAuthenticationPane*
+publishing_authenticator_shotwell_facebook_web_authentication_pane_construct (GType object_type)
+{
PublishingAuthenticatorShotwellFacebookWebAuthenticationPane * self = NULL;
gchar* _tmp0_;
gchar* _tmp1_;
@@ -210,45 +242,51 @@ PublishingAuthenticatorShotwellFacebookWebAuthenticationPane* publishing_authent
_g_free0 (_tmp1_);
#line 19 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
return self;
-#line 206 "FacebookPublishingAuthenticator.c"
+#line 238 "FacebookPublishingAuthenticator.c"
}
-PublishingAuthenticatorShotwellFacebookWebAuthenticationPane* publishing_authenticator_shotwell_facebook_web_authentication_pane_new (void) {
+PublishingAuthenticatorShotwellFacebookWebAuthenticationPane*
+publishing_authenticator_shotwell_facebook_web_authentication_pane_new (void)
+{
#line 19 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
return publishing_authenticator_shotwell_facebook_web_authentication_pane_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_TYPE_WEB_AUTHENTICATION_PANE);
-#line 213 "FacebookPublishingAuthenticator.c"
+#line 247 "FacebookPublishingAuthenticator.c"
}
-static gpointer _publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_ref0 (gpointer self) {
+static gpointer
+_publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_ref0 (gpointer self)
+{
#line 99 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
return self ? publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_ref (self) : NULL;
-#line 220 "FacebookPublishingAuthenticator.c"
+#line 256 "FacebookPublishingAuthenticator.c"
}
-static gboolean string_contains (const gchar* self, const gchar* needle) {
+static gboolean
+string_contains (const gchar* self,
+ const gchar* needle)
+{
gboolean result = FALSE;
- const gchar* _tmp0_;
- gchar* _tmp1_;
-#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ gchar* _tmp0_;
+#line 1417 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, FALSE);
-#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1417 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (needle != NULL, FALSE);
-#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp0_ = needle;
-#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- result = _tmp1_ != NULL;
-#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1418 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp0_ = strstr ((gchar*) self, (gchar*) needle);
+#line 1418 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = _tmp0_ != NULL;
+#line 1418 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 240 "FacebookPublishingAuthenticator.c"
+#line 276 "FacebookPublishingAuthenticator.c"
}
-static gchar* publishing_authenticator_shotwell_facebook_web_authentication_pane_get_system_locale_as_facebook_locale (void) {
+static gchar*
+publishing_authenticator_shotwell_facebook_web_authentication_pane_get_system_locale_as_facebook_locale (void)
+{
gchar* result = NULL;
const gchar* raw_system_locale = NULL;
const gchar* _tmp0_;
@@ -265,7 +303,7 @@ static gchar* publishing_authenticator_shotwell_facebook_web_authentication_pane
gchar* _tmp11_;
PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup** _tmp12_;
gint _tmp12__length1;
- gchar* _tmp43_;
+ gchar* _tmp40_;
#line 93 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
_tmp0_ = setlocale (LC_ALL, "");
#line 93 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
@@ -276,18 +314,18 @@ static gchar* publishing_authenticator_shotwell_facebook_web_authentication_pane
if (_tmp2_ == NULL) {
#line 94 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
_tmp1_ = TRUE;
-#line 272 "FacebookPublishingAuthenticator.c"
+#line 310 "FacebookPublishingAuthenticator.c"
} else {
const gchar* _tmp3_;
#line 94 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
_tmp3_ = raw_system_locale;
#line 94 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
_tmp1_ = g_strcmp0 (_tmp3_, "") == 0;
-#line 279 "FacebookPublishingAuthenticator.c"
+#line 317 "FacebookPublishingAuthenticator.c"
}
#line 94 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
if (_tmp1_) {
-#line 283 "FacebookPublishingAuthenticator.c"
+#line 321 "FacebookPublishingAuthenticator.c"
gchar* _tmp4_;
#line 95 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
_tmp4_ = g_strdup ("www");
@@ -295,7 +333,7 @@ static gchar* publishing_authenticator_shotwell_facebook_web_authentication_pane
result = _tmp4_;
#line 95 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
return result;
-#line 291 "FacebookPublishingAuthenticator.c"
+#line 329 "FacebookPublishingAuthenticator.c"
}
#line 97 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
_tmp5_ = raw_system_locale;
@@ -319,7 +357,7 @@ static gchar* publishing_authenticator_shotwell_facebook_web_authentication_pane
_tmp12_ = publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_table;
#line 99 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
_tmp12__length1 = publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_table_length1;
-#line 315 "FacebookPublishingAuthenticator.c"
+#line 353 "FacebookPublishingAuthenticator.c"
{
PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup** locale_lookup_collection = NULL;
gint locale_lookup_collection_length1 = 0;
@@ -331,26 +369,25 @@ static gchar* publishing_authenticator_shotwell_facebook_web_authentication_pane
locale_lookup_collection_length1 = _tmp12__length1;
#line 99 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
for (locale_lookup_it = 0; locale_lookup_it < _tmp12__length1; locale_lookup_it = locale_lookup_it + 1) {
-#line 327 "FacebookPublishingAuthenticator.c"
+#line 365 "FacebookPublishingAuthenticator.c"
PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp13_;
PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* locale_lookup = NULL;
#line 99 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
_tmp13_ = _publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_ref0 (locale_lookup_collection[locale_lookup_it]);
#line 99 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
locale_lookup = _tmp13_;
-#line 334 "FacebookPublishingAuthenticator.c"
+#line 372 "FacebookPublishingAuthenticator.c"
{
const gchar* _tmp14_;
PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp15_;
const gchar* _tmp16_;
- gboolean _tmp17_;
- PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp18_;
- const gchar* _tmp19_;
- PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp29_;
- const gchar* _tmp30_;
- PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp40_;
- const gchar* _tmp41_;
- gchar* _tmp42_;
+ PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp17_;
+ const gchar* _tmp18_;
+ PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp27_;
+ const gchar* _tmp28_;
+ PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp37_;
+ const gchar* _tmp38_;
+ gchar* _tmp39_;
#line 100 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
_tmp14_ = system_locale;
#line 100 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
@@ -358,146 +395,140 @@ static gchar* publishing_authenticator_shotwell_facebook_web_authentication_pane
#line 100 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
_tmp16_ = _tmp15_->prefix;
#line 100 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp17_ = g_str_has_prefix (_tmp14_, _tmp16_);
-#line 100 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- if (!_tmp17_) {
+ if (!g_str_has_prefix (_tmp14_, _tmp16_)) {
#line 101 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
_publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_unref0 (locale_lookup);
#line 101 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
continue;
-#line 361 "FacebookPublishingAuthenticator.c"
+#line 396 "FacebookPublishingAuthenticator.c"
}
#line 103 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp18_ = locale_lookup;
+ _tmp17_ = locale_lookup;
#line 103 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp19_ = _tmp18_->exception_code;
+ _tmp18_ = _tmp17_->exception_code;
#line 103 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- if (_tmp19_ != NULL) {
-#line 369 "FacebookPublishingAuthenticator.c"
- PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp20_;
+ if (_tmp18_ != NULL) {
+#line 404 "FacebookPublishingAuthenticator.c"
+ PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp19_;
+ const gchar* _tmp20_;
const gchar* _tmp21_;
- const gchar* _tmp22_;
- PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp23_;
- const gchar* _tmp24_;
- gboolean _tmp25_;
+ PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp22_;
+ const gchar* _tmp23_;
#line 104 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp20_ = locale_lookup;
+ _tmp19_ = locale_lookup;
#line 104 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp21_ = _tmp20_->exception_translation;
+ _tmp20_ = _tmp19_->exception_translation;
#line 104 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _vala_assert (_tmp21_ != NULL, "locale_lookup.exception_translation != null");
+ _vala_assert (_tmp20_ != NULL, "locale_lookup.exception_translation != null");
#line 106 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp22_ = system_locale;
+ _tmp21_ = system_locale;
#line 106 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp23_ = locale_lookup;
+ _tmp22_ = locale_lookup;
#line 106 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp24_ = _tmp23_->exception_code;
+ _tmp23_ = _tmp22_->exception_code;
#line 106 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp25_ = string_contains (_tmp22_, _tmp24_);
-#line 106 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- if (_tmp25_) {
-#line 392 "FacebookPublishingAuthenticator.c"
- PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp26_;
- const gchar* _tmp27_;
- gchar* _tmp28_;
+ if (string_contains (_tmp21_, _tmp23_)) {
+#line 424 "FacebookPublishingAuthenticator.c"
+ PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp24_;
+ const gchar* _tmp25_;
+ gchar* _tmp26_;
#line 107 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp26_ = locale_lookup;
+ _tmp24_ = locale_lookup;
#line 107 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp27_ = _tmp26_->exception_translation;
+ _tmp25_ = _tmp24_->exception_translation;
#line 107 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp28_ = g_strdup (_tmp27_);
+ _tmp26_ = g_strdup (_tmp25_);
#line 107 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- result = _tmp28_;
+ result = _tmp26_;
#line 107 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
_publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_unref0 (locale_lookup);
#line 107 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
_g_free0 (system_locale);
#line 107 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
return result;
-#line 410 "FacebookPublishingAuthenticator.c"
+#line 442 "FacebookPublishingAuthenticator.c"
}
}
#line 110 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp29_ = locale_lookup;
+ _tmp27_ = locale_lookup;
#line 110 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp30_ = _tmp29_->exception_code_2;
+ _tmp28_ = _tmp27_->exception_code_2;
#line 110 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- if (_tmp30_ != NULL) {
-#line 419 "FacebookPublishingAuthenticator.c"
- PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp31_;
- const gchar* _tmp32_;
+ if (_tmp28_ != NULL) {
+#line 451 "FacebookPublishingAuthenticator.c"
+ PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp29_;
+ const gchar* _tmp30_;
+ const gchar* _tmp31_;
+ PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp32_;
const gchar* _tmp33_;
- PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp34_;
- const gchar* _tmp35_;
- gboolean _tmp36_;
#line 111 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp31_ = locale_lookup;
+ _tmp29_ = locale_lookup;
#line 111 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp32_ = _tmp31_->exception_translation_2;
+ _tmp30_ = _tmp29_->exception_translation_2;
#line 111 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _vala_assert (_tmp32_ != NULL, "locale_lookup.exception_translation_2 != null");
+ _vala_assert (_tmp30_ != NULL, "locale_lookup.exception_translation_2 != null");
#line 113 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp33_ = system_locale;
+ _tmp31_ = system_locale;
#line 113 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp34_ = locale_lookup;
+ _tmp32_ = locale_lookup;
#line 113 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp35_ = _tmp34_->exception_code_2;
+ _tmp33_ = _tmp32_->exception_code_2;
#line 113 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp36_ = string_contains (_tmp33_, _tmp35_);
-#line 113 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- if (_tmp36_) {
-#line 442 "FacebookPublishingAuthenticator.c"
- PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp37_;
- const gchar* _tmp38_;
- gchar* _tmp39_;
+ if (string_contains (_tmp31_, _tmp33_)) {
+#line 471 "FacebookPublishingAuthenticator.c"
+ PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp34_;
+ const gchar* _tmp35_;
+ gchar* _tmp36_;
#line 114 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp37_ = locale_lookup;
+ _tmp34_ = locale_lookup;
#line 114 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp38_ = _tmp37_->exception_translation_2;
+ _tmp35_ = _tmp34_->exception_translation_2;
#line 114 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp39_ = g_strdup (_tmp38_);
+ _tmp36_ = g_strdup (_tmp35_);
#line 114 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- result = _tmp39_;
+ result = _tmp36_;
#line 114 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
_publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_unref0 (locale_lookup);
#line 114 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
_g_free0 (system_locale);
#line 114 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
return result;
-#line 460 "FacebookPublishingAuthenticator.c"
+#line 489 "FacebookPublishingAuthenticator.c"
}
}
#line 117 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp40_ = locale_lookup;
+ _tmp37_ = locale_lookup;
#line 117 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp41_ = _tmp40_->translation;
+ _tmp38_ = _tmp37_->translation;
#line 117 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp42_ = g_strdup (_tmp41_);
+ _tmp39_ = g_strdup (_tmp38_);
#line 117 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- result = _tmp42_;
+ result = _tmp39_;
#line 117 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
_publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_unref0 (locale_lookup);
#line 117 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
_g_free0 (system_locale);
#line 117 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
return result;
-#line 477 "FacebookPublishingAuthenticator.c"
+#line 506 "FacebookPublishingAuthenticator.c"
}
}
}
#line 121 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp43_ = g_strdup ("www");
+ _tmp40_ = g_strdup ("www");
#line 121 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- result = _tmp43_;
+ result = _tmp40_;
#line 121 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
_g_free0 (system_locale);
#line 121 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
return result;
-#line 489 "FacebookPublishingAuthenticator.c"
+#line 518 "FacebookPublishingAuthenticator.c"
}
-static gchar* publishing_authenticator_shotwell_facebook_web_authentication_pane_get_login_url (void) {
+static gchar*
+publishing_authenticator_shotwell_facebook_web_authentication_pane_get_login_url (void)
+{
gchar* result = NULL;
gchar* facebook_locale = NULL;
gchar* _tmp0_;
@@ -516,332 +547,286 @@ static gchar* publishing_authenticator_shotwell_facebook_web_authentication_pane
_g_free0 (facebook_locale);
#line 127 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
return result;
-#line 510 "FacebookPublishingAuthenticator.c"
+#line 541 "FacebookPublishingAuthenticator.c"
}
-static gint string_index_of_char (const gchar* self, gunichar c, gint start_index) {
+static gint
+string_index_of_char (const gchar* self,
+ gunichar c,
+ gint start_index)
+{
gint result = 0;
gchar* _result_ = NULL;
- gint _tmp0_;
- gunichar _tmp1_;
- gchar* _tmp2_;
- gchar* _tmp3_;
-#line 1031 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ gchar* _tmp0_;
+ gchar* _tmp1_;
+#line 1045 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, 0);
-#line 1032 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp0_ = start_index;
-#line 1032 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp1_ = c;
-#line 1032 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp2_ = g_utf8_strchr (((gchar*) self) + _tmp0_, (gssize) -1, _tmp1_);
-#line 1032 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _result_ = _tmp2_;
-#line 1034 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp3_ = _result_;
-#line 1034 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp3_ != NULL) {
-#line 535 "FacebookPublishingAuthenticator.c"
- gchar* _tmp4_;
-#line 1035 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp4_ = _result_;
-#line 1035 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- result = (gint) (_tmp4_ - ((gchar*) self));
-#line 1035 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1046 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp0_ = g_utf8_strchr (((gchar*) self) + start_index, (gssize) -1, c);
+#line 1046 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _result_ = _tmp0_;
+#line 1048 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp1_ = _result_;
+#line 1048 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (_tmp1_ != NULL) {
+#line 564 "FacebookPublishingAuthenticator.c"
+ gchar* _tmp2_;
+#line 1049 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp2_ = _result_;
+#line 1049 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = (gint) (_tmp2_ - ((gchar*) self));
+#line 1049 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 543 "FacebookPublishingAuthenticator.c"
+#line 572 "FacebookPublishingAuthenticator.c"
} else {
-#line 1037 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1051 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
result = -1;
-#line 1037 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1051 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 549 "FacebookPublishingAuthenticator.c"
+#line 578 "FacebookPublishingAuthenticator.c"
}
}
-static gchar* string_slice (const gchar* self, glong start, glong end) {
+static gchar*
+string_slice (const gchar* self,
+ glong start,
+ glong end)
+{
gchar* result = NULL;
glong string_length = 0L;
gint _tmp0_;
gint _tmp1_;
- glong _tmp2_;
- glong _tmp5_;
- gboolean _tmp8_ = FALSE;
- glong _tmp9_;
- gboolean _tmp12_ = FALSE;
- glong _tmp13_;
- glong _tmp16_;
- glong _tmp17_;
- glong _tmp18_;
- glong _tmp19_;
- glong _tmp20_;
- gchar* _tmp21_;
-#line 1355 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ gboolean _tmp4_ = FALSE;
+ gboolean _tmp6_ = FALSE;
+ gchar* _tmp8_;
+#line 1369 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1370 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp0_ = strlen (self);
-#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1370 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp1_ = _tmp0_;
-#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1370 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
string_length = (glong) _tmp1_;
-#line 1357 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp2_ = start;
-#line 1357 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp2_ < ((glong) 0)) {
-#line 583 "FacebookPublishingAuthenticator.c"
+#line 1371 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (start < ((glong) 0)) {
+#line 605 "FacebookPublishingAuthenticator.c"
+ glong _tmp2_;
+#line 1372 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp2_ = string_length;
+#line 1372 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ start = _tmp2_ + start;
+#line 611 "FacebookPublishingAuthenticator.c"
+ }
+#line 1374 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (end < ((glong) 0)) {
+#line 615 "FacebookPublishingAuthenticator.c"
glong _tmp3_;
- glong _tmp4_;
-#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1375 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp3_ = string_length;
-#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp4_ = start;
-#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- start = _tmp3_ + _tmp4_;
-#line 592 "FacebookPublishingAuthenticator.c"
+#line 1375 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ end = _tmp3_ + end;
+#line 621 "FacebookPublishingAuthenticator.c"
}
-#line 1360 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp5_ = end;
-#line 1360 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp5_ < ((glong) 0)) {
-#line 598 "FacebookPublishingAuthenticator.c"
- glong _tmp6_;
- glong _tmp7_;
-#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp6_ = string_length;
-#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp7_ = end;
-#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- end = _tmp6_ + _tmp7_;
-#line 607 "FacebookPublishingAuthenticator.c"
- }
-#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp9_ = start;
-#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp9_ >= ((glong) 0)) {
-#line 613 "FacebookPublishingAuthenticator.c"
- glong _tmp10_;
- glong _tmp11_;
-#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp10_ = start;
-#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp11_ = string_length;
-#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp8_ = _tmp10_ <= _tmp11_;
-#line 622 "FacebookPublishingAuthenticator.c"
+#line 1377 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (start >= ((glong) 0)) {
+#line 625 "FacebookPublishingAuthenticator.c"
+ glong _tmp5_;
+#line 1377 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp5_ = string_length;
+#line 1377 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp4_ = start <= _tmp5_;
+#line 631 "FacebookPublishingAuthenticator.c"
} else {
-#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp8_ = FALSE;
-#line 626 "FacebookPublishingAuthenticator.c"
+#line 1377 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp4_ = FALSE;
+#line 635 "FacebookPublishingAuthenticator.c"
}
-#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- g_return_val_if_fail (_tmp8_, NULL);
-#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp13_ = end;
-#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp13_ >= ((glong) 0)) {
-#line 634 "FacebookPublishingAuthenticator.c"
- glong _tmp14_;
- glong _tmp15_;
-#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp14_ = end;
-#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp15_ = string_length;
-#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp12_ = _tmp14_ <= _tmp15_;
-#line 643 "FacebookPublishingAuthenticator.c"
- } else {
-#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp12_ = FALSE;
+#line 1377 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ g_return_val_if_fail (_tmp4_, NULL);
+#line 1378 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (end >= ((glong) 0)) {
+#line 641 "FacebookPublishingAuthenticator.c"
+ glong _tmp7_;
+#line 1378 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp7_ = string_length;
+#line 1378 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp6_ = end <= _tmp7_;
#line 647 "FacebookPublishingAuthenticator.c"
+ } else {
+#line 1378 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp6_ = FALSE;
+#line 651 "FacebookPublishingAuthenticator.c"
}
-#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- g_return_val_if_fail (_tmp12_, NULL);
-#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp16_ = start;
-#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp17_ = end;
-#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL);
-#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp18_ = start;
-#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp19_ = end;
-#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp20_ = start;
-#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_));
-#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- result = _tmp21_;
-#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1378 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ g_return_val_if_fail (_tmp6_, NULL);
+#line 1379 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ g_return_val_if_fail (start <= end, NULL);
+#line 1380 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp8_ = g_strndup (((gchar*) self) + start, (gsize) (end - start));
+#line 1380 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = _tmp8_;
+#line 1380 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 669 "FacebookPublishingAuthenticator.c"
+#line 663 "FacebookPublishingAuthenticator.c"
}
-static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
+static gchar*
+string_replace (const gchar* self,
+ const gchar* old,
+ const gchar* replacement)
+{
gchar* result = NULL;
gboolean _tmp0_ = FALSE;
gboolean _tmp1_ = FALSE;
GError * _inner_error_ = NULL;
-#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (old != NULL, NULL);
-#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (replacement != NULL, NULL);
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
if ((*((gchar*) self)) == '\0') {
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp1_ = TRUE;
-#line 688 "FacebookPublishingAuthenticator.c"
+#line 686 "FacebookPublishingAuthenticator.c"
} else {
- const gchar* _tmp2_;
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp2_ = old;
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp1_ = (*((gchar*) _tmp2_)) == '\0';
-#line 695 "FacebookPublishingAuthenticator.c"
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp1_ = (*((gchar*) old)) == '\0';
+#line 690 "FacebookPublishingAuthenticator.c"
}
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
if (_tmp1_) {
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp0_ = TRUE;
-#line 701 "FacebookPublishingAuthenticator.c"
+#line 696 "FacebookPublishingAuthenticator.c"
} else {
- const gchar* _tmp3_;
- const gchar* _tmp4_;
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp3_ = old;
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp4_ = replacement;
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp0_ = g_strcmp0 (_tmp3_, _tmp4_) == 0;
-#line 711 "FacebookPublishingAuthenticator.c"
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp0_ = g_strcmp0 (old, replacement) == 0;
+#line 700 "FacebookPublishingAuthenticator.c"
}
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
if (_tmp0_) {
-#line 715 "FacebookPublishingAuthenticator.c"
- gchar* _tmp5_;
-#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp5_ = g_strdup (self);
-#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- result = _tmp5_;
-#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 704 "FacebookPublishingAuthenticator.c"
+ gchar* _tmp2_;
+#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp2_ = g_strdup (self);
+#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = _tmp2_;
+#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 723 "FacebookPublishingAuthenticator.c"
+#line 712 "FacebookPublishingAuthenticator.c"
}
{
GRegex* regex = NULL;
- const gchar* _tmp6_;
- gchar* _tmp7_;
- gchar* _tmp8_;
- GRegex* _tmp9_;
- GRegex* _tmp10_;
- gchar* _tmp11_ = NULL;
- GRegex* _tmp12_;
- const gchar* _tmp13_;
- gchar* _tmp14_;
- gchar* _tmp15_;
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp6_ = old;
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp7_ = g_regex_escape_string (_tmp6_, -1);
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp8_ = _tmp7_;
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp9_ = g_regex_new (_tmp8_, 0, 0, &_inner_error_);
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp10_ = _tmp9_;
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _g_free0 (_tmp8_);
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- regex = _tmp10_;
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ gchar* _tmp3_;
+ gchar* _tmp4_;
+ GRegex* _tmp5_;
+ GRegex* _tmp6_;
+ gchar* _tmp7_ = NULL;
+ GRegex* _tmp8_;
+ gchar* _tmp9_;
+ gchar* _tmp10_;
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp3_ = g_regex_escape_string (old, -1);
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp4_ = _tmp3_;
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp5_ = g_regex_new (_tmp4_, 0, 0, &_inner_error_);
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp6_ = _tmp5_;
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _g_free0 (_tmp4_);
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ regex = _tmp6_;
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 755 "FacebookPublishingAuthenticator.c"
+#line 740 "FacebookPublishingAuthenticator.c"
goto __catch0_g_regex_error;
}
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_clear_error (&_inner_error_);
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return NULL;
-#line 764 "FacebookPublishingAuthenticator.c"
+#line 749 "FacebookPublishingAuthenticator.c"
}
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp12_ = regex;
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp13_ = replacement;
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp14_ = g_regex_replace_literal (_tmp12_, self, (gssize) -1, 0, _tmp13_, 0, &_inner_error_);
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp11_ = _tmp14_;
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp8_ = regex;
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp9_ = g_regex_replace_literal (_tmp8_, self, (gssize) -1, 0, replacement, 0, &_inner_error_);
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp7_ = _tmp9_;
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_g_regex_unref0 (regex);
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 780 "FacebookPublishingAuthenticator.c"
+#line 763 "FacebookPublishingAuthenticator.c"
goto __catch0_g_regex_error;
}
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_g_regex_unref0 (regex);
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_clear_error (&_inner_error_);
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return NULL;
-#line 791 "FacebookPublishingAuthenticator.c"
+#line 774 "FacebookPublishingAuthenticator.c"
}
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp15_ = _tmp11_;
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp11_ = NULL;
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- result = _tmp15_;
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _g_free0 (_tmp11_);
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp10_ = _tmp7_;
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp7_ = NULL;
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = _tmp10_;
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _g_free0 (_tmp7_);
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_g_regex_unref0 (regex);
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 805 "FacebookPublishingAuthenticator.c"
+#line 788 "FacebookPublishingAuthenticator.c"
}
goto __finally0;
__catch0_g_regex_error:
{
GError* e = NULL;
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
e = _inner_error_;
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_inner_error_ = NULL;
-#line 1415 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1429 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_assert_not_reached ();
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_g_error_free0 (e);
-#line 819 "FacebookPublishingAuthenticator.c"
+#line 802 "FacebookPublishingAuthenticator.c"
}
__finally0:
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_clear_error (&_inner_error_);
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return NULL;
-#line 830 "FacebookPublishingAuthenticator.c"
+#line 813 "FacebookPublishingAuthenticator.c"
}
}
-static void publishing_authenticator_shotwell_facebook_web_authentication_pane_real_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* base) {
+static void
+publishing_authenticator_shotwell_facebook_web_authentication_pane_real_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* base)
+{
PublishingAuthenticatorShotwellFacebookWebAuthenticationPane * self;
gchar* loaded_url = NULL;
WebKitWebView* _tmp0_;
@@ -854,11 +839,8 @@ static void publishing_authenticator_shotwell_facebook_web_authentication_pane_r
gchar* _tmp7_;
gchar* _tmp8_;
const gchar* _tmp9_;
- gboolean _tmp10_;
- const gchar* _tmp22_;
- gboolean _tmp23_;
- const gchar* _tmp28_;
- gboolean _tmp29_;
+ const gchar* _tmp20_;
+ const gchar* _tmp25_;
#line 130 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_TYPE_WEB_AUTHENTICATION_PANE, PublishingAuthenticatorShotwellFacebookWebAuthenticationPane);
#line 131 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
@@ -890,109 +872,102 @@ static void publishing_authenticator_shotwell_facebook_web_authentication_pane_r
#line 135 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
_tmp9_ = loaded_url;
#line 135 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp10_ = string_contains (_tmp9_, "?");
-#line 135 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- if (_tmp10_) {
-#line 887 "FacebookPublishingAuthenticator.c"
+ if (string_contains (_tmp9_, "?")) {
+#line 867 "FacebookPublishingAuthenticator.c"
gint index = 0;
+ const gchar* _tmp10_;
+ gchar* params = NULL;
const gchar* _tmp11_;
gint _tmp12_;
- gchar* params = NULL;
const gchar* _tmp13_;
gint _tmp14_;
- const gchar* _tmp15_;
- gint _tmp16_;
- gint _tmp17_;
- gchar* _tmp18_;
- const gchar* _tmp19_;
- const gchar* _tmp20_;
- gchar* _tmp21_;
-#line 136 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp11_ = loaded_url;
+ gint _tmp15_;
+ gchar* _tmp16_;
+ const gchar* _tmp17_;
+ const gchar* _tmp18_;
+ gchar* _tmp19_;
#line 136 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp12_ = string_index_of_char (_tmp11_, (gunichar) '?', 0);
+ _tmp10_ = loaded_url;
#line 136 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- index = _tmp12_;
+ index = string_index_of_char (_tmp10_, (gunichar) '?', 0);
#line 137 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp13_ = loaded_url;
+ _tmp11_ = loaded_url;
#line 137 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp14_ = index;
+ _tmp12_ = index;
#line 137 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp15_ = loaded_url;
+ _tmp13_ = loaded_url;
#line 137 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp16_ = strlen (_tmp15_);
+ _tmp14_ = strlen (_tmp13_);
#line 137 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp17_ = _tmp16_;
+ _tmp15_ = _tmp14_;
#line 137 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp18_ = string_slice (_tmp13_, (glong) _tmp14_, (glong) _tmp17_);
+ _tmp16_ = string_slice (_tmp11_, (glong) _tmp12_, (glong) _tmp15_);
#line 137 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- params = _tmp18_;
+ params = _tmp16_;
#line 138 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp19_ = loaded_url;
+ _tmp17_ = loaded_url;
#line 138 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp20_ = params;
+ _tmp18_ = params;
#line 138 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp21_ = string_replace (_tmp19_, _tmp20_, "");
+ _tmp19_ = string_replace (_tmp17_, _tmp18_, "");
#line 138 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
_g_free0 (loaded_url);
#line 138 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- loaded_url = _tmp21_;
+ loaded_url = _tmp19_;
#line 135 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
_g_free0 (params);
-#line 933 "FacebookPublishingAuthenticator.c"
+#line 910 "FacebookPublishingAuthenticator.c"
}
#line 142 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp22_ = loaded_url;
-#line 142 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp23_ = string_contains (_tmp22_, "login_success");
+ _tmp20_ = loaded_url;
#line 142 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- if (_tmp23_) {
-#line 941 "FacebookPublishingAuthenticator.c"
- WebKitWebView* _tmp24_;
- WebKitWebView* _tmp25_;
- const gchar* _tmp26_;
- const gchar* _tmp27_;
+ if (string_contains (_tmp20_, "login_success")) {
+#line 916 "FacebookPublishingAuthenticator.c"
+ WebKitWebView* _tmp21_;
+ WebKitWebView* _tmp22_;
+ const gchar* _tmp23_;
+ const gchar* _tmp24_;
#line 143 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
publishing_authenticator_shotwell_facebook_web_authentication_pane_cache_dirty = TRUE;
#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp24_ = shotwell_plugins_common_web_authentication_pane_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPane));
+ _tmp21_ = shotwell_plugins_common_web_authentication_pane_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPane));
#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp25_ = _tmp24_;
+ _tmp22_ = _tmp21_;
#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp26_ = webkit_web_view_get_uri (_tmp25_);
+ _tmp23_ = webkit_web_view_get_uri (_tmp22_);
#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp27_ = _tmp26_;
+ _tmp24_ = _tmp23_;
#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- g_signal_emit (self, publishing_authenticator_shotwell_facebook_web_authentication_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_LOGIN_SUCCEEDED_SIGNAL], 0, _tmp27_);
+ g_signal_emit (self, publishing_authenticator_shotwell_facebook_web_authentication_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_LOGIN_SUCCEEDED_SIGNAL], 0, _tmp24_);
#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _g_object_unref0 (_tmp25_);
+ _g_object_unref0 (_tmp22_);
#line 145 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
_g_free0 (loaded_url);
#line 145 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
return;
-#line 964 "FacebookPublishingAuthenticator.c"
+#line 939 "FacebookPublishingAuthenticator.c"
}
#line 149 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp28_ = loaded_url;
+ _tmp25_ = loaded_url;
#line 149 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp29_ = string_contains (_tmp28_, "login_failure");
-#line 149 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- if (_tmp29_) {
+ if (string_contains (_tmp25_, "login_failure")) {
#line 150 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
g_signal_emit (self, publishing_authenticator_shotwell_facebook_web_authentication_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_LOGIN_FAILED_SIGNAL], 0);
#line 151 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
_g_free0 (loaded_url);
#line 151 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
return;
-#line 978 "FacebookPublishingAuthenticator.c"
+#line 951 "FacebookPublishingAuthenticator.c"
}
#line 130 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
_g_free0 (loaded_url);
-#line 982 "FacebookPublishingAuthenticator.c"
+#line 955 "FacebookPublishingAuthenticator.c"
}
-gboolean publishing_authenticator_shotwell_facebook_web_authentication_pane_is_cache_dirty (void) {
+gboolean
+publishing_authenticator_shotwell_facebook_web_authentication_pane_is_cache_dirty (void)
+{
gboolean result = FALSE;
gboolean _tmp0_;
#line 156 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
@@ -1001,24 +976,26 @@ gboolean publishing_authenticator_shotwell_facebook_web_authentication_pane_is_c
result = _tmp0_;
#line 156 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
return result;
-#line 995 "FacebookPublishingAuthenticator.c"
+#line 970 "FacebookPublishingAuthenticator.c"
}
-static PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_construct (GType object_type, const gchar* prefix, const gchar* translation, const gchar* exception_code, const gchar* exception_translation, const gchar* exception_code_2, const gchar* exception_translation_2) {
+static PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup*
+publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_construct (GType object_type,
+ const gchar* prefix,
+ const gchar* translation,
+ const gchar* exception_code,
+ const gchar* exception_translation,
+ const gchar* exception_code_2,
+ const gchar* exception_translation_2)
+{
PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* self = NULL;
- const gchar* _tmp0_;
+ gchar* _tmp0_;
gchar* _tmp1_;
- const gchar* _tmp2_;
+ gchar* _tmp2_;
gchar* _tmp3_;
- const gchar* _tmp4_;
+ gchar* _tmp4_;
gchar* _tmp5_;
- const gchar* _tmp6_;
- gchar* _tmp7_;
- const gchar* _tmp8_;
- gchar* _tmp9_;
- const gchar* _tmp10_;
- gchar* _tmp11_;
#line 31 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
g_return_val_if_fail (prefix != NULL, NULL);
#line 31 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
@@ -1026,164 +1003,184 @@ static PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup*
#line 31 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
self = (PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup*) g_type_create_instance (object_type);
#line 34 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp0_ = prefix;
-#line 34 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp1_ = g_strdup (_tmp0_);
+ _tmp0_ = g_strdup (prefix);
#line 34 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
_g_free0 (self->prefix);
#line 34 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- self->prefix = _tmp1_;
-#line 35 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp2_ = translation;
+ self->prefix = _tmp0_;
#line 35 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp3_ = g_strdup (_tmp2_);
+ _tmp1_ = g_strdup (translation);
#line 35 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
_g_free0 (self->translation);
#line 35 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- self->translation = _tmp3_;
+ self->translation = _tmp1_;
#line 36 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp4_ = exception_code;
-#line 36 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp5_ = g_strdup (_tmp4_);
+ _tmp2_ = g_strdup (exception_code);
#line 36 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
_g_free0 (self->exception_code);
#line 36 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- self->exception_code = _tmp5_;
-#line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp6_ = exception_translation;
+ self->exception_code = _tmp2_;
#line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp7_ = g_strdup (_tmp6_);
+ _tmp3_ = g_strdup (exception_translation);
#line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
_g_free0 (self->exception_translation);
#line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- self->exception_translation = _tmp7_;
+ self->exception_translation = _tmp3_;
#line 38 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp8_ = exception_code_2;
-#line 38 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp9_ = g_strdup (_tmp8_);
+ _tmp4_ = g_strdup (exception_code_2);
#line 38 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
_g_free0 (self->exception_code_2);
#line 38 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- self->exception_code_2 = _tmp9_;
-#line 39 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp10_ = exception_translation_2;
+ self->exception_code_2 = _tmp4_;
#line 39 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp11_ = g_strdup (_tmp10_);
+ _tmp5_ = g_strdup (exception_translation_2);
#line 39 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
_g_free0 (self->exception_translation_2);
#line 39 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- self->exception_translation_2 = _tmp11_;
+ self->exception_translation_2 = _tmp5_;
#line 31 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
return self;
-#line 1069 "FacebookPublishingAuthenticator.c"
+#line 1034 "FacebookPublishingAuthenticator.c"
}
-static PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_new (const gchar* prefix, const gchar* translation, const gchar* exception_code, const gchar* exception_translation, const gchar* exception_code_2, const gchar* exception_translation_2) {
+static PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup*
+publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_new (const gchar* prefix,
+ const gchar* translation,
+ const gchar* exception_code,
+ const gchar* exception_translation,
+ const gchar* exception_code_2,
+ const gchar* exception_translation_2)
+{
#line 31 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
return publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_TYPE_LOCALE_LOOKUP, prefix, translation, exception_code, exception_translation, exception_code_2, exception_translation_2);
-#line 1076 "FacebookPublishingAuthenticator.c"
+#line 1048 "FacebookPublishingAuthenticator.c"
}
-static void publishing_authenticator_shotwell_facebook_web_authentication_pane_value_locale_lookup_init (GValue* value) {
+static void
+publishing_authenticator_shotwell_facebook_web_authentication_pane_value_locale_lookup_init (GValue* value)
+{
#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
value->data[0].v_pointer = NULL;
-#line 1083 "FacebookPublishingAuthenticator.c"
+#line 1057 "FacebookPublishingAuthenticator.c"
}
-static void publishing_authenticator_shotwell_facebook_web_authentication_pane_value_locale_lookup_free_value (GValue* value) {
+static void
+publishing_authenticator_shotwell_facebook_web_authentication_pane_value_locale_lookup_free_value (GValue* value)
+{
#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
if (value->data[0].v_pointer) {
#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_unref (value->data[0].v_pointer);
-#line 1092 "FacebookPublishingAuthenticator.c"
+#line 1068 "FacebookPublishingAuthenticator.c"
}
}
-static void publishing_authenticator_shotwell_facebook_web_authentication_pane_value_locale_lookup_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+publishing_authenticator_shotwell_facebook_web_authentication_pane_value_locale_lookup_copy_value (const GValue* src_value,
+ GValue* dest_value)
+{
#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
if (src_value->data[0].v_pointer) {
#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
dest_value->data[0].v_pointer = publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_ref (src_value->data[0].v_pointer);
-#line 1102 "FacebookPublishingAuthenticator.c"
+#line 1081 "FacebookPublishingAuthenticator.c"
} else {
#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
dest_value->data[0].v_pointer = NULL;
-#line 1106 "FacebookPublishingAuthenticator.c"
+#line 1085 "FacebookPublishingAuthenticator.c"
}
}
-static gpointer publishing_authenticator_shotwell_facebook_web_authentication_pane_value_locale_lookup_peek_pointer (const GValue* value) {
+static gpointer
+publishing_authenticator_shotwell_facebook_web_authentication_pane_value_locale_lookup_peek_pointer (const GValue* value)
+{
#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
return value->data[0].v_pointer;
-#line 1114 "FacebookPublishingAuthenticator.c"
+#line 1095 "FacebookPublishingAuthenticator.c"
}
-static gchar* publishing_authenticator_shotwell_facebook_web_authentication_pane_value_locale_lookup_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_authenticator_shotwell_facebook_web_authentication_pane_value_locale_lookup_collect_value (GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
if (collect_values[0].v_pointer) {
-#line 1121 "FacebookPublishingAuthenticator.c"
+#line 1107 "FacebookPublishingAuthenticator.c"
PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup * object;
object = collect_values[0].v_pointer;
#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
if (object->parent_instance.g_class == NULL) {
#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1128 "FacebookPublishingAuthenticator.c"
+#line 1114 "FacebookPublishingAuthenticator.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1132 "FacebookPublishingAuthenticator.c"
+#line 1118 "FacebookPublishingAuthenticator.c"
}
#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
value->data[0].v_pointer = publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_ref (object);
-#line 1136 "FacebookPublishingAuthenticator.c"
+#line 1122 "FacebookPublishingAuthenticator.c"
} else {
#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
value->data[0].v_pointer = NULL;
-#line 1140 "FacebookPublishingAuthenticator.c"
+#line 1126 "FacebookPublishingAuthenticator.c"
}
#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
return NULL;
-#line 1144 "FacebookPublishingAuthenticator.c"
+#line 1130 "FacebookPublishingAuthenticator.c"
}
-static gchar* publishing_authenticator_shotwell_facebook_web_authentication_pane_value_locale_lookup_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_authenticator_shotwell_facebook_web_authentication_pane_value_locale_lookup_lcopy_value (const GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup ** object_p;
object_p = collect_values[0].v_pointer;
#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
if (!object_p) {
#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1155 "FacebookPublishingAuthenticator.c"
+#line 1146 "FacebookPublishingAuthenticator.c"
}
#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
if (!value->data[0].v_pointer) {
#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
*object_p = NULL;
-#line 1161 "FacebookPublishingAuthenticator.c"
+#line 1152 "FacebookPublishingAuthenticator.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
*object_p = value->data[0].v_pointer;
-#line 1165 "FacebookPublishingAuthenticator.c"
+#line 1156 "FacebookPublishingAuthenticator.c"
} else {
#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
*object_p = publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_ref (value->data[0].v_pointer);
-#line 1169 "FacebookPublishingAuthenticator.c"
+#line 1160 "FacebookPublishingAuthenticator.c"
}
#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
return NULL;
-#line 1173 "FacebookPublishingAuthenticator.c"
+#line 1164 "FacebookPublishingAuthenticator.c"
}
-static GParamSpec* publishing_authenticator_shotwell_facebook_web_authentication_pane_param_spec_locale_lookup (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+static GParamSpec*
+publishing_authenticator_shotwell_facebook_web_authentication_pane_param_spec_locale_lookup (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags)
+{
PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneParamSpecLocaleLookup* spec;
#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_TYPE_LOCALE_LOOKUP), NULL);
@@ -1193,20 +1190,25 @@ static GParamSpec* publishing_authenticator_shotwell_facebook_web_authentication
G_PARAM_SPEC (spec)->value_type = object_type;
#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
return G_PARAM_SPEC (spec);
-#line 1187 "FacebookPublishingAuthenticator.c"
+#line 1184 "FacebookPublishingAuthenticator.c"
}
-static gpointer publishing_authenticator_shotwell_facebook_web_authentication_pane_value_get_locale_lookup (const GValue* value) {
+static gpointer
+publishing_authenticator_shotwell_facebook_web_authentication_pane_value_get_locale_lookup (const GValue* value)
+{
#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_TYPE_LOCALE_LOOKUP), NULL);
#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
return value->data[0].v_pointer;
-#line 1196 "FacebookPublishingAuthenticator.c"
+#line 1195 "FacebookPublishingAuthenticator.c"
}
-static void publishing_authenticator_shotwell_facebook_web_authentication_pane_value_set_locale_lookup (GValue* value, gpointer v_object) {
+static void
+publishing_authenticator_shotwell_facebook_web_authentication_pane_value_set_locale_lookup (GValue* value,
+ gpointer v_object)
+{
PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup * old;
#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_TYPE_LOCALE_LOOKUP));
@@ -1222,22 +1224,25 @@ static void publishing_authenticator_shotwell_facebook_web_authentication_pane_v
value->data[0].v_pointer = v_object;
#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_ref (value->data[0].v_pointer);
-#line 1216 "FacebookPublishingAuthenticator.c"
+#line 1218 "FacebookPublishingAuthenticator.c"
} else {
#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
value->data[0].v_pointer = NULL;
-#line 1220 "FacebookPublishingAuthenticator.c"
+#line 1222 "FacebookPublishingAuthenticator.c"
}
#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
if (old) {
#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_unref (old);
-#line 1226 "FacebookPublishingAuthenticator.c"
+#line 1228 "FacebookPublishingAuthenticator.c"
}
}
-static void publishing_authenticator_shotwell_facebook_web_authentication_pane_value_take_locale_lookup (GValue* value, gpointer v_object) {
+static void
+publishing_authenticator_shotwell_facebook_web_authentication_pane_value_take_locale_lookup (GValue* value,
+ gpointer v_object)
+{
PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup * old;
#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_TYPE_LOCALE_LOOKUP));
@@ -1251,38 +1256,44 @@ static void publishing_authenticator_shotwell_facebook_web_authentication_pane_v
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
value->data[0].v_pointer = v_object;
-#line 1245 "FacebookPublishingAuthenticator.c"
+#line 1250 "FacebookPublishingAuthenticator.c"
} else {
#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
value->data[0].v_pointer = NULL;
-#line 1249 "FacebookPublishingAuthenticator.c"
+#line 1254 "FacebookPublishingAuthenticator.c"
}
#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
if (old) {
#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_unref (old);
-#line 1255 "FacebookPublishingAuthenticator.c"
+#line 1260 "FacebookPublishingAuthenticator.c"
}
}
-static void publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_class_init (PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookupClass * klass) {
+static void
+publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_class_init (PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookupClass * klass)
+{
#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_parent_class = g_type_class_peek_parent (klass);
#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
((PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookupClass *) klass)->finalize = publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_finalize;
-#line 1265 "FacebookPublishingAuthenticator.c"
+#line 1272 "FacebookPublishingAuthenticator.c"
}
-static void publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_instance_init (PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup * self) {
+static void
+publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_instance_init (PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup * self)
+{
#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
self->ref_count = 1;
-#line 1272 "FacebookPublishingAuthenticator.c"
+#line 1281 "FacebookPublishingAuthenticator.c"
}
-static void publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_finalize (PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup * obj) {
+static void
+publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_finalize (PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup * obj)
+{
PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup * self;
#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_TYPE_LOCALE_LOOKUP, PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup);
@@ -1300,11 +1311,13 @@ static void publishing_authenticator_shotwell_facebook_web_authentication_pane_l
_g_free0 (self->exception_code_2);
#line 29 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
_g_free0 (self->exception_translation_2);
-#line 1294 "FacebookPublishingAuthenticator.c"
+#line 1305 "FacebookPublishingAuthenticator.c"
}
-static GType publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_get_type (void) {
+static GType
+publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_get_type (void)
+{
static volatile gsize publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_type_id__volatile = 0;
if (g_once_init_enter (&publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_type_id__volatile)) {
static const GTypeValueTable g_define_type_value_table = { publishing_authenticator_shotwell_facebook_web_authentication_pane_value_locale_lookup_init, publishing_authenticator_shotwell_facebook_web_authentication_pane_value_locale_lookup_free_value, publishing_authenticator_shotwell_facebook_web_authentication_pane_value_locale_lookup_copy_value, publishing_authenticator_shotwell_facebook_web_authentication_pane_value_locale_lookup_peek_pointer, "p", publishing_authenticator_shotwell_facebook_web_authentication_pane_value_locale_lookup_collect_value, "p", publishing_authenticator_shotwell_facebook_web_authentication_pane_value_locale_lookup_lcopy_value };
@@ -1318,18 +1331,22 @@ static GType publishing_authenticator_shotwell_facebook_web_authentication_pane_
}
-static gpointer publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_ref (gpointer instance) {
+static gpointer
+publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_ref (gpointer instance)
+{
PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup * self;
self = instance;
#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
g_atomic_int_inc (&self->ref_count);
#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
return instance;
-#line 1319 "FacebookPublishingAuthenticator.c"
+#line 1334 "FacebookPublishingAuthenticator.c"
}
-static void publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_unref (gpointer instance) {
+static void
+publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_unref (gpointer instance)
+{
PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup * self;
self = instance;
#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
@@ -1338,12 +1355,14 @@ static void publishing_authenticator_shotwell_facebook_web_authentication_pane_l
PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_LOCALE_LOOKUP_GET_CLASS (self)->finalize (self);
#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 1332 "FacebookPublishingAuthenticator.c"
+#line 1349 "FacebookPublishingAuthenticator.c"
}
}
-static void publishing_authenticator_shotwell_facebook_web_authentication_pane_class_init (PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneClass * klass) {
+static void
+publishing_authenticator_shotwell_facebook_web_authentication_pane_class_init (PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneClass * klass)
+{
PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp0_;
PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp1_;
PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp2_;
@@ -1586,25 +1605,31 @@ static void publishing_authenticator_shotwell_facebook_web_authentication_pane_c
publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_table = _tmp45_;
#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_table_length1 = 45;
-#line 1580 "FacebookPublishingAuthenticator.c"
+#line 1599 "FacebookPublishingAuthenticator.c"
}
-static void publishing_authenticator_shotwell_facebook_web_authentication_pane_instance_init (PublishingAuthenticatorShotwellFacebookWebAuthenticationPane * self) {
+static void
+publishing_authenticator_shotwell_facebook_web_authentication_pane_instance_init (PublishingAuthenticatorShotwellFacebookWebAuthenticationPane * self)
+{
}
-static void publishing_authenticator_shotwell_facebook_web_authentication_pane_finalize (GObject * obj) {
+static void
+publishing_authenticator_shotwell_facebook_web_authentication_pane_finalize (GObject * obj)
+{
PublishingAuthenticatorShotwellFacebookWebAuthenticationPane * self;
#line 13 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_TYPE_WEB_AUTHENTICATION_PANE, PublishingAuthenticatorShotwellFacebookWebAuthenticationPane);
#line 13 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
G_OBJECT_CLASS (publishing_authenticator_shotwell_facebook_web_authentication_pane_parent_class)->finalize (obj);
-#line 1594 "FacebookPublishingAuthenticator.c"
+#line 1617 "FacebookPublishingAuthenticator.c"
}
-GType publishing_authenticator_shotwell_facebook_web_authentication_pane_get_type (void) {
+GType
+publishing_authenticator_shotwell_facebook_web_authentication_pane_get_type (void)
+{
static volatile gsize publishing_authenticator_shotwell_facebook_web_authentication_pane_type_id__volatile = 0;
if (g_once_init_enter (&publishing_authenticator_shotwell_facebook_web_authentication_pane_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_authenticator_shotwell_facebook_web_authentication_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingAuthenticatorShotwellFacebookWebAuthenticationPane), 0, (GInstanceInitFunc) publishing_authenticator_shotwell_facebook_web_authentication_pane_instance_init, NULL };
@@ -1616,135 +1641,141 @@ GType publishing_authenticator_shotwell_facebook_web_authentication_pane_get_typ
}
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
#line 172 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
return self ? g_object_ref (self) : NULL;
-#line 1613 "FacebookPublishingAuthenticator.c"
+#line 1640 "FacebookPublishingAuthenticator.c"
}
-static void _g_free0_ (gpointer var) {
+static void
+_g_free0_ (gpointer var)
+{
#line 173 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
var = (g_free (var), NULL);
-#line 1620 "FacebookPublishingAuthenticator.c"
+#line 1649 "FacebookPublishingAuthenticator.c"
}
-static void _g_variant_unref0_ (gpointer var) {
+static void
+_g_variant_unref0_ (gpointer var)
+{
#line 173 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
(var == NULL) ? NULL : (var = (g_variant_unref (var), NULL));
-#line 1627 "FacebookPublishingAuthenticator.c"
+#line 1658 "FacebookPublishingAuthenticator.c"
}
-PublishingAuthenticatorShotwellFacebookFacebook* publishing_authenticator_shotwell_facebook_facebook_construct (GType object_type, SpitPublishingPluginHost* host) {
+PublishingAuthenticatorShotwellFacebookFacebook*
+publishing_authenticator_shotwell_facebook_facebook_construct (GType object_type,
+ SpitPublishingPluginHost* host)
+{
PublishingAuthenticatorShotwellFacebookFacebook * self = NULL;
SpitPublishingPluginHost* _tmp0_;
- SpitPublishingPluginHost* _tmp1_;
- GHashFunc _tmp2_;
- GEqualFunc _tmp3_;
- GHashTable* _tmp4_;
+ GHashFunc _tmp1_;
+ GEqualFunc _tmp2_;
+ GHashTable* _tmp3_;
#line 171 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL);
#line 171 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
self = (PublishingAuthenticatorShotwellFacebookFacebook*) g_object_new (object_type, NULL);
#line 172 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp0_ = host;
-#line 172 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp1_ = _g_object_ref0 (_tmp0_);
+ _tmp0_ = _g_object_ref0 (host);
#line 172 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
_g_object_unref0 (self->priv->host);
#line 172 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- self->priv->host = _tmp1_;
+ self->priv->host = _tmp0_;
#line 173 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp2_ = g_str_hash;
+ _tmp1_ = g_str_hash;
#line 173 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp3_ = g_str_equal;
+ _tmp2_ = g_str_equal;
#line 173 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp4_ = g_hash_table_new_full (_tmp2_, _tmp3_, _g_free0_, _g_variant_unref0_);
+ _tmp3_ = g_hash_table_new_full (_tmp1_, _tmp2_, _g_free0_, _g_variant_unref0_);
#line 173 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
_g_hash_table_unref0 (self->priv->params);
#line 173 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- self->priv->params = _tmp4_;
+ self->priv->params = _tmp3_;
#line 171 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
return self;
-#line 1662 "FacebookPublishingAuthenticator.c"
+#line 1693 "FacebookPublishingAuthenticator.c"
}
-PublishingAuthenticatorShotwellFacebookFacebook* publishing_authenticator_shotwell_facebook_facebook_new (SpitPublishingPluginHost* host) {
+PublishingAuthenticatorShotwellFacebookFacebook*
+publishing_authenticator_shotwell_facebook_facebook_new (SpitPublishingPluginHost* host)
+{
#line 171 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
return publishing_authenticator_shotwell_facebook_facebook_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_TYPE_FACEBOOK, host);
-#line 1669 "FacebookPublishingAuthenticator.c"
+#line 1702 "FacebookPublishingAuthenticator.c"
}
-static void publishing_authenticator_shotwell_facebook_facebook_real_authenticate (SpitPublishingAuthenticator* base) {
+static void
+publishing_authenticator_shotwell_facebook_facebook_real_authenticate (SpitPublishingAuthenticator* base)
+{
PublishingAuthenticatorShotwellFacebookFacebook * self;
- gboolean _tmp0_;
- gboolean _tmp6_;
#line 176 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_TYPE_FACEBOOK, PublishingAuthenticatorShotwellFacebookFacebook);
#line 180 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp0_ = publishing_authenticator_shotwell_facebook_facebook_is_persistent_session_valid (self);
-#line 180 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- if (_tmp0_) {
-#line 1683 "FacebookPublishingAuthenticator.c"
+ if (publishing_authenticator_shotwell_facebook_facebook_is_persistent_session_valid (self)) {
+#line 1714 "FacebookPublishingAuthenticator.c"
gchar* access_token = NULL;
- gchar* _tmp1_;
- GHashTable* _tmp2_;
- gchar* _tmp3_;
- const gchar* _tmp4_;
- GVariant* _tmp5_;
+ gchar* _tmp0_;
+ GHashTable* _tmp1_;
+ gchar* _tmp2_;
+ const gchar* _tmp3_;
+ GVariant* _tmp4_;
#line 181 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp1_ = publishing_authenticator_shotwell_facebook_facebook_get_persistent_access_token (self);
+ _tmp0_ = publishing_authenticator_shotwell_facebook_facebook_get_persistent_access_token (self);
#line 181 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- access_token = _tmp1_;
+ access_token = _tmp0_;
#line 182 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp2_ = self->priv->params;
+ _tmp1_ = self->priv->params;
#line 182 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp3_ = g_strdup ("AccessToken");
+ _tmp2_ = g_strdup ("AccessToken");
#line 182 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp4_ = access_token;
+ _tmp3_ = access_token;
#line 182 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp5_ = g_variant_new_string (_tmp4_);
+ _tmp4_ = g_variant_new_string (_tmp3_);
#line 182 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- g_variant_ref_sink (_tmp5_);
+ g_variant_ref_sink (_tmp4_);
#line 182 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- g_hash_table_insert (_tmp2_, _tmp3_, _tmp5_);
+ g_hash_table_insert (_tmp1_, _tmp2_, _tmp4_);
#line 183 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator), "authenticated");
#line 184 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
_g_free0 (access_token);
#line 184 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
return;
-#line 1712 "FacebookPublishingAuthenticator.c"
+#line 1743 "FacebookPublishingAuthenticator.c"
}
#line 188 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp6_ = publishing_authenticator_shotwell_facebook_web_authentication_pane_is_cache_dirty ();
-#line 188 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- if (_tmp6_) {
-#line 1718 "FacebookPublishingAuthenticator.c"
- SpitPublishingPluginHost* _tmp7_;
- SpitPublishingPluginHost* _tmp8_;
+ if (publishing_authenticator_shotwell_facebook_web_authentication_pane_is_cache_dirty ()) {
+#line 1747 "FacebookPublishingAuthenticator.c"
+ SpitPublishingPluginHost* _tmp5_;
+ SpitPublishingPluginHost* _tmp6_;
#line 189 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp7_ = self->priv->host;
+ _tmp5_ = self->priv->host;
#line 189 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- spit_publishing_plugin_host_set_service_locked (_tmp7_, FALSE);
+ spit_publishing_plugin_host_set_service_locked (_tmp5_, FALSE);
#line 190 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp8_ = self->priv->host;
+ _tmp6_ = self->priv->host;
#line 190 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- spit_publishing_plugin_host_install_static_message_pane (_tmp8_, PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_FACEBOOK_RESTART_ERROR_MESSAGE, SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
-#line 1729 "FacebookPublishingAuthenticator.c"
+ spit_publishing_plugin_host_install_static_message_pane (_tmp6_, PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_FACEBOOK_RESTART_ERROR_MESSAGE, SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
+#line 1758 "FacebookPublishingAuthenticator.c"
} else {
#line 193 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
publishing_authenticator_shotwell_facebook_facebook_do_show_service_welcome_pane (self);
-#line 1733 "FacebookPublishingAuthenticator.c"
+#line 1762 "FacebookPublishingAuthenticator.c"
}
}
-static gboolean publishing_authenticator_shotwell_facebook_facebook_real_can_logout (SpitPublishingAuthenticator* base) {
+static gboolean
+publishing_authenticator_shotwell_facebook_facebook_real_can_logout (SpitPublishingAuthenticator* base)
+{
PublishingAuthenticatorShotwellFacebookFacebook * self;
gboolean result = FALSE;
#line 197 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
@@ -1753,18 +1784,22 @@ static gboolean publishing_authenticator_shotwell_facebook_facebook_real_can_log
result = TRUE;
#line 198 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
return result;
-#line 1747 "FacebookPublishingAuthenticator.c"
+#line 1778 "FacebookPublishingAuthenticator.c"
}
-static gpointer _g_hash_table_ref0 (gpointer self) {
+static gpointer
+_g_hash_table_ref0 (gpointer self)
+{
#line 202 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
return self ? g_hash_table_ref (self) : NULL;
-#line 1754 "FacebookPublishingAuthenticator.c"
+#line 1787 "FacebookPublishingAuthenticator.c"
}
-static GHashTable* publishing_authenticator_shotwell_facebook_facebook_real_get_authentication_parameter (SpitPublishingAuthenticator* base) {
+static GHashTable*
+publishing_authenticator_shotwell_facebook_facebook_real_get_authentication_parameter (SpitPublishingAuthenticator* base)
+{
PublishingAuthenticatorShotwellFacebookFacebook * self;
GHashTable* result = NULL;
GHashTable* _tmp0_;
@@ -1779,11 +1814,13 @@ static GHashTable* publishing_authenticator_shotwell_facebook_facebook_real_get_
result = _tmp1_;
#line 202 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
return result;
-#line 1773 "FacebookPublishingAuthenticator.c"
+#line 1808 "FacebookPublishingAuthenticator.c"
}
-void publishing_authenticator_shotwell_facebook_facebook_invalidate_persistent_session (PublishingAuthenticatorShotwellFacebookFacebook* self) {
+void
+publishing_authenticator_shotwell_facebook_facebook_invalidate_persistent_session (PublishingAuthenticatorShotwellFacebookFacebook* self)
+{
#line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_IS_FACEBOOK (self));
#line 206 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
@@ -1791,29 +1828,35 @@ void publishing_authenticator_shotwell_facebook_facebook_invalidate_persistent_s
"session.");
#line 207 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
publishing_authenticator_shotwell_facebook_facebook_set_persistent_access_token (self, "");
-#line 1784 "FacebookPublishingAuthenticator.c"
+#line 1821 "FacebookPublishingAuthenticator.c"
}
-static void publishing_authenticator_shotwell_facebook_facebook_real_logout (SpitPublishingAuthenticator* base) {
+static void
+publishing_authenticator_shotwell_facebook_facebook_real_logout (SpitPublishingAuthenticator* base)
+{
PublishingAuthenticatorShotwellFacebookFacebook * self;
#line 210 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_TYPE_FACEBOOK, PublishingAuthenticatorShotwellFacebookFacebook);
#line 211 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
publishing_authenticator_shotwell_facebook_facebook_invalidate_persistent_session (self);
-#line 1794 "FacebookPublishingAuthenticator.c"
+#line 1833 "FacebookPublishingAuthenticator.c"
}
-static void publishing_authenticator_shotwell_facebook_facebook_real_refresh (SpitPublishingAuthenticator* base) {
+static void
+publishing_authenticator_shotwell_facebook_facebook_real_refresh (SpitPublishingAuthenticator* base)
+{
PublishingAuthenticatorShotwellFacebookFacebook * self;
#line 214 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_TYPE_FACEBOOK, PublishingAuthenticatorShotwellFacebookFacebook);
-#line 1802 "FacebookPublishingAuthenticator.c"
+#line 1843 "FacebookPublishingAuthenticator.c"
}
-static gboolean publishing_authenticator_shotwell_facebook_facebook_is_persistent_session_valid (PublishingAuthenticatorShotwellFacebookFacebook* self) {
+static gboolean
+publishing_authenticator_shotwell_facebook_facebook_is_persistent_session_valid (PublishingAuthenticatorShotwellFacebookFacebook* self)
+{
gboolean result = FALSE;
gchar* token = NULL;
gchar* _tmp0_;
@@ -1829,19 +1872,19 @@ static gboolean publishing_authenticator_shotwell_facebook_facebook_is_persisten
_tmp1_ = token;
#line 222 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
if (_tmp1_ != NULL) {
-#line 1822 "FacebookPublishingAuthenticator.c"
+#line 1865 "FacebookPublishingAuthenticator.c"
const gchar* _tmp2_;
#line 223 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
_tmp2_ = token;
#line 223 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
g_debug ("FacebookPublishingAuthenticator.vala:223: existing Facebook session fo" \
"und in configuration database (access_token = %s).", _tmp2_);
-#line 1828 "FacebookPublishingAuthenticator.c"
+#line 1871 "FacebookPublishingAuthenticator.c"
} else {
#line 226 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
g_debug ("FacebookPublishingAuthenticator.vala:226: no existing Facebook session" \
" available.");
-#line 1832 "FacebookPublishingAuthenticator.c"
+#line 1875 "FacebookPublishingAuthenticator.c"
}
#line 228 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
_tmp3_ = token;
@@ -1851,11 +1894,13 @@ static gboolean publishing_authenticator_shotwell_facebook_facebook_is_persisten
_g_free0 (token);
#line 228 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
return result;
-#line 1842 "FacebookPublishingAuthenticator.c"
+#line 1885 "FacebookPublishingAuthenticator.c"
}
-static gchar* publishing_authenticator_shotwell_facebook_facebook_get_persistent_access_token (PublishingAuthenticatorShotwellFacebookFacebook* self) {
+static gchar*
+publishing_authenticator_shotwell_facebook_facebook_get_persistent_access_token (PublishingAuthenticatorShotwellFacebookFacebook* self)
+{
gchar* result = NULL;
SpitPublishingPluginHost* _tmp0_;
gchar* _tmp1_;
@@ -1869,13 +1914,15 @@ static gchar* publishing_authenticator_shotwell_facebook_facebook_get_persistent
result = _tmp1_;
#line 232 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
return result;
-#line 1860 "FacebookPublishingAuthenticator.c"
+#line 1905 "FacebookPublishingAuthenticator.c"
}
-static void publishing_authenticator_shotwell_facebook_facebook_set_persistent_access_token (PublishingAuthenticatorShotwellFacebookFacebook* self, const gchar* access_token) {
+static void
+publishing_authenticator_shotwell_facebook_facebook_set_persistent_access_token (PublishingAuthenticatorShotwellFacebookFacebook* self,
+ const gchar* access_token)
+{
SpitPublishingPluginHost* _tmp0_;
- const gchar* _tmp1_;
#line 235 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_IS_FACEBOOK (self));
#line 235 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
@@ -1883,21 +1930,23 @@ static void publishing_authenticator_shotwell_facebook_facebook_set_persistent_a
#line 236 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
_tmp0_ = self->priv->host;
#line 236 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp1_ = access_token;
-#line 236 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "access_token", _tmp1_);
-#line 1877 "FacebookPublishingAuthenticator.c"
+ spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "access_token", access_token);
+#line 1922 "FacebookPublishingAuthenticator.c"
}
-static void _publishing_authenticator_shotwell_facebook_facebook_on_login_clicked_spit_publishing_login_callback (gpointer self) {
+static void
+_publishing_authenticator_shotwell_facebook_facebook_on_login_clicked_spit_publishing_login_callback (gpointer self)
+{
#line 242 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
publishing_authenticator_shotwell_facebook_facebook_on_login_clicked ((PublishingAuthenticatorShotwellFacebookFacebook*) self);
-#line 1884 "FacebookPublishingAuthenticator.c"
+#line 1931 "FacebookPublishingAuthenticator.c"
}
-static void publishing_authenticator_shotwell_facebook_facebook_do_show_service_welcome_pane (PublishingAuthenticatorShotwellFacebookFacebook* self) {
+static void
+publishing_authenticator_shotwell_facebook_facebook_do_show_service_welcome_pane (PublishingAuthenticatorShotwellFacebookFacebook* self)
+{
SpitPublishingPluginHost* _tmp0_;
SpitPublishingPluginHost* _tmp1_;
#line 239 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
@@ -1913,11 +1962,13 @@ static void publishing_authenticator_shotwell_facebook_facebook_do_show_service_
_tmp1_ = self->priv->host;
#line 243 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
spit_publishing_plugin_host_set_service_locked (_tmp1_, FALSE);
-#line 1903 "FacebookPublishingAuthenticator.c"
+#line 1952 "FacebookPublishingAuthenticator.c"
}
-static void publishing_authenticator_shotwell_facebook_facebook_on_login_clicked (PublishingAuthenticatorShotwellFacebookFacebook* self) {
+static void
+publishing_authenticator_shotwell_facebook_facebook_on_login_clicked (PublishingAuthenticatorShotwellFacebookFacebook* self)
+{
#line 246 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_IS_FACEBOOK (self));
#line 247 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
@@ -1925,25 +1976,34 @@ static void publishing_authenticator_shotwell_facebook_facebook_on_login_clicked
"on welcome pane.");
#line 249 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
publishing_authenticator_shotwell_facebook_facebook_do_hosted_web_authentication (self);
-#line 1914 "FacebookPublishingAuthenticator.c"
+#line 1965 "FacebookPublishingAuthenticator.c"
}
-static void _publishing_authenticator_shotwell_facebook_facebook_on_web_auth_pane_login_succeeded_publishing_authenticator_shotwell_facebook_web_authentication_pane_login_succeeded (PublishingAuthenticatorShotwellFacebookWebAuthenticationPane* _sender, const gchar* success_url, gpointer self) {
+static void
+_publishing_authenticator_shotwell_facebook_facebook_on_web_auth_pane_login_succeeded_publishing_authenticator_shotwell_facebook_web_authentication_pane_login_succeeded (PublishingAuthenticatorShotwellFacebookWebAuthenticationPane* _sender,
+ const gchar* success_url,
+ gpointer self)
+{
#line 258 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
publishing_authenticator_shotwell_facebook_facebook_on_web_auth_pane_login_succeeded ((PublishingAuthenticatorShotwellFacebookFacebook*) self, success_url);
-#line 1921 "FacebookPublishingAuthenticator.c"
+#line 1976 "FacebookPublishingAuthenticator.c"
}
-static void _publishing_authenticator_shotwell_facebook_facebook_on_web_auth_pane_login_failed_publishing_authenticator_shotwell_facebook_web_authentication_pane_login_failed (PublishingAuthenticatorShotwellFacebookWebAuthenticationPane* _sender, gpointer self) {
+static void
+_publishing_authenticator_shotwell_facebook_facebook_on_web_auth_pane_login_failed_publishing_authenticator_shotwell_facebook_web_authentication_pane_login_failed (PublishingAuthenticatorShotwellFacebookWebAuthenticationPane* _sender,
+ gpointer self)
+{
#line 259 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
publishing_authenticator_shotwell_facebook_facebook_on_web_auth_pane_login_failed ((PublishingAuthenticatorShotwellFacebookFacebook*) self);
-#line 1928 "FacebookPublishingAuthenticator.c"
+#line 1986 "FacebookPublishingAuthenticator.c"
}
-static void publishing_authenticator_shotwell_facebook_facebook_do_hosted_web_authentication (PublishingAuthenticatorShotwellFacebookFacebook* self) {
+static void
+publishing_authenticator_shotwell_facebook_facebook_do_hosted_web_authentication (PublishingAuthenticatorShotwellFacebookFacebook* self)
+{
SpitPublishingPluginHost* _tmp0_;
PublishingAuthenticatorShotwellFacebookWebAuthenticationPane* _tmp1_;
PublishingAuthenticatorShotwellFacebookWebAuthenticationPane* _tmp2_;
@@ -1979,12 +2039,14 @@ static void publishing_authenticator_shotwell_facebook_facebook_do_hosted_web_au
_tmp5_ = self->priv->web_auth_pane;
#line 261 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
spit_publishing_plugin_host_install_dialog_pane (_tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
-#line 1967 "FacebookPublishingAuthenticator.c"
+#line 2027 "FacebookPublishingAuthenticator.c"
}
-static void publishing_authenticator_shotwell_facebook_facebook_on_web_auth_pane_login_succeeded (PublishingAuthenticatorShotwellFacebookFacebook* self, const gchar* success_url) {
- const gchar* _tmp0_;
+static void
+publishing_authenticator_shotwell_facebook_facebook_on_web_auth_pane_login_succeeded (PublishingAuthenticatorShotwellFacebookFacebook* self,
+ const gchar* success_url)
+{
#line 266 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_IS_FACEBOOK (self));
#line 266 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
@@ -1993,14 +2055,14 @@ static void publishing_authenticator_shotwell_facebook_facebook_on_web_auth_pane
g_debug ("FacebookPublishingAuthenticator.vala:267: EVENT: hosted web login succ" \
"eeded.");
#line 269 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp0_ = success_url;
-#line 269 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- publishing_authenticator_shotwell_facebook_facebook_do_authenticate_session (self, _tmp0_);
-#line 1983 "FacebookPublishingAuthenticator.c"
+ publishing_authenticator_shotwell_facebook_facebook_do_authenticate_session (self, success_url);
+#line 2043 "FacebookPublishingAuthenticator.c"
}
-static void publishing_authenticator_shotwell_facebook_facebook_on_web_auth_pane_login_failed (PublishingAuthenticatorShotwellFacebookFacebook* self) {
+static void
+publishing_authenticator_shotwell_facebook_facebook_on_web_auth_pane_login_failed (PublishingAuthenticatorShotwellFacebookFacebook* self)
+{
#line 272 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_IS_FACEBOOK (self));
#line 273 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
@@ -2008,234 +2070,223 @@ static void publishing_authenticator_shotwell_facebook_facebook_on_web_auth_pane
"ed.");
#line 281 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
publishing_authenticator_shotwell_facebook_facebook_do_show_service_welcome_pane (self);
-#line 1994 "FacebookPublishingAuthenticator.c"
+#line 2056 "FacebookPublishingAuthenticator.c"
}
-static gint string_index_of (const gchar* self, const gchar* needle, gint start_index) {
+static gint
+string_index_of (const gchar* self,
+ const gchar* needle,
+ gint start_index)
+{
gint result = 0;
gchar* _result_ = NULL;
- gint _tmp0_;
- const gchar* _tmp1_;
- gchar* _tmp2_;
- gchar* _tmp3_;
-#line 1011 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ gchar* _tmp0_;
+ gchar* _tmp1_;
+#line 1025 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, 0);
-#line 1011 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1025 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (needle != NULL, 0);
-#line 1012 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp0_ = start_index;
-#line 1012 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp1_ = needle;
-#line 1012 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp2_ = strstr (((gchar*) self) + _tmp0_, (gchar*) _tmp1_);
-#line 1012 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _result_ = _tmp2_;
-#line 1014 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp3_ = _result_;
-#line 1014 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp3_ != NULL) {
-#line 2021 "FacebookPublishingAuthenticator.c"
- gchar* _tmp4_;
-#line 1015 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp4_ = _result_;
-#line 1015 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- result = (gint) (_tmp4_ - ((gchar*) self));
-#line 1015 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1026 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp0_ = strstr (((gchar*) self) + start_index, (gchar*) needle);
+#line 1026 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _result_ = _tmp0_;
+#line 1028 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp1_ = _result_;
+#line 1028 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (_tmp1_ != NULL) {
+#line 2081 "FacebookPublishingAuthenticator.c"
+ gchar* _tmp2_;
+#line 1029 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp2_ = _result_;
+#line 1029 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = (gint) (_tmp2_ - ((gchar*) self));
+#line 1029 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 2029 "FacebookPublishingAuthenticator.c"
+#line 2089 "FacebookPublishingAuthenticator.c"
} else {
-#line 1017 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1031 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
result = -1;
-#line 1017 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1031 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 2035 "FacebookPublishingAuthenticator.c"
+#line 2095 "FacebookPublishingAuthenticator.c"
}
}
-static void publishing_authenticator_shotwell_facebook_facebook_do_authenticate_session (PublishingAuthenticatorShotwellFacebookFacebook* self, const gchar* good_login_uri) {
- const gchar* _tmp0_;
+static void
+publishing_authenticator_shotwell_facebook_facebook_do_authenticate_session (PublishingAuthenticatorShotwellFacebookFacebook* self,
+ const gchar* good_login_uri)
+{
gchar* decoded_uri = NULL;
- const gchar* _tmp1_;
- gchar* _tmp2_;
+ gchar* _tmp0_;
gchar* access_token = NULL;
gint index = 0;
- const gchar* _tmp3_;
- gint _tmp4_;
- gint _tmp5_;
- const gchar* _tmp12_;
+ const gchar* _tmp1_;
+ gint _tmp2_;
+ const gchar* _tmp9_;
gchar* trailing_params = NULL;
- const gchar* _tmp16_;
- gint _tmp17_;
- gint _tmp18_;
+ const gchar* _tmp13_;
+ gint _tmp14_;
+ const gchar* _tmp21_;
const gchar* _tmp25_;
+ gchar* _tmp26_;
+ GHashTable* _tmp27_;
+ gchar* _tmp28_;
const gchar* _tmp29_;
- gchar* _tmp30_;
- GHashTable* _tmp31_;
- gchar* _tmp32_;
- const gchar* _tmp33_;
- GVariant* _tmp34_;
- const gchar* _tmp35_;
+ GVariant* _tmp30_;
+ const gchar* _tmp31_;
#line 284 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_IS_FACEBOOK (self));
#line 284 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
g_return_if_fail (good_login_uri != NULL);
#line 285 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp0_ = good_login_uri;
-#line 285 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
g_debug ("FacebookPublishingAuthenticator.vala:285: ACTION: preparing to extract" \
-" session information encoded in uri = '%s'", _tmp0_);
-#line 289 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp1_ = good_login_uri;
+" session information encoded in uri = '%s'", good_login_uri);
#line 289 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp2_ = soup_uri_decode (_tmp1_);
+ _tmp0_ = soup_uri_decode (good_login_uri);
#line 289 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- decoded_uri = _tmp2_;
+ decoded_uri = _tmp0_;
#line 292 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
access_token = NULL;
#line 293 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp3_ = decoded_uri;
+ _tmp1_ = decoded_uri;
#line 293 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp4_ = string_index_of (_tmp3_, "#access_token=", 0);
-#line 293 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- index = _tmp4_;
+ index = string_index_of (_tmp1_, "#access_token=", 0);
#line 294 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp5_ = index;
+ _tmp2_ = index;
#line 294 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- if (_tmp5_ >= 0) {
-#line 2089 "FacebookPublishingAuthenticator.c"
- const gchar* _tmp6_;
+ if (_tmp2_ >= 0) {
+#line 2142 "FacebookPublishingAuthenticator.c"
+ const gchar* _tmp3_;
+ gint _tmp4_;
+ const gchar* _tmp5_;
+ gint _tmp6_;
gint _tmp7_;
- const gchar* _tmp8_;
- gint _tmp9_;
- gint _tmp10_;
- gchar* _tmp11_;
+ gchar* _tmp8_;
#line 295 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp6_ = decoded_uri;
+ _tmp3_ = decoded_uri;
#line 295 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp7_ = index;
+ _tmp4_ = index;
#line 295 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp8_ = decoded_uri;
+ _tmp5_ = decoded_uri;
#line 295 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp9_ = strlen (_tmp8_);
+ _tmp6_ = strlen (_tmp5_);
#line 295 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp10_ = _tmp9_;
+ _tmp7_ = _tmp6_;
#line 295 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp11_ = string_slice (_tmp6_, (glong) _tmp7_, (glong) _tmp10_);
+ _tmp8_ = string_slice (_tmp3_, (glong) _tmp4_, (glong) _tmp7_);
#line 295 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
_g_free0 (access_token);
#line 295 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- access_token = _tmp11_;
-#line 2112 "FacebookPublishingAuthenticator.c"
+ access_token = _tmp8_;
+#line 2165 "FacebookPublishingAuthenticator.c"
}
#line 296 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp12_ = access_token;
+ _tmp9_ = access_token;
#line 296 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- if (_tmp12_ == NULL) {
-#line 2118 "FacebookPublishingAuthenticator.c"
- SpitPublishingPluginHost* _tmp13_;
- GError* _tmp14_;
- GError* _tmp15_;
+ if (_tmp9_ == NULL) {
+#line 2171 "FacebookPublishingAuthenticator.c"
+ SpitPublishingPluginHost* _tmp10_;
+ GError* _tmp11_;
+ GError* _tmp12_;
#line 297 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp13_ = self->priv->host;
+ _tmp10_ = self->priv->host;
#line 297 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp14_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Server redirect URL contained no access token");
+ _tmp11_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Server redirect URL contained no access token");
#line 297 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp15_ = _tmp14_;
+ _tmp12_ = _tmp11_;
#line 297 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- spit_publishing_plugin_host_post_error (_tmp13_, _tmp15_);
+ spit_publishing_plugin_host_post_error (_tmp10_, _tmp12_);
#line 297 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _g_error_free0 (_tmp15_);
+ _g_error_free0 (_tmp12_);
#line 299 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
_g_free0 (access_token);
#line 299 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
_g_free0 (decoded_uri);
#line 299 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
return;
-#line 2138 "FacebookPublishingAuthenticator.c"
+#line 2191 "FacebookPublishingAuthenticator.c"
}
#line 303 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
trailing_params = NULL;
#line 304 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp16_ = access_token;
+ _tmp13_ = access_token;
#line 304 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp17_ = string_index_of_char (_tmp16_, (gunichar) '&', 0);
-#line 304 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- index = _tmp17_;
+ index = string_index_of_char (_tmp13_, (gunichar) '&', 0);
#line 305 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp18_ = index;
+ _tmp14_ = index;
#line 305 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- if (_tmp18_ >= 0) {
-#line 2152 "FacebookPublishingAuthenticator.c"
- const gchar* _tmp19_;
- gint _tmp20_;
- const gchar* _tmp21_;
- gint _tmp22_;
- gint _tmp23_;
- gchar* _tmp24_;
+ if (_tmp14_ >= 0) {
+#line 2203 "FacebookPublishingAuthenticator.c"
+ const gchar* _tmp15_;
+ gint _tmp16_;
+ const gchar* _tmp17_;
+ gint _tmp18_;
+ gint _tmp19_;
+ gchar* _tmp20_;
#line 306 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp19_ = access_token;
+ _tmp15_ = access_token;
#line 306 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp20_ = index;
+ _tmp16_ = index;
#line 306 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp21_ = access_token;
+ _tmp17_ = access_token;
#line 306 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp22_ = strlen (_tmp21_);
+ _tmp18_ = strlen (_tmp17_);
#line 306 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp23_ = _tmp22_;
+ _tmp19_ = _tmp18_;
#line 306 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp24_ = string_slice (_tmp19_, (glong) _tmp20_, (glong) _tmp23_);
+ _tmp20_ = string_slice (_tmp15_, (glong) _tmp16_, (glong) _tmp19_);
#line 306 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
_g_free0 (trailing_params);
#line 306 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- trailing_params = _tmp24_;
-#line 2175 "FacebookPublishingAuthenticator.c"
+ trailing_params = _tmp20_;
+#line 2226 "FacebookPublishingAuthenticator.c"
}
#line 307 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp25_ = trailing_params;
+ _tmp21_ = trailing_params;
#line 307 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- if (_tmp25_ != NULL) {
-#line 2181 "FacebookPublishingAuthenticator.c"
- const gchar* _tmp26_;
- const gchar* _tmp27_;
- gchar* _tmp28_;
+ if (_tmp21_ != NULL) {
+#line 2232 "FacebookPublishingAuthenticator.c"
+ const gchar* _tmp22_;
+ const gchar* _tmp23_;
+ gchar* _tmp24_;
#line 308 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp26_ = access_token;
+ _tmp22_ = access_token;
#line 308 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp27_ = trailing_params;
+ _tmp23_ = trailing_params;
#line 308 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp28_ = string_replace (_tmp26_, _tmp27_, "");
+ _tmp24_ = string_replace (_tmp22_, _tmp23_, "");
#line 308 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
_g_free0 (access_token);
#line 308 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- access_token = _tmp28_;
-#line 2195 "FacebookPublishingAuthenticator.c"
+ access_token = _tmp24_;
+#line 2246 "FacebookPublishingAuthenticator.c"
}
#line 311 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp29_ = access_token;
+ _tmp25_ = access_token;
#line 311 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp30_ = string_replace (_tmp29_, "#access_token=", "");
+ _tmp26_ = string_replace (_tmp25_, "#access_token=", "");
#line 311 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
_g_free0 (access_token);
#line 311 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- access_token = _tmp30_;
+ access_token = _tmp26_;
#line 312 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp31_ = self->priv->params;
+ _tmp27_ = self->priv->params;
#line 312 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp32_ = g_strdup ("AccessToken");
+ _tmp28_ = g_strdup ("AccessToken");
#line 312 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp33_ = access_token;
+ _tmp29_ = access_token;
#line 312 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp34_ = g_variant_new_string (_tmp33_);
+ _tmp30_ = g_variant_new_string (_tmp29_);
#line 312 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- g_variant_ref_sink (_tmp34_);
+ g_variant_ref_sink (_tmp30_);
#line 312 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- g_hash_table_insert (_tmp31_, _tmp32_, _tmp34_);
+ g_hash_table_insert (_tmp27_, _tmp28_, _tmp30_);
#line 313 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- _tmp35_ = access_token;
+ _tmp31_ = access_token;
#line 313 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
- publishing_authenticator_shotwell_facebook_facebook_set_persistent_access_token (self, _tmp35_);
+ publishing_authenticator_shotwell_facebook_facebook_set_persistent_access_token (self, _tmp31_);
#line 315 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator), "authenticated");
#line 284 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
@@ -2244,22 +2295,26 @@ static void publishing_authenticator_shotwell_facebook_facebook_do_authenticate_
_g_free0 (access_token);
#line 284 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
_g_free0 (decoded_uri);
-#line 2229 "FacebookPublishingAuthenticator.c"
+#line 2280 "FacebookPublishingAuthenticator.c"
}
-static void publishing_authenticator_shotwell_facebook_facebook_class_init (PublishingAuthenticatorShotwellFacebookFacebookClass * klass) {
+static void
+publishing_authenticator_shotwell_facebook_facebook_class_init (PublishingAuthenticatorShotwellFacebookFacebookClass * klass)
+{
#line 160 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
publishing_authenticator_shotwell_facebook_facebook_parent_class = g_type_class_peek_parent (klass);
#line 160 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
g_type_class_add_private (klass, sizeof (PublishingAuthenticatorShotwellFacebookFacebookPrivate));
#line 160 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
G_OBJECT_CLASS (klass)->finalize = publishing_authenticator_shotwell_facebook_facebook_finalize;
-#line 2240 "FacebookPublishingAuthenticator.c"
+#line 2293 "FacebookPublishingAuthenticator.c"
}
-static void publishing_authenticator_shotwell_facebook_facebook_spit_publishing_authenticator_interface_init (SpitPublishingAuthenticatorIface * iface) {
+static void
+publishing_authenticator_shotwell_facebook_facebook_spit_publishing_authenticator_interface_init (SpitPublishingAuthenticatorIface * iface)
+{
#line 160 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
publishing_authenticator_shotwell_facebook_facebook_spit_publishing_authenticator_parent_iface = g_type_interface_peek_parent (iface);
#line 160 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
@@ -2272,20 +2327,24 @@ static void publishing_authenticator_shotwell_facebook_facebook_spit_publishing_
iface->logout = (void (*) (SpitPublishingAuthenticator *)) publishing_authenticator_shotwell_facebook_facebook_real_logout;
#line 160 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
iface->refresh = (void (*) (SpitPublishingAuthenticator *)) publishing_authenticator_shotwell_facebook_facebook_real_refresh;
-#line 2257 "FacebookPublishingAuthenticator.c"
+#line 2312 "FacebookPublishingAuthenticator.c"
}
-static void publishing_authenticator_shotwell_facebook_facebook_instance_init (PublishingAuthenticatorShotwellFacebookFacebook * self) {
+static void
+publishing_authenticator_shotwell_facebook_facebook_instance_init (PublishingAuthenticatorShotwellFacebookFacebook * self)
+{
#line 160 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
self->priv = PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_FACEBOOK_GET_PRIVATE (self);
#line 162 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
self->priv->web_auth_pane = NULL;
-#line 2266 "FacebookPublishingAuthenticator.c"
+#line 2323 "FacebookPublishingAuthenticator.c"
}
-static void publishing_authenticator_shotwell_facebook_facebook_finalize (GObject * obj) {
+static void
+publishing_authenticator_shotwell_facebook_facebook_finalize (GObject * obj)
+{
PublishingAuthenticatorShotwellFacebookFacebook * self;
#line 160 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_TYPE_FACEBOOK, PublishingAuthenticatorShotwellFacebookFacebook);
@@ -2297,11 +2356,13 @@ static void publishing_authenticator_shotwell_facebook_facebook_finalize (GObjec
_g_hash_table_unref0 (self->priv->params);
#line 160 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
G_OBJECT_CLASS (publishing_authenticator_shotwell_facebook_facebook_parent_class)->finalize (obj);
-#line 2282 "FacebookPublishingAuthenticator.c"
+#line 2341 "FacebookPublishingAuthenticator.c"
}
-GType publishing_authenticator_shotwell_facebook_facebook_get_type (void) {
+GType
+publishing_authenticator_shotwell_facebook_facebook_get_type (void)
+{
static volatile gsize publishing_authenticator_shotwell_facebook_facebook_type_id__volatile = 0;
if (g_once_init_enter (&publishing_authenticator_shotwell_facebook_facebook_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingAuthenticatorShotwellFacebookFacebookClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_authenticator_shotwell_facebook_facebook_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingAuthenticatorShotwellFacebookFacebook), 0, (GInstanceInitFunc) publishing_authenticator_shotwell_facebook_facebook_instance_init, NULL };
@@ -2315,7 +2376,11 @@ GType publishing_authenticator_shotwell_facebook_facebook_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) {
@@ -2327,13 +2392,19 @@ 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);
}
-static gint _vala_array_length (gpointer array) {
+static gint
+_vala_array_length (gpointer array)
+{
int length;
length = 0;
if (array) {
diff --git a/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.c b/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.c
index cfeb019..bdee2ff 100644
--- a/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.c
+++ b/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.c
@@ -1,4 +1,4 @@
-/* FlickrPublishingAuthenticator.c generated by valac 0.36.6, the Vala compiler
+/* FlickrPublishingAuthenticator.c generated by valac 0.40.4, the Vala compiler
* generated from FlickrPublishingAuthenticator.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>
@@ -52,15 +53,20 @@ typedef struct _PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction
typedef struct _PublishingAuthenticatorShotwellFlickrWebAuthenticationPane PublishingAuthenticatorShotwellFlickrWebAuthenticationPane;
typedef struct _PublishingAuthenticatorShotwellFlickrWebAuthenticationPaneClass PublishingAuthenticatorShotwellFlickrWebAuthenticationPaneClass;
typedef struct _PublishingAuthenticatorShotwellFlickrWebAuthenticationPanePrivate PublishingAuthenticatorShotwellFlickrWebAuthenticationPanePrivate;
+enum {
+ PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_WEB_AUTHENTICATION_PANE_0_PROPERTY,
+ PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_WEB_AUTHENTICATION_PANE_NUM_PROPERTIES
+};
+static GParamSpec* publishing_authenticator_shotwell_flickr_web_authentication_pane_properties[PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_WEB_AUTHENTICATION_PANE_NUM_PROPERTIES];
#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
#define __vala_SoupURI_free0(var) ((var == NULL) ? NULL : (var = (_vala_SoupURI_free (var), NULL)))
#define _g_hash_table_unref0(var) ((var == NULL) ? NULL : (var = (g_hash_table_unref (var), NULL)))
enum {
PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_WEB_AUTHENTICATION_PANE_AUTHORIZED_SIGNAL,
PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_WEB_AUTHENTICATION_PANE_ERROR_SIGNAL,
- PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_WEB_AUTHENTICATION_PANE_LAST_SIGNAL
+ PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_WEB_AUTHENTICATION_PANE_NUM_SIGNALS
};
-static guint publishing_authenticator_shotwell_flickr_web_authentication_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_WEB_AUTHENTICATION_PANE_LAST_SIGNAL] = {0};
+static guint publishing_authenticator_shotwell_flickr_web_authentication_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_WEB_AUTHENTICATION_PANE_NUM_SIGNALS] = {0};
#define PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR (publishing_authenticator_shotwell_oauth1_authenticator_get_type ())
#define PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_AUTHENTICATOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator))
@@ -83,6 +89,11 @@ typedef struct _PublishingAuthenticatorShotwellOAuth1AuthenticatorPrivate Publis
typedef struct _PublishingAuthenticatorShotwellFlickrFlickr PublishingAuthenticatorShotwellFlickrFlickr;
typedef struct _PublishingAuthenticatorShotwellFlickrFlickrClass PublishingAuthenticatorShotwellFlickrFlickrClass;
typedef struct _PublishingAuthenticatorShotwellFlickrFlickrPrivate PublishingAuthenticatorShotwellFlickrFlickrPrivate;
+enum {
+ PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_FLICKR_0_PROPERTY,
+ PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_FLICKR_NUM_PROPERTIES
+};
+static GParamSpec* publishing_authenticator_shotwell_flickr_flickr_properties[PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_FLICKR_NUM_PROPERTIES];
#define _publishing_rest_support_transaction_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rest_support_transaction_unref (var), NULL)))
#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
@@ -157,41 +168,41 @@ static gpointer publishing_authenticator_shotwell_flickr_flickr_parent_class = N
"Click Log in to log into Flickr in your Web browser. You will have to " \
"authorize Shotwell Connect to link to your Flickr account.")
GType publishing_authenticator_shotwell_flickr_authentication_request_transaction_get_type (void) G_GNUC_CONST;
-enum {
- PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_AUTHENTICATION_REQUEST_TRANSACTION_DUMMY_PROPERTY
-};
PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction* publishing_authenticator_shotwell_flickr_authentication_request_transaction_new (PublishingRESTSupportOAuth1Session* session);
-PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction* publishing_authenticator_shotwell_flickr_authentication_request_transaction_construct (GType object_type, PublishingRESTSupportOAuth1Session* session);
+PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction* publishing_authenticator_shotwell_flickr_authentication_request_transaction_construct (GType object_type,
+ PublishingRESTSupportOAuth1Session* session);
GType publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_get_type (void) G_GNUC_CONST;
-enum {
- PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_ACCESS_TOKEN_FETCH_TRANSACTION_DUMMY_PROPERTY
-};
-PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction* publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_new (PublishingRESTSupportOAuth1Session* session, const gchar* user_verifier);
-PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction* publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_construct (GType object_type, PublishingRESTSupportOAuth1Session* session, const gchar* user_verifier);
+PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction* publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_new (PublishingRESTSupportOAuth1Session* session,
+ const gchar* user_verifier);
+PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction* publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_construct (GType object_type,
+ PublishingRESTSupportOAuth1Session* session,
+ const gchar* user_verifier);
GType publishing_authenticator_shotwell_flickr_web_authentication_pane_get_type (void) G_GNUC_CONST;
#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_WEB_AUTHENTICATION_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_WEB_AUTHENTICATION_PANE, PublishingAuthenticatorShotwellFlickrWebAuthenticationPanePrivate))
-enum {
- PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_WEB_AUTHENTICATION_PANE_DUMMY_PROPERTY
-};
#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_WEB_AUTHENTICATION_PANE_LOGIN_URI "https://www.flickr.com/services/oauth/authorize?oauth_token=%s&perms=w" \
"rite"
PublishingAuthenticatorShotwellFlickrWebAuthenticationPane* publishing_authenticator_shotwell_flickr_web_authentication_pane_new (const gchar* token);
-PublishingAuthenticatorShotwellFlickrWebAuthenticationPane* publishing_authenticator_shotwell_flickr_web_authentication_pane_construct (GType object_type, const gchar* token);
+PublishingAuthenticatorShotwellFlickrWebAuthenticationPane* publishing_authenticator_shotwell_flickr_web_authentication_pane_construct (GType object_type,
+ const gchar* token);
static void publishing_authenticator_shotwell_flickr_web_authentication_pane_real_constructed (GObject* base);
-static void publishing_authenticator_shotwell_flickr_web_authentication_pane_on_shotwell_auth_request_cb (PublishingAuthenticatorShotwellFlickrWebAuthenticationPane* self, WebKitURISchemeRequest* request);
-static void _publishing_authenticator_shotwell_flickr_web_authentication_pane_on_shotwell_auth_request_cb_web_kit_uri_scheme_request_callback (WebKitURISchemeRequest* request, gpointer self);
+static void publishing_authenticator_shotwell_flickr_web_authentication_pane_on_shotwell_auth_request_cb (PublishingAuthenticatorShotwellFlickrWebAuthenticationPane* self,
+ WebKitURISchemeRequest* request);
+static void _publishing_authenticator_shotwell_flickr_web_authentication_pane_on_shotwell_auth_request_cb_web_kit_uri_scheme_request_callback (WebKitURISchemeRequest* request,
+ gpointer self);
static void publishing_authenticator_shotwell_flickr_web_authentication_pane_real_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* base);
static void _vala_SoupURI_free (SoupURI* self);
-static guint8* _vala_array_dup1 (guint8* self, int length);
+static guint8* _vala_array_dup1 (guint8* self,
+ int length);
static void publishing_authenticator_shotwell_flickr_web_authentication_pane_finalize (GObject * obj);
GType publishing_authenticator_shotwell_oauth1_authenticator_get_type (void) G_GNUC_CONST;
GType publishing_authenticator_shotwell_flickr_flickr_get_type (void) G_GNUC_CONST;
-enum {
- PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_FLICKR_DUMMY_PROPERTY
-};
PublishingAuthenticatorShotwellFlickrFlickr* publishing_authenticator_shotwell_flickr_flickr_new (SpitPublishingPluginHost* host);
-PublishingAuthenticatorShotwellFlickrFlickr* publishing_authenticator_shotwell_flickr_flickr_construct (GType object_type, SpitPublishingPluginHost* host);
-PublishingAuthenticatorShotwellOAuth1Authenticator* publishing_authenticator_shotwell_oauth1_authenticator_construct (GType object_type, const gchar* api_key, const gchar* api_secret, SpitPublishingPluginHost* host);
+PublishingAuthenticatorShotwellFlickrFlickr* publishing_authenticator_shotwell_flickr_flickr_construct (GType object_type,
+ SpitPublishingPluginHost* host);
+PublishingAuthenticatorShotwellOAuth1Authenticator* publishing_authenticator_shotwell_oauth1_authenticator_construct (GType object_type,
+ const gchar* api_key,
+ const gchar* api_secret,
+ SpitPublishingPluginHost* host);
static void publishing_authenticator_shotwell_flickr_flickr_real_authenticate (PublishingAuthenticatorShotwellOAuth1Authenticator* base);
gboolean publishing_authenticator_shotwell_oauth1_authenticator_is_persistent_session_valid (PublishingAuthenticatorShotwellOAuth1Authenticator* self);
gchar* publishing_authenticator_shotwell_oauth1_authenticator_get_persistent_access_phase_token (PublishingAuthenticatorShotwellOAuth1Authenticator* self);
@@ -205,60 +216,89 @@ static void publishing_authenticator_shotwell_flickr_flickr_real_refresh (Publis
static void publishing_authenticator_shotwell_flickr_flickr_on_welcome_pane_login_clicked (PublishingAuthenticatorShotwellFlickrFlickr* self);
static void _publishing_authenticator_shotwell_flickr_flickr_on_welcome_pane_login_clicked_spit_publishing_login_callback (gpointer self);
static void publishing_authenticator_shotwell_flickr_flickr_do_run_authentication_request_transaction (PublishingAuthenticatorShotwellFlickrFlickr* self);
-static void publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_completed (PublishingAuthenticatorShotwellFlickrFlickr* self, PublishingRESTSupportTransaction* txn);
-static void _publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
-static void publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_error (PublishingAuthenticatorShotwellFlickrFlickr* self, PublishingRESTSupportTransaction* txn, GError* err);
-static void _publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self);
-static void publishing_authenticator_shotwell_flickr_flickr_do_parse_token_info_from_auth_request (PublishingAuthenticatorShotwellFlickrFlickr* self, const gchar* response);
-static void publishing_authenticator_shotwell_flickr_flickr_on_authentication_token_available (PublishingAuthenticatorShotwellFlickrFlickr* self, const gchar* token, const gchar* token_secret);
-static void publishing_authenticator_shotwell_flickr_flickr_do_web_authentication (PublishingAuthenticatorShotwellFlickrFlickr* self, const gchar* token);
-static void publishing_authenticator_shotwell_flickr_flickr_do_verify_pin (PublishingAuthenticatorShotwellFlickrFlickr* self, const gchar* pin);
-static void _publishing_authenticator_shotwell_flickr_flickr_do_verify_pin_publishing_authenticator_shotwell_flickr_web_authentication_pane_authorized (PublishingAuthenticatorShotwellFlickrWebAuthenticationPane* _sender, const gchar* auth_code, gpointer self);
+static void publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_completed (PublishingAuthenticatorShotwellFlickrFlickr* self,
+ PublishingRESTSupportTransaction* txn);
+static void _publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+ gpointer self);
+static void publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_error (PublishingAuthenticatorShotwellFlickrFlickr* self,
+ PublishingRESTSupportTransaction* txn,
+ GError* err);
+static void _publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+ GError* err,
+ gpointer self);
+static void publishing_authenticator_shotwell_flickr_flickr_do_parse_token_info_from_auth_request (PublishingAuthenticatorShotwellFlickrFlickr* self,
+ const gchar* response);
+static void publishing_authenticator_shotwell_flickr_flickr_on_authentication_token_available (PublishingAuthenticatorShotwellFlickrFlickr* self,
+ const gchar* token,
+ const gchar* token_secret);
+static void publishing_authenticator_shotwell_flickr_flickr_do_web_authentication (PublishingAuthenticatorShotwellFlickrFlickr* self,
+ const gchar* token);
+static void publishing_authenticator_shotwell_flickr_flickr_do_verify_pin (PublishingAuthenticatorShotwellFlickrFlickr* self,
+ const gchar* pin);
+static void _publishing_authenticator_shotwell_flickr_flickr_do_verify_pin_publishing_authenticator_shotwell_flickr_web_authentication_pane_authorized (PublishingAuthenticatorShotwellFlickrWebAuthenticationPane* _sender,
+ const gchar* auth_code,
+ gpointer self);
static void publishing_authenticator_shotwell_flickr_flickr_on_web_login_error (PublishingAuthenticatorShotwellFlickrFlickr* self);
-static void _publishing_authenticator_shotwell_flickr_flickr_on_web_login_error_publishing_authenticator_shotwell_flickr_web_authentication_pane_error (PublishingAuthenticatorShotwellFlickrWebAuthenticationPane* _sender, gpointer self);
-static void publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_txn_completed (PublishingAuthenticatorShotwellFlickrFlickr* self, PublishingRESTSupportTransaction* txn);
-static void _publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
-static void publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_error (PublishingAuthenticatorShotwellFlickrFlickr* self, PublishingRESTSupportTransaction* txn, GError* err);
-static void _publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self);
-static void publishing_authenticator_shotwell_flickr_flickr_do_extract_access_phase_credentials_from_reponse (PublishingAuthenticatorShotwellFlickrFlickr* self, const gchar* response);
-
-
-PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction* publishing_authenticator_shotwell_flickr_authentication_request_transaction_construct (GType object_type, PublishingRESTSupportOAuth1Session* session) {
+static void _publishing_authenticator_shotwell_flickr_flickr_on_web_login_error_publishing_authenticator_shotwell_flickr_web_authentication_pane_error (PublishingAuthenticatorShotwellFlickrWebAuthenticationPane* _sender,
+ gpointer self);
+static void publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_txn_completed (PublishingAuthenticatorShotwellFlickrFlickr* self,
+ PublishingRESTSupportTransaction* txn);
+static void _publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+ gpointer self);
+static void publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_error (PublishingAuthenticatorShotwellFlickrFlickr* self,
+ PublishingRESTSupportTransaction* txn,
+ GError* err);
+static void _publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+ GError* err,
+ gpointer self);
+static void publishing_authenticator_shotwell_flickr_flickr_do_extract_access_phase_credentials_from_reponse (PublishingAuthenticatorShotwellFlickrFlickr* self,
+ const gchar* response);
+
+
+PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction*
+publishing_authenticator_shotwell_flickr_authentication_request_transaction_construct (GType object_type,
+ PublishingRESTSupportOAuth1Session* session)
+{
PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction* self = NULL;
- PublishingRESTSupportOAuth1Session* _tmp0_;
#line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION (session), NULL);
#line 21 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp0_ = session;
-#line 21 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- self = (PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction*) publishing_rest_support_oauth1_transaction_construct_with_uri (object_type, _tmp0_, "https://www.flickr.com/services/oauth/request_token", PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET);
+ self = (PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction*) publishing_rest_support_oauth1_transaction_construct_with_uri (object_type, session, "https://www.flickr.com/services/oauth/request_token", PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET);
#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_callback", "shotwell-auth%3A%2F%2Flocal-callback");
#line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
return self;
-#line 236 "FlickrPublishingAuthenticator.c"
+#line 268 "FlickrPublishingAuthenticator.c"
}
-PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction* publishing_authenticator_shotwell_flickr_authentication_request_transaction_new (PublishingRESTSupportOAuth1Session* session) {
+PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction*
+publishing_authenticator_shotwell_flickr_authentication_request_transaction_new (PublishingRESTSupportOAuth1Session* session)
+{
#line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
return publishing_authenticator_shotwell_flickr_authentication_request_transaction_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_AUTHENTICATION_REQUEST_TRANSACTION, session);
-#line 243 "FlickrPublishingAuthenticator.c"
+#line 277 "FlickrPublishingAuthenticator.c"
}
-static void publishing_authenticator_shotwell_flickr_authentication_request_transaction_class_init (PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransactionClass * klass) {
+static void
+publishing_authenticator_shotwell_flickr_authentication_request_transaction_class_init (PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransactionClass * klass)
+{
#line 19 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
publishing_authenticator_shotwell_flickr_authentication_request_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 250 "FlickrPublishingAuthenticator.c"
+#line 286 "FlickrPublishingAuthenticator.c"
}
-static void publishing_authenticator_shotwell_flickr_authentication_request_transaction_instance_init (PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction * self) {
+static void
+publishing_authenticator_shotwell_flickr_authentication_request_transaction_instance_init (PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction * self)
+{
}
-GType publishing_authenticator_shotwell_flickr_authentication_request_transaction_get_type (void) {
+GType
+publishing_authenticator_shotwell_flickr_authentication_request_transaction_get_type (void)
+{
static volatile gsize publishing_authenticator_shotwell_flickr_authentication_request_transaction_type_id__volatile = 0;
if (g_once_init_enter (&publishing_authenticator_shotwell_flickr_authentication_request_transaction_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_authenticator_shotwell_flickr_authentication_request_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction), 0, (GInstanceInitFunc) publishing_authenticator_shotwell_flickr_authentication_request_transaction_instance_init, NULL };
@@ -270,62 +310,66 @@ GType publishing_authenticator_shotwell_flickr_authentication_request_transactio
}
-PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction* publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_construct (GType object_type, PublishingRESTSupportOAuth1Session* session, const gchar* user_verifier) {
+PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction*
+publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_construct (GType object_type,
+ PublishingRESTSupportOAuth1Session* session,
+ const gchar* user_verifier)
+{
PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction* self = NULL;
- PublishingRESTSupportOAuth1Session* _tmp0_;
- const gchar* _tmp1_;
- PublishingRESTSupportOAuth1Session* _tmp2_;
- gchar* _tmp3_;
- gchar* _tmp4_;
+ gchar* _tmp0_;
+ gchar* _tmp1_;
#line 28 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION (session), NULL);
#line 28 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_return_val_if_fail (user_verifier != NULL, NULL);
#line 29 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp0_ = session;
-#line 29 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- self = (PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction*) publishing_rest_support_oauth1_transaction_construct_with_uri (object_type, _tmp0_, "https://www.flickr.com/services/oauth/access_token", PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET);
+ self = (PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction*) publishing_rest_support_oauth1_transaction_construct_with_uri (object_type, session, "https://www.flickr.com/services/oauth/access_token", PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET);
#line 31 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp1_ = user_verifier;
-#line 31 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_verifier", _tmp1_);
-#line 32 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp2_ = session;
+ publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_verifier", user_verifier);
#line 32 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp3_ = publishing_rest_support_oauth1_session_get_request_phase_token (_tmp2_);
+ _tmp0_ = publishing_rest_support_oauth1_session_get_request_phase_token (session);
#line 32 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp4_ = _tmp3_;
+ _tmp1_ = _tmp0_;
#line 32 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_token", _tmp4_);
+ publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_token", _tmp1_);
#line 32 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _g_free0 (_tmp4_);
+ _g_free0 (_tmp1_);
#line 33 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_callback", "shotwell-auth%3A%2F%2Flocal-callback");
#line 28 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
return self;
-#line 303 "FlickrPublishingAuthenticator.c"
+#line 338 "FlickrPublishingAuthenticator.c"
}
-PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction* publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_new (PublishingRESTSupportOAuth1Session* session, const gchar* user_verifier) {
+PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction*
+publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_new (PublishingRESTSupportOAuth1Session* session,
+ const gchar* user_verifier)
+{
#line 28 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
return publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_ACCESS_TOKEN_FETCH_TRANSACTION, session, user_verifier);
-#line 310 "FlickrPublishingAuthenticator.c"
+#line 348 "FlickrPublishingAuthenticator.c"
}
-static void publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_class_init (PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransactionClass * klass) {
+static void
+publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_class_init (PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransactionClass * klass)
+{
#line 27 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 317 "FlickrPublishingAuthenticator.c"
+#line 357 "FlickrPublishingAuthenticator.c"
}
-static void publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_instance_init (PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction * self) {
+static void
+publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_instance_init (PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction * self)
+{
}
-GType publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_get_type (void) {
+GType
+publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_get_type (void)
+{
static volatile gsize publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_type_id__volatile = 0;
if (g_once_init_enter (&publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction), 0, (GInstanceInitFunc) publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_instance_init, NULL };
@@ -337,51 +381,60 @@ GType publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_ge
}
-PublishingAuthenticatorShotwellFlickrWebAuthenticationPane* publishing_authenticator_shotwell_flickr_web_authentication_pane_construct (GType object_type, const gchar* token) {
+PublishingAuthenticatorShotwellFlickrWebAuthenticationPane*
+publishing_authenticator_shotwell_flickr_web_authentication_pane_construct (GType object_type,
+ const gchar* token)
+{
PublishingAuthenticatorShotwellFlickrWebAuthenticationPane * self = NULL;
- const gchar* _tmp0_;
+ gchar* _tmp0_;
gchar* _tmp1_;
- gchar* _tmp2_;
#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_return_val_if_fail (token != NULL, NULL);
#line 45 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp0_ = token;
-#line 45 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp1_ = g_strdup_printf (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_WEB_AUTHENTICATION_PANE_LOGIN_URI, _tmp0_);
+ _tmp0_ = g_strdup_printf (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_WEB_AUTHENTICATION_PANE_LOGIN_URI, token);
#line 45 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp2_ = _tmp1_;
+ _tmp1_ = _tmp0_;
#line 45 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- self = (PublishingAuthenticatorShotwellFlickrWebAuthenticationPane*) g_object_new (object_type, "login-uri", _tmp2_, NULL);
+ self = (PublishingAuthenticatorShotwellFlickrWebAuthenticationPane*) g_object_new (object_type, "login-uri", _tmp1_, NULL);
#line 45 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _g_free0 (_tmp2_);
+ _g_free0 (_tmp1_);
#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
return self;
-#line 356 "FlickrPublishingAuthenticator.c"
+#line 400 "FlickrPublishingAuthenticator.c"
}
-PublishingAuthenticatorShotwellFlickrWebAuthenticationPane* publishing_authenticator_shotwell_flickr_web_authentication_pane_new (const gchar* token) {
+PublishingAuthenticatorShotwellFlickrWebAuthenticationPane*
+publishing_authenticator_shotwell_flickr_web_authentication_pane_new (const gchar* token)
+{
#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
return publishing_authenticator_shotwell_flickr_web_authentication_pane_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_WEB_AUTHENTICATION_PANE, token);
-#line 363 "FlickrPublishingAuthenticator.c"
+#line 409 "FlickrPublishingAuthenticator.c"
}
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
#line 51 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
return self ? g_object_ref (self) : NULL;
-#line 370 "FlickrPublishingAuthenticator.c"
+#line 418 "FlickrPublishingAuthenticator.c"
}
-static void _publishing_authenticator_shotwell_flickr_web_authentication_pane_on_shotwell_auth_request_cb_web_kit_uri_scheme_request_callback (WebKitURISchemeRequest* request, gpointer self) {
+static void
+_publishing_authenticator_shotwell_flickr_web_authentication_pane_on_shotwell_auth_request_cb_web_kit_uri_scheme_request_callback (WebKitURISchemeRequest* request,
+ gpointer self)
+{
#line 52 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
publishing_authenticator_shotwell_flickr_web_authentication_pane_on_shotwell_auth_request_cb ((PublishingAuthenticatorShotwellFlickrWebAuthenticationPane*) self, request);
-#line 377 "FlickrPublishingAuthenticator.c"
+#line 428 "FlickrPublishingAuthenticator.c"
}
-static void publishing_authenticator_shotwell_flickr_web_authentication_pane_real_constructed (GObject* base) {
+static void
+publishing_authenticator_shotwell_flickr_web_authentication_pane_real_constructed (GObject* base)
+{
PublishingAuthenticatorShotwellFlickrWebAuthenticationPane * self;
WebKitWebContext* ctx = NULL;
WebKitWebContext* _tmp0_;
@@ -400,18 +453,22 @@ static void publishing_authenticator_shotwell_flickr_web_authentication_pane_rea
webkit_web_context_register_uri_scheme (ctx, "shotwell-auth", _publishing_authenticator_shotwell_flickr_web_authentication_pane_on_shotwell_auth_request_cb_web_kit_uri_scheme_request_callback, g_object_ref (self), g_object_unref);
#line 48 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_g_object_unref0 (ctx);
-#line 400 "FlickrPublishingAuthenticator.c"
+#line 453 "FlickrPublishingAuthenticator.c"
}
-static void _vala_SoupURI_free (SoupURI* self) {
+static void
+_vala_SoupURI_free (SoupURI* self)
+{
#line 55 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_boxed_free (soup_uri_get_type (), self);
-#line 407 "FlickrPublishingAuthenticator.c"
+#line 462 "FlickrPublishingAuthenticator.c"
}
-static void publishing_authenticator_shotwell_flickr_web_authentication_pane_real_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* base) {
+static void
+publishing_authenticator_shotwell_flickr_web_authentication_pane_real_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* base)
+{
PublishingAuthenticatorShotwellFlickrWebAuthenticationPane * self;
SoupURI* uri = NULL;
WebKitWebView* _tmp0_;
@@ -445,43 +502,46 @@ static void publishing_authenticator_shotwell_flickr_web_authentication_pane_rea
_tmp7_ = _tmp6_->scheme;
#line 57 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
if (g_strcmp0 (_tmp7_, "shotwell-auth") == 0) {
-#line 445 "FlickrPublishingAuthenticator.c"
+#line 502 "FlickrPublishingAuthenticator.c"
const gchar* _tmp8_;
#line 57 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_tmp8_ = self->priv->auth_code;
#line 57 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_tmp5_ = _tmp8_ == NULL;
-#line 451 "FlickrPublishingAuthenticator.c"
+#line 508 "FlickrPublishingAuthenticator.c"
} else {
#line 57 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_tmp5_ = FALSE;
-#line 455 "FlickrPublishingAuthenticator.c"
+#line 512 "FlickrPublishingAuthenticator.c"
}
#line 57 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
if (_tmp5_) {
#line 58 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_signal_emit (self, publishing_authenticator_shotwell_flickr_web_authentication_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_WEB_AUTHENTICATION_PANE_ERROR_SIGNAL], 0);
-#line 461 "FlickrPublishingAuthenticator.c"
+#line 518 "FlickrPublishingAuthenticator.c"
}
#line 61 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_tmp9_ = self->priv->auth_code;
#line 61 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
if (_tmp9_ != NULL) {
-#line 467 "FlickrPublishingAuthenticator.c"
+#line 524 "FlickrPublishingAuthenticator.c"
const gchar* _tmp10_;
#line 62 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_tmp10_ = self->priv->auth_code;
#line 62 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_signal_emit (self, publishing_authenticator_shotwell_flickr_web_authentication_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_WEB_AUTHENTICATION_PANE_AUTHORIZED_SIGNAL], 0, _tmp10_);
-#line 473 "FlickrPublishingAuthenticator.c"
+#line 530 "FlickrPublishingAuthenticator.c"
}
#line 55 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
__vala_SoupURI_free0 (uri);
-#line 477 "FlickrPublishingAuthenticator.c"
+#line 534 "FlickrPublishingAuthenticator.c"
}
-static guint8* string_get_data (const gchar* self, int* result_length1) {
+static guint8*
+string_get_data (const gchar* self,
+ int* result_length1)
+{
guint8* result;
guint8* res = NULL;
gint res_length1;
@@ -493,120 +553,120 @@ static guint8* string_get_data (const gchar* self, int* result_length1) {
gint _tmp3__length1;
guint8* _tmp4_;
gint _tmp4__length1;
-#line 1428 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1442 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1443 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
res = (guint8*) self;
-#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1443 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
res_length1 = -1;
-#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1443 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_res_size_ = res_length1;
-#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1444 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp0_ = strlen (self);
-#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1444 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp1_ = _tmp0_;
-#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1444 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
res_length1 = (gint) _tmp1_;
-#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1444 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp2_ = res_length1;
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp3_ = res;
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp3__length1 = res_length1;
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp4_ = _tmp3_;
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp4__length1 = _tmp3__length1;
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
if (result_length1) {
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
*result_length1 = _tmp4__length1;
-#line 521 "FlickrPublishingAuthenticator.c"
+#line 581 "FlickrPublishingAuthenticator.c"
}
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
result = _tmp4_;
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 527 "FlickrPublishingAuthenticator.c"
+#line 587 "FlickrPublishingAuthenticator.c"
}
-static guint8* _vala_array_dup1 (guint8* self, int length) {
+static guint8*
+_vala_array_dup1 (guint8* self,
+ int length)
+{
#line 72 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
return g_memdup (self, length * sizeof (guint8));
-#line 534 "FlickrPublishingAuthenticator.c"
+#line 597 "FlickrPublishingAuthenticator.c"
}
-static void publishing_authenticator_shotwell_flickr_web_authentication_pane_on_shotwell_auth_request_cb (PublishingAuthenticatorShotwellFlickrWebAuthenticationPane* self, WebKitURISchemeRequest* request) {
+static void
+publishing_authenticator_shotwell_flickr_web_authentication_pane_on_shotwell_auth_request_cb (PublishingAuthenticatorShotwellFlickrWebAuthenticationPane* self,
+ WebKitURISchemeRequest* request)
+{
SoupURI* uri = NULL;
- WebKitURISchemeRequest* _tmp0_;
- const gchar* _tmp1_;
- SoupURI* _tmp2_;
+ const gchar* _tmp0_;
+ SoupURI* _tmp1_;
GHashTable* form_data = NULL;
- const gchar* _tmp3_;
- GHashTable* _tmp4_;
- gconstpointer _tmp5_;
- gchar* _tmp6_;
+ const gchar* _tmp2_;
+ GHashTable* _tmp3_;
+ gconstpointer _tmp4_;
+ gchar* _tmp5_;
gchar* response = NULL;
- gchar* _tmp7_;
+ gchar* _tmp6_;
GMemoryInputStream* mins = NULL;
+ guint8* _tmp7_;
+ gint _tmp7__length1;
guint8* _tmp8_;
gint _tmp8__length1;
guint8* _tmp9_;
gint _tmp9__length1;
- guint8* _tmp10_;
- gint _tmp10__length1;
- GMemoryInputStream* _tmp11_;
- WebKitURISchemeRequest* _tmp12_;
+ GMemoryInputStream* _tmp10_;
#line 66 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_WEB_AUTHENTICATION_PANE (self));
#line 66 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_return_if_fail (WEBKIT_IS_URI_SCHEME_REQUEST (request));
#line 67 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp0_ = request;
+ _tmp0_ = webkit_uri_scheme_request_get_uri (request);
#line 67 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp1_ = webkit_uri_scheme_request_get_uri (_tmp0_);
+ _tmp1_ = soup_uri_new (_tmp0_);
#line 67 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp2_ = soup_uri_new (_tmp1_);
-#line 67 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- uri = _tmp2_;
+ uri = _tmp1_;
#line 68 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp3_ = uri->query;
+ _tmp2_ = uri->query;
#line 68 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp4_ = soup_form_decode (_tmp3_);
+ _tmp3_ = soup_form_decode (_tmp2_);
#line 68 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- form_data = _tmp4_;
+ form_data = _tmp3_;
#line 69 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp5_ = g_hash_table_lookup (form_data, "oauth_verifier");
+ _tmp4_ = g_hash_table_lookup (form_data, "oauth_verifier");
#line 69 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp6_ = g_strdup ((const gchar*) _tmp5_);
+ _tmp5_ = g_strdup ((const gchar*) _tmp4_);
#line 69 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_g_free0 (self->priv->auth_code);
#line 69 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- self->priv->auth_code = _tmp6_;
+ self->priv->auth_code = _tmp5_;
#line 71 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp7_ = g_strdup ("");
+ _tmp6_ = g_strdup ("");
#line 71 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- response = _tmp7_;
+ response = _tmp6_;
#line 72 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp8_ = string_get_data (response, &_tmp8__length1);
+ _tmp7_ = string_get_data (response, &_tmp7__length1);
#line 72 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp9_ = _tmp8_;
+ _tmp8_ = _tmp7_;
#line 72 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp9__length1 = _tmp8__length1;
+ _tmp8__length1 = _tmp7__length1;
#line 72 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp10_ = (_tmp9_ != NULL) ? _vala_array_dup1 (_tmp9_, _tmp9__length1) : ((gpointer) _tmp9_);
+ _tmp9_ = (_tmp8_ != NULL) ? _vala_array_dup1 (_tmp8_, _tmp8__length1) : ((gpointer) _tmp8_);
#line 72 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp10__length1 = _tmp9__length1;
+ _tmp9__length1 = _tmp8__length1;
#line 72 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp11_ = (GMemoryInputStream*) g_memory_input_stream_new_from_data (_tmp10_, _tmp10__length1, NULL);
+ _tmp10_ = (GMemoryInputStream*) g_memory_input_stream_new_from_data (_tmp9_, _tmp9__length1, NULL);
#line 72 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- mins = _tmp11_;
-#line 73 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp12_ = request;
+ mins = _tmp10_;
#line 73 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- webkit_uri_scheme_request_finish (_tmp12_, G_TYPE_CHECK_INSTANCE_CAST (mins, g_input_stream_get_type (), GInputStream), (gint64) -1, "text/plain");
+ webkit_uri_scheme_request_finish (request, G_TYPE_CHECK_INSTANCE_CAST (mins, g_input_stream_get_type (), GInputStream), (gint64) -1, "text/plain");
#line 66 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_g_object_unref0 (mins);
#line 66 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -615,11 +675,13 @@ static void publishing_authenticator_shotwell_flickr_web_authentication_pane_on_
_g_hash_table_unref0 (form_data);
#line 66 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
__vala_SoupURI_free0 (uri);
-#line 615 "FlickrPublishingAuthenticator.c"
+#line 675 "FlickrPublishingAuthenticator.c"
}
-static void publishing_authenticator_shotwell_flickr_web_authentication_pane_class_init (PublishingAuthenticatorShotwellFlickrWebAuthenticationPaneClass * klass) {
+static void
+publishing_authenticator_shotwell_flickr_web_authentication_pane_class_init (PublishingAuthenticatorShotwellFlickrWebAuthenticationPaneClass * klass)
+{
#line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
publishing_authenticator_shotwell_flickr_web_authentication_pane_parent_class = g_type_class_peek_parent (klass);
#line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -634,20 +696,24 @@ static void publishing_authenticator_shotwell_flickr_web_authentication_pane_cla
publishing_authenticator_shotwell_flickr_web_authentication_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_WEB_AUTHENTICATION_PANE_AUTHORIZED_SIGNAL] = g_signal_new ("authorized", PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_WEB_AUTHENTICATION_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING);
#line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
publishing_authenticator_shotwell_flickr_web_authentication_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_WEB_AUTHENTICATION_PANE_ERROR_SIGNAL] = g_signal_new ("error", PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_WEB_AUTHENTICATION_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 634 "FlickrPublishingAuthenticator.c"
+#line 696 "FlickrPublishingAuthenticator.c"
}
-static void publishing_authenticator_shotwell_flickr_web_authentication_pane_instance_init (PublishingAuthenticatorShotwellFlickrWebAuthenticationPane * self) {
+static void
+publishing_authenticator_shotwell_flickr_web_authentication_pane_instance_init (PublishingAuthenticatorShotwellFlickrWebAuthenticationPane * self)
+{
#line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
self->priv = PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_WEB_AUTHENTICATION_PANE_GET_PRIVATE (self);
#line 38 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
self->priv->auth_code = NULL;
-#line 643 "FlickrPublishingAuthenticator.c"
+#line 707 "FlickrPublishingAuthenticator.c"
}
-static void publishing_authenticator_shotwell_flickr_web_authentication_pane_finalize (GObject * obj) {
+static void
+publishing_authenticator_shotwell_flickr_web_authentication_pane_finalize (GObject * obj)
+{
PublishingAuthenticatorShotwellFlickrWebAuthenticationPane * self;
#line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_WEB_AUTHENTICATION_PANE, PublishingAuthenticatorShotwellFlickrWebAuthenticationPane);
@@ -655,11 +721,13 @@ static void publishing_authenticator_shotwell_flickr_web_authentication_pane_fin
_g_free0 (self->priv->auth_code);
#line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
G_OBJECT_CLASS (publishing_authenticator_shotwell_flickr_web_authentication_pane_parent_class)->finalize (obj);
-#line 655 "FlickrPublishingAuthenticator.c"
+#line 721 "FlickrPublishingAuthenticator.c"
}
-GType publishing_authenticator_shotwell_flickr_web_authentication_pane_get_type (void) {
+GType
+publishing_authenticator_shotwell_flickr_web_authentication_pane_get_type (void)
+{
static volatile gsize publishing_authenticator_shotwell_flickr_web_authentication_pane_type_id__volatile = 0;
if (g_once_init_enter (&publishing_authenticator_shotwell_flickr_web_authentication_pane_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingAuthenticatorShotwellFlickrWebAuthenticationPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_authenticator_shotwell_flickr_web_authentication_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingAuthenticatorShotwellFlickrWebAuthenticationPane), 0, (GInstanceInitFunc) publishing_authenticator_shotwell_flickr_web_authentication_pane_instance_init, NULL };
@@ -671,83 +739,86 @@ GType publishing_authenticator_shotwell_flickr_web_authentication_pane_get_type
}
-PublishingAuthenticatorShotwellFlickrFlickr* publishing_authenticator_shotwell_flickr_flickr_construct (GType object_type, SpitPublishingPluginHost* host) {
+PublishingAuthenticatorShotwellFlickrFlickr*
+publishing_authenticator_shotwell_flickr_flickr_construct (GType object_type,
+ SpitPublishingPluginHost* host)
+{
PublishingAuthenticatorShotwellFlickrFlickr * self = NULL;
- SpitPublishingPluginHost* _tmp0_;
#line 78 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL);
#line 79 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp0_ = host;
-#line 79 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- self = (PublishingAuthenticatorShotwellFlickrFlickr*) publishing_authenticator_shotwell_oauth1_authenticator_construct (object_type, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_API_KEY, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_API_SECRET, _tmp0_);
+ self = (PublishingAuthenticatorShotwellFlickrFlickr*) publishing_authenticator_shotwell_oauth1_authenticator_construct (object_type, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_API_KEY, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_API_SECRET, host);
#line 78 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
return self;
-#line 682 "FlickrPublishingAuthenticator.c"
+#line 750 "FlickrPublishingAuthenticator.c"
}
-PublishingAuthenticatorShotwellFlickrFlickr* publishing_authenticator_shotwell_flickr_flickr_new (SpitPublishingPluginHost* host) {
+PublishingAuthenticatorShotwellFlickrFlickr*
+publishing_authenticator_shotwell_flickr_flickr_new (SpitPublishingPluginHost* host)
+{
#line 78 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
return publishing_authenticator_shotwell_flickr_flickr_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_FLICKR, host);
-#line 689 "FlickrPublishingAuthenticator.c"
+#line 759 "FlickrPublishingAuthenticator.c"
}
-static void publishing_authenticator_shotwell_flickr_flickr_real_authenticate (PublishingAuthenticatorShotwellOAuth1Authenticator* base) {
+static void
+publishing_authenticator_shotwell_flickr_flickr_real_authenticate (PublishingAuthenticatorShotwellOAuth1Authenticator* base)
+{
PublishingAuthenticatorShotwellFlickrFlickr * self;
- gboolean _tmp0_;
#line 82 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_FLICKR, PublishingAuthenticatorShotwellFlickrFlickr);
#line 83 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp0_ = publishing_authenticator_shotwell_oauth1_authenticator_is_persistent_session_valid (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator));
-#line 83 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- if (_tmp0_) {
-#line 702 "FlickrPublishingAuthenticator.c"
- PublishingRESTSupportOAuth1Session* _tmp1_;
+ if (publishing_authenticator_shotwell_oauth1_authenticator_is_persistent_session_valid (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator))) {
+#line 771 "FlickrPublishingAuthenticator.c"
+ PublishingRESTSupportOAuth1Session* _tmp0_;
+ gchar* _tmp1_;
gchar* _tmp2_;
gchar* _tmp3_;
gchar* _tmp4_;
gchar* _tmp5_;
gchar* _tmp6_;
- gchar* _tmp7_;
#line 84 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_debug ("FlickrPublishingAuthenticator.vala:84: attempt start: a persistent ses" \
"sion is available; using it");
#line 86 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->session;
+ _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->session;
#line 86 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp2_ = publishing_authenticator_shotwell_oauth1_authenticator_get_persistent_access_phase_token (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator));
+ _tmp1_ = publishing_authenticator_shotwell_oauth1_authenticator_get_persistent_access_phase_token (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator));
#line 86 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp3_ = _tmp2_;
+ _tmp2_ = _tmp1_;
#line 86 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp4_ = publishing_authenticator_shotwell_oauth1_authenticator_get_persistent_access_phase_token_secret (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator));
+ _tmp3_ = publishing_authenticator_shotwell_oauth1_authenticator_get_persistent_access_phase_token_secret (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator));
#line 86 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp5_ = _tmp4_;
+ _tmp4_ = _tmp3_;
#line 86 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp6_ = publishing_authenticator_shotwell_oauth1_authenticator_get_persistent_access_phase_username (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator));
+ _tmp5_ = publishing_authenticator_shotwell_oauth1_authenticator_get_persistent_access_phase_username (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator));
#line 86 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp7_ = _tmp6_;
+ _tmp6_ = _tmp5_;
#line 86 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- publishing_rest_support_oauth1_session_authenticate_from_persistent_credentials (_tmp1_, _tmp3_, _tmp5_, _tmp7_);
+ publishing_rest_support_oauth1_session_authenticate_from_persistent_credentials (_tmp0_, _tmp2_, _tmp4_, _tmp6_);
#line 86 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _g_free0 (_tmp7_);
+ _g_free0 (_tmp6_);
#line 86 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _g_free0 (_tmp5_);
+ _g_free0 (_tmp4_);
#line 86 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _g_free0 (_tmp3_);
-#line 734 "FlickrPublishingAuthenticator.c"
+ _g_free0 (_tmp2_);
+#line 803 "FlickrPublishingAuthenticator.c"
} else {
#line 89 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_debug ("FlickrPublishingAuthenticator.vala:89: attempt start: no persistent se" \
"ssion available; showing login welcome pane");
#line 90 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
publishing_authenticator_shotwell_flickr_flickr_do_show_login_welcome_pane (self);
-#line 740 "FlickrPublishingAuthenticator.c"
+#line 809 "FlickrPublishingAuthenticator.c"
}
}
-static gboolean publishing_authenticator_shotwell_flickr_flickr_real_can_logout (PublishingAuthenticatorShotwellOAuth1Authenticator* base) {
+static gboolean
+publishing_authenticator_shotwell_flickr_flickr_real_can_logout (PublishingAuthenticatorShotwellOAuth1Authenticator* base)
+{
PublishingAuthenticatorShotwellFlickrFlickr * self;
gboolean result = FALSE;
#line 94 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -756,11 +827,13 @@ static gboolean publishing_authenticator_shotwell_flickr_flickr_real_can_logout
result = TRUE;
#line 95 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
return result;
-#line 754 "FlickrPublishingAuthenticator.c"
+#line 825 "FlickrPublishingAuthenticator.c"
}
-static void publishing_authenticator_shotwell_flickr_flickr_real_logout (PublishingAuthenticatorShotwellOAuth1Authenticator* base) {
+static void
+publishing_authenticator_shotwell_flickr_flickr_real_logout (PublishingAuthenticatorShotwellOAuth1Authenticator* base)
+{
PublishingAuthenticatorShotwellFlickrFlickr * self;
PublishingRESTSupportOAuth1Session* _tmp0_;
#line 98 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -771,26 +844,32 @@ static void publishing_authenticator_shotwell_flickr_flickr_real_logout (Publish
publishing_rest_support_oauth1_session_deauthenticate (_tmp0_);
#line 100 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
publishing_authenticator_shotwell_oauth1_authenticator_invalidate_persistent_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator));
-#line 769 "FlickrPublishingAuthenticator.c"
+#line 842 "FlickrPublishingAuthenticator.c"
}
-static void publishing_authenticator_shotwell_flickr_flickr_real_refresh (PublishingAuthenticatorShotwellOAuth1Authenticator* base) {
+static void
+publishing_authenticator_shotwell_flickr_flickr_real_refresh (PublishingAuthenticatorShotwellOAuth1Authenticator* base)
+{
PublishingAuthenticatorShotwellFlickrFlickr * self;
#line 103 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_FLICKR, PublishingAuthenticatorShotwellFlickrFlickr);
-#line 777 "FlickrPublishingAuthenticator.c"
+#line 852 "FlickrPublishingAuthenticator.c"
}
-static void _publishing_authenticator_shotwell_flickr_flickr_on_welcome_pane_login_clicked_spit_publishing_login_callback (gpointer self) {
+static void
+_publishing_authenticator_shotwell_flickr_flickr_on_welcome_pane_login_clicked_spit_publishing_login_callback (gpointer self)
+{
#line 111 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
publishing_authenticator_shotwell_flickr_flickr_on_welcome_pane_login_clicked ((PublishingAuthenticatorShotwellFlickrFlickr*) self);
-#line 784 "FlickrPublishingAuthenticator.c"
+#line 861 "FlickrPublishingAuthenticator.c"
}
-static void publishing_authenticator_shotwell_flickr_flickr_do_show_login_welcome_pane (PublishingAuthenticatorShotwellFlickrFlickr* self) {
+static void
+publishing_authenticator_shotwell_flickr_flickr_do_show_login_welcome_pane (PublishingAuthenticatorShotwellFlickrFlickr* self)
+{
SpitPublishingPluginHost* _tmp0_;
SpitPublishingPluginHost* _tmp1_;
#line 107 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -806,11 +885,13 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_show_login_welcom
_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->host;
#line 111 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
spit_publishing_plugin_host_install_welcome_pane (_tmp1_, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_SERVICE_WELCOME_MESSAGE, _publishing_authenticator_shotwell_flickr_flickr_on_welcome_pane_login_clicked_spit_publishing_login_callback, self);
-#line 803 "FlickrPublishingAuthenticator.c"
+#line 882 "FlickrPublishingAuthenticator.c"
}
-static void publishing_authenticator_shotwell_flickr_flickr_on_welcome_pane_login_clicked (PublishingAuthenticatorShotwellFlickrFlickr* self) {
+static void
+publishing_authenticator_shotwell_flickr_flickr_on_welcome_pane_login_clicked (PublishingAuthenticatorShotwellFlickrFlickr* self)
+{
#line 114 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self));
#line 115 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -818,25 +899,34 @@ static void publishing_authenticator_shotwell_flickr_flickr_on_welcome_pane_logi
"tton in the welcome pane");
#line 117 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
publishing_authenticator_shotwell_flickr_flickr_do_run_authentication_request_transaction (self);
-#line 814 "FlickrPublishingAuthenticator.c"
+#line 895 "FlickrPublishingAuthenticator.c"
}
-static void _publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
+static void
+_publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+ gpointer self)
+{
#line 127 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_completed ((PublishingAuthenticatorShotwellFlickrFlickr*) self, _sender);
-#line 821 "FlickrPublishingAuthenticator.c"
+#line 905 "FlickrPublishingAuthenticator.c"
}
-static void _publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
+static void
+_publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+ GError* err,
+ gpointer self)
+{
#line 128 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_error ((PublishingAuthenticatorShotwellFlickrFlickr*) self, _sender, err);
-#line 828 "FlickrPublishingAuthenticator.c"
+#line 916 "FlickrPublishingAuthenticator.c"
}
-static void publishing_authenticator_shotwell_flickr_flickr_do_run_authentication_request_transaction (PublishingAuthenticatorShotwellFlickrFlickr* self) {
+static void
+publishing_authenticator_shotwell_flickr_flickr_do_run_authentication_request_transaction (PublishingAuthenticatorShotwellFlickrFlickr* self)
+{
SpitPublishingPluginHost* _tmp0_;
SpitPublishingPluginHost* _tmp1_;
PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction* txn = NULL;
@@ -866,7 +956,7 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_run_authenticatio
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_completed_publishing_rest_support_transaction_completed, self, 0);
#line 128 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 861 "FlickrPublishingAuthenticator.c"
+#line 951 "FlickrPublishingAuthenticator.c"
{
#line 131 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
@@ -874,7 +964,7 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_run_authenticatio
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 131 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 869 "FlickrPublishingAuthenticator.c"
+#line 959 "FlickrPublishingAuthenticator.c"
goto __catch1_spit_publishing_publishing_error;
}
#line 131 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -885,7 +975,7 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_run_authenticatio
g_clear_error (&_inner_error_);
#line 131 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
return;
-#line 880 "FlickrPublishingAuthenticator.c"
+#line 970 "FlickrPublishingAuthenticator.c"
}
}
goto __finally1;
@@ -906,7 +996,7 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_run_authenticatio
spit_publishing_plugin_host_post_error (_tmp4_, _tmp5_);
#line 130 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_g_error_free0 (err);
-#line 901 "FlickrPublishingAuthenticator.c"
+#line 991 "FlickrPublishingAuthenticator.c"
}
__finally1:
#line 130 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -919,219 +1009,198 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_run_authenticatio
g_clear_error (&_inner_error_);
#line 130 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
return;
-#line 914 "FlickrPublishingAuthenticator.c"
+#line 1004 "FlickrPublishingAuthenticator.c"
}
#line 120 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_publishing_rest_support_transaction_unref0 (txn);
-#line 918 "FlickrPublishingAuthenticator.c"
+#line 1008 "FlickrPublishingAuthenticator.c"
}
-static void publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_completed (PublishingAuthenticatorShotwellFlickrFlickr* self, PublishingRESTSupportTransaction* txn) {
- PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_completed (PublishingAuthenticatorShotwellFlickrFlickr* self,
+ PublishingRESTSupportTransaction* txn)
+{
+ guint _tmp0_;
guint _tmp1_;
- PublishingRESTSupportTransaction* _tmp2_;
- guint _tmp3_;
- PublishingRESTSupportTransaction* _tmp4_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
+ gchar* _tmp4_;
gchar* _tmp5_;
- gchar* _tmp6_;
- PublishingRESTSupportTransaction* _tmp7_;
- gchar* _tmp8_;
- gchar* _tmp9_;
#line 137 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self));
#line 137 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
#line 138 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp0_ = txn;
+ g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
#line 138 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 138 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_completed_publishing_rest_support_transaction_completed, self);
-#line 139 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp2_ = txn;
+ g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_completed_publishing_rest_support_transaction_completed, self);
#line 139 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
+ g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
#line 139 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_error_publishing_rest_support_transaction_network_error, self);
+ g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_error_publishing_rest_support_transaction_network_error, self);
#line 141 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp4_ = txn;
+ _tmp2_ = publishing_rest_support_transaction_get_response (txn);
#line 141 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp5_ = publishing_rest_support_transaction_get_response (_tmp4_);
-#line 141 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp6_ = _tmp5_;
+ _tmp3_ = _tmp2_;
#line 141 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_debug ("FlickrPublishingAuthenticator.vala:141: EVENT: OAuth authentication re" \
-"quest transaction completed; response = '%s'", _tmp6_);
+"quest transaction completed; response = '%s'", _tmp3_);
#line 141 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _g_free0 (_tmp6_);
-#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp7_ = txn;
+ _g_free0 (_tmp3_);
#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp8_ = publishing_rest_support_transaction_get_response (_tmp7_);
+ _tmp4_ = publishing_rest_support_transaction_get_response (txn);
#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp9_ = _tmp8_;
+ _tmp5_ = _tmp4_;
#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- publishing_authenticator_shotwell_flickr_flickr_do_parse_token_info_from_auth_request (self, _tmp9_);
+ publishing_authenticator_shotwell_flickr_flickr_do_parse_token_info_from_auth_request (self, _tmp5_);
#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _g_free0 (_tmp9_);
-#line 969 "FlickrPublishingAuthenticator.c"
+ _g_free0 (_tmp5_);
+#line 1050 "FlickrPublishingAuthenticator.c"
}
-static void publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_error (PublishingAuthenticatorShotwellFlickrFlickr* self, PublishingRESTSupportTransaction* txn, GError* err) {
- PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_error (PublishingAuthenticatorShotwellFlickrFlickr* self,
+ PublishingRESTSupportTransaction* txn,
+ GError* err)
+{
+ guint _tmp0_;
guint _tmp1_;
- PublishingRESTSupportTransaction* _tmp2_;
- guint _tmp3_;
- SpitPublishingPluginHost* _tmp4_;
- GError* _tmp5_;
+ SpitPublishingPluginHost* _tmp2_;
#line 147 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self));
#line 147 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
#line 149 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp0_ = txn;
-#line 149 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
+ g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
#line 149 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_completed_publishing_rest_support_transaction_completed, self);
-#line 150 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp2_ = txn;
+ g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_completed_publishing_rest_support_transaction_completed, self);
#line 150 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
+ g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
#line 150 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_error_publishing_rest_support_transaction_network_error, self);
+ g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_error_publishing_rest_support_transaction_network_error, self);
#line 152 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_debug ("FlickrPublishingAuthenticator.vala:152: EVENT: OAuth authentication re" \
"quest transaction caused a network error");
#line 153 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->host;
-#line 153 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp5_ = err;
+ _tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->host;
#line 153 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- spit_publishing_plugin_host_post_error (_tmp4_, _tmp5_);
+ spit_publishing_plugin_host_post_error (_tmp2_, err);
#line 155 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator), "authentication-failed");
-#line 1006 "FlickrPublishingAuthenticator.c"
+#line 1082 "FlickrPublishingAuthenticator.c"
}
-static void publishing_authenticator_shotwell_flickr_flickr_do_parse_token_info_from_auth_request (PublishingAuthenticatorShotwellFlickrFlickr* self, const gchar* response) {
- const gchar* _tmp0_;
+static void
+publishing_authenticator_shotwell_flickr_flickr_do_parse_token_info_from_auth_request (PublishingAuthenticatorShotwellFlickrFlickr* self,
+ const gchar* response)
+{
gchar* oauth_token = NULL;
gchar* oauth_token_secret = NULL;
GHashTable* data = NULL;
- const gchar* _tmp1_;
- GHashTable* _tmp2_;
- GHashTable* _tmp3_;
- gconstpointer _tmp4_ = NULL;
- gchar* _tmp5_;
- GHashTable* _tmp6_;
- gconstpointer _tmp7_ = NULL;
- gchar* _tmp8_;
- gboolean _tmp9_ = FALSE;
- const gchar* _tmp10_;
- const gchar* _tmp16_;
- const gchar* _tmp17_;
+ GHashTable* _tmp0_;
+ GHashTable* _tmp1_;
+ gconstpointer _tmp2_ = NULL;
+ gchar* _tmp3_;
+ GHashTable* _tmp4_;
+ gconstpointer _tmp5_ = NULL;
+ gchar* _tmp6_;
+ gboolean _tmp7_ = FALSE;
+ const gchar* _tmp8_;
+ const gchar* _tmp13_;
+ const gchar* _tmp14_;
#line 158 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self));
#line 158 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_return_if_fail (response != NULL);
#line 159 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp0_ = response;
-#line 159 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_debug ("FlickrPublishingAuthenticator.vala:159: ACTION: parsing authorization " \
-"request response '%s' into token and secret", _tmp0_);
+"request response '%s' into token and secret", response);
#line 161 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
oauth_token = NULL;
#line 162 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
oauth_token_secret = NULL;
#line 164 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp1_ = response;
+ _tmp0_ = soup_form_decode (response);
#line 164 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp2_ = soup_form_decode (_tmp1_);
-#line 164 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- data = _tmp2_;
+ data = _tmp0_;
#line 165 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp3_ = data;
+ _tmp1_ = data;
#line 165 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- g_hash_table_lookup_extended (_tmp3_, "oauth_token", NULL, &_tmp4_);
+ g_hash_table_lookup_extended (_tmp1_, "oauth_token", NULL, &_tmp2_);
#line 165 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_g_free0 (oauth_token);
#line 165 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp5_ = g_strdup (_tmp4_);
+ _tmp3_ = g_strdup (_tmp2_);
#line 165 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- oauth_token = _tmp5_;
+ oauth_token = _tmp3_;
#line 166 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp6_ = data;
+ _tmp4_ = data;
#line 166 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- g_hash_table_lookup_extended (_tmp6_, "oauth_token_secret", NULL, &_tmp7_);
+ g_hash_table_lookup_extended (_tmp4_, "oauth_token_secret", NULL, &_tmp5_);
#line 166 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_g_free0 (oauth_token_secret);
#line 166 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp8_ = g_strdup (_tmp7_);
+ _tmp6_ = g_strdup (_tmp5_);
#line 166 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- oauth_token_secret = _tmp8_;
+ oauth_token_secret = _tmp6_;
#line 168 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp10_ = oauth_token;
+ _tmp8_ = oauth_token;
#line 168 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- if (_tmp10_ == NULL) {
+ if (_tmp8_ == NULL) {
#line 168 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp9_ = TRUE;
-#line 1071 "FlickrPublishingAuthenticator.c"
+ _tmp7_ = TRUE;
+#line 1144 "FlickrPublishingAuthenticator.c"
} else {
- const gchar* _tmp11_;
+ const gchar* _tmp9_;
#line 168 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp11_ = oauth_token_secret;
+ _tmp9_ = oauth_token_secret;
#line 168 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp9_ = _tmp11_ == NULL;
-#line 1078 "FlickrPublishingAuthenticator.c"
+ _tmp7_ = _tmp9_ == NULL;
+#line 1151 "FlickrPublishingAuthenticator.c"
}
#line 168 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- if (_tmp9_) {
-#line 1082 "FlickrPublishingAuthenticator.c"
- SpitPublishingPluginHost* _tmp12_;
- const gchar* _tmp13_;
- GError* _tmp14_;
- GError* _tmp15_;
-#line 169 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->host;
+ if (_tmp7_) {
+#line 1155 "FlickrPublishingAuthenticator.c"
+ SpitPublishingPluginHost* _tmp10_;
+ GError* _tmp11_;
+ GError* _tmp12_;
#line 169 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp13_ = response;
+ _tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->host;
#line 169 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp14_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "'%s' isn't a valid response to an OAuth authentication request", _tmp13_);
+ _tmp11_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "'%s' isn't a valid response to an OAuth authentication request", response);
#line 169 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp15_ = _tmp14_;
+ _tmp12_ = _tmp11_;
#line 169 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- spit_publishing_plugin_host_post_error (_tmp12_, _tmp15_);
+ spit_publishing_plugin_host_post_error (_tmp10_, _tmp12_);
#line 169 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _g_error_free0 (_tmp15_);
-#line 1099 "FlickrPublishingAuthenticator.c"
+ _g_error_free0 (_tmp12_);
+#line 1169 "FlickrPublishingAuthenticator.c"
}
#line 173 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp16_ = oauth_token;
+ _tmp13_ = oauth_token;
#line 173 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp17_ = oauth_token_secret;
+ _tmp14_ = oauth_token_secret;
#line 173 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- publishing_authenticator_shotwell_flickr_flickr_on_authentication_token_available (self, _tmp16_, _tmp17_);
+ publishing_authenticator_shotwell_flickr_flickr_on_authentication_token_available (self, _tmp13_, _tmp14_);
#line 158 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_g_hash_table_unref0 (data);
#line 158 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_g_free0 (oauth_token_secret);
#line 158 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_g_free0 (oauth_token);
-#line 1113 "FlickrPublishingAuthenticator.c"
+#line 1183 "FlickrPublishingAuthenticator.c"
}
-static void publishing_authenticator_shotwell_flickr_flickr_on_authentication_token_available (PublishingAuthenticatorShotwellFlickrFlickr* self, const gchar* token, const gchar* token_secret) {
- const gchar* _tmp0_;
- const gchar* _tmp1_;
- PublishingRESTSupportOAuth1Session* _tmp2_;
- const gchar* _tmp3_;
- const gchar* _tmp4_;
- const gchar* _tmp5_;
+static void
+publishing_authenticator_shotwell_flickr_flickr_on_authentication_token_available (PublishingAuthenticatorShotwellFlickrFlickr* self,
+ const gchar* token,
+ const gchar* token_secret)
+{
+ PublishingRESTSupportOAuth1Session* _tmp0_;
#line 176 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self));
#line 176 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -1139,72 +1208,71 @@ static void publishing_authenticator_shotwell_flickr_flickr_on_authentication_to
#line 176 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_return_if_fail (token_secret != NULL);
#line 177 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp0_ = token;
-#line 177 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp1_ = token_secret;
-#line 177 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_debug ("FlickrPublishingAuthenticator.vala:177: EVENT: OAuth authentication to" \
-"ken (%s) and token secret (%s) available", _tmp0_, _tmp1_);
-#line 180 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->session;
+"ken (%s) and token secret (%s) available", token, token_secret);
#line 180 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp3_ = token;
-#line 180 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp4_ = token_secret;
+ _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->session;
#line 180 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- publishing_rest_support_oauth1_session_set_request_phase_credentials (_tmp2_, _tmp3_, _tmp4_);
-#line 182 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp5_ = token;
+ publishing_rest_support_oauth1_session_set_request_phase_credentials (_tmp0_, token, token_secret);
#line 182 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- publishing_authenticator_shotwell_flickr_flickr_do_web_authentication (self, _tmp5_);
-#line 1148 "FlickrPublishingAuthenticator.c"
+ publishing_authenticator_shotwell_flickr_flickr_do_web_authentication (self, token);
+#line 1207 "FlickrPublishingAuthenticator.c"
}
-static void _publishing_authenticator_shotwell_flickr_flickr_do_verify_pin_publishing_authenticator_shotwell_flickr_web_authentication_pane_authorized (PublishingAuthenticatorShotwellFlickrWebAuthenticationPane* _sender, const gchar* auth_code, gpointer self) {
+static void
+_publishing_authenticator_shotwell_flickr_flickr_do_verify_pin_publishing_authenticator_shotwell_flickr_web_authentication_pane_authorized (PublishingAuthenticatorShotwellFlickrWebAuthenticationPane* _sender,
+ const gchar* auth_code,
+ gpointer self)
+{
#line 188 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
publishing_authenticator_shotwell_flickr_flickr_do_verify_pin ((PublishingAuthenticatorShotwellFlickrFlickr*) self, auth_code);
-#line 1155 "FlickrPublishingAuthenticator.c"
+#line 1218 "FlickrPublishingAuthenticator.c"
}
-static void _publishing_authenticator_shotwell_flickr_flickr_on_web_login_error_publishing_authenticator_shotwell_flickr_web_authentication_pane_error (PublishingAuthenticatorShotwellFlickrWebAuthenticationPane* _sender, gpointer self) {
+static void
+_publishing_authenticator_shotwell_flickr_flickr_on_web_login_error_publishing_authenticator_shotwell_flickr_web_authentication_pane_error (PublishingAuthenticatorShotwellFlickrWebAuthenticationPane* _sender,
+ gpointer self)
+{
#line 189 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
publishing_authenticator_shotwell_flickr_flickr_on_web_login_error ((PublishingAuthenticatorShotwellFlickrFlickr*) self);
-#line 1162 "FlickrPublishingAuthenticator.c"
+#line 1228 "FlickrPublishingAuthenticator.c"
}
-static void publishing_authenticator_shotwell_flickr_flickr_do_web_authentication (PublishingAuthenticatorShotwellFlickrFlickr* self, const gchar* token) {
+static void
+publishing_authenticator_shotwell_flickr_flickr_do_web_authentication (PublishingAuthenticatorShotwellFlickrFlickr* self,
+ const gchar* token)
+{
PublishingAuthenticatorShotwellFlickrWebAuthenticationPane* pane = NULL;
- const gchar* _tmp0_;
- PublishingAuthenticatorShotwellFlickrWebAuthenticationPane* _tmp1_;
- SpitPublishingPluginHost* _tmp2_;
+ PublishingAuthenticatorShotwellFlickrWebAuthenticationPane* _tmp0_;
+ SpitPublishingPluginHost* _tmp1_;
#line 185 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self));
#line 185 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_return_if_fail (token != NULL);
#line 186 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp0_ = token;
-#line 186 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp1_ = publishing_authenticator_shotwell_flickr_web_authentication_pane_new (_tmp0_);
+ _tmp0_ = publishing_authenticator_shotwell_flickr_web_authentication_pane_new (token);
#line 186 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- pane = _tmp1_;
+ pane = _tmp0_;
#line 187 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->host;
+ _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->host;
#line 187 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- spit_publishing_plugin_host_install_dialog_pane (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (pane, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
+ spit_publishing_plugin_host_install_dialog_pane (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (pane, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
#line 188 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_signal_connect_object (pane, "authorized", (GCallback) _publishing_authenticator_shotwell_flickr_flickr_do_verify_pin_publishing_authenticator_shotwell_flickr_web_authentication_pane_authorized, self, 0);
#line 189 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_signal_connect_object (pane, "error", (GCallback) _publishing_authenticator_shotwell_flickr_flickr_on_web_login_error_publishing_authenticator_shotwell_flickr_web_authentication_pane_error, self, 0);
#line 185 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_g_object_unref0 (pane);
-#line 1191 "FlickrPublishingAuthenticator.c"
+#line 1257 "FlickrPublishingAuthenticator.c"
}
-static void publishing_authenticator_shotwell_flickr_flickr_on_web_login_error (PublishingAuthenticatorShotwellFlickrFlickr* self) {
+static void
+publishing_authenticator_shotwell_flickr_flickr_on_web_login_error (PublishingAuthenticatorShotwellFlickrFlickr* self)
+{
SpitPublishingPluginHost* _tmp0_;
GError* _tmp1_;
GError* _tmp2_;
@@ -1220,63 +1288,67 @@ static void publishing_authenticator_shotwell_flickr_flickr_on_web_login_error (
spit_publishing_plugin_host_post_error (_tmp0_, _tmp2_);
#line 193 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_g_error_free0 (_tmp2_);
-#line 1211 "FlickrPublishingAuthenticator.c"
+#line 1279 "FlickrPublishingAuthenticator.c"
}
-static void _publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
+static void
+_publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+ gpointer self)
+{
#line 203 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_txn_completed ((PublishingAuthenticatorShotwellFlickrFlickr*) self, _sender);
-#line 1218 "FlickrPublishingAuthenticator.c"
+#line 1289 "FlickrPublishingAuthenticator.c"
}
-static void _publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
+static void
+_publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+ GError* err,
+ gpointer self)
+{
#line 204 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_error ((PublishingAuthenticatorShotwellFlickrFlickr*) self, _sender, err);
-#line 1225 "FlickrPublishingAuthenticator.c"
+#line 1300 "FlickrPublishingAuthenticator.c"
}
-static void publishing_authenticator_shotwell_flickr_flickr_do_verify_pin (PublishingAuthenticatorShotwellFlickrFlickr* self, const gchar* pin) {
- const gchar* _tmp0_;
+static void
+publishing_authenticator_shotwell_flickr_flickr_do_verify_pin (PublishingAuthenticatorShotwellFlickrFlickr* self,
+ const gchar* pin)
+{
+ SpitPublishingPluginHost* _tmp0_;
SpitPublishingPluginHost* _tmp1_;
- SpitPublishingPluginHost* _tmp2_;
PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction* txn = NULL;
- PublishingRESTSupportOAuth1Session* _tmp3_;
- const gchar* _tmp4_;
- PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction* _tmp5_;
+ PublishingRESTSupportOAuth1Session* _tmp2_;
+ PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction* _tmp3_;
GError * _inner_error_ = NULL;
#line 196 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self));
#line 196 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_return_if_fail (pin != NULL);
#line 197 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp0_ = pin;
-#line 197 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_debug ("FlickrPublishingAuthenticator.vala:197: ACTION: validating authorizati" \
-"on PIN %s", _tmp0_);
+"on PIN %s", pin);
#line 199 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->host;
+ _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->host;
#line 199 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- spit_publishing_plugin_host_set_service_locked (_tmp1_, TRUE);
+ spit_publishing_plugin_host_set_service_locked (_tmp0_, TRUE);
#line 200 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->host;
+ _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->host;
#line 200 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- spit_publishing_plugin_host_install_static_message_pane (_tmp2_, _ ("Verifying authorization…"), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
-#line 202 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->session;
+ spit_publishing_plugin_host_install_static_message_pane (_tmp1_, _ ("Verifying authorization…"), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
#line 202 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp4_ = pin;
+ _tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->session;
#line 202 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp5_ = publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_new (_tmp3_, _tmp4_);
+ _tmp3_ = publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_new (_tmp2_, pin);
#line 202 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- txn = _tmp5_;
+ txn = _tmp3_;
#line 203 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_txn_completed_publishing_rest_support_transaction_completed, self, 0);
#line 204 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 1266 "FlickrPublishingAuthenticator.c"
+#line 1338 "FlickrPublishingAuthenticator.c"
{
#line 207 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
@@ -1284,7 +1356,7 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_verify_pin (Publi
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 207 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 1274 "FlickrPublishingAuthenticator.c"
+#line 1346 "FlickrPublishingAuthenticator.c"
goto __catch2_spit_publishing_publishing_error;
}
#line 207 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -1295,28 +1367,28 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_verify_pin (Publi
g_clear_error (&_inner_error_);
#line 207 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
return;
-#line 1285 "FlickrPublishingAuthenticator.c"
+#line 1357 "FlickrPublishingAuthenticator.c"
}
}
goto __finally2;
__catch2_spit_publishing_publishing_error:
{
GError* err = NULL;
- SpitPublishingPluginHost* _tmp6_;
- GError* _tmp7_;
+ SpitPublishingPluginHost* _tmp4_;
+ GError* _tmp5_;
#line 206 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
err = _inner_error_;
#line 206 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_inner_error_ = NULL;
#line 209 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->host;
+ _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->host;
#line 209 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp7_ = err;
+ _tmp5_ = err;
#line 209 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- spit_publishing_plugin_host_post_error (_tmp6_, _tmp7_);
+ spit_publishing_plugin_host_post_error (_tmp4_, _tmp5_);
#line 206 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_g_error_free0 (err);
-#line 1306 "FlickrPublishingAuthenticator.c"
+#line 1378 "FlickrPublishingAuthenticator.c"
}
__finally2:
#line 206 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -1329,125 +1401,113 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_verify_pin (Publi
g_clear_error (&_inner_error_);
#line 206 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
return;
-#line 1319 "FlickrPublishingAuthenticator.c"
+#line 1391 "FlickrPublishingAuthenticator.c"
}
#line 196 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_publishing_rest_support_transaction_unref0 (txn);
-#line 1323 "FlickrPublishingAuthenticator.c"
+#line 1395 "FlickrPublishingAuthenticator.c"
}
-static void publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_txn_completed (PublishingAuthenticatorShotwellFlickrFlickr* self, PublishingRESTSupportTransaction* txn) {
- PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_txn_completed (PublishingAuthenticatorShotwellFlickrFlickr* self,
+ PublishingRESTSupportTransaction* txn)
+{
+ guint _tmp0_;
guint _tmp1_;
- PublishingRESTSupportTransaction* _tmp2_;
- guint _tmp3_;
- PublishingRESTSupportTransaction* _tmp4_;
- gchar* _tmp5_;
- gchar* _tmp6_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
#line 213 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self));
#line 213 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
#line 214 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp0_ = txn;
+ g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
#line 214 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 214 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_txn_completed_publishing_rest_support_transaction_completed, self);
-#line 215 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp2_ = txn;
+ g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_txn_completed_publishing_rest_support_transaction_completed, self);
#line 215 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
+ g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
#line 215 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_error_publishing_rest_support_transaction_network_error, self);
+ g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_error_publishing_rest_support_transaction_network_error, self);
#line 217 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_debug ("FlickrPublishingAuthenticator.vala:217: EVENT: fetching OAuth access t" \
"oken over the network succeeded");
#line 219 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp4_ = txn;
+ _tmp2_ = publishing_rest_support_transaction_get_response (txn);
#line 219 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp5_ = publishing_rest_support_transaction_get_response (_tmp4_);
+ _tmp3_ = _tmp2_;
#line 219 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp6_ = _tmp5_;
+ publishing_authenticator_shotwell_flickr_flickr_do_extract_access_phase_credentials_from_reponse (self, _tmp3_);
#line 219 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- publishing_authenticator_shotwell_flickr_flickr_do_extract_access_phase_credentials_from_reponse (self, _tmp6_);
-#line 219 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _g_free0 (_tmp6_);
-#line 1363 "FlickrPublishingAuthenticator.c"
+ _g_free0 (_tmp3_);
+#line 1429 "FlickrPublishingAuthenticator.c"
}
-static void publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_error (PublishingAuthenticatorShotwellFlickrFlickr* self, PublishingRESTSupportTransaction* txn, GError* err) {
- PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_error (PublishingAuthenticatorShotwellFlickrFlickr* self,
+ PublishingRESTSupportTransaction* txn,
+ GError* err)
+{
+ guint _tmp0_;
guint _tmp1_;
- PublishingRESTSupportTransaction* _tmp2_;
- guint _tmp3_;
- SpitPublishingPluginHost* _tmp4_;
- GError* _tmp5_;
+ SpitPublishingPluginHost* _tmp2_;
#line 222 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self));
#line 222 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
#line 224 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp0_ = txn;
-#line 224 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
+ g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
#line 224 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_txn_completed_publishing_rest_support_transaction_completed, self);
+ g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_txn_completed_publishing_rest_support_transaction_completed, self);
#line 225 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp2_ = txn;
+ g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
#line 225 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 225 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_error_publishing_rest_support_transaction_network_error, self);
+ g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_error_publishing_rest_support_transaction_network_error, self);
#line 227 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_debug ("FlickrPublishingAuthenticator.vala:227: EVENT: fetching OAuth access t" \
"oken over the network caused an error.");
#line 229 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->host;
-#line 229 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp5_ = err;
+ _tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->host;
#line 229 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- spit_publishing_plugin_host_post_error (_tmp4_, _tmp5_);
+ spit_publishing_plugin_host_post_error (_tmp2_, err);
#line 230 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator), "authentication-failed");
-#line 1400 "FlickrPublishingAuthenticator.c"
+#line 1461 "FlickrPublishingAuthenticator.c"
}
-static void publishing_authenticator_shotwell_flickr_flickr_do_extract_access_phase_credentials_from_reponse (PublishingAuthenticatorShotwellFlickrFlickr* self, const gchar* response) {
- const gchar* _tmp0_;
+static void
+publishing_authenticator_shotwell_flickr_flickr_do_extract_access_phase_credentials_from_reponse (PublishingAuthenticatorShotwellFlickrFlickr* self,
+ const gchar* response)
+{
gchar* token = NULL;
gchar* token_secret = NULL;
gchar* username = NULL;
GHashTable* data = NULL;
- const gchar* _tmp1_;
- GHashTable* _tmp2_;
- GHashTable* _tmp3_;
- gconstpointer _tmp4_ = NULL;
- gchar* _tmp5_;
- GHashTable* _tmp6_;
- gconstpointer _tmp7_ = NULL;
- gchar* _tmp8_;
- GHashTable* _tmp9_;
- gconstpointer _tmp10_ = NULL;
- gchar* _tmp11_;
+ GHashTable* _tmp0_;
+ GHashTable* _tmp1_;
+ gconstpointer _tmp2_ = NULL;
+ gchar* _tmp3_;
+ GHashTable* _tmp4_;
+ gconstpointer _tmp5_ = NULL;
+ gchar* _tmp6_;
+ GHashTable* _tmp7_;
+ gconstpointer _tmp8_ = NULL;
+ gchar* _tmp9_;
+ const gchar* _tmp10_;
+ const gchar* _tmp11_;
const gchar* _tmp12_;
- const gchar* _tmp13_;
- const gchar* _tmp14_;
- gboolean _tmp15_ = FALSE;
- gboolean _tmp16_ = FALSE;
- const gchar* _tmp17_;
+ gboolean _tmp13_ = FALSE;
+ gboolean _tmp14_ = FALSE;
+ const gchar* _tmp15_;
#line 233 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self));
#line 233 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_return_if_fail (response != NULL);
#line 234 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp0_ = response;
-#line 234 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_debug ("FlickrPublishingAuthenticator.vala:234: ACTION: extracting access phas" \
-"e credentials from '%s'", _tmp0_);
+"e credentials from '%s'", response);
#line 236 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
token = NULL;
#line 237 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -1455,114 +1515,112 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_extract_access_ph
#line 238 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
username = NULL;
#line 240 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp1_ = response;
-#line 240 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp2_ = soup_form_decode (_tmp1_);
+ _tmp0_ = soup_form_decode (response);
#line 240 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- data = _tmp2_;
+ data = _tmp0_;
#line 241 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp3_ = data;
+ _tmp1_ = data;
#line 241 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- g_hash_table_lookup_extended (_tmp3_, "oauth_token", NULL, &_tmp4_);
+ g_hash_table_lookup_extended (_tmp1_, "oauth_token", NULL, &_tmp2_);
#line 241 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_g_free0 (token);
#line 241 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp5_ = g_strdup (_tmp4_);
+ _tmp3_ = g_strdup (_tmp2_);
#line 241 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- token = _tmp5_;
+ token = _tmp3_;
#line 242 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp6_ = data;
+ _tmp4_ = data;
#line 242 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- g_hash_table_lookup_extended (_tmp6_, "oauth_token_secret", NULL, &_tmp7_);
+ g_hash_table_lookup_extended (_tmp4_, "oauth_token_secret", NULL, &_tmp5_);
#line 242 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_g_free0 (token_secret);
#line 242 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp8_ = g_strdup (_tmp7_);
+ _tmp6_ = g_strdup (_tmp5_);
#line 242 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- token_secret = _tmp8_;
+ token_secret = _tmp6_;
#line 243 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp9_ = data;
+ _tmp7_ = data;
#line 243 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- g_hash_table_lookup_extended (_tmp9_, "username", NULL, &_tmp10_);
+ g_hash_table_lookup_extended (_tmp7_, "username", NULL, &_tmp8_);
#line 243 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_g_free0 (username);
#line 243 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp11_ = g_strdup (_tmp10_);
+ _tmp9_ = g_strdup (_tmp8_);
#line 243 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- username = _tmp11_;
+ username = _tmp9_;
#line 245 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp12_ = token;
+ _tmp10_ = token;
#line 245 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp13_ = token_secret;
+ _tmp11_ = token_secret;
#line 245 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp14_ = username;
+ _tmp12_ = username;
#line 245 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_debug ("FlickrPublishingAuthenticator.vala:245: access phase credentials: { to" \
-"ken = '%s'; token_secret = '%s'; username = '%s' }", _tmp12_, _tmp13_, _tmp14_);
+"ken = '%s'; token_secret = '%s'; username = '%s' }", _tmp10_, _tmp11_, _tmp12_);
#line 248 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp17_ = token;
+ _tmp15_ = token;
#line 248 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- if (_tmp17_ == NULL) {
+ if (_tmp15_ == NULL) {
#line 248 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp16_ = TRUE;
-#line 1491 "FlickrPublishingAuthenticator.c"
+ _tmp14_ = TRUE;
+#line 1549 "FlickrPublishingAuthenticator.c"
} else {
- const gchar* _tmp18_;
+ const gchar* _tmp16_;
#line 248 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp18_ = token_secret;
+ _tmp16_ = token_secret;
#line 248 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp16_ = _tmp18_ == NULL;
-#line 1498 "FlickrPublishingAuthenticator.c"
+ _tmp14_ = _tmp16_ == NULL;
+#line 1556 "FlickrPublishingAuthenticator.c"
}
#line 248 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- if (_tmp16_) {
+ if (_tmp14_) {
#line 248 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp15_ = TRUE;
-#line 1504 "FlickrPublishingAuthenticator.c"
+ _tmp13_ = TRUE;
+#line 1562 "FlickrPublishingAuthenticator.c"
} else {
- const gchar* _tmp19_;
+ const gchar* _tmp17_;
#line 248 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp19_ = username;
+ _tmp17_ = username;
#line 248 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp15_ = _tmp19_ == NULL;
-#line 1511 "FlickrPublishingAuthenticator.c"
+ _tmp13_ = _tmp17_ == NULL;
+#line 1569 "FlickrPublishingAuthenticator.c"
}
#line 248 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- if (_tmp15_) {
-#line 1515 "FlickrPublishingAuthenticator.c"
- SpitPublishingPluginHost* _tmp20_;
- GError* _tmp21_;
- GError* _tmp22_;
+ if (_tmp13_) {
+#line 1573 "FlickrPublishingAuthenticator.c"
+ SpitPublishingPluginHost* _tmp18_;
+ GError* _tmp19_;
+ GError* _tmp20_;
#line 249 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp20_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->host;
+ _tmp18_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->host;
#line 249 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp21_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "expected " "access phase credentials to contain token, token secret, and username " \
+ _tmp19_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "expected " "access phase credentials to contain token, token secret, and username " \
"but at " "least one of these is absent");
#line 249 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp22_ = _tmp21_;
+ _tmp20_ = _tmp19_;
#line 249 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- spit_publishing_plugin_host_post_error (_tmp20_, _tmp22_);
+ spit_publishing_plugin_host_post_error (_tmp18_, _tmp20_);
#line 249 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _g_error_free0 (_tmp22_);
+ _g_error_free0 (_tmp20_);
#line 252 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator), "authentication-failed");
-#line 1531 "FlickrPublishingAuthenticator.c"
+#line 1589 "FlickrPublishingAuthenticator.c"
} else {
- PublishingRESTSupportOAuth1Session* _tmp23_;
+ PublishingRESTSupportOAuth1Session* _tmp21_;
+ const gchar* _tmp22_;
+ const gchar* _tmp23_;
const gchar* _tmp24_;
- const gchar* _tmp25_;
- const gchar* _tmp26_;
#line 254 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp23_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->session;
+ _tmp21_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->session;
#line 254 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp24_ = token;
+ _tmp22_ = token;
#line 254 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp25_ = token_secret;
+ _tmp23_ = token_secret;
#line 254 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp26_ = username;
+ _tmp24_ = username;
#line 254 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- publishing_rest_support_oauth1_session_set_access_phase_credentials (_tmp23_, _tmp24_, _tmp25_, _tmp26_);
-#line 1547 "FlickrPublishingAuthenticator.c"
+ publishing_rest_support_oauth1_session_set_access_phase_credentials (_tmp21_, _tmp22_, _tmp23_, _tmp24_);
+#line 1605 "FlickrPublishingAuthenticator.c"
}
#line 233 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_g_hash_table_unref0 (data);
@@ -1572,11 +1630,13 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_extract_access_ph
_g_free0 (token_secret);
#line 233 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_g_free0 (token);
-#line 1557 "FlickrPublishingAuthenticator.c"
+#line 1615 "FlickrPublishingAuthenticator.c"
}
-static void publishing_authenticator_shotwell_flickr_flickr_class_init (PublishingAuthenticatorShotwellFlickrFlickrClass * klass) {
+static void
+publishing_authenticator_shotwell_flickr_flickr_class_init (PublishingAuthenticatorShotwellFlickrFlickrClass * klass)
+{
#line 77 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
publishing_authenticator_shotwell_flickr_flickr_parent_class = g_type_class_peek_parent (klass);
#line 77 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -1587,15 +1647,19 @@ static void publishing_authenticator_shotwell_flickr_flickr_class_init (Publishi
((PublishingAuthenticatorShotwellOAuth1AuthenticatorClass *) klass)->logout = (void (*) (PublishingAuthenticatorShotwellOAuth1Authenticator *)) publishing_authenticator_shotwell_flickr_flickr_real_logout;
#line 77 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
((PublishingAuthenticatorShotwellOAuth1AuthenticatorClass *) klass)->refresh = (void (*) (PublishingAuthenticatorShotwellOAuth1Authenticator *)) publishing_authenticator_shotwell_flickr_flickr_real_refresh;
-#line 1572 "FlickrPublishingAuthenticator.c"
+#line 1632 "FlickrPublishingAuthenticator.c"
}
-static void publishing_authenticator_shotwell_flickr_flickr_instance_init (PublishingAuthenticatorShotwellFlickrFlickr * self) {
+static void
+publishing_authenticator_shotwell_flickr_flickr_instance_init (PublishingAuthenticatorShotwellFlickrFlickr * self)
+{
}
-GType publishing_authenticator_shotwell_flickr_flickr_get_type (void) {
+GType
+publishing_authenticator_shotwell_flickr_flickr_get_type (void)
+{
static volatile gsize publishing_authenticator_shotwell_flickr_flickr_type_id__volatile = 0;
if (g_once_init_enter (&publishing_authenticator_shotwell_flickr_flickr_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingAuthenticatorShotwellFlickrFlickrClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_authenticator_shotwell_flickr_flickr_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingAuthenticatorShotwellFlickrFlickr), 0, (GInstanceInitFunc) publishing_authenticator_shotwell_flickr_flickr_instance_init, NULL };
diff --git a/plugins/authenticator/shotwell/GoogleAuthenticator.c b/plugins/authenticator/shotwell/GoogleAuthenticator.c
index 9f9972f..644ee53 100644
--- a/plugins/authenticator/shotwell/GoogleAuthenticator.c
+++ b/plugins/authenticator/shotwell/GoogleAuthenticator.c
@@ -1,7 +1,8 @@
-/* GoogleAuthenticator.c generated by valac 0.36.6, the Vala compiler
+/* GoogleAuthenticator.c generated by valac 0.40.4, the Vala compiler
* generated from GoogleAuthenticator.vala, do not modify */
+
#include <glib.h>
#include <glib-object.h>
#include <stdlib.h>
@@ -24,13 +25,18 @@
typedef struct _PublishingAuthenticatorShotwellGoogleWebAuthenticationPane PublishingAuthenticatorShotwellGoogleWebAuthenticationPane;
typedef struct _PublishingAuthenticatorShotwellGoogleWebAuthenticationPaneClass PublishingAuthenticatorShotwellGoogleWebAuthenticationPaneClass;
typedef struct _PublishingAuthenticatorShotwellGoogleWebAuthenticationPanePrivate PublishingAuthenticatorShotwellGoogleWebAuthenticationPanePrivate;
+enum {
+ PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_WEB_AUTHENTICATION_PANE_0_PROPERTY,
+ PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_WEB_AUTHENTICATION_PANE_NUM_PROPERTIES
+};
+static GParamSpec* publishing_authenticator_shotwell_google_web_authentication_pane_properties[PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_WEB_AUTHENTICATION_PANE_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))
enum {
PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_WEB_AUTHENTICATION_PANE_AUTHORIZED_SIGNAL,
- PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_WEB_AUTHENTICATION_PANE_LAST_SIGNAL
+ PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_WEB_AUTHENTICATION_PANE_NUM_SIGNALS
};
-static guint publishing_authenticator_shotwell_google_web_authentication_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_WEB_AUTHENTICATION_PANE_LAST_SIGNAL] = {0};
+static guint publishing_authenticator_shotwell_google_web_authentication_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_WEB_AUTHENTICATION_PANE_NUM_SIGNALS] = {0};
#define PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_SESSION (publishing_authenticator_shotwell_google_session_get_type ())
#define PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_SESSION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_SESSION, PublishingAuthenticatorShotwellGoogleSession))
@@ -86,6 +92,11 @@ typedef struct _PublishingAuthenticatorShotwellGoogleUsernameFetchTransactionPri
typedef struct _PublishingAuthenticatorShotwellGoogleGoogle PublishingAuthenticatorShotwellGoogleGoogle;
typedef struct _PublishingAuthenticatorShotwellGoogleGoogleClass PublishingAuthenticatorShotwellGoogleGoogleClass;
typedef struct _PublishingAuthenticatorShotwellGoogleGooglePrivate PublishingAuthenticatorShotwellGoogleGooglePrivate;
+enum {
+ PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_GOOGLE_0_PROPERTY,
+ PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_GOOGLE_NUM_PROPERTIES
+};
+static GParamSpec* publishing_authenticator_shotwell_google_google_properties[PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_GOOGLE_NUM_PROPERTIES];
#define _g_hash_table_unref0(var) ((var == NULL) ? NULL : (var = (g_hash_table_unref (var), NULL)))
#define _publishing_rest_support_session_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rest_support_session_unref (var), NULL)))
#define _publishing_rest_support_transaction_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rest_support_transaction_unref (var), NULL)))
@@ -177,55 +188,49 @@ static SpitPublishingAuthenticatorIface * publishing_authenticator_shotwell_goog
"om"
#define PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_OAUTH_CLIENT_SECRET "pwpzZ7W1TCcD5uIfYCu8sM7x"
GType publishing_authenticator_shotwell_google_web_authentication_pane_get_type (void) G_GNUC_CONST;
-enum {
- PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_WEB_AUTHENTICATION_PANE_DUMMY_PROPERTY
-};
PublishingAuthenticatorShotwellGoogleWebAuthenticationPane* publishing_authenticator_shotwell_google_web_authentication_pane_new (const gchar* auth_sequence_start_url);
-PublishingAuthenticatorShotwellGoogleWebAuthenticationPane* publishing_authenticator_shotwell_google_web_authentication_pane_construct (GType object_type, const gchar* auth_sequence_start_url);
+PublishingAuthenticatorShotwellGoogleWebAuthenticationPane* publishing_authenticator_shotwell_google_web_authentication_pane_construct (GType object_type,
+ const gchar* auth_sequence_start_url);
gboolean publishing_authenticator_shotwell_google_web_authentication_pane_is_cache_dirty (void);
static void publishing_authenticator_shotwell_google_web_authentication_pane_real_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* base);
static void publishing_authenticator_shotwell_google_web_authentication_pane_finalize (GObject * obj);
GType publishing_authenticator_shotwell_google_session_get_type (void) G_GNUC_CONST;
-enum {
- PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_SESSION_DUMMY_PROPERTY
-};
static gboolean publishing_authenticator_shotwell_google_session_real_is_authenticated (PublishingRESTSupportSession* base);
void publishing_authenticator_shotwell_google_session_deauthenticate (PublishingAuthenticatorShotwellGoogleSession* self);
PublishingAuthenticatorShotwellGoogleSession* publishing_authenticator_shotwell_google_session_new (void);
PublishingAuthenticatorShotwellGoogleSession* publishing_authenticator_shotwell_google_session_construct (GType object_type);
static void publishing_authenticator_shotwell_google_session_finalize (PublishingRESTSupportSession * obj);
GType publishing_authenticator_shotwell_google_get_access_tokens_transaction_get_type (void) G_GNUC_CONST;
-enum {
- PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_GET_ACCESS_TOKENS_TRANSACTION_DUMMY_PROPERTY
-};
#define PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_GET_ACCESS_TOKENS_TRANSACTION_ENDPOINT_URL "https://accounts.google.com/o/oauth2/token"
-PublishingAuthenticatorShotwellGoogleGetAccessTokensTransaction* publishing_authenticator_shotwell_google_get_access_tokens_transaction_new (PublishingAuthenticatorShotwellGoogleSession* session, const gchar* auth_code);
-PublishingAuthenticatorShotwellGoogleGetAccessTokensTransaction* publishing_authenticator_shotwell_google_get_access_tokens_transaction_construct (GType object_type, PublishingAuthenticatorShotwellGoogleSession* session, const gchar* auth_code);
+PublishingAuthenticatorShotwellGoogleGetAccessTokensTransaction* publishing_authenticator_shotwell_google_get_access_tokens_transaction_new (PublishingAuthenticatorShotwellGoogleSession* session,
+ const gchar* auth_code);
+PublishingAuthenticatorShotwellGoogleGetAccessTokensTransaction* publishing_authenticator_shotwell_google_get_access_tokens_transaction_construct (GType object_type,
+ PublishingAuthenticatorShotwellGoogleSession* session,
+ const gchar* auth_code);
GType publishing_authenticator_shotwell_google_refresh_access_token_transaction_get_type (void) G_GNUC_CONST;
-enum {
- PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_REFRESH_ACCESS_TOKEN_TRANSACTION_DUMMY_PROPERTY
-};
#define PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_REFRESH_ACCESS_TOKEN_TRANSACTION_ENDPOINT_URL "https://accounts.google.com/o/oauth2/token"
PublishingAuthenticatorShotwellGoogleRefreshAccessTokenTransaction* publishing_authenticator_shotwell_google_refresh_access_token_transaction_new (PublishingAuthenticatorShotwellGoogleSession* session);
-PublishingAuthenticatorShotwellGoogleRefreshAccessTokenTransaction* publishing_authenticator_shotwell_google_refresh_access_token_transaction_construct (GType object_type, PublishingAuthenticatorShotwellGoogleSession* session);
+PublishingAuthenticatorShotwellGoogleRefreshAccessTokenTransaction* publishing_authenticator_shotwell_google_refresh_access_token_transaction_construct (GType object_type,
+ PublishingAuthenticatorShotwellGoogleSession* session);
GType publishing_authenticator_shotwell_google_username_fetch_transaction_get_type (void) G_GNUC_CONST;
-enum {
- PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_USERNAME_FETCH_TRANSACTION_DUMMY_PROPERTY
-};
#define PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_USERNAME_FETCH_TRANSACTION_ENDPOINT_URL "https://www.googleapis.com/oauth2/v1/userinfo"
PublishingAuthenticatorShotwellGoogleUsernameFetchTransaction* publishing_authenticator_shotwell_google_username_fetch_transaction_new (PublishingAuthenticatorShotwellGoogleSession* session);
-PublishingAuthenticatorShotwellGoogleUsernameFetchTransaction* publishing_authenticator_shotwell_google_username_fetch_transaction_construct (GType object_type, PublishingAuthenticatorShotwellGoogleSession* session);
+PublishingAuthenticatorShotwellGoogleUsernameFetchTransaction* publishing_authenticator_shotwell_google_username_fetch_transaction_construct (GType object_type,
+ PublishingAuthenticatorShotwellGoogleSession* session);
GType publishing_authenticator_shotwell_google_google_get_type (void) G_GNUC_CONST;
#define PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_GOOGLE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_GOOGLE, PublishingAuthenticatorShotwellGoogleGooglePrivate))
-enum {
- PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_GOOGLE_DUMMY_PROPERTY
-};
-PublishingAuthenticatorShotwellGoogleGoogle* publishing_authenticator_shotwell_google_google_new (const gchar* scope, const gchar* welcome_message, SpitPublishingPluginHost* host);
-PublishingAuthenticatorShotwellGoogleGoogle* publishing_authenticator_shotwell_google_google_construct (GType object_type, const gchar* scope, const gchar* welcome_message, SpitPublishingPluginHost* host);
+PublishingAuthenticatorShotwellGoogleGoogle* publishing_authenticator_shotwell_google_google_new (const gchar* scope,
+ const gchar* welcome_message,
+ SpitPublishingPluginHost* host);
+PublishingAuthenticatorShotwellGoogleGoogle* publishing_authenticator_shotwell_google_google_construct (GType object_type,
+ const gchar* scope,
+ const gchar* welcome_message,
+ SpitPublishingPluginHost* host);
static void _g_free0_ (gpointer var);
static void _g_variant_unref0_ (gpointer var);
static void publishing_authenticator_shotwell_google_google_real_authenticate (SpitPublishingAuthenticator* base);
-static void publishing_authenticator_shotwell_google_google_on_refresh_token_available (PublishingAuthenticatorShotwellGoogleGoogle* self, const gchar* token);
+static void publishing_authenticator_shotwell_google_google_on_refresh_token_available (PublishingAuthenticatorShotwellGoogleGoogle* self,
+ const gchar* token);
static void publishing_authenticator_shotwell_google_google_do_exchange_refresh_token_for_access_token (PublishingAuthenticatorShotwellGoogleGoogle* self);
static void publishing_authenticator_shotwell_google_google_do_show_service_welcome_pane (PublishingAuthenticatorShotwellGoogleGoogle* self);
static gboolean publishing_authenticator_shotwell_google_google_real_can_logout (SpitPublishingAuthenticator* base);
@@ -233,26 +238,52 @@ static GHashTable* publishing_authenticator_shotwell_google_google_real_get_auth
static void publishing_authenticator_shotwell_google_google_real_logout (SpitPublishingAuthenticator* base);
static void publishing_authenticator_shotwell_google_google_real_refresh (SpitPublishingAuthenticator* base);
static void publishing_authenticator_shotwell_google_google_do_hosted_web_authentication (PublishingAuthenticatorShotwellGoogleGoogle* self);
-static void publishing_authenticator_shotwell_google_google_on_web_auth_pane_authorized (PublishingAuthenticatorShotwellGoogleGoogle* self, const gchar* auth_code);
-static void _publishing_authenticator_shotwell_google_google_on_web_auth_pane_authorized_publishing_authenticator_shotwell_google_web_authentication_pane_authorized (PublishingAuthenticatorShotwellGoogleWebAuthenticationPane* _sender, const gchar* auth_code, gpointer self);
-static void publishing_authenticator_shotwell_google_google_do_get_access_tokens (PublishingAuthenticatorShotwellGoogleGoogle* self, const gchar* auth_code);
-static void publishing_authenticator_shotwell_google_google_on_get_access_tokens_complete (PublishingAuthenticatorShotwellGoogleGoogle* self, PublishingRESTSupportTransaction* txn);
-static void _publishing_authenticator_shotwell_google_google_on_get_access_tokens_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
-static void publishing_authenticator_shotwell_google_google_on_get_access_tokens_error (PublishingAuthenticatorShotwellGoogleGoogle* self, PublishingRESTSupportTransaction* txn, GError* err);
-static void _publishing_authenticator_shotwell_google_google_on_get_access_tokens_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self);
-static void publishing_authenticator_shotwell_google_google_do_extract_tokens (PublishingAuthenticatorShotwellGoogleGoogle* self, const gchar* response_body);
-static void publishing_authenticator_shotwell_google_google_on_expiry_time_avilable (PublishingAuthenticatorShotwellGoogleGoogle* self, gint64 abs_time);
-static void publishing_authenticator_shotwell_google_google_on_access_token_available (PublishingAuthenticatorShotwellGoogleGoogle* self, const gchar* token);
+static void publishing_authenticator_shotwell_google_google_on_web_auth_pane_authorized (PublishingAuthenticatorShotwellGoogleGoogle* self,
+ const gchar* auth_code);
+static void _publishing_authenticator_shotwell_google_google_on_web_auth_pane_authorized_publishing_authenticator_shotwell_google_web_authentication_pane_authorized (PublishingAuthenticatorShotwellGoogleWebAuthenticationPane* _sender,
+ const gchar* auth_code,
+ gpointer self);
+static void publishing_authenticator_shotwell_google_google_do_get_access_tokens (PublishingAuthenticatorShotwellGoogleGoogle* self,
+ const gchar* auth_code);
+static void publishing_authenticator_shotwell_google_google_on_get_access_tokens_complete (PublishingAuthenticatorShotwellGoogleGoogle* self,
+ PublishingRESTSupportTransaction* txn);
+static void _publishing_authenticator_shotwell_google_google_on_get_access_tokens_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+ gpointer self);
+static void publishing_authenticator_shotwell_google_google_on_get_access_tokens_error (PublishingAuthenticatorShotwellGoogleGoogle* self,
+ PublishingRESTSupportTransaction* txn,
+ GError* err);
+static void _publishing_authenticator_shotwell_google_google_on_get_access_tokens_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+ GError* err,
+ gpointer self);
+static void publishing_authenticator_shotwell_google_google_do_extract_tokens (PublishingAuthenticatorShotwellGoogleGoogle* self,
+ const gchar* response_body);
+static void publishing_authenticator_shotwell_google_google_on_expiry_time_avilable (PublishingAuthenticatorShotwellGoogleGoogle* self,
+ gint64 abs_time);
+static void publishing_authenticator_shotwell_google_google_on_access_token_available (PublishingAuthenticatorShotwellGoogleGoogle* self,
+ const gchar* token);
static void publishing_authenticator_shotwell_google_google_do_fetch_username (PublishingAuthenticatorShotwellGoogleGoogle* self);
-static void publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_completed (PublishingAuthenticatorShotwellGoogleGoogle* self, PublishingRESTSupportTransaction* txn);
-static void _publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
-static void publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_error (PublishingAuthenticatorShotwellGoogleGoogle* self, PublishingRESTSupportTransaction* txn, GError* err);
-static void _publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self);
-static void publishing_authenticator_shotwell_google_google_do_extract_username (PublishingAuthenticatorShotwellGoogleGoogle* self, const gchar* response_body);
-static void publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_completed (PublishingAuthenticatorShotwellGoogleGoogle* self, PublishingRESTSupportTransaction* txn);
-static void _publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
-static void publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_error (PublishingAuthenticatorShotwellGoogleGoogle* self, PublishingRESTSupportTransaction* txn, GError* err);
-static void _publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self);
+static void publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_completed (PublishingAuthenticatorShotwellGoogleGoogle* self,
+ PublishingRESTSupportTransaction* txn);
+static void _publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+ gpointer self);
+static void publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_error (PublishingAuthenticatorShotwellGoogleGoogle* self,
+ PublishingRESTSupportTransaction* txn,
+ GError* err);
+static void _publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+ GError* err,
+ gpointer self);
+static void publishing_authenticator_shotwell_google_google_do_extract_username (PublishingAuthenticatorShotwellGoogleGoogle* self,
+ const gchar* response_body);
+static void publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_completed (PublishingAuthenticatorShotwellGoogleGoogle* self,
+ PublishingRESTSupportTransaction* txn);
+static void _publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+ gpointer self);
+static void publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_error (PublishingAuthenticatorShotwellGoogleGoogle* self,
+ PublishingRESTSupportTransaction* txn,
+ GError* err);
+static void _publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+ GError* err,
+ gpointer self);
static gboolean ___lambda4_ (PublishingAuthenticatorShotwellGoogleGoogle* self);
static gboolean ____lambda4__gsource_func (gpointer self);
static void publishing_authenticator_shotwell_google_google_on_service_welcome_login (PublishingAuthenticatorShotwellGoogleGoogle* self);
@@ -260,29 +291,33 @@ static void _publishing_authenticator_shotwell_google_google_on_service_welcome_
static void publishing_authenticator_shotwell_google_google_finalize (GObject * obj);
-PublishingAuthenticatorShotwellGoogleWebAuthenticationPane* publishing_authenticator_shotwell_google_web_authentication_pane_construct (GType object_type, const gchar* auth_sequence_start_url) {
+PublishingAuthenticatorShotwellGoogleWebAuthenticationPane*
+publishing_authenticator_shotwell_google_web_authentication_pane_construct (GType object_type,
+ const gchar* auth_sequence_start_url)
+{
PublishingAuthenticatorShotwellGoogleWebAuthenticationPane * self = NULL;
- const gchar* _tmp0_;
#line 13 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
g_return_val_if_fail (auth_sequence_start_url != NULL, NULL);
#line 14 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp0_ = auth_sequence_start_url;
-#line 14 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- self = (PublishingAuthenticatorShotwellGoogleWebAuthenticationPane*) g_object_new (object_type, "login-uri", _tmp0_, NULL);
+ self = (PublishingAuthenticatorShotwellGoogleWebAuthenticationPane*) g_object_new (object_type, "login-uri", auth_sequence_start_url, NULL);
#line 13 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
return self;
-#line 274 "GoogleAuthenticator.c"
+#line 305 "GoogleAuthenticator.c"
}
-PublishingAuthenticatorShotwellGoogleWebAuthenticationPane* publishing_authenticator_shotwell_google_web_authentication_pane_new (const gchar* auth_sequence_start_url) {
+PublishingAuthenticatorShotwellGoogleWebAuthenticationPane*
+publishing_authenticator_shotwell_google_web_authentication_pane_new (const gchar* auth_sequence_start_url)
+{
#line 13 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
return publishing_authenticator_shotwell_google_web_authentication_pane_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_WEB_AUTHENTICATION_PANE, auth_sequence_start_url);
-#line 281 "GoogleAuthenticator.c"
+#line 314 "GoogleAuthenticator.c"
}
-gboolean publishing_authenticator_shotwell_google_web_authentication_pane_is_cache_dirty (void) {
+gboolean
+publishing_authenticator_shotwell_google_web_authentication_pane_is_cache_dirty (void)
+{
gboolean result = FALSE;
gboolean _tmp0_;
#line 18 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -291,221 +326,168 @@ gboolean publishing_authenticator_shotwell_google_web_authentication_pane_is_cac
result = _tmp0_;
#line 18 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
return result;
-#line 294 "GoogleAuthenticator.c"
+#line 329 "GoogleAuthenticator.c"
}
-static gint string_index_of (const gchar* self, const gchar* needle, gint start_index) {
+static gint
+string_index_of (const gchar* self,
+ const gchar* needle,
+ gint start_index)
+{
gint result = 0;
gchar* _result_ = NULL;
- gint _tmp0_;
- const gchar* _tmp1_;
- gchar* _tmp2_;
- gchar* _tmp3_;
-#line 1011 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ gchar* _tmp0_;
+ gchar* _tmp1_;
+#line 1025 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, 0);
-#line 1011 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1025 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (needle != NULL, 0);
-#line 1012 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp0_ = start_index;
-#line 1012 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp1_ = needle;
-#line 1012 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp2_ = strstr (((gchar*) self) + _tmp0_, (gchar*) _tmp1_);
-#line 1012 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _result_ = _tmp2_;
-#line 1014 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp3_ = _result_;
-#line 1014 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp3_ != NULL) {
-#line 321 "GoogleAuthenticator.c"
- gchar* _tmp4_;
-#line 1015 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp4_ = _result_;
-#line 1015 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- result = (gint) (_tmp4_ - ((gchar*) self));
-#line 1015 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1026 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp0_ = strstr (((gchar*) self) + start_index, (gchar*) needle);
+#line 1026 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _result_ = _tmp0_;
+#line 1028 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp1_ = _result_;
+#line 1028 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (_tmp1_ != NULL) {
+#line 354 "GoogleAuthenticator.c"
+ gchar* _tmp2_;
+#line 1029 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp2_ = _result_;
+#line 1029 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = (gint) (_tmp2_ - ((gchar*) self));
+#line 1029 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 329 "GoogleAuthenticator.c"
+#line 362 "GoogleAuthenticator.c"
} else {
-#line 1017 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1031 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
result = -1;
-#line 1017 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1031 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 335 "GoogleAuthenticator.c"
+#line 368 "GoogleAuthenticator.c"
}
}
-static glong string_strnlen (gchar* str, glong maxlen) {
+static glong
+string_strnlen (gchar* str,
+ glong maxlen)
+{
glong result = 0L;
gchar* end = NULL;
gchar* _tmp0_;
- glong _tmp1_;
- gchar* _tmp2_;
- gchar* _tmp3_;
-#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp0_ = str;
-#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp1_ = maxlen;
-#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- end = _tmp2_;
-#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp3_ = end;
-#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp3_ == NULL) {
-#line 359 "GoogleAuthenticator.c"
- glong _tmp4_;
-#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp4_ = maxlen;
-#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- result = _tmp4_;
-#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ gchar* _tmp1_;
+#line 1336 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp0_ = memchr (str, 0, (gsize) maxlen);
+#line 1336 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ end = _tmp0_;
+#line 1337 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp1_ = end;
+#line 1337 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (_tmp1_ == NULL) {
+#line 1338 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = maxlen;
+#line 1338 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 367 "GoogleAuthenticator.c"
+#line 393 "GoogleAuthenticator.c"
} else {
- gchar* _tmp5_;
- gchar* _tmp6_;
-#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp5_ = end;
-#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp6_ = str;
-#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- result = (glong) (_tmp5_ - _tmp6_);
-#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ gchar* _tmp2_;
+#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp2_ = end;
+#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = (glong) (_tmp2_ - str);
+#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 379 "GoogleAuthenticator.c"
+#line 402 "GoogleAuthenticator.c"
}
}
-static gchar* string_substring (const gchar* self, glong offset, glong len) {
+static gchar*
+string_substring (const gchar* self,
+ glong offset,
+ glong len)
+{
gchar* result = NULL;
glong string_length = 0L;
gboolean _tmp0_ = FALSE;
- glong _tmp1_;
- glong _tmp8_;
- glong _tmp14_;
- glong _tmp17_;
- glong _tmp18_;
- glong _tmp19_;
- glong _tmp20_;
- glong _tmp21_;
- gchar* _tmp22_;
-#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ glong _tmp6_;
+ gchar* _tmp7_;
+#line 1347 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp1_ = offset;
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp1_ >= ((glong) 0)) {
-#line 403 "GoogleAuthenticator.c"
- glong _tmp2_;
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp2_ = len;
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp0_ = _tmp2_ >= ((glong) 0);
-#line 409 "GoogleAuthenticator.c"
+#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (offset >= ((glong) 0)) {
+#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp0_ = len >= ((glong) 0);
+#line 423 "GoogleAuthenticator.c"
} else {
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp0_ = FALSE;
-#line 413 "GoogleAuthenticator.c"
+#line 427 "GoogleAuthenticator.c"
}
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
if (_tmp0_) {
-#line 417 "GoogleAuthenticator.c"
- glong _tmp3_;
- glong _tmp4_;
- glong _tmp5_;
-#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp3_ = offset;
-#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp4_ = len;
-#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- string_length = _tmp5_;
-#line 429 "GoogleAuthenticator.c"
+#line 1351 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ string_length = string_strnlen ((gchar*) self, offset + len);
+#line 433 "GoogleAuthenticator.c"
} else {
- gint _tmp6_;
- gint _tmp7_;
-#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp6_ = strlen (self);
-#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp7_ = _tmp6_;
-#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- string_length = (glong) _tmp7_;
-#line 439 "GoogleAuthenticator.c"
+ gint _tmp1_;
+ gint _tmp2_;
+#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp1_ = strlen (self);
+#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp2_ = _tmp1_;
+#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ string_length = (glong) _tmp2_;
+#line 443 "GoogleAuthenticator.c"
}
-#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp8_ = offset;
-#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp8_ < ((glong) 0)) {
-#line 445 "GoogleAuthenticator.c"
- glong _tmp9_;
- glong _tmp10_;
- glong _tmp11_;
-#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp9_ = string_length;
-#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp10_ = offset;
-#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- offset = _tmp9_ + _tmp10_;
-#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp11_ = offset;
-#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 459 "GoogleAuthenticator.c"
+#line 1356 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (offset < ((glong) 0)) {
+#line 447 "GoogleAuthenticator.c"
+ glong _tmp3_;
+#line 1357 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp3_ = string_length;
+#line 1357 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ offset = _tmp3_ + offset;
+#line 1358 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ g_return_val_if_fail (offset >= ((glong) 0), NULL);
+#line 455 "GoogleAuthenticator.c"
} else {
- glong _tmp12_;
- glong _tmp13_;
-#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp12_ = offset;
-#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp13_ = string_length;
-#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 469 "GoogleAuthenticator.c"
+ glong _tmp4_;
+#line 1360 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp4_ = string_length;
+#line 1360 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ g_return_val_if_fail (offset <= _tmp4_, NULL);
+#line 462 "GoogleAuthenticator.c"
}
-#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp14_ = len;
-#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp14_ < ((glong) 0)) {
-#line 475 "GoogleAuthenticator.c"
- glong _tmp15_;
- glong _tmp16_;
-#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp15_ = string_length;
-#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp16_ = offset;
-#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- len = _tmp15_ - _tmp16_;
-#line 484 "GoogleAuthenticator.c"
+#line 1362 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (len < ((glong) 0)) {
+#line 466 "GoogleAuthenticator.c"
+ glong _tmp5_;
+#line 1363 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp5_ = string_length;
+#line 1363 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ len = _tmp5_ - offset;
+#line 472 "GoogleAuthenticator.c"
}
-#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp17_ = offset;
-#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp18_ = len;
-#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp19_ = string_length;
-#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp20_ = offset;
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp21_ = len;
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- result = _tmp22_;
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1365 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp6_ = string_length;
+#line 1365 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ g_return_val_if_fail ((offset + len) <= _tmp6_, NULL);
+#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp7_ = g_strndup (((gchar*) self) + offset, (gsize) len);
+#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = _tmp7_;
+#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 504 "GoogleAuthenticator.c"
+#line 484 "GoogleAuthenticator.c"
}
-static void publishing_authenticator_shotwell_google_web_authentication_pane_real_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* base) {
+static void
+publishing_authenticator_shotwell_google_web_authentication_pane_real_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* base)
+{
PublishingAuthenticatorShotwellGoogleWebAuthenticationPane * self;
gchar* page_title = NULL;
WebKitWebView* _tmp0_;
@@ -514,7 +496,6 @@ static void publishing_authenticator_shotwell_google_web_authentication_pane_rea
gchar* _tmp3_;
gchar* _tmp4_;
const gchar* _tmp5_;
- gint _tmp6_;
#line 21 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_WEB_AUTHENTICATION_PANE, PublishingAuthenticatorShotwellGoogleWebAuthenticationPane);
#line 22 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -534,60 +515,57 @@ static void publishing_authenticator_shotwell_google_web_authentication_pane_rea
#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_tmp5_ = page_title;
#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp6_ = string_index_of (_tmp5_, "state=connect", 0);
-#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- if (_tmp6_ > 0) {
-#line 540 "GoogleAuthenticator.c"
+ if (string_index_of (_tmp5_, "state=connect", 0) > 0) {
+#line 519 "GoogleAuthenticator.c"
gint auth_code_field_start = 0;
- const gchar* _tmp7_;
- gint _tmp8_;
- gint _tmp9_;
+ const gchar* _tmp6_;
+ gint _tmp7_;
gchar* auth_code = NULL;
- const gchar* _tmp10_;
- gint _tmp11_;
- gchar* _tmp12_;
- const gchar* _tmp13_;
-#line 24 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp7_ = page_title;
+ const gchar* _tmp8_;
+ gint _tmp9_;
+ gchar* _tmp10_;
+ const gchar* _tmp11_;
#line 24 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp8_ = string_index_of (_tmp7_, "code=", 0);
+ _tmp6_ = page_title;
#line 24 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- auth_code_field_start = _tmp8_;
+ auth_code_field_start = string_index_of (_tmp6_, "code=", 0);
#line 25 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp9_ = auth_code_field_start;
+ _tmp7_ = auth_code_field_start;
#line 25 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- if (_tmp9_ < 0) {
+ if (_tmp7_ < 0) {
#line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_g_free0 (page_title);
#line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
return;
-#line 564 "GoogleAuthenticator.c"
+#line 540 "GoogleAuthenticator.c"
}
#line 28 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp10_ = page_title;
+ _tmp8_ = page_title;
#line 28 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp11_ = auth_code_field_start;
+ _tmp9_ = auth_code_field_start;
#line 28 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp12_ = string_substring (_tmp10_, (glong) (_tmp11_ + 5), (glong) -1);
+ _tmp10_ = string_substring (_tmp8_, (glong) (_tmp9_ + 5), (glong) -1);
#line 28 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- auth_code = _tmp12_;
+ auth_code = _tmp10_;
#line 30 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
publishing_authenticator_shotwell_google_web_authentication_pane_cache_dirty = TRUE;
#line 32 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp13_ = auth_code;
+ _tmp11_ = auth_code;
#line 32 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- g_signal_emit (self, publishing_authenticator_shotwell_google_web_authentication_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_WEB_AUTHENTICATION_PANE_AUTHORIZED_SIGNAL], 0, _tmp13_);
+ g_signal_emit (self, publishing_authenticator_shotwell_google_web_authentication_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_WEB_AUTHENTICATION_PANE_AUTHORIZED_SIGNAL], 0, _tmp11_);
#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_g_free0 (auth_code);
-#line 582 "GoogleAuthenticator.c"
+#line 558 "GoogleAuthenticator.c"
}
#line 21 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_g_free0 (page_title);
-#line 586 "GoogleAuthenticator.c"
+#line 562 "GoogleAuthenticator.c"
}
-static void publishing_authenticator_shotwell_google_web_authentication_pane_class_init (PublishingAuthenticatorShotwellGoogleWebAuthenticationPaneClass * klass) {
+static void
+publishing_authenticator_shotwell_google_web_authentication_pane_class_init (PublishingAuthenticatorShotwellGoogleWebAuthenticationPaneClass * klass)
+{
#line 8 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
publishing_authenticator_shotwell_google_web_authentication_pane_parent_class = g_type_class_peek_parent (klass);
#line 8 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -596,25 +574,31 @@ static void publishing_authenticator_shotwell_google_web_authentication_pane_cla
G_OBJECT_CLASS (klass)->finalize = publishing_authenticator_shotwell_google_web_authentication_pane_finalize;
#line 8 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
publishing_authenticator_shotwell_google_web_authentication_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_WEB_AUTHENTICATION_PANE_AUTHORIZED_SIGNAL] = g_signal_new ("authorized", PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_WEB_AUTHENTICATION_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING);
-#line 599 "GoogleAuthenticator.c"
+#line 577 "GoogleAuthenticator.c"
}
-static void publishing_authenticator_shotwell_google_web_authentication_pane_instance_init (PublishingAuthenticatorShotwellGoogleWebAuthenticationPane * self) {
+static void
+publishing_authenticator_shotwell_google_web_authentication_pane_instance_init (PublishingAuthenticatorShotwellGoogleWebAuthenticationPane * self)
+{
}
-static void publishing_authenticator_shotwell_google_web_authentication_pane_finalize (GObject * obj) {
+static void
+publishing_authenticator_shotwell_google_web_authentication_pane_finalize (GObject * obj)
+{
PublishingAuthenticatorShotwellGoogleWebAuthenticationPane * self;
#line 8 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_WEB_AUTHENTICATION_PANE, PublishingAuthenticatorShotwellGoogleWebAuthenticationPane);
#line 8 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
G_OBJECT_CLASS (publishing_authenticator_shotwell_google_web_authentication_pane_parent_class)->finalize (obj);
-#line 613 "GoogleAuthenticator.c"
+#line 595 "GoogleAuthenticator.c"
}
-GType publishing_authenticator_shotwell_google_web_authentication_pane_get_type (void) {
+GType
+publishing_authenticator_shotwell_google_web_authentication_pane_get_type (void)
+{
static volatile gsize publishing_authenticator_shotwell_google_web_authentication_pane_type_id__volatile = 0;
if (g_once_init_enter (&publishing_authenticator_shotwell_google_web_authentication_pane_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingAuthenticatorShotwellGoogleWebAuthenticationPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_authenticator_shotwell_google_web_authentication_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingAuthenticatorShotwellGoogleWebAuthenticationPane), 0, (GInstanceInitFunc) publishing_authenticator_shotwell_google_web_authentication_pane_instance_init, NULL };
@@ -626,7 +610,9 @@ GType publishing_authenticator_shotwell_google_web_authentication_pane_get_type
}
-static gboolean publishing_authenticator_shotwell_google_session_real_is_authenticated (PublishingRESTSupportSession* base) {
+static gboolean
+publishing_authenticator_shotwell_google_session_real_is_authenticated (PublishingRESTSupportSession* base)
+{
PublishingAuthenticatorShotwellGoogleSession * self;
gboolean result = FALSE;
const gchar* _tmp0_;
@@ -638,11 +624,13 @@ static gboolean publishing_authenticator_shotwell_google_session_real_is_authent
result = _tmp0_ != NULL;
#line 43 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
return result;
-#line 641 "GoogleAuthenticator.c"
+#line 627 "GoogleAuthenticator.c"
}
-void publishing_authenticator_shotwell_google_session_deauthenticate (PublishingAuthenticatorShotwellGoogleSession* self) {
+void
+publishing_authenticator_shotwell_google_session_deauthenticate (PublishingAuthenticatorShotwellGoogleSession* self)
+{
#line 46 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_SESSION (self));
#line 47 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -655,50 +643,60 @@ void publishing_authenticator_shotwell_google_session_deauthenticate (Publishing
self->refresh_token = NULL;
#line 49 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
self->expires_at = (gint64) -1;
-#line 658 "GoogleAuthenticator.c"
+#line 646 "GoogleAuthenticator.c"
}
-PublishingAuthenticatorShotwellGoogleSession* publishing_authenticator_shotwell_google_session_construct (GType object_type) {
+PublishingAuthenticatorShotwellGoogleSession*
+publishing_authenticator_shotwell_google_session_construct (GType object_type)
+{
PublishingAuthenticatorShotwellGoogleSession* self = NULL;
#line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
self = (PublishingAuthenticatorShotwellGoogleSession*) publishing_rest_support_session_construct (object_type, NULL);
#line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
return self;
-#line 668 "GoogleAuthenticator.c"
+#line 658 "GoogleAuthenticator.c"
}
-PublishingAuthenticatorShotwellGoogleSession* publishing_authenticator_shotwell_google_session_new (void) {
+PublishingAuthenticatorShotwellGoogleSession*
+publishing_authenticator_shotwell_google_session_new (void)
+{
#line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
return publishing_authenticator_shotwell_google_session_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_SESSION);
-#line 675 "GoogleAuthenticator.c"
+#line 667 "GoogleAuthenticator.c"
}
-static void publishing_authenticator_shotwell_google_session_class_init (PublishingAuthenticatorShotwellGoogleSessionClass * klass) {
+static void
+publishing_authenticator_shotwell_google_session_class_init (PublishingAuthenticatorShotwellGoogleSessionClass * klass)
+{
#line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
publishing_authenticator_shotwell_google_session_parent_class = g_type_class_peek_parent (klass);
#line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
((PublishingRESTSupportSessionClass *) klass)->finalize = publishing_authenticator_shotwell_google_session_finalize;
#line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*) (PublishingRESTSupportSession *)) publishing_authenticator_shotwell_google_session_real_is_authenticated;
-#line 686 "GoogleAuthenticator.c"
+#line 680 "GoogleAuthenticator.c"
}
-static void publishing_authenticator_shotwell_google_session_instance_init (PublishingAuthenticatorShotwellGoogleSession * self) {
+static void
+publishing_authenticator_shotwell_google_session_instance_init (PublishingAuthenticatorShotwellGoogleSession * self)
+{
#line 38 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
self->access_token = NULL;
#line 39 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
self->refresh_token = NULL;
#line 40 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
self->expires_at = (gint64) -1;
-#line 697 "GoogleAuthenticator.c"
+#line 693 "GoogleAuthenticator.c"
}
-static void publishing_authenticator_shotwell_google_session_finalize (PublishingRESTSupportSession * obj) {
+static void
+publishing_authenticator_shotwell_google_session_finalize (PublishingRESTSupportSession * obj)
+{
PublishingAuthenticatorShotwellGoogleSession * self;
#line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_SESSION, PublishingAuthenticatorShotwellGoogleSession);
@@ -708,11 +706,13 @@ static void publishing_authenticator_shotwell_google_session_finalize (Publishin
_g_free0 (self->refresh_token);
#line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
PUBLISHING_REST_SUPPORT_SESSION_CLASS (publishing_authenticator_shotwell_google_session_parent_class)->finalize (obj);
-#line 711 "GoogleAuthenticator.c"
+#line 709 "GoogleAuthenticator.c"
}
-GType publishing_authenticator_shotwell_google_session_get_type (void) {
+GType
+publishing_authenticator_shotwell_google_session_get_type (void)
+{
static volatile gsize publishing_authenticator_shotwell_google_session_type_id__volatile = 0;
if (g_once_init_enter (&publishing_authenticator_shotwell_google_session_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingAuthenticatorShotwellGoogleSessionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_authenticator_shotwell_google_session_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingAuthenticatorShotwellGoogleSession), 0, (GInstanceInitFunc) publishing_authenticator_shotwell_google_session_instance_init, NULL };
@@ -724,22 +724,20 @@ GType publishing_authenticator_shotwell_google_session_get_type (void) {
}
-PublishingAuthenticatorShotwellGoogleGetAccessTokensTransaction* publishing_authenticator_shotwell_google_get_access_tokens_transaction_construct (GType object_type, PublishingAuthenticatorShotwellGoogleSession* session, const gchar* auth_code) {
+PublishingAuthenticatorShotwellGoogleGetAccessTokensTransaction*
+publishing_authenticator_shotwell_google_get_access_tokens_transaction_construct (GType object_type,
+ PublishingAuthenticatorShotwellGoogleSession* session,
+ const gchar* auth_code)
+{
PublishingAuthenticatorShotwellGoogleGetAccessTokensTransaction* self = NULL;
- PublishingAuthenticatorShotwellGoogleSession* _tmp0_;
- const gchar* _tmp1_;
#line 56 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_SESSION (session), NULL);
#line 56 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
g_return_val_if_fail (auth_code != NULL, NULL);
#line 57 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp0_ = session;
-#line 57 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- self = (PublishingAuthenticatorShotwellGoogleGetAccessTokensTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_GET_ACCESS_TOKENS_TRANSACTION_ENDPOINT_URL, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
+ self = (PublishingAuthenticatorShotwellGoogleGetAccessTokensTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_GET_ACCESS_TOKENS_TRANSACTION_ENDPOINT_URL, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
#line 59 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp1_ = auth_code;
-#line 59 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "code", _tmp1_);
+ publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "code", auth_code);
#line 60 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "client_id", PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_OAUTH_CLIENT_ID);
#line 61 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -750,29 +748,38 @@ PublishingAuthenticatorShotwellGoogleGetAccessTokensTransaction* publishing_auth
publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "grant_type", "authorization_code");
#line 56 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
return self;
-#line 753 "GoogleAuthenticator.c"
+#line 751 "GoogleAuthenticator.c"
}
-PublishingAuthenticatorShotwellGoogleGetAccessTokensTransaction* publishing_authenticator_shotwell_google_get_access_tokens_transaction_new (PublishingAuthenticatorShotwellGoogleSession* session, const gchar* auth_code) {
+PublishingAuthenticatorShotwellGoogleGetAccessTokensTransaction*
+publishing_authenticator_shotwell_google_get_access_tokens_transaction_new (PublishingAuthenticatorShotwellGoogleSession* session,
+ const gchar* auth_code)
+{
#line 56 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
return publishing_authenticator_shotwell_google_get_access_tokens_transaction_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_GET_ACCESS_TOKENS_TRANSACTION, session, auth_code);
-#line 760 "GoogleAuthenticator.c"
+#line 761 "GoogleAuthenticator.c"
}
-static void publishing_authenticator_shotwell_google_get_access_tokens_transaction_class_init (PublishingAuthenticatorShotwellGoogleGetAccessTokensTransactionClass * klass) {
+static void
+publishing_authenticator_shotwell_google_get_access_tokens_transaction_class_init (PublishingAuthenticatorShotwellGoogleGetAccessTokensTransactionClass * klass)
+{
#line 53 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
publishing_authenticator_shotwell_google_get_access_tokens_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 767 "GoogleAuthenticator.c"
+#line 770 "GoogleAuthenticator.c"
}
-static void publishing_authenticator_shotwell_google_get_access_tokens_transaction_instance_init (PublishingAuthenticatorShotwellGoogleGetAccessTokensTransaction * self) {
+static void
+publishing_authenticator_shotwell_google_get_access_tokens_transaction_instance_init (PublishingAuthenticatorShotwellGoogleGetAccessTokensTransaction * self)
+{
}
-GType publishing_authenticator_shotwell_google_get_access_tokens_transaction_get_type (void) {
+GType
+publishing_authenticator_shotwell_google_get_access_tokens_transaction_get_type (void)
+{
static volatile gsize publishing_authenticator_shotwell_google_get_access_tokens_transaction_type_id__volatile = 0;
if (g_once_init_enter (&publishing_authenticator_shotwell_google_get_access_tokens_transaction_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingAuthenticatorShotwellGoogleGetAccessTokensTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_authenticator_shotwell_google_get_access_tokens_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingAuthenticatorShotwellGoogleGetAccessTokensTransaction), 0, (GInstanceInitFunc) publishing_authenticator_shotwell_google_get_access_tokens_transaction_instance_init, NULL };
@@ -784,54 +791,59 @@ GType publishing_authenticator_shotwell_google_get_access_tokens_transaction_get
}
-PublishingAuthenticatorShotwellGoogleRefreshAccessTokenTransaction* publishing_authenticator_shotwell_google_refresh_access_token_transaction_construct (GType object_type, PublishingAuthenticatorShotwellGoogleSession* session) {
+PublishingAuthenticatorShotwellGoogleRefreshAccessTokenTransaction*
+publishing_authenticator_shotwell_google_refresh_access_token_transaction_construct (GType object_type,
+ PublishingAuthenticatorShotwellGoogleSession* session)
+{
PublishingAuthenticatorShotwellGoogleRefreshAccessTokenTransaction* self = NULL;
- PublishingAuthenticatorShotwellGoogleSession* _tmp0_;
- PublishingAuthenticatorShotwellGoogleSession* _tmp1_;
- const gchar* _tmp2_;
+ const gchar* _tmp0_;
#line 70 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_SESSION (session), NULL);
#line 71 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp0_ = session;
-#line 71 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- self = (PublishingAuthenticatorShotwellGoogleRefreshAccessTokenTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_REFRESH_ACCESS_TOKEN_TRANSACTION_ENDPOINT_URL, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
+ self = (PublishingAuthenticatorShotwellGoogleRefreshAccessTokenTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_REFRESH_ACCESS_TOKEN_TRANSACTION_ENDPOINT_URL, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
#line 73 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "client_id", PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_OAUTH_CLIENT_ID);
#line 74 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "client_secret", PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_OAUTH_CLIENT_SECRET);
#line 75 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp1_ = session;
+ _tmp0_ = session->refresh_token;
#line 75 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp2_ = _tmp1_->refresh_token;
-#line 75 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "refresh_token", _tmp2_);
+ publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "refresh_token", _tmp0_);
#line 76 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "grant_type", "refresh_token");
#line 70 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
return self;
-#line 812 "GoogleAuthenticator.c"
+#line 816 "GoogleAuthenticator.c"
}
-PublishingAuthenticatorShotwellGoogleRefreshAccessTokenTransaction* publishing_authenticator_shotwell_google_refresh_access_token_transaction_new (PublishingAuthenticatorShotwellGoogleSession* session) {
+PublishingAuthenticatorShotwellGoogleRefreshAccessTokenTransaction*
+publishing_authenticator_shotwell_google_refresh_access_token_transaction_new (PublishingAuthenticatorShotwellGoogleSession* session)
+{
#line 70 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
return publishing_authenticator_shotwell_google_refresh_access_token_transaction_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_REFRESH_ACCESS_TOKEN_TRANSACTION, session);
-#line 819 "GoogleAuthenticator.c"
+#line 825 "GoogleAuthenticator.c"
}
-static void publishing_authenticator_shotwell_google_refresh_access_token_transaction_class_init (PublishingAuthenticatorShotwellGoogleRefreshAccessTokenTransactionClass * klass) {
+static void
+publishing_authenticator_shotwell_google_refresh_access_token_transaction_class_init (PublishingAuthenticatorShotwellGoogleRefreshAccessTokenTransactionClass * klass)
+{
#line 67 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
publishing_authenticator_shotwell_google_refresh_access_token_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 826 "GoogleAuthenticator.c"
+#line 834 "GoogleAuthenticator.c"
}
-static void publishing_authenticator_shotwell_google_refresh_access_token_transaction_instance_init (PublishingAuthenticatorShotwellGoogleRefreshAccessTokenTransaction * self) {
+static void
+publishing_authenticator_shotwell_google_refresh_access_token_transaction_instance_init (PublishingAuthenticatorShotwellGoogleRefreshAccessTokenTransaction * self)
+{
}
-GType publishing_authenticator_shotwell_google_refresh_access_token_transaction_get_type (void) {
+GType
+publishing_authenticator_shotwell_google_refresh_access_token_transaction_get_type (void)
+{
static volatile gsize publishing_authenticator_shotwell_google_refresh_access_token_transaction_type_id__volatile = 0;
if (g_once_init_enter (&publishing_authenticator_shotwell_google_refresh_access_token_transaction_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingAuthenticatorShotwellGoogleRefreshAccessTokenTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_authenticator_shotwell_google_refresh_access_token_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingAuthenticatorShotwellGoogleRefreshAccessTokenTransaction), 0, (GInstanceInitFunc) publishing_authenticator_shotwell_google_refresh_access_token_transaction_instance_init, NULL };
@@ -843,56 +855,61 @@ GType publishing_authenticator_shotwell_google_refresh_access_token_transaction_
}
-PublishingAuthenticatorShotwellGoogleUsernameFetchTransaction* publishing_authenticator_shotwell_google_username_fetch_transaction_construct (GType object_type, PublishingAuthenticatorShotwellGoogleSession* session) {
+PublishingAuthenticatorShotwellGoogleUsernameFetchTransaction*
+publishing_authenticator_shotwell_google_username_fetch_transaction_construct (GType object_type,
+ PublishingAuthenticatorShotwellGoogleSession* session)
+{
PublishingAuthenticatorShotwellGoogleUsernameFetchTransaction* self = NULL;
- PublishingAuthenticatorShotwellGoogleSession* _tmp0_;
- PublishingAuthenticatorShotwellGoogleSession* _tmp1_;
- const gchar* _tmp2_;
- gchar* _tmp3_;
- gchar* _tmp4_;
+ const gchar* _tmp0_;
+ gchar* _tmp1_;
+ gchar* _tmp2_;
#line 82 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_SESSION (session), NULL);
#line 83 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp0_ = session;
-#line 83 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- self = (PublishingAuthenticatorShotwellGoogleUsernameFetchTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_USERNAME_FETCH_TRANSACTION_ENDPOINT_URL, PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET);
+ self = (PublishingAuthenticatorShotwellGoogleUsernameFetchTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_USERNAME_FETCH_TRANSACTION_ENDPOINT_URL, PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET);
#line 84 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp1_ = session;
+ _tmp0_ = session->access_token;
#line 84 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp2_ = _tmp1_->access_token;
+ _tmp1_ = g_strconcat ("Bearer ", _tmp0_, NULL);
#line 84 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp3_ = g_strconcat ("Bearer ", _tmp2_, NULL);
-#line 84 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp4_ = _tmp3_;
+ _tmp2_ = _tmp1_;
#line 84 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "Authorization", _tmp4_);
+ publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "Authorization", _tmp2_);
#line 84 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _g_free0 (_tmp4_);
+ _g_free0 (_tmp2_);
#line 82 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
return self;
-#line 873 "GoogleAuthenticator.c"
+#line 882 "GoogleAuthenticator.c"
}
-PublishingAuthenticatorShotwellGoogleUsernameFetchTransaction* publishing_authenticator_shotwell_google_username_fetch_transaction_new (PublishingAuthenticatorShotwellGoogleSession* session) {
+PublishingAuthenticatorShotwellGoogleUsernameFetchTransaction*
+publishing_authenticator_shotwell_google_username_fetch_transaction_new (PublishingAuthenticatorShotwellGoogleSession* session)
+{
#line 82 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
return publishing_authenticator_shotwell_google_username_fetch_transaction_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_USERNAME_FETCH_TRANSACTION, session);
-#line 880 "GoogleAuthenticator.c"
+#line 891 "GoogleAuthenticator.c"
}
-static void publishing_authenticator_shotwell_google_username_fetch_transaction_class_init (PublishingAuthenticatorShotwellGoogleUsernameFetchTransactionClass * klass) {
+static void
+publishing_authenticator_shotwell_google_username_fetch_transaction_class_init (PublishingAuthenticatorShotwellGoogleUsernameFetchTransactionClass * klass)
+{
#line 80 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
publishing_authenticator_shotwell_google_username_fetch_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 887 "GoogleAuthenticator.c"
+#line 900 "GoogleAuthenticator.c"
}
-static void publishing_authenticator_shotwell_google_username_fetch_transaction_instance_init (PublishingAuthenticatorShotwellGoogleUsernameFetchTransaction * self) {
+static void
+publishing_authenticator_shotwell_google_username_fetch_transaction_instance_init (PublishingAuthenticatorShotwellGoogleUsernameFetchTransaction * self)
+{
}
-GType publishing_authenticator_shotwell_google_username_fetch_transaction_get_type (void) {
+GType
+publishing_authenticator_shotwell_google_username_fetch_transaction_get_type (void)
+{
static volatile gsize publishing_authenticator_shotwell_google_username_fetch_transaction_type_id__volatile = 0;
if (g_once_init_enter (&publishing_authenticator_shotwell_google_username_fetch_transaction_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingAuthenticatorShotwellGoogleUsernameFetchTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_authenticator_shotwell_google_username_fetch_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingAuthenticatorShotwellGoogleUsernameFetchTransaction), 0, (GInstanceInitFunc) publishing_authenticator_shotwell_google_username_fetch_transaction_instance_init, NULL };
@@ -904,39 +921,47 @@ GType publishing_authenticator_shotwell_google_username_fetch_transaction_get_ty
}
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
#line 99 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
return self ? g_object_ref (self) : NULL;
-#line 910 "GoogleAuthenticator.c"
+#line 929 "GoogleAuthenticator.c"
}
-static void _g_free0_ (gpointer var) {
+static void
+_g_free0_ (gpointer var)
+{
#line 100 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
var = (g_free (var), NULL);
-#line 917 "GoogleAuthenticator.c"
+#line 938 "GoogleAuthenticator.c"
}
-static void _g_variant_unref0_ (gpointer var) {
+static void
+_g_variant_unref0_ (gpointer var)
+{
#line 100 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
(var == NULL) ? NULL : (var = (g_variant_unref (var), NULL));
-#line 924 "GoogleAuthenticator.c"
+#line 947 "GoogleAuthenticator.c"
}
-PublishingAuthenticatorShotwellGoogleGoogle* publishing_authenticator_shotwell_google_google_construct (GType object_type, const gchar* scope, const gchar* welcome_message, SpitPublishingPluginHost* host) {
+PublishingAuthenticatorShotwellGoogleGoogle*
+publishing_authenticator_shotwell_google_google_construct (GType object_type,
+ const gchar* scope,
+ const gchar* welcome_message,
+ SpitPublishingPluginHost* host)
+{
PublishingAuthenticatorShotwellGoogleGoogle * self = NULL;
SpitPublishingPluginHost* _tmp0_;
- SpitPublishingPluginHost* _tmp1_;
- GHashFunc _tmp2_;
- GEqualFunc _tmp3_;
- GHashTable* _tmp4_;
- const gchar* _tmp5_;
+ GHashFunc _tmp1_;
+ GEqualFunc _tmp2_;
+ GHashTable* _tmp3_;
+ gchar* _tmp4_;
+ PublishingAuthenticatorShotwellGoogleSession* _tmp5_;
gchar* _tmp6_;
- PublishingAuthenticatorShotwellGoogleSession* _tmp7_;
- const gchar* _tmp8_;
- gchar* _tmp9_;
#line 96 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
g_return_val_if_fail (scope != NULL, NULL);
#line 96 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -946,66 +971,65 @@ PublishingAuthenticatorShotwellGoogleGoogle* publishing_authenticator_shotwell_g
#line 96 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
self = (PublishingAuthenticatorShotwellGoogleGoogle*) g_object_new (object_type, NULL);
#line 99 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp0_ = host;
-#line 99 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp1_ = _g_object_ref0 (_tmp0_);
+ _tmp0_ = _g_object_ref0 (host);
#line 99 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_g_object_unref0 (self->priv->host);
#line 99 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- self->priv->host = _tmp1_;
+ self->priv->host = _tmp0_;
#line 100 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp2_ = g_str_hash;
+ _tmp1_ = g_str_hash;
#line 100 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp3_ = g_str_equal;
+ _tmp2_ = g_str_equal;
#line 100 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp4_ = g_hash_table_new_full (_tmp2_, _tmp3_, _g_free0_, _g_variant_unref0_);
+ _tmp3_ = g_hash_table_new_full (_tmp1_, _tmp2_, _g_free0_, _g_variant_unref0_);
#line 100 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_g_hash_table_unref0 (self->priv->params);
#line 100 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- self->priv->params = _tmp4_;
-#line 101 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp5_ = scope;
+ self->priv->params = _tmp3_;
#line 101 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp6_ = g_strdup (_tmp5_);
+ _tmp4_ = g_strdup (scope);
#line 101 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_g_free0 (self->priv->scope);
#line 101 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- self->priv->scope = _tmp6_;
+ self->priv->scope = _tmp4_;
#line 102 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp7_ = publishing_authenticator_shotwell_google_session_new ();
+ _tmp5_ = publishing_authenticator_shotwell_google_session_new ();
#line 102 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_publishing_rest_support_session_unref0 (self->priv->session);
#line 102 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- self->priv->session = _tmp7_;
+ self->priv->session = _tmp5_;
#line 103 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp8_ = welcome_message;
-#line 103 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp9_ = g_strdup (_tmp8_);
+ _tmp6_ = g_strdup (welcome_message);
#line 103 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_g_free0 (self->priv->welcome_message);
#line 103 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- self->priv->welcome_message = _tmp9_;
+ self->priv->welcome_message = _tmp6_;
#line 96 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
return self;
-#line 990 "GoogleAuthenticator.c"
+#line 1009 "GoogleAuthenticator.c"
}
-PublishingAuthenticatorShotwellGoogleGoogle* publishing_authenticator_shotwell_google_google_new (const gchar* scope, const gchar* welcome_message, SpitPublishingPluginHost* host) {
+PublishingAuthenticatorShotwellGoogleGoogle*
+publishing_authenticator_shotwell_google_google_new (const gchar* scope,
+ const gchar* welcome_message,
+ SpitPublishingPluginHost* host)
+{
#line 96 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
return publishing_authenticator_shotwell_google_google_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_GOOGLE, scope, welcome_message, host);
-#line 997 "GoogleAuthenticator.c"
+#line 1020 "GoogleAuthenticator.c"
}
-static void publishing_authenticator_shotwell_google_google_real_authenticate (SpitPublishingAuthenticator* base) {
+static void
+publishing_authenticator_shotwell_google_google_real_authenticate (SpitPublishingAuthenticator* base)
+{
PublishingAuthenticatorShotwellGoogleGoogle * self;
gchar* refresh_token = NULL;
SpitPublishingPluginHost* _tmp0_;
gchar* _tmp1_;
gboolean _tmp2_ = FALSE;
const gchar* _tmp3_;
- gboolean _tmp6_;
#line 106 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_GOOGLE, PublishingAuthenticatorShotwellGoogleGoogle);
#line 107 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -1018,21 +1042,21 @@ static void publishing_authenticator_shotwell_google_google_real_authenticate (S
_tmp3_ = refresh_token;
#line 108 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
if (_tmp3_ != NULL) {
-#line 1021 "GoogleAuthenticator.c"
+#line 1045 "GoogleAuthenticator.c"
const gchar* _tmp4_;
#line 108 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_tmp4_ = refresh_token;
#line 108 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_tmp2_ = g_strcmp0 (_tmp4_, "") != 0;
-#line 1027 "GoogleAuthenticator.c"
+#line 1051 "GoogleAuthenticator.c"
} else {
#line 108 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_tmp2_ = FALSE;
-#line 1031 "GoogleAuthenticator.c"
+#line 1055 "GoogleAuthenticator.c"
}
#line 108 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
if (_tmp2_) {
-#line 1035 "GoogleAuthenticator.c"
+#line 1059 "GoogleAuthenticator.c"
const gchar* _tmp5_;
#line 109 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_tmp5_ = refresh_token;
@@ -1044,40 +1068,40 @@ static void publishing_authenticator_shotwell_google_google_real_authenticate (S
_g_free0 (refresh_token);
#line 111 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
return;
-#line 1047 "GoogleAuthenticator.c"
+#line 1071 "GoogleAuthenticator.c"
}
#line 115 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp6_ = publishing_authenticator_shotwell_google_web_authentication_pane_is_cache_dirty ();
-#line 115 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- if (_tmp6_) {
-#line 1053 "GoogleAuthenticator.c"
+ if (publishing_authenticator_shotwell_google_web_authentication_pane_is_cache_dirty ()) {
+#line 1075 "GoogleAuthenticator.c"
+ SpitPublishingPluginHost* _tmp6_;
SpitPublishingPluginHost* _tmp7_;
- SpitPublishingPluginHost* _tmp8_;
#line 116 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp7_ = self->priv->host;
+ _tmp6_ = self->priv->host;
#line 116 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- spit_publishing_plugin_host_set_service_locked (_tmp7_, FALSE);
+ spit_publishing_plugin_host_set_service_locked (_tmp6_, FALSE);
#line 118 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp8_ = self->priv->host;
+ _tmp7_ = self->priv->host;
#line 118 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- spit_publishing_plugin_host_install_static_message_pane (_tmp8_, _ ("You have already logged in and out of a Google service during this Sho" \
+ spit_publishing_plugin_host_install_static_message_pane (_tmp7_, _ ("You have already logged in and out of a Google service during this Sho" \
"twell session.\n" \
"\n" \
"To continue publishing to Google services, quit and restart Shotwell, " \
"then try publishing again."), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
-#line 1064 "GoogleAuthenticator.c"
+#line 1086 "GoogleAuthenticator.c"
} else {
#line 120 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
publishing_authenticator_shotwell_google_google_do_show_service_welcome_pane (self);
-#line 1068 "GoogleAuthenticator.c"
+#line 1090 "GoogleAuthenticator.c"
}
#line 106 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_g_free0 (refresh_token);
-#line 1072 "GoogleAuthenticator.c"
+#line 1094 "GoogleAuthenticator.c"
}
-static gboolean publishing_authenticator_shotwell_google_google_real_can_logout (SpitPublishingAuthenticator* base) {
+static gboolean
+publishing_authenticator_shotwell_google_google_real_can_logout (SpitPublishingAuthenticator* base)
+{
PublishingAuthenticatorShotwellGoogleGoogle * self;
gboolean result = FALSE;
#line 124 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -1086,18 +1110,22 @@ static gboolean publishing_authenticator_shotwell_google_google_real_can_logout
result = TRUE;
#line 125 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
return result;
-#line 1085 "GoogleAuthenticator.c"
+#line 1109 "GoogleAuthenticator.c"
}
-static gpointer _g_hash_table_ref0 (gpointer self) {
+static gpointer
+_g_hash_table_ref0 (gpointer self)
+{
#line 129 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
return self ? g_hash_table_ref (self) : NULL;
-#line 1092 "GoogleAuthenticator.c"
+#line 1118 "GoogleAuthenticator.c"
}
-static GHashTable* publishing_authenticator_shotwell_google_google_real_get_authentication_parameter (SpitPublishingAuthenticator* base) {
+static GHashTable*
+publishing_authenticator_shotwell_google_google_real_get_authentication_parameter (SpitPublishingAuthenticator* base)
+{
PublishingAuthenticatorShotwellGoogleGoogle * self;
GHashTable* result = NULL;
GHashTable* _tmp0_;
@@ -1112,11 +1140,13 @@ static GHashTable* publishing_authenticator_shotwell_google_google_real_get_auth
result = _tmp1_;
#line 129 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
return result;
-#line 1111 "GoogleAuthenticator.c"
+#line 1139 "GoogleAuthenticator.c"
}
-static void publishing_authenticator_shotwell_google_google_real_logout (SpitPublishingAuthenticator* base) {
+static void
+publishing_authenticator_shotwell_google_google_real_logout (SpitPublishingAuthenticator* base)
+{
PublishingAuthenticatorShotwellGoogleGoogle * self;
PublishingAuthenticatorShotwellGoogleSession* _tmp0_;
SpitPublishingPluginHost* _tmp1_;
@@ -1130,26 +1160,34 @@ static void publishing_authenticator_shotwell_google_google_real_logout (SpitPub
_tmp1_ = self->priv->host;
#line 134 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "refresh_token", "");
-#line 1129 "GoogleAuthenticator.c"
+#line 1159 "GoogleAuthenticator.c"
}
-static void publishing_authenticator_shotwell_google_google_real_refresh (SpitPublishingAuthenticator* base) {
+static void
+publishing_authenticator_shotwell_google_google_real_refresh (SpitPublishingAuthenticator* base)
+{
PublishingAuthenticatorShotwellGoogleGoogle * self;
#line 137 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_GOOGLE, PublishingAuthenticatorShotwellGoogleGoogle);
-#line 1137 "GoogleAuthenticator.c"
+#line 1169 "GoogleAuthenticator.c"
}
-static void _publishing_authenticator_shotwell_google_google_on_web_auth_pane_authorized_publishing_authenticator_shotwell_google_web_authentication_pane_authorized (PublishingAuthenticatorShotwellGoogleWebAuthenticationPane* _sender, const gchar* auth_code, gpointer self) {
+static void
+_publishing_authenticator_shotwell_google_google_on_web_auth_pane_authorized_publishing_authenticator_shotwell_google_web_authentication_pane_authorized (PublishingAuthenticatorShotwellGoogleWebAuthenticationPane* _sender,
+ const gchar* auth_code,
+ gpointer self)
+{
#line 155 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
publishing_authenticator_shotwell_google_google_on_web_auth_pane_authorized ((PublishingAuthenticatorShotwellGoogleGoogle*) self, auth_code);
-#line 1144 "GoogleAuthenticator.c"
+#line 1180 "GoogleAuthenticator.c"
}
-static void publishing_authenticator_shotwell_google_google_do_hosted_web_authentication (PublishingAuthenticatorShotwellGoogleGoogle* self) {
+static void
+publishing_authenticator_shotwell_google_google_do_hosted_web_authentication (PublishingAuthenticatorShotwellGoogleGoogle* self)
+{
gchar* user_authorization_url = NULL;
gchar* _tmp0_;
gchar* _tmp1_;
@@ -1285,16 +1323,17 @@ static void publishing_authenticator_shotwell_google_google_do_hosted_web_authen
spit_publishing_plugin_host_install_dialog_pane (_tmp29_, G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
#line 141 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_g_free0 (user_authorization_url);
-#line 1283 "GoogleAuthenticator.c"
+#line 1321 "GoogleAuthenticator.c"
}
-static void publishing_authenticator_shotwell_google_google_on_web_auth_pane_authorized (PublishingAuthenticatorShotwellGoogleGoogle* self, const gchar* auth_code) {
+static void
+publishing_authenticator_shotwell_google_google_on_web_auth_pane_authorized (PublishingAuthenticatorShotwellGoogleGoogle* self,
+ const gchar* auth_code)
+{
PublishingAuthenticatorShotwellGoogleWebAuthenticationPane* _tmp0_;
guint _tmp1_;
const gchar* _tmp2_;
- const gchar* _tmp3_;
- const gchar* _tmp4_;
#line 160 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_GOOGLE (self));
#line 160 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -1308,38 +1347,43 @@ static void publishing_authenticator_shotwell_google_google_on_web_auth_pane_aut
#line 163 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_tmp2_ = self->priv->scope;
#line 163 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp3_ = auth_code;
-#line 163 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
g_debug ("GoogleAuthenticator.vala:163: EVENT: user authorized scope %s with aut" \
-"h_code %s", _tmp2_, _tmp3_);
+"h_code %s", _tmp2_, auth_code);
#line 165 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp4_ = auth_code;
-#line 165 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- publishing_authenticator_shotwell_google_google_do_get_access_tokens (self, _tmp4_);
-#line 1313 "GoogleAuthenticator.c"
+ publishing_authenticator_shotwell_google_google_do_get_access_tokens (self, auth_code);
+#line 1348 "GoogleAuthenticator.c"
}
-static void _publishing_authenticator_shotwell_google_google_on_get_access_tokens_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
+static void
+_publishing_authenticator_shotwell_google_google_on_get_access_tokens_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+ gpointer self)
+{
#line 174 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
publishing_authenticator_shotwell_google_google_on_get_access_tokens_complete ((PublishingAuthenticatorShotwellGoogleGoogle*) self, _sender);
-#line 1320 "GoogleAuthenticator.c"
+#line 1358 "GoogleAuthenticator.c"
}
-static void _publishing_authenticator_shotwell_google_google_on_get_access_tokens_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
+static void
+_publishing_authenticator_shotwell_google_google_on_get_access_tokens_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+ GError* err,
+ gpointer self)
+{
#line 175 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
publishing_authenticator_shotwell_google_google_on_get_access_tokens_error ((PublishingAuthenticatorShotwellGoogleGoogle*) self, _sender, err);
-#line 1327 "GoogleAuthenticator.c"
+#line 1369 "GoogleAuthenticator.c"
}
-static void publishing_authenticator_shotwell_google_google_do_get_access_tokens (PublishingAuthenticatorShotwellGoogleGoogle* self, const gchar* auth_code) {
+static void
+publishing_authenticator_shotwell_google_google_do_get_access_tokens (PublishingAuthenticatorShotwellGoogleGoogle* self,
+ const gchar* auth_code)
+{
SpitPublishingPluginHost* _tmp0_;
PublishingAuthenticatorShotwellGoogleGetAccessTokensTransaction* tokens_txn = NULL;
PublishingAuthenticatorShotwellGoogleSession* _tmp1_;
- const gchar* _tmp2_;
- PublishingAuthenticatorShotwellGoogleGetAccessTokensTransaction* _tmp3_;
+ PublishingAuthenticatorShotwellGoogleGetAccessTokensTransaction* _tmp2_;
GError * _inner_error_ = NULL;
#line 168 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_GOOGLE (self));
@@ -1355,16 +1399,14 @@ static void publishing_authenticator_shotwell_google_google_do_get_access_tokens
#line 173 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_tmp1_ = self->priv->session;
#line 173 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp2_ = auth_code;
+ _tmp2_ = publishing_authenticator_shotwell_google_get_access_tokens_transaction_new (_tmp1_, auth_code);
#line 173 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp3_ = publishing_authenticator_shotwell_google_get_access_tokens_transaction_new (_tmp1_, _tmp2_);
-#line 173 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- tokens_txn = _tmp3_;
+ tokens_txn = _tmp2_;
#line 174 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (tokens_txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_authenticator_shotwell_google_google_on_get_access_tokens_complete_publishing_rest_support_transaction_completed, self, 0);
#line 175 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (tokens_txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_authenticator_shotwell_google_google_on_get_access_tokens_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 1360 "GoogleAuthenticator.c"
+#line 1402 "GoogleAuthenticator.c"
{
#line 178 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (tokens_txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
@@ -1372,7 +1414,7 @@ static void publishing_authenticator_shotwell_google_google_do_get_access_tokens
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 178 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 1368 "GoogleAuthenticator.c"
+#line 1410 "GoogleAuthenticator.c"
goto __catch3_spit_publishing_publishing_error;
}
#line 178 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -1383,28 +1425,28 @@ static void publishing_authenticator_shotwell_google_google_do_get_access_tokens
g_clear_error (&_inner_error_);
#line 178 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
return;
-#line 1379 "GoogleAuthenticator.c"
+#line 1421 "GoogleAuthenticator.c"
}
}
goto __finally3;
__catch3_spit_publishing_publishing_error:
{
GError* err = NULL;
- SpitPublishingPluginHost* _tmp4_;
- GError* _tmp5_;
+ SpitPublishingPluginHost* _tmp3_;
+ GError* _tmp4_;
#line 177 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
err = _inner_error_;
#line 177 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_inner_error_ = NULL;
#line 180 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp4_ = self->priv->host;
+ _tmp3_ = self->priv->host;
#line 180 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp5_ = err;
+ _tmp4_ = err;
#line 180 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- spit_publishing_plugin_host_post_error (_tmp4_, _tmp5_);
+ spit_publishing_plugin_host_post_error (_tmp3_, _tmp4_);
#line 177 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_g_error_free0 (err);
-#line 1400 "GoogleAuthenticator.c"
+#line 1442 "GoogleAuthenticator.c"
}
__finally3:
#line 177 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -1417,126 +1459,113 @@ static void publishing_authenticator_shotwell_google_google_do_get_access_tokens
g_clear_error (&_inner_error_);
#line 177 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
return;
-#line 1413 "GoogleAuthenticator.c"
+#line 1455 "GoogleAuthenticator.c"
}
#line 168 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_publishing_rest_support_transaction_unref0 (tokens_txn);
-#line 1417 "GoogleAuthenticator.c"
+#line 1459 "GoogleAuthenticator.c"
}
-static void publishing_authenticator_shotwell_google_google_on_get_access_tokens_complete (PublishingAuthenticatorShotwellGoogleGoogle* self, PublishingRESTSupportTransaction* txn) {
- PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_authenticator_shotwell_google_google_on_get_access_tokens_complete (PublishingAuthenticatorShotwellGoogleGoogle* self,
+ PublishingRESTSupportTransaction* txn)
+{
+ guint _tmp0_;
guint _tmp1_;
- PublishingRESTSupportTransaction* _tmp2_;
- guint _tmp3_;
- PublishingRESTSupportTransaction* _tmp4_;
- gchar* _tmp5_;
- gchar* _tmp6_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
#line 184 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_GOOGLE (self));
#line 184 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
#line 185 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp0_ = txn;
-#line 185 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
+ g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
#line 185 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_google_google_on_get_access_tokens_complete_publishing_rest_support_transaction_completed, self);
+ g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_google_google_on_get_access_tokens_complete_publishing_rest_support_transaction_completed, self);
#line 186 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp2_ = txn;
+ g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
#line 186 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 186 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_google_google_on_get_access_tokens_error_publishing_rest_support_transaction_network_error, self);
+ g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_google_google_on_get_access_tokens_error_publishing_rest_support_transaction_network_error, self);
#line 188 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
g_debug ("GoogleAuthenticator.vala:188: %s", "EVENT: network transaction to exchange authorization code for access t" \
"okens " "completed successfully.");
#line 191 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp4_ = txn;
-#line 191 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp5_ = publishing_rest_support_transaction_get_response (_tmp4_);
+ _tmp2_ = publishing_rest_support_transaction_get_response (txn);
#line 191 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp6_ = _tmp5_;
+ _tmp3_ = _tmp2_;
#line 191 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- publishing_authenticator_shotwell_google_google_do_extract_tokens (self, _tmp6_);
+ publishing_authenticator_shotwell_google_google_do_extract_tokens (self, _tmp3_);
#line 191 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _g_free0 (_tmp6_);
-#line 1457 "GoogleAuthenticator.c"
+ _g_free0 (_tmp3_);
+#line 1493 "GoogleAuthenticator.c"
}
-static void publishing_authenticator_shotwell_google_google_on_get_access_tokens_error (PublishingAuthenticatorShotwellGoogleGoogle* self, PublishingRESTSupportTransaction* txn, GError* err) {
- PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_authenticator_shotwell_google_google_on_get_access_tokens_error (PublishingAuthenticatorShotwellGoogleGoogle* self,
+ PublishingRESTSupportTransaction* txn,
+ GError* err)
+{
+ guint _tmp0_;
guint _tmp1_;
- PublishingRESTSupportTransaction* _tmp2_;
- guint _tmp3_;
- PublishingRESTSupportTransaction* _tmp4_;
- gchar* _tmp5_;
- gchar* _tmp6_;
- SpitPublishingPluginHost* _tmp7_;
- GError* _tmp8_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
+ SpitPublishingPluginHost* _tmp4_;
#line 194 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_GOOGLE (self));
#line 194 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
#line 196 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp0_ = txn;
-#line 196 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
+ g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
#line 196 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_google_google_on_get_access_tokens_complete_publishing_rest_support_transaction_completed, self);
+ g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_google_google_on_get_access_tokens_complete_publishing_rest_support_transaction_completed, self);
#line 197 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp2_ = txn;
+ g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
#line 197 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 197 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_google_google_on_get_access_tokens_error_publishing_rest_support_transaction_network_error, self);
-#line 199 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp4_ = txn;
+ g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_google_google_on_get_access_tokens_error_publishing_rest_support_transaction_network_error, self);
#line 199 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp5_ = publishing_rest_support_transaction_get_response (_tmp4_);
+ _tmp2_ = publishing_rest_support_transaction_get_response (txn);
#line 199 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp6_ = _tmp5_;
+ _tmp3_ = _tmp2_;
#line 199 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
g_debug ("EVENT: network transaction to exchange authorization code for access t" \
-"okens " "failed; response = '%s'", _tmp6_);
+"okens " "failed; response = '%s'", _tmp3_);
#line 199 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _g_free0 (_tmp6_);
-#line 202 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp7_ = self->priv->host;
+ _g_free0 (_tmp3_);
#line 202 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp8_ = err;
+ _tmp4_ = self->priv->host;
#line 202 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- spit_publishing_plugin_host_post_error (_tmp7_, _tmp8_);
-#line 1503 "GoogleAuthenticator.c"
+ spit_publishing_plugin_host_post_error (_tmp4_, err);
+#line 1531 "GoogleAuthenticator.c"
}
-static gpointer _json_object_ref0 (gpointer self) {
+static gpointer
+_json_object_ref0 (gpointer self)
+{
#line 218 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
return self ? json_object_ref (self) : NULL;
-#line 1510 "GoogleAuthenticator.c"
+#line 1540 "GoogleAuthenticator.c"
}
-static void publishing_authenticator_shotwell_google_google_do_extract_tokens (PublishingAuthenticatorShotwellGoogleGoogle* self, const gchar* response_body) {
+static void
+publishing_authenticator_shotwell_google_google_do_extract_tokens (PublishingAuthenticatorShotwellGoogleGoogle* self,
+ const gchar* response_body)
+{
JsonParser* parser = NULL;
JsonParser* _tmp0_;
JsonObject* response_obj = NULL;
- JsonParser* _tmp10_;
- JsonNode* _tmp11_;
+ JsonParser* _tmp9_;
+ JsonNode* _tmp10_;
+ JsonObject* _tmp11_;
JsonObject* _tmp12_;
- JsonObject* _tmp13_;
- gboolean _tmp14_ = FALSE;
- JsonObject* _tmp15_;
- gboolean _tmp16_;
- JsonObject* _tmp22_;
- gboolean _tmp23_;
+ gboolean _tmp13_ = FALSE;
+ JsonObject* _tmp14_;
+ JsonObject* _tmp19_;
+ JsonObject* _tmp23_;
JsonObject* _tmp29_;
- gboolean _tmp30_;
- JsonObject* _tmp36_;
- gboolean _tmp37_;
GError * _inner_error_ = NULL;
#line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_GOOGLE (self));
@@ -1549,19 +1578,16 @@ static void publishing_authenticator_shotwell_google_google_do_extract_tokens (P
_tmp0_ = json_parser_new ();
#line 208 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
parser = _tmp0_;
-#line 1542 "GoogleAuthenticator.c"
+#line 1571 "GoogleAuthenticator.c"
{
JsonParser* _tmp1_;
- const gchar* _tmp2_;
#line 211 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_tmp1_ = parser;
#line 211 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp2_ = response_body;
-#line 211 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- json_parser_load_from_data (_tmp1_, _tmp2_, (gssize) -1, &_inner_error_);
+ json_parser_load_from_data (_tmp1_, response_body, (gssize) -1, &_inner_error_);
#line 211 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1554 "GoogleAuthenticator.c"
+#line 1580 "GoogleAuthenticator.c"
goto __catch4_g_error;
}
}
@@ -1569,44 +1595,44 @@ static void publishing_authenticator_shotwell_google_google_do_extract_tokens (P
__catch4_g_error:
{
GError* err = NULL;
- SpitPublishingPluginHost* _tmp3_;
- GError* _tmp4_;
- const gchar* _tmp5_;
+ SpitPublishingPluginHost* _tmp2_;
+ GError* _tmp3_;
+ const gchar* _tmp4_;
+ gchar* _tmp5_;
gchar* _tmp6_;
- gchar* _tmp7_;
+ GError* _tmp7_;
GError* _tmp8_;
- GError* _tmp9_;
#line 210 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
err = _inner_error_;
#line 210 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_inner_error_ = NULL;
#line 213 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp3_ = self->priv->host;
+ _tmp2_ = self->priv->host;
#line 213 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp4_ = err;
+ _tmp3_ = err;
#line 213 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp5_ = _tmp4_->message;
+ _tmp4_ = _tmp3_->message;
#line 213 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp6_ = g_strconcat ("Couldn't parse JSON response: ", _tmp5_, NULL);
+ _tmp5_ = g_strconcat ("Couldn't parse JSON response: ", _tmp4_, NULL);
#line 213 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp7_ = _tmp6_;
+ _tmp6_ = _tmp5_;
#line 213 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp8_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, _tmp7_);
+ _tmp7_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, _tmp6_);
#line 213 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp9_ = _tmp8_;
+ _tmp8_ = _tmp7_;
#line 213 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- spit_publishing_plugin_host_post_error (_tmp3_, _tmp9_);
+ spit_publishing_plugin_host_post_error (_tmp2_, _tmp8_);
#line 213 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _g_error_free0 (_tmp9_);
+ _g_error_free0 (_tmp8_);
#line 213 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _g_free0 (_tmp7_);
+ _g_free0 (_tmp6_);
#line 215 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_g_error_free0 (err);
#line 215 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_g_object_unref0 (parser);
#line 215 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
return;
-#line 1599 "GoogleAuthenticator.c"
+#line 1625 "GoogleAuthenticator.c"
}
__finally4:
#line 210 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -1619,316 +1645,290 @@ static void publishing_authenticator_shotwell_google_google_do_extract_tokens (P
g_clear_error (&_inner_error_);
#line 210 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
return;
-#line 1612 "GoogleAuthenticator.c"
+#line 1638 "GoogleAuthenticator.c"
}
#line 218 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp10_ = parser;
+ _tmp9_ = parser;
#line 218 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp11_ = json_parser_get_root (_tmp10_);
+ _tmp10_ = json_parser_get_root (_tmp9_);
#line 218 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp12_ = json_node_get_object (_tmp11_);
+ _tmp11_ = json_node_get_object (_tmp10_);
#line 218 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp13_ = _json_object_ref0 (_tmp12_);
+ _tmp12_ = _json_object_ref0 (_tmp11_);
#line 218 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- response_obj = _tmp13_;
-#line 220 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp15_ = response_obj;
+ response_obj = _tmp12_;
#line 220 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp16_ = json_object_has_member (_tmp15_, "access_token");
-#line 220 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- if (!_tmp16_) {
-#line 1630 "GoogleAuthenticator.c"
- JsonObject* _tmp17_;
- gboolean _tmp18_;
+ _tmp14_ = response_obj;
#line 220 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp17_ = response_obj;
+ if (!json_object_has_member (_tmp14_, "access_token")) {
+#line 1654 "GoogleAuthenticator.c"
+ JsonObject* _tmp15_;
#line 220 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp18_ = json_object_has_member (_tmp17_, "refresh_token");
+ _tmp15_ = response_obj;
#line 220 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp14_ = !_tmp18_;
-#line 1639 "GoogleAuthenticator.c"
+ _tmp13_ = !json_object_has_member (_tmp15_, "refresh_token");
+#line 1660 "GoogleAuthenticator.c"
} else {
#line 220 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp14_ = FALSE;
-#line 1643 "GoogleAuthenticator.c"
+ _tmp13_ = FALSE;
+#line 1664 "GoogleAuthenticator.c"
}
#line 220 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- if (_tmp14_) {
-#line 1647 "GoogleAuthenticator.c"
- SpitPublishingPluginHost* _tmp19_;
- GError* _tmp20_;
- GError* _tmp21_;
+ if (_tmp13_) {
+#line 1668 "GoogleAuthenticator.c"
+ SpitPublishingPluginHost* _tmp16_;
+ GError* _tmp17_;
+ GError* _tmp18_;
#line 221 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp19_ = self->priv->host;
+ _tmp16_ = self->priv->host;
#line 221 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp20_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "neither access_token nor refresh_token not present in server response");
+ _tmp17_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "neither access_token nor refresh_token not present in server response");
#line 221 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp21_ = _tmp20_;
+ _tmp18_ = _tmp17_;
#line 221 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- spit_publishing_plugin_host_post_error (_tmp19_, _tmp21_);
+ spit_publishing_plugin_host_post_error (_tmp16_, _tmp18_);
#line 221 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _g_error_free0 (_tmp21_);
+ _g_error_free0 (_tmp18_);
#line 223 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_json_object_unref0 (response_obj);
#line 223 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_g_object_unref0 (parser);
#line 223 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
return;
-#line 1667 "GoogleAuthenticator.c"
+#line 1688 "GoogleAuthenticator.c"
}
#line 226 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp22_ = response_obj;
-#line 226 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp23_ = json_object_has_member (_tmp22_, "expires_in");
+ _tmp19_ = response_obj;
#line 226 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- if (_tmp23_) {
-#line 1675 "GoogleAuthenticator.c"
+ if (json_object_has_member (_tmp19_, "expires_in")) {
+#line 1694 "GoogleAuthenticator.c"
gint64 duration = 0LL;
- JsonObject* _tmp24_;
- gint64 _tmp25_;
+ JsonObject* _tmp20_;
gint64 abs_time = 0LL;
- gint64 _tmp26_;
- gint64 _tmp27_;
- gint64 _tmp28_;
-#line 227 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp24_ = response_obj;
+ gint64 _tmp21_;
+ gint64 _tmp22_;
#line 227 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp25_ = json_object_get_int_member (_tmp24_, "expires_in");
+ _tmp20_ = response_obj;
#line 227 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- duration = _tmp25_;
-#line 228 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp26_ = g_get_real_time ();
+ duration = json_object_get_int_member (_tmp20_, "expires_in");
#line 228 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp27_ = duration;
+ _tmp21_ = duration;
#line 228 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- abs_time = _tmp26_ + ((_tmp27_ * 1000L) * 1000L);
+ abs_time = g_get_real_time () + ((_tmp21_ * 1000L) * 1000L);
#line 229 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp28_ = abs_time;
+ _tmp22_ = abs_time;
#line 229 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- publishing_authenticator_shotwell_google_google_on_expiry_time_avilable (self, _tmp28_);
-#line 1699 "GoogleAuthenticator.c"
+ publishing_authenticator_shotwell_google_google_on_expiry_time_avilable (self, _tmp22_);
+#line 1712 "GoogleAuthenticator.c"
}
#line 232 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp29_ = response_obj;
-#line 232 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp30_ = json_object_has_member (_tmp29_, "refresh_token");
+ _tmp23_ = response_obj;
#line 232 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- if (_tmp30_) {
-#line 1707 "GoogleAuthenticator.c"
+ if (json_object_has_member (_tmp23_, "refresh_token")) {
+#line 1718 "GoogleAuthenticator.c"
gchar* refresh_token = NULL;
- JsonObject* _tmp31_;
- const gchar* _tmp32_;
- gchar* _tmp33_;
- const gchar* _tmp34_;
+ JsonObject* _tmp24_;
+ const gchar* _tmp25_;
+ gchar* _tmp26_;
+ const gchar* _tmp27_;
#line 233 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp31_ = response_obj;
+ _tmp24_ = response_obj;
#line 233 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp32_ = json_object_get_string_member (_tmp31_, "refresh_token");
+ _tmp25_ = json_object_get_string_member (_tmp24_, "refresh_token");
#line 233 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp33_ = g_strdup (_tmp32_);
+ _tmp26_ = g_strdup (_tmp25_);
#line 233 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- refresh_token = _tmp33_;
+ refresh_token = _tmp26_;
#line 235 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp34_ = refresh_token;
+ _tmp27_ = refresh_token;
#line 235 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- if (g_strcmp0 (_tmp34_, "") != 0) {
-#line 1725 "GoogleAuthenticator.c"
- const gchar* _tmp35_;
+ if (g_strcmp0 (_tmp27_, "") != 0) {
+#line 1736 "GoogleAuthenticator.c"
+ const gchar* _tmp28_;
#line 236 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp35_ = refresh_token;
+ _tmp28_ = refresh_token;
#line 236 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- publishing_authenticator_shotwell_google_google_on_refresh_token_available (self, _tmp35_);
-#line 1731 "GoogleAuthenticator.c"
+ publishing_authenticator_shotwell_google_google_on_refresh_token_available (self, _tmp28_);
+#line 1742 "GoogleAuthenticator.c"
}
#line 232 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_g_free0 (refresh_token);
-#line 1735 "GoogleAuthenticator.c"
+#line 1746 "GoogleAuthenticator.c"
}
#line 239 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp36_ = response_obj;
-#line 239 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp37_ = json_object_has_member (_tmp36_, "access_token");
+ _tmp29_ = response_obj;
#line 239 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- if (_tmp37_) {
-#line 1743 "GoogleAuthenticator.c"
+ if (json_object_has_member (_tmp29_, "access_token")) {
+#line 1752 "GoogleAuthenticator.c"
gchar* access_token = NULL;
- JsonObject* _tmp38_;
- const gchar* _tmp39_;
- gchar* _tmp40_;
- const gchar* _tmp41_;
+ JsonObject* _tmp30_;
+ const gchar* _tmp31_;
+ gchar* _tmp32_;
+ const gchar* _tmp33_;
#line 240 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp38_ = response_obj;
+ _tmp30_ = response_obj;
#line 240 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp39_ = json_object_get_string_member (_tmp38_, "access_token");
+ _tmp31_ = json_object_get_string_member (_tmp30_, "access_token");
#line 240 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp40_ = g_strdup (_tmp39_);
+ _tmp32_ = g_strdup (_tmp31_);
#line 240 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- access_token = _tmp40_;
+ access_token = _tmp32_;
#line 242 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp41_ = access_token;
+ _tmp33_ = access_token;
#line 242 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- if (g_strcmp0 (_tmp41_, "") != 0) {
-#line 1761 "GoogleAuthenticator.c"
- const gchar* _tmp42_;
+ if (g_strcmp0 (_tmp33_, "") != 0) {
+#line 1770 "GoogleAuthenticator.c"
+ const gchar* _tmp34_;
#line 243 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp42_ = access_token;
+ _tmp34_ = access_token;
#line 243 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- publishing_authenticator_shotwell_google_google_on_access_token_available (self, _tmp42_);
-#line 1767 "GoogleAuthenticator.c"
+ publishing_authenticator_shotwell_google_google_on_access_token_available (self, _tmp34_);
+#line 1776 "GoogleAuthenticator.c"
}
#line 239 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_g_free0 (access_token);
-#line 1771 "GoogleAuthenticator.c"
+#line 1780 "GoogleAuthenticator.c"
}
#line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_json_object_unref0 (response_obj);
#line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_g_object_unref0 (parser);
-#line 1777 "GoogleAuthenticator.c"
+#line 1786 "GoogleAuthenticator.c"
}
-static void publishing_authenticator_shotwell_google_google_on_refresh_token_available (PublishingAuthenticatorShotwellGoogleGoogle* self, const gchar* token) {
- const gchar* _tmp0_;
- GHashTable* _tmp1_;
- gchar* _tmp2_;
- const gchar* _tmp3_;
- GVariant* _tmp4_;
- PublishingAuthenticatorShotwellGoogleSession* _tmp5_;
- const gchar* _tmp6_;
- gchar* _tmp7_;
+static void
+publishing_authenticator_shotwell_google_google_on_refresh_token_available (PublishingAuthenticatorShotwellGoogleGoogle* self,
+ const gchar* token)
+{
+ GHashTable* _tmp0_;
+ gchar* _tmp1_;
+ GVariant* _tmp2_;
+ PublishingAuthenticatorShotwellGoogleSession* _tmp3_;
+ gchar* _tmp4_;
#line 247 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_GOOGLE (self));
#line 247 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
g_return_if_fail (token != NULL);
#line 248 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp0_ = token;
-#line 248 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
g_debug ("GoogleAuthenticator.vala:248: EVENT: an OAuth refresh token has become" \
-" available; token = '%s'.", _tmp0_);
+" available; token = '%s'.", token);
#line 249 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp1_ = self->priv->params;
-#line 249 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp2_ = g_strdup ("RefreshToken");
+ _tmp0_ = self->priv->params;
#line 249 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp3_ = token;
+ _tmp1_ = g_strdup ("RefreshToken");
#line 249 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp4_ = g_variant_new_string (_tmp3_);
+ _tmp2_ = g_variant_new_string (token);
#line 249 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- g_variant_ref_sink (_tmp4_);
+ g_variant_ref_sink (_tmp2_);
#line 249 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- g_hash_table_insert (_tmp1_, _tmp2_, _tmp4_);
+ g_hash_table_insert (_tmp0_, _tmp1_, _tmp2_);
#line 251 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp5_ = self->priv->session;
+ _tmp3_ = self->priv->session;
#line 251 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp6_ = token;
+ _tmp4_ = g_strdup (token);
#line 251 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp7_ = g_strdup (_tmp6_);
+ _g_free0 (_tmp3_->refresh_token);
#line 251 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _g_free0 (_tmp5_->refresh_token);
-#line 251 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp5_->refresh_token = _tmp7_;
-#line 1820 "GoogleAuthenticator.c"
+ _tmp3_->refresh_token = _tmp4_;
+#line 1823 "GoogleAuthenticator.c"
}
-static void publishing_authenticator_shotwell_google_google_on_expiry_time_avilable (PublishingAuthenticatorShotwellGoogleGoogle* self, gint64 abs_time) {
- gint64 _tmp0_;
- PublishingAuthenticatorShotwellGoogleSession* _tmp1_;
- gint64 _tmp2_;
- GHashTable* _tmp3_;
- gchar* _tmp4_;
- gint64 _tmp5_;
- GVariant* _tmp6_;
+static void
+publishing_authenticator_shotwell_google_google_on_expiry_time_avilable (PublishingAuthenticatorShotwellGoogleGoogle* self,
+ gint64 abs_time)
+{
+ PublishingAuthenticatorShotwellGoogleSession* _tmp0_;
+ GHashTable* _tmp1_;
+ gchar* _tmp2_;
+ GVariant* _tmp3_;
#line 254 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_GOOGLE (self));
#line 255 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp0_ = abs_time;
-#line 255 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- g_debug ("EVENT: an OAuth access token expiry time became available; time = %'" G_GINT64_FORMAT "'.", _tmp0_);
+ g_debug ("EVENT: an OAuth access token expiry time became available; time = %'" G_GINT64_FORMAT "'.", abs_time);
#line 258 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp1_ = self->priv->session;
-#line 258 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp2_ = abs_time;
+ _tmp0_ = self->priv->session;
#line 258 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp1_->expires_at = _tmp2_;
-#line 259 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp3_ = self->priv->params;
+ _tmp0_->expires_at = abs_time;
#line 259 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp4_ = g_strdup ("ExpiryTime");
+ _tmp1_ = self->priv->params;
#line 259 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp5_ = abs_time;
+ _tmp2_ = g_strdup ("ExpiryTime");
#line 259 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp6_ = g_variant_new_int64 (_tmp5_);
+ _tmp3_ = g_variant_new_int64 (abs_time);
#line 259 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- g_variant_ref_sink (_tmp6_);
+ g_variant_ref_sink (_tmp3_);
#line 259 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- g_hash_table_insert (_tmp3_, _tmp4_, _tmp6_);
-#line 1856 "GoogleAuthenticator.c"
+ g_hash_table_insert (_tmp1_, _tmp2_, _tmp3_);
+#line 1853 "GoogleAuthenticator.c"
}
-static void publishing_authenticator_shotwell_google_google_on_access_token_available (PublishingAuthenticatorShotwellGoogleGoogle* self, const gchar* token) {
- const gchar* _tmp0_;
- PublishingAuthenticatorShotwellGoogleSession* _tmp1_;
- const gchar* _tmp2_;
+static void
+publishing_authenticator_shotwell_google_google_on_access_token_available (PublishingAuthenticatorShotwellGoogleGoogle* self,
+ const gchar* token)
+{
+ PublishingAuthenticatorShotwellGoogleSession* _tmp0_;
+ gchar* _tmp1_;
+ GHashTable* _tmp2_;
gchar* _tmp3_;
- GHashTable* _tmp4_;
- gchar* _tmp5_;
- const gchar* _tmp6_;
- GVariant* _tmp7_;
+ GVariant* _tmp4_;
#line 263 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_GOOGLE (self));
#line 263 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
g_return_if_fail (token != NULL);
#line 264 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp0_ = token;
-#line 264 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
g_debug ("GoogleAuthenticator.vala:264: EVENT: an OAuth access token has become " \
-"available; token = '%s'.", _tmp0_);
-#line 266 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp1_ = self->priv->session;
+"available; token = '%s'.", token);
#line 266 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp2_ = token;
+ _tmp0_ = self->priv->session;
#line 266 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp3_ = g_strdup (_tmp2_);
+ _tmp1_ = g_strdup (token);
#line 266 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _g_free0 (_tmp1_->access_token);
+ _g_free0 (_tmp0_->access_token);
#line 266 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp1_->access_token = _tmp3_;
-#line 267 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp4_ = self->priv->params;
+ _tmp0_->access_token = _tmp1_;
#line 267 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp5_ = g_strdup ("AccessToken");
+ _tmp2_ = self->priv->params;
#line 267 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp6_ = token;
+ _tmp3_ = g_strdup ("AccessToken");
#line 267 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp7_ = g_variant_new_string (_tmp6_);
+ _tmp4_ = g_variant_new_string (token);
#line 267 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- g_variant_ref_sink (_tmp7_);
+ g_variant_ref_sink (_tmp4_);
#line 267 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- g_hash_table_insert (_tmp4_, _tmp5_, _tmp7_);
+ g_hash_table_insert (_tmp2_, _tmp3_, _tmp4_);
#line 269 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
publishing_authenticator_shotwell_google_google_do_fetch_username (self);
-#line 1901 "GoogleAuthenticator.c"
+#line 1892 "GoogleAuthenticator.c"
}
-static void _publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
+static void
+_publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+ gpointer self)
+{
#line 279 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_completed ((PublishingAuthenticatorShotwellGoogleGoogle*) self, _sender);
-#line 1908 "GoogleAuthenticator.c"
+#line 1902 "GoogleAuthenticator.c"
}
-static void _publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
+static void
+_publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+ GError* err,
+ gpointer self)
+{
#line 280 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_error ((PublishingAuthenticatorShotwellGoogleGoogle*) self, _sender, err);
-#line 1915 "GoogleAuthenticator.c"
+#line 1913 "GoogleAuthenticator.c"
}
-static void publishing_authenticator_shotwell_google_google_do_fetch_username (PublishingAuthenticatorShotwellGoogleGoogle* self) {
+static void
+publishing_authenticator_shotwell_google_google_do_fetch_username (PublishingAuthenticatorShotwellGoogleGoogle* self)
+{
SpitPublishingPluginHost* _tmp0_;
SpitPublishingPluginHost* _tmp1_;
PublishingAuthenticatorShotwellGoogleUsernameFetchTransaction* txn = NULL;
@@ -2007,100 +2007,89 @@ static void publishing_authenticator_shotwell_google_google_do_fetch_username (P
}
-static void publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_completed (PublishingAuthenticatorShotwellGoogleGoogle* self, PublishingRESTSupportTransaction* txn) {
- PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_completed (PublishingAuthenticatorShotwellGoogleGoogle* self,
+ PublishingRESTSupportTransaction* txn)
+{
+ guint _tmp0_;
guint _tmp1_;
- PublishingRESTSupportTransaction* _tmp2_;
- guint _tmp3_;
- PublishingRESTSupportTransaction* _tmp4_;
- gchar* _tmp5_;
- gchar* _tmp6_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
#line 289 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_GOOGLE (self));
#line 289 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
#line 290 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp0_ = txn;
-#line 290 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
+ g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
#line 290 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_completed_publishing_rest_support_transaction_completed, self);
+ g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_completed_publishing_rest_support_transaction_completed, self);
#line 291 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp2_ = txn;
+ g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
#line 291 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 291 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_error_publishing_rest_support_transaction_network_error, self);
+ g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_error_publishing_rest_support_transaction_network_error, self);
#line 293 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
g_debug ("GoogleAuthenticator.vala:293: EVENT: username fetch transaction comple" \
"ted successfully.");
#line 295 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp4_ = txn;
-#line 295 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp5_ = publishing_rest_support_transaction_get_response (_tmp4_);
+ _tmp2_ = publishing_rest_support_transaction_get_response (txn);
#line 295 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp6_ = _tmp5_;
+ _tmp3_ = _tmp2_;
#line 295 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- publishing_authenticator_shotwell_google_google_do_extract_username (self, _tmp6_);
+ publishing_authenticator_shotwell_google_google_do_extract_username (self, _tmp3_);
#line 295 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _g_free0 (_tmp6_);
-#line 2033 "GoogleAuthenticator.c"
+ _g_free0 (_tmp3_);
+#line 2027 "GoogleAuthenticator.c"
}
-static void publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_error (PublishingAuthenticatorShotwellGoogleGoogle* self, PublishingRESTSupportTransaction* txn, GError* err) {
- PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_error (PublishingAuthenticatorShotwellGoogleGoogle* self,
+ PublishingRESTSupportTransaction* txn,
+ GError* err)
+{
+ guint _tmp0_;
guint _tmp1_;
- PublishingRESTSupportTransaction* _tmp2_;
- guint _tmp3_;
- SpitPublishingPluginHost* _tmp4_;
- GError* _tmp5_;
+ SpitPublishingPluginHost* _tmp2_;
#line 298 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_GOOGLE (self));
#line 298 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
#line 300 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp0_ = txn;
-#line 300 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
+ g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
#line 300 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_completed_publishing_rest_support_transaction_completed, self);
+ g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_completed_publishing_rest_support_transaction_completed, self);
#line 301 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp2_ = txn;
+ g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
#line 301 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 301 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_error_publishing_rest_support_transaction_network_error, self);
+ g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_error_publishing_rest_support_transaction_network_error, self);
#line 303 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
g_debug ("GoogleAuthenticator.vala:303: EVENT: username fetch transaction caused" \
" a network error");
#line 305 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp4_ = self->priv->host;
-#line 305 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp5_ = err;
+ _tmp2_ = self->priv->host;
#line 305 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- spit_publishing_plugin_host_post_error (_tmp4_, _tmp5_);
-#line 2068 "GoogleAuthenticator.c"
+ spit_publishing_plugin_host_post_error (_tmp2_, err);
+#line 2057 "GoogleAuthenticator.c"
}
-static void publishing_authenticator_shotwell_google_google_do_extract_username (PublishingAuthenticatorShotwellGoogleGoogle* self, const gchar* response_body) {
+static void
+publishing_authenticator_shotwell_google_google_do_extract_username (PublishingAuthenticatorShotwellGoogleGoogle* self,
+ const gchar* response_body)
+{
JsonParser* parser = NULL;
JsonParser* _tmp0_;
JsonObject* response_obj = NULL;
- JsonParser* _tmp10_;
- JsonNode* _tmp11_;
+ JsonParser* _tmp9_;
+ JsonNode* _tmp10_;
+ JsonObject* _tmp11_;
JsonObject* _tmp12_;
JsonObject* _tmp13_;
- JsonObject* _tmp14_;
- gboolean _tmp15_;
- JsonObject* _tmp24_;
- gboolean _tmp25_;
- PublishingAuthenticatorShotwellGoogleSession* _tmp34_;
- gboolean _tmp35_;
- SpitPublishingPluginHost* _tmp36_;
- PublishingAuthenticatorShotwellGoogleSession* _tmp37_;
- const gchar* _tmp38_;
+ JsonObject* _tmp22_;
+ PublishingAuthenticatorShotwellGoogleSession* _tmp31_;
+ SpitPublishingPluginHost* _tmp32_;
+ PublishingAuthenticatorShotwellGoogleSession* _tmp33_;
+ const gchar* _tmp34_;
GError * _inner_error_ = NULL;
#line 308 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_GOOGLE (self));
@@ -2113,19 +2102,16 @@ static void publishing_authenticator_shotwell_google_google_do_extract_username
_tmp0_ = json_parser_new ();
#line 311 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
parser = _tmp0_;
-#line 2100 "GoogleAuthenticator.c"
+#line 2089 "GoogleAuthenticator.c"
{
JsonParser* _tmp1_;
- const gchar* _tmp2_;
#line 314 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_tmp1_ = parser;
#line 314 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp2_ = response_body;
-#line 314 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- json_parser_load_from_data (_tmp1_, _tmp2_, (gssize) -1, &_inner_error_);
+ json_parser_load_from_data (_tmp1_, response_body, (gssize) -1, &_inner_error_);
#line 314 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2112 "GoogleAuthenticator.c"
+#line 2098 "GoogleAuthenticator.c"
goto __catch6_g_error;
}
}
@@ -2133,44 +2119,44 @@ static void publishing_authenticator_shotwell_google_google_do_extract_username
__catch6_g_error:
{
GError* err = NULL;
- SpitPublishingPluginHost* _tmp3_;
- GError* _tmp4_;
- const gchar* _tmp5_;
+ SpitPublishingPluginHost* _tmp2_;
+ GError* _tmp3_;
+ const gchar* _tmp4_;
+ gchar* _tmp5_;
gchar* _tmp6_;
- gchar* _tmp7_;
+ GError* _tmp7_;
GError* _tmp8_;
- GError* _tmp9_;
#line 313 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
err = _inner_error_;
#line 313 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_inner_error_ = NULL;
#line 316 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp3_ = self->priv->host;
+ _tmp2_ = self->priv->host;
#line 316 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp4_ = err;
+ _tmp3_ = err;
#line 316 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp5_ = _tmp4_->message;
+ _tmp4_ = _tmp3_->message;
#line 316 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp6_ = g_strconcat ("Couldn't parse JSON response: ", _tmp5_, NULL);
+ _tmp5_ = g_strconcat ("Couldn't parse JSON response: ", _tmp4_, NULL);
#line 316 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp7_ = _tmp6_;
+ _tmp6_ = _tmp5_;
#line 316 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp8_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, _tmp7_);
+ _tmp7_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, _tmp6_);
#line 316 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp9_ = _tmp8_;
+ _tmp8_ = _tmp7_;
#line 316 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- spit_publishing_plugin_host_post_error (_tmp3_, _tmp9_);
+ spit_publishing_plugin_host_post_error (_tmp2_, _tmp8_);
#line 316 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _g_error_free0 (_tmp9_);
+ _g_error_free0 (_tmp8_);
#line 316 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _g_free0 (_tmp7_);
+ _g_free0 (_tmp6_);
#line 318 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_g_error_free0 (err);
#line 318 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_g_object_unref0 (parser);
#line 318 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
return;
-#line 2157 "GoogleAuthenticator.c"
+#line 2143 "GoogleAuthenticator.c"
}
__finally6:
#line 313 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -2183,151 +2169,154 @@ static void publishing_authenticator_shotwell_google_google_do_extract_username
g_clear_error (&_inner_error_);
#line 313 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
return;
-#line 2170 "GoogleAuthenticator.c"
+#line 2156 "GoogleAuthenticator.c"
}
#line 321 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp10_ = parser;
+ _tmp9_ = parser;
#line 321 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp11_ = json_parser_get_root (_tmp10_);
+ _tmp10_ = json_parser_get_root (_tmp9_);
#line 321 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp12_ = json_node_get_object (_tmp11_);
+ _tmp11_ = json_node_get_object (_tmp10_);
#line 321 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp13_ = _json_object_ref0 (_tmp12_);
+ _tmp12_ = _json_object_ref0 (_tmp11_);
#line 321 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- response_obj = _tmp13_;
-#line 323 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp14_ = response_obj;
+ response_obj = _tmp12_;
#line 323 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp15_ = json_object_has_member (_tmp14_, "name");
+ _tmp13_ = response_obj;
#line 323 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- if (_tmp15_) {
-#line 2188 "GoogleAuthenticator.c"
+ if (json_object_has_member (_tmp13_, "name")) {
+#line 2172 "GoogleAuthenticator.c"
gchar* username = NULL;
- JsonObject* _tmp16_;
+ JsonObject* _tmp14_;
+ const gchar* _tmp15_;
+ gchar* _tmp16_;
const gchar* _tmp17_;
- gchar* _tmp18_;
- const gchar* _tmp19_;
#line 324 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp16_ = response_obj;
+ _tmp14_ = response_obj;
#line 324 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp17_ = json_object_get_string_member (_tmp16_, "name");
+ _tmp15_ = json_object_get_string_member (_tmp14_, "name");
#line 324 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp18_ = g_strdup (_tmp17_);
+ _tmp16_ = g_strdup (_tmp15_);
#line 324 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- username = _tmp18_;
+ username = _tmp16_;
#line 326 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp19_ = username;
+ _tmp17_ = username;
#line 326 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- if (g_strcmp0 (_tmp19_, "") != 0) {
-#line 2206 "GoogleAuthenticator.c"
- GHashTable* _tmp20_;
- gchar* _tmp21_;
- const gchar* _tmp22_;
- GVariant* _tmp23_;
+ if (g_strcmp0 (_tmp17_, "") != 0) {
+#line 2190 "GoogleAuthenticator.c"
+ GHashTable* _tmp18_;
+ gchar* _tmp19_;
+ const gchar* _tmp20_;
+ GVariant* _tmp21_;
#line 327 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp20_ = self->priv->params;
+ _tmp18_ = self->priv->params;
#line 327 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp21_ = g_strdup ("UserName");
+ _tmp19_ = g_strdup ("UserName");
#line 327 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp22_ = username;
+ _tmp20_ = username;
#line 327 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp23_ = g_variant_new_string (_tmp22_);
+ _tmp21_ = g_variant_new_string (_tmp20_);
#line 327 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- g_variant_ref_sink (_tmp23_);
+ g_variant_ref_sink (_tmp21_);
#line 327 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- g_hash_table_insert (_tmp20_, _tmp21_, _tmp23_);
-#line 2223 "GoogleAuthenticator.c"
+ g_hash_table_insert (_tmp18_, _tmp19_, _tmp21_);
+#line 2207 "GoogleAuthenticator.c"
}
#line 323 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_g_free0 (username);
-#line 2227 "GoogleAuthenticator.c"
+#line 2211 "GoogleAuthenticator.c"
}
#line 330 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp24_ = response_obj;
-#line 330 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp25_ = json_object_has_member (_tmp24_, "access_token");
+ _tmp22_ = response_obj;
#line 330 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- if (_tmp25_) {
-#line 2235 "GoogleAuthenticator.c"
+ if (json_object_has_member (_tmp22_, "access_token")) {
+#line 2217 "GoogleAuthenticator.c"
gchar* access_token = NULL;
- JsonObject* _tmp26_;
- const gchar* _tmp27_;
- gchar* _tmp28_;
- const gchar* _tmp29_;
+ JsonObject* _tmp23_;
+ const gchar* _tmp24_;
+ gchar* _tmp25_;
+ const gchar* _tmp26_;
#line 331 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp26_ = response_obj;
+ _tmp23_ = response_obj;
#line 331 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp27_ = json_object_get_string_member (_tmp26_, "access_token");
+ _tmp24_ = json_object_get_string_member (_tmp23_, "access_token");
#line 331 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp28_ = g_strdup (_tmp27_);
+ _tmp25_ = g_strdup (_tmp24_);
#line 331 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- access_token = _tmp28_;
+ access_token = _tmp25_;
#line 333 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp29_ = access_token;
+ _tmp26_ = access_token;
#line 333 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- if (g_strcmp0 (_tmp29_, "") != 0) {
-#line 2253 "GoogleAuthenticator.c"
- GHashTable* _tmp30_;
- gchar* _tmp31_;
- const gchar* _tmp32_;
- GVariant* _tmp33_;
+ if (g_strcmp0 (_tmp26_, "") != 0) {
+#line 2235 "GoogleAuthenticator.c"
+ GHashTable* _tmp27_;
+ gchar* _tmp28_;
+ const gchar* _tmp29_;
+ GVariant* _tmp30_;
#line 334 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp30_ = self->priv->params;
+ _tmp27_ = self->priv->params;
#line 334 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp31_ = g_strdup ("AccessToken");
+ _tmp28_ = g_strdup ("AccessToken");
#line 334 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp32_ = access_token;
+ _tmp29_ = access_token;
#line 334 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp33_ = g_variant_new_string (_tmp32_);
+ _tmp30_ = g_variant_new_string (_tmp29_);
#line 334 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- g_variant_ref_sink (_tmp33_);
+ g_variant_ref_sink (_tmp30_);
#line 334 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- g_hash_table_insert (_tmp30_, _tmp31_, _tmp33_);
-#line 2270 "GoogleAuthenticator.c"
+ g_hash_table_insert (_tmp27_, _tmp28_, _tmp30_);
+#line 2252 "GoogleAuthenticator.c"
}
#line 330 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_g_free0 (access_token);
-#line 2274 "GoogleAuthenticator.c"
+#line 2256 "GoogleAuthenticator.c"
}
#line 339 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp34_ = self->priv->session;
+ _tmp31_ = self->priv->session;
#line 339 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp35_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 339 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _vala_assert (_tmp35_, "session.is_authenticated()");
+ _vala_assert (publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession)), "session.is_authenticated()");
#line 340 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp36_ = self->priv->host;
+ _tmp32_ = self->priv->host;
#line 340 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp37_ = self->priv->session;
+ _tmp33_ = self->priv->session;
#line 340 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp38_ = _tmp37_->refresh_token;
+ _tmp34_ = _tmp33_->refresh_token;
#line 340 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "refresh_token", _tmp38_);
+ spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "refresh_token", _tmp34_);
#line 342 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator), "authenticated");
#line 308 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_json_object_unref0 (response_obj);
#line 308 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_g_object_unref0 (parser);
-#line 2296 "GoogleAuthenticator.c"
+#line 2276 "GoogleAuthenticator.c"
}
-static void _publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
+static void
+_publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+ gpointer self)
+{
#line 353 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_completed ((PublishingAuthenticatorShotwellGoogleGoogle*) self, _sender);
-#line 2303 "GoogleAuthenticator.c"
+#line 2286 "GoogleAuthenticator.c"
}
-static void _publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
+static void
+_publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+ GError* err,
+ gpointer self)
+{
#line 354 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_error ((PublishingAuthenticatorShotwellGoogleGoogle*) self, _sender, err);
-#line 2310 "GoogleAuthenticator.c"
+#line 2297 "GoogleAuthenticator.c"
}
-static void publishing_authenticator_shotwell_google_google_do_exchange_refresh_token_for_access_token (PublishingAuthenticatorShotwellGoogleGoogle* self) {
+static void
+publishing_authenticator_shotwell_google_google_do_exchange_refresh_token_for_access_token (PublishingAuthenticatorShotwellGoogleGoogle* self)
+{
SpitPublishingPluginHost* _tmp0_;
PublishingAuthenticatorShotwellGoogleRefreshAccessTokenTransaction* txn = NULL;
PublishingAuthenticatorShotwellGoogleSession* _tmp1_;
@@ -2352,7 +2341,7 @@ static void publishing_authenticator_shotwell_google_google_do_exchange_refresh_
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_completed_publishing_rest_support_transaction_completed, self, 0);
#line 354 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 2338 "GoogleAuthenticator.c"
+#line 2327 "GoogleAuthenticator.c"
{
#line 357 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
@@ -2360,7 +2349,7 @@ static void publishing_authenticator_shotwell_google_google_do_exchange_refresh_
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 357 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2346 "GoogleAuthenticator.c"
+#line 2335 "GoogleAuthenticator.c"
goto __catch7_spit_publishing_publishing_error;
}
#line 357 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -2371,7 +2360,7 @@ static void publishing_authenticator_shotwell_google_google_do_exchange_refresh_
g_clear_error (&_inner_error_);
#line 357 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
return;
-#line 2357 "GoogleAuthenticator.c"
+#line 2346 "GoogleAuthenticator.c"
}
}
goto __finally7;
@@ -2392,7 +2381,7 @@ static void publishing_authenticator_shotwell_google_google_do_exchange_refresh_
spit_publishing_plugin_host_post_error (_tmp3_, _tmp4_);
#line 356 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_g_error_free0 (err);
-#line 2378 "GoogleAuthenticator.c"
+#line 2367 "GoogleAuthenticator.c"
}
__finally7:
#line 356 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -2405,68 +2394,61 @@ static void publishing_authenticator_shotwell_google_google_do_exchange_refresh_
g_clear_error (&_inner_error_);
#line 356 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
return;
-#line 2391 "GoogleAuthenticator.c"
+#line 2380 "GoogleAuthenticator.c"
}
#line 346 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_publishing_rest_support_transaction_unref0 (txn);
-#line 2395 "GoogleAuthenticator.c"
+#line 2384 "GoogleAuthenticator.c"
}
-static void publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_completed (PublishingAuthenticatorShotwellGoogleGoogle* self, PublishingRESTSupportTransaction* txn) {
- PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_completed (PublishingAuthenticatorShotwellGoogleGoogle* self,
+ PublishingRESTSupportTransaction* txn)
+{
+ guint _tmp0_;
guint _tmp1_;
- PublishingRESTSupportTransaction* _tmp2_;
- guint _tmp3_;
- PublishingAuthenticatorShotwellGoogleSession* _tmp4_;
- gboolean _tmp5_;
- PublishingRESTSupportTransaction* _tmp6_;
- gchar* _tmp7_;
- gchar* _tmp8_;
+ PublishingAuthenticatorShotwellGoogleSession* _tmp2_;
+ gchar* _tmp3_;
+ gchar* _tmp4_;
#line 363 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_GOOGLE (self));
#line 363 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
#line 365 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp0_ = txn;
-#line 365 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
+ g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
#line 365 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_completed_publishing_rest_support_transaction_completed, self);
+ g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_completed_publishing_rest_support_transaction_completed, self);
#line 366 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp2_ = txn;
+ g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
#line 366 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 366 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_error_publishing_rest_support_transaction_network_error, self);
+ g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_error_publishing_rest_support_transaction_network_error, self);
#line 368 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
g_debug ("GoogleAuthenticator.vala:368: EVENT: refresh access token transaction " \
"completed successfully.");
#line 370 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp4_ = self->priv->session;
-#line 370 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp5_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
+ _tmp2_ = self->priv->session;
#line 370 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- if (_tmp5_) {
+ if (publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession))) {
#line 371 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
return;
-#line 2435 "GoogleAuthenticator.c"
+#line 2417 "GoogleAuthenticator.c"
}
#line 373 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp6_ = txn;
-#line 373 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp7_ = publishing_rest_support_transaction_get_response (_tmp6_);
+ _tmp3_ = publishing_rest_support_transaction_get_response (txn);
#line 373 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp8_ = _tmp7_;
+ _tmp4_ = _tmp3_;
#line 373 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- publishing_authenticator_shotwell_google_google_do_extract_tokens (self, _tmp8_);
+ publishing_authenticator_shotwell_google_google_do_extract_tokens (self, _tmp4_);
#line 373 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _g_free0 (_tmp8_);
-#line 2447 "GoogleAuthenticator.c"
+ _g_free0 (_tmp4_);
+#line 2427 "GoogleAuthenticator.c"
}
-static gboolean ___lambda4_ (PublishingAuthenticatorShotwellGoogleGoogle* self) {
+static gboolean
+___lambda4_ (PublishingAuthenticatorShotwellGoogleGoogle* self)
+{
gboolean result = FALSE;
#line 389 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
spit_publishing_authenticator_authenticate (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator));
@@ -2474,110 +2456,96 @@ static gboolean ___lambda4_ (PublishingAuthenticatorShotwellGoogleGoogle* self)
result = FALSE;
#line 389 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
return result;
-#line 2459 "GoogleAuthenticator.c"
+#line 2441 "GoogleAuthenticator.c"
}
-static gboolean ____lambda4__gsource_func (gpointer self) {
+static gboolean
+____lambda4__gsource_func (gpointer self)
+{
gboolean result;
result = ___lambda4_ ((PublishingAuthenticatorShotwellGoogleGoogle*) self);
#line 389 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
return result;
-#line 2468 "GoogleAuthenticator.c"
+#line 2452 "GoogleAuthenticator.c"
}
-static void publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_error (PublishingAuthenticatorShotwellGoogleGoogle* self, PublishingRESTSupportTransaction* txn, GError* err) {
- PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_error (PublishingAuthenticatorShotwellGoogleGoogle* self,
+ PublishingRESTSupportTransaction* txn,
+ GError* err)
+{
+ guint _tmp0_;
guint _tmp1_;
- PublishingRESTSupportTransaction* _tmp2_;
- guint _tmp3_;
- PublishingAuthenticatorShotwellGoogleSession* _tmp4_;
- gboolean _tmp5_;
- gboolean _tmp6_ = FALSE;
- PublishingRESTSupportTransaction* _tmp7_;
- guint _tmp8_;
- SpitPublishingPluginHost* _tmp12_;
- GError* _tmp13_;
+ PublishingAuthenticatorShotwellGoogleSession* _tmp2_;
+ gboolean _tmp3_ = FALSE;
+ SpitPublishingPluginHost* _tmp5_;
#line 376 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_GOOGLE (self));
#line 376 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
#line 378 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp0_ = txn;
-#line 378 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
+ g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
#line 378 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_completed_publishing_rest_support_transaction_completed, self);
+ g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_completed_publishing_rest_support_transaction_completed, self);
#line 379 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp2_ = txn;
+ g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
#line 379 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 379 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_error_publishing_rest_support_transaction_network_error, self);
+ g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_error_publishing_rest_support_transaction_network_error, self);
#line 381 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
g_debug ("GoogleAuthenticator.vala:381: EVENT: refresh access token transaction " \
"caused a network error.");
#line 383 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp4_ = self->priv->session;
-#line 383 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp5_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
+ _tmp2_ = self->priv->session;
#line 383 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- if (_tmp5_) {
+ if (publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession))) {
#line 384 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
return;
-#line 2510 "GoogleAuthenticator.c"
+#line 2486 "GoogleAuthenticator.c"
}
#line 385 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp7_ = txn;
-#line 385 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp8_ = publishing_rest_support_transaction_get_status_code (_tmp7_);
+ if (publishing_rest_support_transaction_get_status_code (txn) == ((guint) SOUP_STATUS_BAD_REQUEST)) {
#line 385 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- if (_tmp8_ == ((guint) SOUP_STATUS_BAD_REQUEST)) {
-#line 385 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp6_ = TRUE;
-#line 2520 "GoogleAuthenticator.c"
+ _tmp3_ = TRUE;
+#line 2492 "GoogleAuthenticator.c"
} else {
- PublishingRESTSupportTransaction* _tmp9_;
- guint _tmp10_;
-#line 386 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp9_ = txn;
#line 386 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp10_ = publishing_rest_support_transaction_get_status_code (_tmp9_);
-#line 386 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp6_ = _tmp10_ == ((guint) SOUP_STATUS_UNAUTHORIZED);
-#line 2530 "GoogleAuthenticator.c"
+ _tmp3_ = publishing_rest_support_transaction_get_status_code (txn) == ((guint) SOUP_STATUS_UNAUTHORIZED);
+#line 2496 "GoogleAuthenticator.c"
}
#line 385 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- if (_tmp6_) {
-#line 2534 "GoogleAuthenticator.c"
- SpitPublishingPluginHost* _tmp11_;
+ if (_tmp3_) {
+#line 2500 "GoogleAuthenticator.c"
+ SpitPublishingPluginHost* _tmp4_;
#line 388 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp11_ = self->priv->host;
+ _tmp4_ = self->priv->host;
#line 388 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "refresh_token", "");
+ spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "refresh_token", "");
#line 389 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ____lambda4__gsource_func, g_object_ref (self), g_object_unref);
-#line 2542 "GoogleAuthenticator.c"
+#line 2508 "GoogleAuthenticator.c"
}
#line 392 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp12_ = self->priv->host;
+ _tmp5_ = self->priv->host;
#line 392 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp13_ = err;
-#line 392 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- spit_publishing_plugin_host_post_error (_tmp12_, _tmp13_);
-#line 2550 "GoogleAuthenticator.c"
+ spit_publishing_plugin_host_post_error (_tmp5_, err);
+#line 2514 "GoogleAuthenticator.c"
}
-static void _publishing_authenticator_shotwell_google_google_on_service_welcome_login_spit_publishing_login_callback (gpointer self) {
+static void
+_publishing_authenticator_shotwell_google_google_on_service_welcome_login_spit_publishing_login_callback (gpointer self)
+{
#line 398 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
publishing_authenticator_shotwell_google_google_on_service_welcome_login ((PublishingAuthenticatorShotwellGoogleGoogle*) self);
-#line 2557 "GoogleAuthenticator.c"
+#line 2523 "GoogleAuthenticator.c"
}
-static void publishing_authenticator_shotwell_google_google_do_show_service_welcome_pane (PublishingAuthenticatorShotwellGoogleGoogle* self) {
+static void
+publishing_authenticator_shotwell_google_google_do_show_service_welcome_pane (PublishingAuthenticatorShotwellGoogleGoogle* self)
+{
SpitPublishingPluginHost* _tmp0_;
const gchar* _tmp1_;
#line 395 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -2590,11 +2558,13 @@ static void publishing_authenticator_shotwell_google_google_do_show_service_welc
_tmp1_ = self->priv->welcome_message;
#line 398 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
spit_publishing_plugin_host_install_welcome_pane (_tmp0_, _tmp1_, _publishing_authenticator_shotwell_google_google_on_service_welcome_login_spit_publishing_login_callback, self);
-#line 2574 "GoogleAuthenticator.c"
+#line 2542 "GoogleAuthenticator.c"
}
-static void publishing_authenticator_shotwell_google_google_on_service_welcome_login (PublishingAuthenticatorShotwellGoogleGoogle* self) {
+static void
+publishing_authenticator_shotwell_google_google_on_service_welcome_login (PublishingAuthenticatorShotwellGoogleGoogle* self)
+{
#line 401 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_GOOGLE (self));
#line 402 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -2602,22 +2572,26 @@ static void publishing_authenticator_shotwell_google_google_on_service_welcome_l
"ane.");
#line 404 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
publishing_authenticator_shotwell_google_google_do_hosted_web_authentication (self);
-#line 2585 "GoogleAuthenticator.c"
+#line 2555 "GoogleAuthenticator.c"
}
-static void publishing_authenticator_shotwell_google_google_class_init (PublishingAuthenticatorShotwellGoogleGoogleClass * klass) {
+static void
+publishing_authenticator_shotwell_google_google_class_init (PublishingAuthenticatorShotwellGoogleGoogleClass * klass)
+{
#line 88 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
publishing_authenticator_shotwell_google_google_parent_class = g_type_class_peek_parent (klass);
#line 88 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
g_type_class_add_private (klass, sizeof (PublishingAuthenticatorShotwellGoogleGooglePrivate));
#line 88 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
G_OBJECT_CLASS (klass)->finalize = publishing_authenticator_shotwell_google_google_finalize;
-#line 2596 "GoogleAuthenticator.c"
+#line 2568 "GoogleAuthenticator.c"
}
-static void publishing_authenticator_shotwell_google_google_spit_publishing_authenticator_interface_init (SpitPublishingAuthenticatorIface * iface) {
+static void
+publishing_authenticator_shotwell_google_google_spit_publishing_authenticator_interface_init (SpitPublishingAuthenticatorIface * iface)
+{
#line 88 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
publishing_authenticator_shotwell_google_google_spit_publishing_authenticator_parent_iface = g_type_interface_peek_parent (iface);
#line 88 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -2630,11 +2604,13 @@ static void publishing_authenticator_shotwell_google_google_spit_publishing_auth
iface->logout = (void (*) (SpitPublishingAuthenticator *)) publishing_authenticator_shotwell_google_google_real_logout;
#line 88 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
iface->refresh = (void (*) (SpitPublishingAuthenticator *)) publishing_authenticator_shotwell_google_google_real_refresh;
-#line 2613 "GoogleAuthenticator.c"
+#line 2587 "GoogleAuthenticator.c"
}
-static void publishing_authenticator_shotwell_google_google_instance_init (PublishingAuthenticatorShotwellGoogleGoogle * self) {
+static void
+publishing_authenticator_shotwell_google_google_instance_init (PublishingAuthenticatorShotwellGoogleGoogle * self)
+{
#line 88 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
self->priv = PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_GOOGLE_GET_PRIVATE (self);
#line 89 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -2649,11 +2625,13 @@ static void publishing_authenticator_shotwell_google_google_instance_init (Publi
self->priv->session = NULL;
#line 94 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
self->priv->welcome_message = NULL;
-#line 2632 "GoogleAuthenticator.c"
+#line 2608 "GoogleAuthenticator.c"
}
-static void publishing_authenticator_shotwell_google_google_finalize (GObject * obj) {
+static void
+publishing_authenticator_shotwell_google_google_finalize (GObject * obj)
+{
PublishingAuthenticatorShotwellGoogleGoogle * self;
#line 88 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_GOOGLE, PublishingAuthenticatorShotwellGoogleGoogle);
@@ -2671,11 +2649,13 @@ static void publishing_authenticator_shotwell_google_google_finalize (GObject *
_g_free0 (self->priv->welcome_message);
#line 88 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
G_OBJECT_CLASS (publishing_authenticator_shotwell_google_google_parent_class)->finalize (obj);
-#line 2654 "GoogleAuthenticator.c"
+#line 2632 "GoogleAuthenticator.c"
}
-GType publishing_authenticator_shotwell_google_google_get_type (void) {
+GType
+publishing_authenticator_shotwell_google_google_get_type (void)
+{
static volatile gsize publishing_authenticator_shotwell_google_google_type_id__volatile = 0;
if (g_once_init_enter (&publishing_authenticator_shotwell_google_google_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingAuthenticatorShotwellGoogleGoogleClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_authenticator_shotwell_google_google_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingAuthenticatorShotwellGoogleGoogle), 0, (GInstanceInitFunc) publishing_authenticator_shotwell_google_google_instance_init, NULL };
diff --git a/plugins/authenticator/shotwell/OAuth1Authenticator.c b/plugins/authenticator/shotwell/OAuth1Authenticator.c
index 4fe57ef..7cf5780 100644
--- a/plugins/authenticator/shotwell/OAuth1Authenticator.c
+++ b/plugins/authenticator/shotwell/OAuth1Authenticator.c
@@ -1,4 +1,4 @@
-/* OAuth1Authenticator.c generated by valac 0.36.6, the Vala compiler
+/* OAuth1Authenticator.c generated by valac 0.40.4, the Vala compiler
* generated from OAuth1Authenticator.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -8,6 +8,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"
@@ -26,6 +27,11 @@
typedef struct _PublishingAuthenticatorShotwellOAuth1Authenticator PublishingAuthenticatorShotwellOAuth1Authenticator;
typedef struct _PublishingAuthenticatorShotwellOAuth1AuthenticatorClass PublishingAuthenticatorShotwellOAuth1AuthenticatorClass;
typedef struct _PublishingAuthenticatorShotwellOAuth1AuthenticatorPrivate PublishingAuthenticatorShotwellOAuth1AuthenticatorPrivate;
+enum {
+ PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_AUTHENTICATOR_0_PROPERTY,
+ PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_AUTHENTICATOR_NUM_PROPERTIES
+};
+static GParamSpec* publishing_authenticator_shotwell_oauth1_authenticator_properties[PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_AUTHENTICATOR_NUM_PROPERTIES];
#define _g_hash_table_unref0(var) ((var == NULL) ? NULL : (var = (g_hash_table_unref (var), NULL)))
#define _publishing_rest_support_session_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rest_support_session_unref (var), NULL)))
#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
@@ -52,12 +58,13 @@ static gpointer publishing_authenticator_shotwell_oauth1_authenticator_parent_cl
static SpitPublishingAuthenticatorIface * publishing_authenticator_shotwell_oauth1_authenticator_spit_publishing_authenticator_parent_iface = NULL;
GType publishing_authenticator_shotwell_oauth1_authenticator_get_type (void) G_GNUC_CONST;
-enum {
- PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_AUTHENTICATOR_DUMMY_PROPERTY
-};
void publishing_authenticator_shotwell_oauth1_authenticator_on_session_authenticated (PublishingAuthenticatorShotwellOAuth1Authenticator* self);
-static void _publishing_authenticator_shotwell_oauth1_authenticator_on_session_authenticated_publishing_rest_support_session_authenticated (PublishingRESTSupportSession* _sender, gpointer self);
-PublishingAuthenticatorShotwellOAuth1Authenticator* publishing_authenticator_shotwell_oauth1_authenticator_construct (GType object_type, const gchar* api_key, const gchar* api_secret, SpitPublishingPluginHost* host);
+static void _publishing_authenticator_shotwell_oauth1_authenticator_on_session_authenticated_publishing_rest_support_session_authenticated (PublishingRESTSupportSession* _sender,
+ gpointer self);
+PublishingAuthenticatorShotwellOAuth1Authenticator* publishing_authenticator_shotwell_oauth1_authenticator_construct (GType object_type,
+ const gchar* api_key,
+ const gchar* api_secret,
+ SpitPublishingPluginHost* host);
static void _g_free0_ (gpointer var);
static void _g_variant_unref0_ (gpointer var);
static GVariant* _variant_new1 (const gchar* value);
@@ -72,9 +79,12 @@ static void publishing_authenticator_shotwell_oauth1_authenticator_real_logout (
void publishing_authenticator_shotwell_oauth1_authenticator_refresh (PublishingAuthenticatorShotwellOAuth1Authenticator* self);
static void publishing_authenticator_shotwell_oauth1_authenticator_real_refresh (PublishingAuthenticatorShotwellOAuth1Authenticator* self);
void publishing_authenticator_shotwell_oauth1_authenticator_invalidate_persistent_session (PublishingAuthenticatorShotwellOAuth1Authenticator* self);
-void publishing_authenticator_shotwell_oauth1_authenticator_set_persistent_access_phase_token (PublishingAuthenticatorShotwellOAuth1Authenticator* self, const gchar* token);
-void publishing_authenticator_shotwell_oauth1_authenticator_set_persistent_access_phase_token_secret (PublishingAuthenticatorShotwellOAuth1Authenticator* self, const gchar* secret);
-void publishing_authenticator_shotwell_oauth1_authenticator_set_persistent_access_phase_username (PublishingAuthenticatorShotwellOAuth1Authenticator* self, const gchar* username);
+void publishing_authenticator_shotwell_oauth1_authenticator_set_persistent_access_phase_token (PublishingAuthenticatorShotwellOAuth1Authenticator* self,
+ const gchar* token);
+void publishing_authenticator_shotwell_oauth1_authenticator_set_persistent_access_phase_token_secret (PublishingAuthenticatorShotwellOAuth1Authenticator* self,
+ const gchar* secret);
+void publishing_authenticator_shotwell_oauth1_authenticator_set_persistent_access_phase_username (PublishingAuthenticatorShotwellOAuth1Authenticator* self,
+ const gchar* username);
gboolean publishing_authenticator_shotwell_oauth1_authenticator_is_persistent_session_valid (PublishingAuthenticatorShotwellOAuth1Authenticator* self);
gchar* publishing_authenticator_shotwell_oauth1_authenticator_get_persistent_access_phase_username (PublishingAuthenticatorShotwellOAuth1Authenticator* self);
gchar* publishing_authenticator_shotwell_oauth1_authenticator_get_persistent_access_phase_token (PublishingAuthenticatorShotwellOAuth1Authenticator* self);
@@ -85,68 +95,81 @@ static GVariant* _variant_new5 (gchar* value);
static void publishing_authenticator_shotwell_oauth1_authenticator_finalize (GObject * obj);
-static void _publishing_authenticator_shotwell_oauth1_authenticator_on_session_authenticated_publishing_rest_support_session_authenticated (PublishingRESTSupportSession* _sender, gpointer self) {
+static void
+_publishing_authenticator_shotwell_oauth1_authenticator_on_session_authenticated_publishing_rest_support_session_authenticated (PublishingRESTSupportSession* _sender,
+ gpointer self)
+{
#line 29 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
publishing_authenticator_shotwell_oauth1_authenticator_on_session_authenticated ((PublishingAuthenticatorShotwellOAuth1Authenticator*) self);
-#line 92 "OAuth1Authenticator.c"
+#line 105 "OAuth1Authenticator.c"
}
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
#line 17 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
return self ? g_object_ref (self) : NULL;
-#line 99 "OAuth1Authenticator.c"
+#line 114 "OAuth1Authenticator.c"
}
-static void _g_free0_ (gpointer var) {
+static void
+_g_free0_ (gpointer var)
+{
#line 19 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
var = (g_free (var), NULL);
-#line 106 "OAuth1Authenticator.c"
+#line 123 "OAuth1Authenticator.c"
}
-static void _g_variant_unref0_ (gpointer var) {
+static void
+_g_variant_unref0_ (gpointer var)
+{
#line 19 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
(var == NULL) ? NULL : (var = (g_variant_unref (var), NULL));
-#line 113 "OAuth1Authenticator.c"
+#line 132 "OAuth1Authenticator.c"
}
-static GVariant* _variant_new1 (const gchar* value) {
+static GVariant*
+_variant_new1 (const gchar* value)
+{
#line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
return g_variant_ref_sink (g_variant_new_string (value));
-#line 120 "OAuth1Authenticator.c"
+#line 141 "OAuth1Authenticator.c"
}
-static GVariant* _variant_new2 (const gchar* value) {
+static GVariant*
+_variant_new2 (const gchar* value)
+{
#line 21 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
return g_variant_ref_sink (g_variant_new_string (value));
-#line 127 "OAuth1Authenticator.c"
+#line 150 "OAuth1Authenticator.c"
}
-PublishingAuthenticatorShotwellOAuth1Authenticator* publishing_authenticator_shotwell_oauth1_authenticator_construct (GType object_type, const gchar* api_key, const gchar* api_secret, SpitPublishingPluginHost* host) {
+PublishingAuthenticatorShotwellOAuth1Authenticator*
+publishing_authenticator_shotwell_oauth1_authenticator_construct (GType object_type,
+ const gchar* api_key,
+ const gchar* api_secret,
+ SpitPublishingPluginHost* host)
+{
PublishingAuthenticatorShotwellOAuth1Authenticator * self = NULL;
SpitPublishingPluginHost* _tmp0_;
- SpitPublishingPluginHost* _tmp1_;
- GHashFunc _tmp2_;
- GEqualFunc _tmp3_;
+ GHashFunc _tmp1_;
+ GEqualFunc _tmp2_;
+ GHashTable* _tmp3_;
GHashTable* _tmp4_;
- GHashTable* _tmp5_;
- gchar* _tmp6_;
- const gchar* _tmp7_;
- GVariant* _tmp8_;
- GHashTable* _tmp9_;
- gchar* _tmp10_;
- const gchar* _tmp11_;
- GVariant* _tmp12_;
- PublishingRESTSupportOAuth1Session* _tmp13_;
- PublishingRESTSupportOAuth1Session* _tmp14_;
- const gchar* _tmp15_;
- const gchar* _tmp16_;
- PublishingRESTSupportOAuth1Session* _tmp17_;
+ gchar* _tmp5_;
+ GVariant* _tmp6_;
+ GHashTable* _tmp7_;
+ gchar* _tmp8_;
+ GVariant* _tmp9_;
+ PublishingRESTSupportOAuth1Session* _tmp10_;
+ PublishingRESTSupportOAuth1Session* _tmp11_;
+ PublishingRESTSupportOAuth1Session* _tmp12_;
#line 15 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
g_return_val_if_fail (api_key != NULL, NULL);
#line 15 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
@@ -156,112 +179,114 @@ PublishingAuthenticatorShotwellOAuth1Authenticator* publishing_authenticator_sho
#line 16 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
self = (PublishingAuthenticatorShotwellOAuth1Authenticator*) g_object_new (object_type, NULL);
#line 17 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
- _tmp0_ = host;
-#line 17 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
- _tmp1_ = _g_object_ref0 (_tmp0_);
+ _tmp0_ = _g_object_ref0 (host);
#line 17 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
_g_object_unref0 (self->host);
#line 17 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
- self->host = _tmp1_;
+ self->host = _tmp0_;
#line 19 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
- _tmp2_ = g_str_hash;
+ _tmp1_ = g_str_hash;
#line 19 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
- _tmp3_ = g_str_equal;
+ _tmp2_ = g_str_equal;
#line 19 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
- _tmp4_ = g_hash_table_new_full (_tmp2_, _tmp3_, _g_free0_, _g_variant_unref0_);
+ _tmp3_ = g_hash_table_new_full (_tmp1_, _tmp2_, _g_free0_, _g_variant_unref0_);
#line 19 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
_g_hash_table_unref0 (self->params);
#line 19 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
- self->params = _tmp4_;
-#line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
- _tmp5_ = self->params;
+ self->params = _tmp3_;
#line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
- _tmp6_ = g_strdup ("ConsumerKey");
+ _tmp4_ = self->params;
#line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
- _tmp7_ = api_key;
+ _tmp5_ = g_strdup ("ConsumerKey");
#line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
- _tmp8_ = _variant_new1 (_tmp7_);
+ _tmp6_ = _variant_new1 (api_key);
#line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
- g_hash_table_insert (_tmp5_, _tmp6_, _tmp8_);
+ g_hash_table_insert (_tmp4_, _tmp5_, _tmp6_);
#line 21 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
- _tmp9_ = self->params;
+ _tmp7_ = self->params;
#line 21 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
- _tmp10_ = g_strdup ("ConsumerSecret");
+ _tmp8_ = g_strdup ("ConsumerSecret");
#line 21 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
- _tmp11_ = api_secret;
+ _tmp9_ = _variant_new2 (api_secret);
#line 21 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
- _tmp12_ = _variant_new2 (_tmp11_);
-#line 21 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
- g_hash_table_insert (_tmp9_, _tmp10_, _tmp12_);
+ g_hash_table_insert (_tmp7_, _tmp8_, _tmp9_);
#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
- _tmp13_ = publishing_rest_support_oauth1_session_new (NULL);
+ _tmp10_ = publishing_rest_support_oauth1_session_new (NULL);
#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
_publishing_rest_support_session_unref0 (self->session);
#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
- self->session = _tmp13_;
-#line 24 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
- _tmp14_ = self->session;
+ self->session = _tmp10_;
#line 24 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
- _tmp15_ = api_key;
+ _tmp11_ = self->session;
#line 24 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
- _tmp16_ = api_secret;
-#line 24 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
- publishing_rest_support_oauth1_session_set_api_credentials (_tmp14_, _tmp15_, _tmp16_);
+ publishing_rest_support_oauth1_session_set_api_credentials (_tmp11_, api_key, api_secret);
#line 25 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
- _tmp17_ = self->session;
+ _tmp12_ = self->session;
#line 25 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), "authenticated", (GCallback) _publishing_authenticator_shotwell_oauth1_authenticator_on_session_authenticated_publishing_rest_support_session_authenticated, self, 0);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), "authenticated", (GCallback) _publishing_authenticator_shotwell_oauth1_authenticator_on_session_authenticated_publishing_rest_support_session_authenticated, self, 0);
#line 15 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
return self;
-#line 217 "OAuth1Authenticator.c"
+#line 230 "OAuth1Authenticator.c"
}
-static void publishing_authenticator_shotwell_oauth1_authenticator_real_authenticate (PublishingAuthenticatorShotwellOAuth1Authenticator* self) {
+static void
+publishing_authenticator_shotwell_oauth1_authenticator_real_authenticate (PublishingAuthenticatorShotwellOAuth1Authenticator* self)
+{
#line 33 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
g_critical ("Type `%s' does not implement abstract method `publishing_authenticator_shotwell_oauth1_authenticator_authenticate'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 33 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
return;
-#line 226 "OAuth1Authenticator.c"
+#line 241 "OAuth1Authenticator.c"
}
-void publishing_authenticator_shotwell_oauth1_authenticator_authenticate (PublishingAuthenticatorShotwellOAuth1Authenticator* self) {
+void
+publishing_authenticator_shotwell_oauth1_authenticator_authenticate (PublishingAuthenticatorShotwellOAuth1Authenticator* self)
+{
#line 33 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_IS_AUTHENTICATOR (self));
#line 33 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_AUTHENTICATOR_GET_CLASS (self)->authenticate (self);
-#line 235 "OAuth1Authenticator.c"
+#line 252 "OAuth1Authenticator.c"
}
-static gboolean publishing_authenticator_shotwell_oauth1_authenticator_real_can_logout (PublishingAuthenticatorShotwellOAuth1Authenticator* self) {
+static gboolean
+publishing_authenticator_shotwell_oauth1_authenticator_real_can_logout (PublishingAuthenticatorShotwellOAuth1Authenticator* self)
+{
gboolean _tmp0_ = FALSE;
#line 35 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
g_critical ("Type `%s' does not implement abstract method `publishing_authenticator_shotwell_oauth1_authenticator_can_logout'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 35 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
return _tmp0_;
-#line 245 "OAuth1Authenticator.c"
+#line 264 "OAuth1Authenticator.c"
}
-gboolean publishing_authenticator_shotwell_oauth1_authenticator_can_logout (PublishingAuthenticatorShotwellOAuth1Authenticator* self) {
+gboolean
+publishing_authenticator_shotwell_oauth1_authenticator_can_logout (PublishingAuthenticatorShotwellOAuth1Authenticator* self)
+{
#line 35 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_IS_AUTHENTICATOR (self), FALSE);
#line 35 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
return PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_AUTHENTICATOR_GET_CLASS (self)->can_logout (self);
-#line 254 "OAuth1Authenticator.c"
+#line 275 "OAuth1Authenticator.c"
}
-static gpointer _g_hash_table_ref0 (gpointer self) {
+static gpointer
+_g_hash_table_ref0 (gpointer self)
+{
#line 38 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
return self ? g_hash_table_ref (self) : NULL;
-#line 261 "OAuth1Authenticator.c"
+#line 284 "OAuth1Authenticator.c"
}
-static GHashTable* publishing_authenticator_shotwell_oauth1_authenticator_real_get_authentication_parameter (SpitPublishingAuthenticator* base) {
+static GHashTable*
+publishing_authenticator_shotwell_oauth1_authenticator_real_get_authentication_parameter (SpitPublishingAuthenticator* base)
+{
PublishingAuthenticatorShotwellOAuth1Authenticator * self;
GHashTable* result = NULL;
GHashTable* _tmp0_;
@@ -276,47 +301,57 @@ static GHashTable* publishing_authenticator_shotwell_oauth1_authenticator_real_g
result = _tmp1_;
#line 38 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
return result;
-#line 280 "OAuth1Authenticator.c"
+#line 305 "OAuth1Authenticator.c"
}
-static void publishing_authenticator_shotwell_oauth1_authenticator_real_logout (PublishingAuthenticatorShotwellOAuth1Authenticator* self) {
+static void
+publishing_authenticator_shotwell_oauth1_authenticator_real_logout (PublishingAuthenticatorShotwellOAuth1Authenticator* self)
+{
#line 41 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
g_critical ("Type `%s' does not implement abstract method `publishing_authenticator_shotwell_oauth1_authenticator_logout'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 41 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
return;
-#line 289 "OAuth1Authenticator.c"
+#line 316 "OAuth1Authenticator.c"
}
-void publishing_authenticator_shotwell_oauth1_authenticator_logout (PublishingAuthenticatorShotwellOAuth1Authenticator* self) {
+void
+publishing_authenticator_shotwell_oauth1_authenticator_logout (PublishingAuthenticatorShotwellOAuth1Authenticator* self)
+{
#line 41 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_IS_AUTHENTICATOR (self));
#line 41 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_AUTHENTICATOR_GET_CLASS (self)->logout (self);
-#line 298 "OAuth1Authenticator.c"
+#line 327 "OAuth1Authenticator.c"
}
-static void publishing_authenticator_shotwell_oauth1_authenticator_real_refresh (PublishingAuthenticatorShotwellOAuth1Authenticator* self) {
+static void
+publishing_authenticator_shotwell_oauth1_authenticator_real_refresh (PublishingAuthenticatorShotwellOAuth1Authenticator* self)
+{
#line 43 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
g_critical ("Type `%s' does not implement abstract method `publishing_authenticator_shotwell_oauth1_authenticator_refresh'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 43 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
return;
-#line 307 "OAuth1Authenticator.c"
+#line 338 "OAuth1Authenticator.c"
}
-void publishing_authenticator_shotwell_oauth1_authenticator_refresh (PublishingAuthenticatorShotwellOAuth1Authenticator* self) {
+void
+publishing_authenticator_shotwell_oauth1_authenticator_refresh (PublishingAuthenticatorShotwellOAuth1Authenticator* self)
+{
#line 43 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_IS_AUTHENTICATOR (self));
#line 43 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_AUTHENTICATOR_GET_CLASS (self)->refresh (self);
-#line 316 "OAuth1Authenticator.c"
+#line 349 "OAuth1Authenticator.c"
}
-void publishing_authenticator_shotwell_oauth1_authenticator_invalidate_persistent_session (PublishingAuthenticatorShotwellOAuth1Authenticator* self) {
+void
+publishing_authenticator_shotwell_oauth1_authenticator_invalidate_persistent_session (PublishingAuthenticatorShotwellOAuth1Authenticator* self)
+{
#line 45 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_IS_AUTHENTICATOR (self));
#line 46 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
@@ -325,11 +360,13 @@ void publishing_authenticator_shotwell_oauth1_authenticator_invalidate_persisten
publishing_authenticator_shotwell_oauth1_authenticator_set_persistent_access_phase_token_secret (self, "");
#line 48 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
publishing_authenticator_shotwell_oauth1_authenticator_set_persistent_access_phase_username (self, "");
-#line 329 "OAuth1Authenticator.c"
+#line 364 "OAuth1Authenticator.c"
}
-gboolean publishing_authenticator_shotwell_oauth1_authenticator_is_persistent_session_valid (PublishingAuthenticatorShotwellOAuth1Authenticator* self) {
+gboolean
+publishing_authenticator_shotwell_oauth1_authenticator_is_persistent_session_valid (PublishingAuthenticatorShotwellOAuth1Authenticator* self)
+{
gboolean result = FALSE;
gboolean _tmp0_ = FALSE;
gboolean _tmp1_ = FALSE;
@@ -348,7 +385,7 @@ gboolean publishing_authenticator_shotwell_oauth1_authenticator_is_persistent_se
_g_free0 (_tmp3_);
#line 51 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
if (_tmp4_) {
-#line 352 "OAuth1Authenticator.c"
+#line 389 "OAuth1Authenticator.c"
gchar* _tmp5_;
gchar* _tmp6_;
#line 52 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
@@ -359,15 +396,15 @@ gboolean publishing_authenticator_shotwell_oauth1_authenticator_is_persistent_se
_tmp1_ = _tmp6_ != NULL;
#line 52 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
_g_free0 (_tmp6_);
-#line 363 "OAuth1Authenticator.c"
+#line 400 "OAuth1Authenticator.c"
} else {
#line 51 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
_tmp1_ = FALSE;
-#line 367 "OAuth1Authenticator.c"
+#line 404 "OAuth1Authenticator.c"
}
#line 51 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
if (_tmp1_) {
-#line 371 "OAuth1Authenticator.c"
+#line 408 "OAuth1Authenticator.c"
gchar* _tmp7_;
gchar* _tmp8_;
#line 53 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
@@ -378,21 +415,23 @@ gboolean publishing_authenticator_shotwell_oauth1_authenticator_is_persistent_se
_tmp0_ = _tmp8_ != NULL;
#line 53 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
_g_free0 (_tmp8_);
-#line 382 "OAuth1Authenticator.c"
+#line 419 "OAuth1Authenticator.c"
} else {
#line 51 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
_tmp0_ = FALSE;
-#line 386 "OAuth1Authenticator.c"
+#line 423 "OAuth1Authenticator.c"
}
#line 51 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
result = _tmp0_;
#line 51 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
return result;
-#line 392 "OAuth1Authenticator.c"
+#line 429 "OAuth1Authenticator.c"
}
-gchar* publishing_authenticator_shotwell_oauth1_authenticator_get_persistent_access_phase_username (PublishingAuthenticatorShotwellOAuth1Authenticator* self) {
+gchar*
+publishing_authenticator_shotwell_oauth1_authenticator_get_persistent_access_phase_username (PublishingAuthenticatorShotwellOAuth1Authenticator* self)
+{
gchar* result = NULL;
SpitPublishingPluginHost* _tmp0_;
gchar* _tmp1_;
@@ -406,13 +445,15 @@ gchar* publishing_authenticator_shotwell_oauth1_authenticator_get_persistent_acc
result = _tmp1_;
#line 57 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
return result;
-#line 410 "OAuth1Authenticator.c"
+#line 449 "OAuth1Authenticator.c"
}
-void publishing_authenticator_shotwell_oauth1_authenticator_set_persistent_access_phase_username (PublishingAuthenticatorShotwellOAuth1Authenticator* self, const gchar* username) {
+void
+publishing_authenticator_shotwell_oauth1_authenticator_set_persistent_access_phase_username (PublishingAuthenticatorShotwellOAuth1Authenticator* self,
+ const gchar* username)
+{
SpitPublishingPluginHost* _tmp0_;
- const gchar* _tmp1_;
#line 60 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_IS_AUTHENTICATOR (self));
#line 60 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
@@ -420,14 +461,14 @@ void publishing_authenticator_shotwell_oauth1_authenticator_set_persistent_acces
#line 61 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
_tmp0_ = self->host;
#line 61 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
- _tmp1_ = username;
-#line 61 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
- spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "access_phase_username", _tmp1_);
-#line 427 "OAuth1Authenticator.c"
+ spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "access_phase_username", username);
+#line 466 "OAuth1Authenticator.c"
}
-gchar* publishing_authenticator_shotwell_oauth1_authenticator_get_persistent_access_phase_token (PublishingAuthenticatorShotwellOAuth1Authenticator* self) {
+gchar*
+publishing_authenticator_shotwell_oauth1_authenticator_get_persistent_access_phase_token (PublishingAuthenticatorShotwellOAuth1Authenticator* self)
+{
gchar* result = NULL;
SpitPublishingPluginHost* _tmp0_;
gchar* _tmp1_;
@@ -441,13 +482,15 @@ gchar* publishing_authenticator_shotwell_oauth1_authenticator_get_persistent_acc
result = _tmp1_;
#line 65 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
return result;
-#line 445 "OAuth1Authenticator.c"
+#line 486 "OAuth1Authenticator.c"
}
-void publishing_authenticator_shotwell_oauth1_authenticator_set_persistent_access_phase_token (PublishingAuthenticatorShotwellOAuth1Authenticator* self, const gchar* token) {
+void
+publishing_authenticator_shotwell_oauth1_authenticator_set_persistent_access_phase_token (PublishingAuthenticatorShotwellOAuth1Authenticator* self,
+ const gchar* token)
+{
SpitPublishingPluginHost* _tmp0_;
- const gchar* _tmp1_;
#line 68 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_IS_AUTHENTICATOR (self));
#line 68 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
@@ -455,14 +498,14 @@ void publishing_authenticator_shotwell_oauth1_authenticator_set_persistent_acces
#line 69 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
_tmp0_ = self->host;
#line 69 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
- _tmp1_ = token;
-#line 69 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
- spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "access_phase_token", _tmp1_);
-#line 462 "OAuth1Authenticator.c"
+ spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "access_phase_token", token);
+#line 503 "OAuth1Authenticator.c"
}
-gchar* publishing_authenticator_shotwell_oauth1_authenticator_get_persistent_access_phase_token_secret (PublishingAuthenticatorShotwellOAuth1Authenticator* self) {
+gchar*
+publishing_authenticator_shotwell_oauth1_authenticator_get_persistent_access_phase_token_secret (PublishingAuthenticatorShotwellOAuth1Authenticator* self)
+{
gchar* result = NULL;
SpitPublishingPluginHost* _tmp0_;
gchar* _tmp1_;
@@ -476,13 +519,15 @@ gchar* publishing_authenticator_shotwell_oauth1_authenticator_get_persistent_acc
result = _tmp1_;
#line 73 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
return result;
-#line 480 "OAuth1Authenticator.c"
+#line 523 "OAuth1Authenticator.c"
}
-void publishing_authenticator_shotwell_oauth1_authenticator_set_persistent_access_phase_token_secret (PublishingAuthenticatorShotwellOAuth1Authenticator* self, const gchar* secret) {
+void
+publishing_authenticator_shotwell_oauth1_authenticator_set_persistent_access_phase_token_secret (PublishingAuthenticatorShotwellOAuth1Authenticator* self,
+ const gchar* secret)
+{
SpitPublishingPluginHost* _tmp0_;
- const gchar* _tmp1_;
#line 76 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_IS_AUTHENTICATOR (self));
#line 76 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
@@ -490,35 +535,41 @@ void publishing_authenticator_shotwell_oauth1_authenticator_set_persistent_acces
#line 77 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
_tmp0_ = self->host;
#line 77 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
- _tmp1_ = secret;
-#line 77 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
- spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "access_phase_token_secret", _tmp1_);
-#line 497 "OAuth1Authenticator.c"
+ spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "access_phase_token_secret", secret);
+#line 540 "OAuth1Authenticator.c"
}
-static GVariant* _variant_new3 (gchar* value) {
+static GVariant*
+_variant_new3 (gchar* value)
+{
#line 82 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
return g_variant_ref_sink (g_variant_new_string (value));
-#line 504 "OAuth1Authenticator.c"
+#line 549 "OAuth1Authenticator.c"
}
-static GVariant* _variant_new4 (gchar* value) {
+static GVariant*
+_variant_new4 (gchar* value)
+{
#line 83 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
return g_variant_ref_sink (g_variant_new_string (value));
-#line 511 "OAuth1Authenticator.c"
+#line 558 "OAuth1Authenticator.c"
}
-static GVariant* _variant_new5 (gchar* value) {
+static GVariant*
+_variant_new5 (gchar* value)
+{
#line 84 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
return g_variant_ref_sink (g_variant_new_string (value));
-#line 518 "OAuth1Authenticator.c"
+#line 567 "OAuth1Authenticator.c"
}
-void publishing_authenticator_shotwell_oauth1_authenticator_on_session_authenticated (PublishingAuthenticatorShotwellOAuth1Authenticator* self) {
+void
+publishing_authenticator_shotwell_oauth1_authenticator_on_session_authenticated (PublishingAuthenticatorShotwellOAuth1Authenticator* self)
+{
GHashTable* _tmp0_;
gchar* _tmp1_;
PublishingRESTSupportOAuth1Session* _tmp2_;
@@ -628,11 +679,13 @@ void publishing_authenticator_shotwell_oauth1_authenticator_on_session_authentic
_g_free0 (_tmp26_);
#line 91 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator), "authenticated");
-#line 632 "OAuth1Authenticator.c"
+#line 683 "OAuth1Authenticator.c"
}
-static void publishing_authenticator_shotwell_oauth1_authenticator_class_init (PublishingAuthenticatorShotwellOAuth1AuthenticatorClass * klass) {
+static void
+publishing_authenticator_shotwell_oauth1_authenticator_class_init (PublishingAuthenticatorShotwellOAuth1AuthenticatorClass * klass)
+{
#line 10 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
publishing_authenticator_shotwell_oauth1_authenticator_parent_class = g_type_class_peek_parent (klass);
#line 10 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
@@ -645,11 +698,13 @@ static void publishing_authenticator_shotwell_oauth1_authenticator_class_init (P
((PublishingAuthenticatorShotwellOAuth1AuthenticatorClass *) klass)->refresh = (void (*) (PublishingAuthenticatorShotwellOAuth1Authenticator *)) publishing_authenticator_shotwell_oauth1_authenticator_real_refresh;
#line 10 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
G_OBJECT_CLASS (klass)->finalize = publishing_authenticator_shotwell_oauth1_authenticator_finalize;
-#line 649 "OAuth1Authenticator.c"
+#line 702 "OAuth1Authenticator.c"
}
-static void publishing_authenticator_shotwell_oauth1_authenticator_spit_publishing_authenticator_interface_init (SpitPublishingAuthenticatorIface * iface) {
+static void
+publishing_authenticator_shotwell_oauth1_authenticator_spit_publishing_authenticator_interface_init (SpitPublishingAuthenticatorIface * iface)
+{
#line 10 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
publishing_authenticator_shotwell_oauth1_authenticator_spit_publishing_authenticator_parent_iface = g_type_interface_peek_parent (iface);
#line 10 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
@@ -662,15 +717,19 @@ static void publishing_authenticator_shotwell_oauth1_authenticator_spit_publishi
iface->logout = (void (*) (SpitPublishingAuthenticator *)) publishing_authenticator_shotwell_oauth1_authenticator_logout;
#line 10 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
iface->refresh = (void (*) (SpitPublishingAuthenticator *)) publishing_authenticator_shotwell_oauth1_authenticator_refresh;
-#line 666 "OAuth1Authenticator.c"
+#line 721 "OAuth1Authenticator.c"
}
-static void publishing_authenticator_shotwell_oauth1_authenticator_instance_init (PublishingAuthenticatorShotwellOAuth1Authenticator * self) {
+static void
+publishing_authenticator_shotwell_oauth1_authenticator_instance_init (PublishingAuthenticatorShotwellOAuth1Authenticator * self)
+{
}
-static void publishing_authenticator_shotwell_oauth1_authenticator_finalize (GObject * obj) {
+static void
+publishing_authenticator_shotwell_oauth1_authenticator_finalize (GObject * obj)
+{
PublishingAuthenticatorShotwellOAuth1Authenticator * self;
PublishingRESTSupportOAuth1Session* _tmp0_;
guint _tmp1_;
@@ -690,11 +749,13 @@ static void publishing_authenticator_shotwell_oauth1_authenticator_finalize (GOb
_g_object_unref0 (self->host);
#line 10 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
G_OBJECT_CLASS (publishing_authenticator_shotwell_oauth1_authenticator_parent_class)->finalize (obj);
-#line 694 "OAuth1Authenticator.c"
+#line 753 "OAuth1Authenticator.c"
}
-GType publishing_authenticator_shotwell_oauth1_authenticator_get_type (void) {
+GType
+publishing_authenticator_shotwell_oauth1_authenticator_get_type (void)
+{
static volatile gsize publishing_authenticator_shotwell_oauth1_authenticator_type_id__volatile = 0;
if (g_once_init_enter (&publishing_authenticator_shotwell_oauth1_authenticator_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingAuthenticatorShotwellOAuth1AuthenticatorClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_authenticator_shotwell_oauth1_authenticator_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingAuthenticatorShotwellOAuth1Authenticator), 0, (GInstanceInitFunc) publishing_authenticator_shotwell_oauth1_authenticator_instance_init, NULL };
diff --git a/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.c b/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.c
index 6ac8485..a9568e0 100644
--- a/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.c
+++ b/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.c
@@ -1,7 +1,8 @@
-/* ShotwellAuthenticatorFactory.c generated by valac 0.36.6, the Vala compiler
+/* ShotwellAuthenticatorFactory.c generated by valac 0.40.4, the Vala compiler
* generated from ShotwellAuthenticatorFactory.vala, do not modify */
+
#include <glib.h>
#include <glib-object.h>
#include "shotwell-plugin-dev-1.0.h"
@@ -21,6 +22,11 @@
typedef struct _PublishingAuthenticatorFactory PublishingAuthenticatorFactory;
typedef struct _PublishingAuthenticatorFactoryClass PublishingAuthenticatorFactoryClass;
typedef struct _PublishingAuthenticatorFactoryPrivate PublishingAuthenticatorFactoryPrivate;
+enum {
+ PUBLISHING_AUTHENTICATOR_FACTORY_0_PROPERTY,
+ PUBLISHING_AUTHENTICATOR_FACTORY_NUM_PROPERTIES
+};
+static GParamSpec* publishing_authenticator_factory_properties[PUBLISHING_AUTHENTICATOR_FACTORY_NUM_PROPERTIES];
#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
#define PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR (publishing_authenticator_shotwell_oauth1_authenticator_get_type ())
@@ -89,38 +95,49 @@ static PublishingAuthenticatorFactory* publishing_authenticator_factory_instance
static SpitPublishingAuthenticatorFactoryIface * publishing_authenticator_factory_spit_publishing_authenticator_factory_parent_iface = NULL;
GType publishing_authenticator_factory_get_type (void) G_GNUC_CONST;
-enum {
- PUBLISHING_AUTHENTICATOR_FACTORY_DUMMY_PROPERTY
-};
PublishingAuthenticatorFactory* publishing_authenticator_factory_get_instance (void);
PublishingAuthenticatorFactory* publishing_authenticator_factory_new (void);
PublishingAuthenticatorFactory* publishing_authenticator_factory_construct (GType object_type);
static GeeList* publishing_authenticator_factory_real_get_available_authenticators (SpitPublishingAuthenticatorFactory* base);
-static SpitPublishingAuthenticator* publishing_authenticator_factory_real_create (SpitPublishingAuthenticatorFactory* base, const gchar* provider, SpitPublishingPluginHost* host);
+static SpitPublishingAuthenticator* publishing_authenticator_factory_real_create (SpitPublishingAuthenticatorFactory* base,
+ const gchar* provider,
+ SpitPublishingPluginHost* host);
PublishingAuthenticatorShotwellFlickrFlickr* publishing_authenticator_shotwell_flickr_flickr_new (SpitPublishingPluginHost* host);
-PublishingAuthenticatorShotwellFlickrFlickr* publishing_authenticator_shotwell_flickr_flickr_construct (GType object_type, SpitPublishingPluginHost* host);
+PublishingAuthenticatorShotwellFlickrFlickr* publishing_authenticator_shotwell_flickr_flickr_construct (GType object_type,
+ SpitPublishingPluginHost* host);
GType publishing_authenticator_shotwell_oauth1_authenticator_get_type (void) G_GNUC_CONST;
GType publishing_authenticator_shotwell_flickr_flickr_get_type (void) G_GNUC_CONST;
PublishingAuthenticatorShotwellFacebookFacebook* publishing_authenticator_shotwell_facebook_facebook_new (SpitPublishingPluginHost* host);
-PublishingAuthenticatorShotwellFacebookFacebook* publishing_authenticator_shotwell_facebook_facebook_construct (GType object_type, SpitPublishingPluginHost* host);
+PublishingAuthenticatorShotwellFacebookFacebook* publishing_authenticator_shotwell_facebook_facebook_construct (GType object_type,
+ SpitPublishingPluginHost* host);
GType publishing_authenticator_shotwell_facebook_facebook_get_type (void) G_GNUC_CONST;
-PublishingAuthenticatorShotwellGoogleGoogle* publishing_authenticator_shotwell_google_google_new (const gchar* scope, const gchar* welcome_message, SpitPublishingPluginHost* host);
-PublishingAuthenticatorShotwellGoogleGoogle* publishing_authenticator_shotwell_google_google_construct (GType object_type, const gchar* scope, const gchar* welcome_message, SpitPublishingPluginHost* host);
+PublishingAuthenticatorShotwellGoogleGoogle* publishing_authenticator_shotwell_google_google_new (const gchar* scope,
+ const gchar* welcome_message,
+ SpitPublishingPluginHost* host);
+PublishingAuthenticatorShotwellGoogleGoogle* publishing_authenticator_shotwell_google_google_construct (GType object_type,
+ const gchar* scope,
+ const gchar* welcome_message,
+ SpitPublishingPluginHost* host);
GType publishing_authenticator_shotwell_google_google_get_type (void) G_GNUC_CONST;
PublishingAuthenticatorShotwellTumblrTumblr* publishing_authenticator_shotwell_tumblr_tumblr_new (SpitPublishingPluginHost* host);
-PublishingAuthenticatorShotwellTumblrTumblr* publishing_authenticator_shotwell_tumblr_tumblr_construct (GType object_type, SpitPublishingPluginHost* host);
+PublishingAuthenticatorShotwellTumblrTumblr* publishing_authenticator_shotwell_tumblr_tumblr_construct (GType object_type,
+ SpitPublishingPluginHost* host);
GType publishing_authenticator_shotwell_tumblr_tumblr_get_type (void) G_GNUC_CONST;
static void publishing_authenticator_factory_finalize (GObject * obj);
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
#line 10 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
return self ? g_object_ref (self) : NULL;
-#line 120 "ShotwellAuthenticatorFactory.c"
+#line 135 "ShotwellAuthenticatorFactory.c"
}
-PublishingAuthenticatorFactory* publishing_authenticator_factory_get_instance (void) {
+PublishingAuthenticatorFactory*
+publishing_authenticator_factory_get_instance (void)
+{
PublishingAuthenticatorFactory* result = NULL;
PublishingAuthenticatorFactory* _tmp0_;
PublishingAuthenticatorFactory* _tmp2_;
@@ -129,7 +146,7 @@ PublishingAuthenticatorFactory* publishing_authenticator_factory_get_instance (v
_tmp0_ = publishing_authenticator_factory_instance;
#line 6 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
if (_tmp0_ == NULL) {
-#line 133 "ShotwellAuthenticatorFactory.c"
+#line 150 "ShotwellAuthenticatorFactory.c"
PublishingAuthenticatorFactory* _tmp1_;
#line 7 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
_tmp1_ = publishing_authenticator_factory_new ();
@@ -137,7 +154,7 @@ PublishingAuthenticatorFactory* publishing_authenticator_factory_get_instance (v
_g_object_unref0 (publishing_authenticator_factory_instance);
#line 7 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
publishing_authenticator_factory_instance = _tmp1_;
-#line 141 "ShotwellAuthenticatorFactory.c"
+#line 158 "ShotwellAuthenticatorFactory.c"
}
#line 10 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
_tmp2_ = publishing_authenticator_factory_instance;
@@ -147,11 +164,13 @@ PublishingAuthenticatorFactory* publishing_authenticator_factory_get_instance (v
result = _tmp3_;
#line 10 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
return result;
-#line 151 "ShotwellAuthenticatorFactory.c"
+#line 168 "ShotwellAuthenticatorFactory.c"
}
-static GeeList* publishing_authenticator_factory_real_get_available_authenticators (SpitPublishingAuthenticatorFactory* base) {
+static GeeList*
+publishing_authenticator_factory_real_get_available_authenticators (SpitPublishingAuthenticatorFactory* base)
+{
PublishingAuthenticatorFactory * self;
GeeList* result = NULL;
GeeArrayList* list = NULL;
@@ -176,26 +195,29 @@ static GeeList* publishing_authenticator_factory_real_get_available_authenticato
result = G_TYPE_CHECK_INSTANCE_CAST (list, GEE_TYPE_LIST, GeeList);
#line 21 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
return result;
-#line 180 "ShotwellAuthenticatorFactory.c"
+#line 199 "ShotwellAuthenticatorFactory.c"
}
-static SpitPublishingAuthenticator* publishing_authenticator_factory_real_create (SpitPublishingAuthenticatorFactory* base, const gchar* provider, SpitPublishingPluginHost* host) {
+static SpitPublishingAuthenticator*
+publishing_authenticator_factory_real_create (SpitPublishingAuthenticatorFactory* base,
+ const gchar* provider,
+ SpitPublishingPluginHost* host)
+{
PublishingAuthenticatorFactory * self;
SpitPublishingAuthenticator* result = NULL;
const gchar* _tmp0_;
- const gchar* _tmp1_;
- GQuark _tmp3_ = 0U;
+ GQuark _tmp2_ = 0U;
#line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
- static GQuark _tmp2_label0 = 0;
+ static GQuark _tmp1_label0 = 0;
#line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
- static GQuark _tmp2_label1 = 0;
+ static GQuark _tmp1_label1 = 0;
#line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
- static GQuark _tmp2_label2 = 0;
+ static GQuark _tmp1_label2 = 0;
#line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
- static GQuark _tmp2_label3 = 0;
+ static GQuark _tmp1_label3 = 0;
#line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
- static GQuark _tmp2_label4 = 0;
+ static GQuark _tmp1_label4 = 0;
#line 24 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_TYPE_FACTORY, PublishingAuthenticatorFactory);
#line 24 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
@@ -205,182 +227,179 @@ static SpitPublishingAuthenticator* publishing_authenticator_factory_real_create
#line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
_tmp0_ = provider;
#line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
- _tmp1_ = _tmp0_;
-#line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
- _tmp3_ = (NULL == _tmp1_) ? 0 : g_quark_from_string (_tmp1_);
+ _tmp2_ = (NULL == _tmp0_) ? 0 : g_quark_from_string (_tmp0_);
#line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
- if (_tmp3_ == ((0 != _tmp2_label0) ? _tmp2_label0 : (_tmp2_label0 = g_quark_from_static_string ("flickr")))) {
+ if (_tmp2_ == ((0 != _tmp1_label0) ? _tmp1_label0 : (_tmp1_label0 = g_quark_from_static_string ("flickr")))) {
#line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
switch (0) {
-#line 216 "ShotwellAuthenticatorFactory.c"
+#line 236 "ShotwellAuthenticatorFactory.c"
default:
{
- SpitPublishingPluginHost* _tmp4_;
- PublishingAuthenticatorShotwellFlickrFlickr* _tmp5_;
+ PublishingAuthenticatorShotwellFlickrFlickr* _tmp3_;
#line 28 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
- _tmp4_ = host;
+ _tmp3_ = publishing_authenticator_shotwell_flickr_flickr_new (host);
#line 28 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
- _tmp5_ = publishing_authenticator_shotwell_flickr_flickr_new (_tmp4_);
-#line 28 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
- result = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator);
+ result = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator);
#line 28 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
return result;
-#line 229 "ShotwellAuthenticatorFactory.c"
+#line 246 "ShotwellAuthenticatorFactory.c"
}
}
- } else if (_tmp3_ == ((0 != _tmp2_label1) ? _tmp2_label1 : (_tmp2_label1 = g_quark_from_static_string ("facebook")))) {
+ } else if (_tmp2_ == ((0 != _tmp1_label1) ? _tmp1_label1 : (_tmp1_label1 = g_quark_from_static_string ("facebook")))) {
#line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
switch (0) {
-#line 235 "ShotwellAuthenticatorFactory.c"
+#line 252 "ShotwellAuthenticatorFactory.c"
default:
{
- SpitPublishingPluginHost* _tmp6_;
- PublishingAuthenticatorShotwellFacebookFacebook* _tmp7_;
+ PublishingAuthenticatorShotwellFacebookFacebook* _tmp4_;
#line 30 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
- _tmp6_ = host;
+ _tmp4_ = publishing_authenticator_shotwell_facebook_facebook_new (host);
#line 30 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
- _tmp7_ = publishing_authenticator_shotwell_facebook_facebook_new (_tmp6_);
-#line 30 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
- result = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator);
+ result = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator);
#line 30 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
return result;
-#line 248 "ShotwellAuthenticatorFactory.c"
+#line 262 "ShotwellAuthenticatorFactory.c"
}
}
- } else if (_tmp3_ == ((0 != _tmp2_label2) ? _tmp2_label2 : (_tmp2_label2 = g_quark_from_static_string ("picasa")))) {
+ } else if (_tmp2_ == ((0 != _tmp1_label2) ? _tmp1_label2 : (_tmp1_label2 = g_quark_from_static_string ("picasa")))) {
#line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
switch (0) {
-#line 254 "ShotwellAuthenticatorFactory.c"
+#line 268 "ShotwellAuthenticatorFactory.c"
default:
{
- SpitPublishingPluginHost* _tmp8_;
- PublishingAuthenticatorShotwellGoogleGoogle* _tmp9_;
-#line 32 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
- _tmp8_ = host;
+ PublishingAuthenticatorShotwellGoogleGoogle* _tmp5_;
#line 32 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
- _tmp9_ = publishing_authenticator_shotwell_google_google_new ("https://picasaweb.google.com/data/", _ ("You are not currently logged into Picasa Web Albums.\n" \
+ _tmp5_ = publishing_authenticator_shotwell_google_google_new ("https://picasaweb.google.com/data/", _ ("You are not currently logged into Picasa Web Albums.\n" \
"\n" \
"Click Log in to log into Picasa Web Albums in your Web browser. You wi" \
"ll have to authorize Shotwell Connect to link to your Picasa Web Album" \
-"s account."), _tmp8_);
+"s account."), host);
#line 32 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
- result = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator);
+ result = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator);
#line 32 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
return result;
-#line 267 "ShotwellAuthenticatorFactory.c"
+#line 278 "ShotwellAuthenticatorFactory.c"
}
}
- } else if (_tmp3_ == ((0 != _tmp2_label3) ? _tmp2_label3 : (_tmp2_label3 = g_quark_from_static_string ("youtube")))) {
+ } else if (_tmp2_ == ((0 != _tmp1_label3) ? _tmp1_label3 : (_tmp1_label3 = g_quark_from_static_string ("youtube")))) {
#line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
switch (0) {
-#line 273 "ShotwellAuthenticatorFactory.c"
+#line 284 "ShotwellAuthenticatorFactory.c"
default:
{
- SpitPublishingPluginHost* _tmp10_;
- PublishingAuthenticatorShotwellGoogleGoogle* _tmp11_;
-#line 35 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
- _tmp10_ = host;
+ PublishingAuthenticatorShotwellGoogleGoogle* _tmp6_;
#line 35 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
- _tmp11_ = publishing_authenticator_shotwell_google_google_new ("https://gdata.youtube.com/", _ ("You are not currently logged into YouTube.\n" \
+ _tmp6_ = publishing_authenticator_shotwell_google_google_new ("https://gdata.youtube.com/", _ ("You are not currently logged into YouTube.\n" \
"\n" \
"You must have already signed up for a Google account and set it up for" \
" use with YouTube to continue. You can set up most accounts by using y" \
-"our browser to log into the YouTube site at least once."), _tmp10_);
+"our browser to log into the YouTube site at least once."), host);
#line 35 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
- result = G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator);
+ result = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator);
#line 35 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
return result;
-#line 286 "ShotwellAuthenticatorFactory.c"
+#line 294 "ShotwellAuthenticatorFactory.c"
}
}
- } else if (_tmp3_ == ((0 != _tmp2_label4) ? _tmp2_label4 : (_tmp2_label4 = g_quark_from_static_string ("tumblr")))) {
+ } else if (_tmp2_ == ((0 != _tmp1_label4) ? _tmp1_label4 : (_tmp1_label4 = g_quark_from_static_string ("tumblr")))) {
#line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
switch (0) {
-#line 292 "ShotwellAuthenticatorFactory.c"
+#line 300 "ShotwellAuthenticatorFactory.c"
default:
{
- SpitPublishingPluginHost* _tmp12_;
- PublishingAuthenticatorShotwellTumblrTumblr* _tmp13_;
-#line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
- _tmp12_ = host;
+ PublishingAuthenticatorShotwellTumblrTumblr* _tmp7_;
#line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
- _tmp13_ = publishing_authenticator_shotwell_tumblr_tumblr_new (_tmp12_);
+ _tmp7_ = publishing_authenticator_shotwell_tumblr_tumblr_new (host);
#line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
- result = G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator);
+ result = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator);
#line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
return result;
-#line 305 "ShotwellAuthenticatorFactory.c"
+#line 310 "ShotwellAuthenticatorFactory.c"
}
}
} else {
#line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
switch (0) {
-#line 311 "ShotwellAuthenticatorFactory.c"
+#line 316 "ShotwellAuthenticatorFactory.c"
default:
{
#line 39 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
result = NULL;
#line 39 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
return result;
-#line 318 "ShotwellAuthenticatorFactory.c"
+#line 323 "ShotwellAuthenticatorFactory.c"
}
}
}
}
-PublishingAuthenticatorFactory* publishing_authenticator_factory_construct (GType object_type) {
+PublishingAuthenticatorFactory*
+publishing_authenticator_factory_construct (GType object_type)
+{
PublishingAuthenticatorFactory * self = NULL;
#line 2 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
self = (PublishingAuthenticatorFactory*) g_object_new (object_type, NULL);
#line 2 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
return self;
-#line 331 "ShotwellAuthenticatorFactory.c"
+#line 338 "ShotwellAuthenticatorFactory.c"
}
-PublishingAuthenticatorFactory* publishing_authenticator_factory_new (void) {
+PublishingAuthenticatorFactory*
+publishing_authenticator_factory_new (void)
+{
#line 2 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
return publishing_authenticator_factory_construct (PUBLISHING_AUTHENTICATOR_TYPE_FACTORY);
-#line 338 "ShotwellAuthenticatorFactory.c"
+#line 347 "ShotwellAuthenticatorFactory.c"
}
-static void publishing_authenticator_factory_class_init (PublishingAuthenticatorFactoryClass * klass) {
+static void
+publishing_authenticator_factory_class_init (PublishingAuthenticatorFactoryClass * klass)
+{
#line 2 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
publishing_authenticator_factory_parent_class = g_type_class_peek_parent (klass);
#line 2 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
G_OBJECT_CLASS (klass)->finalize = publishing_authenticator_factory_finalize;
-#line 347 "ShotwellAuthenticatorFactory.c"
+#line 358 "ShotwellAuthenticatorFactory.c"
}
-static void publishing_authenticator_factory_spit_publishing_authenticator_factory_interface_init (SpitPublishingAuthenticatorFactoryIface * iface) {
+static void
+publishing_authenticator_factory_spit_publishing_authenticator_factory_interface_init (SpitPublishingAuthenticatorFactoryIface * iface)
+{
#line 2 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
publishing_authenticator_factory_spit_publishing_authenticator_factory_parent_iface = g_type_interface_peek_parent (iface);
#line 2 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
iface->get_available_authenticators = (GeeList* (*) (SpitPublishingAuthenticatorFactory *)) publishing_authenticator_factory_real_get_available_authenticators;
#line 2 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
iface->create = (SpitPublishingAuthenticator* (*) (SpitPublishingAuthenticatorFactory *, const gchar*, SpitPublishingPluginHost*)) publishing_authenticator_factory_real_create;
-#line 358 "ShotwellAuthenticatorFactory.c"
+#line 371 "ShotwellAuthenticatorFactory.c"
}
-static void publishing_authenticator_factory_instance_init (PublishingAuthenticatorFactory * self) {
+static void
+publishing_authenticator_factory_instance_init (PublishingAuthenticatorFactory * self)
+{
}
-static void publishing_authenticator_factory_finalize (GObject * obj) {
+static void
+publishing_authenticator_factory_finalize (GObject * obj)
+{
PublishingAuthenticatorFactory * self;
#line 2 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_AUTHENTICATOR_TYPE_FACTORY, PublishingAuthenticatorFactory);
#line 2 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
G_OBJECT_CLASS (publishing_authenticator_factory_parent_class)->finalize (obj);
-#line 372 "ShotwellAuthenticatorFactory.c"
+#line 389 "ShotwellAuthenticatorFactory.c"
}
-GType publishing_authenticator_factory_get_type (void) {
+GType
+publishing_authenticator_factory_get_type (void)
+{
static volatile gsize publishing_authenticator_factory_type_id__volatile = 0;
if (g_once_init_enter (&publishing_authenticator_factory_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingAuthenticatorFactoryClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_authenticator_factory_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingAuthenticatorFactory), 0, (GInstanceInitFunc) publishing_authenticator_factory_instance_init, NULL };
diff --git a/plugins/authenticator/shotwell/TumblrAuthenticator.c b/plugins/authenticator/shotwell/TumblrAuthenticator.c
index 1ebc0f4..5fd814c 100644
--- a/plugins/authenticator/shotwell/TumblrAuthenticator.c
+++ b/plugins/authenticator/shotwell/TumblrAuthenticator.c
@@ -1,4 +1,4 @@
-/* TumblrAuthenticator.c generated by valac 0.36.6, the Vala compiler
+/* TumblrAuthenticator.c generated by valac 0.40.4, the Vala compiler
* generated from TumblrAuthenticator.vala, do not modify */
/* Copyright 2012 BJA Electronics
@@ -10,6 +10,7 @@
* (version 2.1 or later). See the COPYING file in this distribution.
*/
+
#include <glib.h>
#include <glib-object.h>
#include <stdlib.h>
@@ -31,6 +32,11 @@
typedef struct _PublishingAuthenticatorShotwellTumblrAuthenticationPane PublishingAuthenticatorShotwellTumblrAuthenticationPane;
typedef struct _PublishingAuthenticatorShotwellTumblrAuthenticationPaneClass PublishingAuthenticatorShotwellTumblrAuthenticationPaneClass;
typedef struct _PublishingAuthenticatorShotwellTumblrAuthenticationPanePrivate PublishingAuthenticatorShotwellTumblrAuthenticationPanePrivate;
+enum {
+ PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_AUTHENTICATION_PANE_0_PROPERTY,
+ PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_AUTHENTICATION_PANE_NUM_PROPERTIES
+};
+static GParamSpec* publishing_authenticator_shotwell_tumblr_authentication_pane_properties[PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_AUTHENTICATION_PANE_NUM_PROPERTIES];
#define PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_AUTHENTICATION_PANE_TYPE_MODE (publishing_authenticator_shotwell_tumblr_authentication_pane_mode_get_type ())
#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
@@ -38,9 +44,9 @@ typedef struct _PublishingAuthenticatorShotwellTumblrAuthenticationPanePrivate P
#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
enum {
PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_AUTHENTICATION_PANE_LOGIN_SIGNAL,
- PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_AUTHENTICATION_PANE_LAST_SIGNAL
+ PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_AUTHENTICATION_PANE_NUM_SIGNALS
};
-static guint publishing_authenticator_shotwell_tumblr_authentication_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_AUTHENTICATION_PANE_LAST_SIGNAL] = {0};
+static guint publishing_authenticator_shotwell_tumblr_authentication_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_AUTHENTICATION_PANE_NUM_SIGNALS] = {0};
#define PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TYPE_ACCESS_TOKEN_FETCH_TRANSACTION (publishing_authenticator_shotwell_tumblr_access_token_fetch_transaction_get_type ())
#define PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_ACCESS_TOKEN_FETCH_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TYPE_ACCESS_TOKEN_FETCH_TRANSACTION, PublishingAuthenticatorShotwellTumblrAccessTokenFetchTransaction))
@@ -74,6 +80,11 @@ typedef struct _PublishingAuthenticatorShotwellOAuth1AuthenticatorPrivate Publis
typedef struct _PublishingAuthenticatorShotwellTumblrTumblr PublishingAuthenticatorShotwellTumblrTumblr;
typedef struct _PublishingAuthenticatorShotwellTumblrTumblrClass PublishingAuthenticatorShotwellTumblrTumblrClass;
typedef struct _PublishingAuthenticatorShotwellTumblrTumblrPrivate PublishingAuthenticatorShotwellTumblrTumblrPrivate;
+enum {
+ PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TUMBLR_0_PROPERTY,
+ PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TUMBLR_NUM_PROPERTIES
+};
+static GParamSpec* publishing_authenticator_shotwell_tumblr_tumblr_properties[PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TUMBLR_NUM_PROPERTIES];
#define _publishing_rest_support_transaction_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rest_support_transaction_unref (var), NULL)))
#define _g_hash_table_unref0(var) ((var == NULL) ? NULL : (var = (g_hash_table_unref (var), NULL)))
@@ -149,60 +160,86 @@ static gpointer publishing_authenticator_shotwell_tumblr_tumblr_parent_class = N
#define PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_ENCODE_RFC_3986_EXTRA "!*'();:@&=+$,/?%#[] \\"
GType publishing_authenticator_shotwell_tumblr_authentication_pane_get_type (void) G_GNUC_CONST;
#define PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_AUTHENTICATION_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TYPE_AUTHENTICATION_PANE, PublishingAuthenticatorShotwellTumblrAuthenticationPanePrivate))
-enum {
- PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_AUTHENTICATION_PANE_DUMMY_PROPERTY
-};
GType publishing_authenticator_shotwell_tumblr_authentication_pane_mode_get_type (void) G_GNUC_CONST;
PublishingAuthenticatorShotwellTumblrAuthenticationPane* publishing_authenticator_shotwell_tumblr_authentication_pane_new (PublishingAuthenticatorShotwellTumblrAuthenticationPaneMode mode);
-PublishingAuthenticatorShotwellTumblrAuthenticationPane* publishing_authenticator_shotwell_tumblr_authentication_pane_construct (GType object_type, PublishingAuthenticatorShotwellTumblrAuthenticationPaneMode mode);
+PublishingAuthenticatorShotwellTumblrAuthenticationPane* publishing_authenticator_shotwell_tumblr_authentication_pane_construct (GType object_type,
+ PublishingAuthenticatorShotwellTumblrAuthenticationPaneMode mode);
static void publishing_authenticator_shotwell_tumblr_authentication_pane_on_user_changed (PublishingAuthenticatorShotwellTumblrAuthenticationPane* self);
-static void _publishing_authenticator_shotwell_tumblr_authentication_pane_on_user_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self);
+static void _publishing_authenticator_shotwell_tumblr_authentication_pane_on_user_changed_gtk_editable_changed (GtkEditable* _sender,
+ gpointer self);
static void publishing_authenticator_shotwell_tumblr_authentication_pane_on_password_changed (PublishingAuthenticatorShotwellTumblrAuthenticationPane* self);
-static void _publishing_authenticator_shotwell_tumblr_authentication_pane_on_password_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self);
+static void _publishing_authenticator_shotwell_tumblr_authentication_pane_on_password_changed_gtk_editable_changed (GtkEditable* _sender,
+ gpointer self);
static void publishing_authenticator_shotwell_tumblr_authentication_pane_on_login_button_clicked (PublishingAuthenticatorShotwellTumblrAuthenticationPane* self);
-static void _publishing_authenticator_shotwell_tumblr_authentication_pane_on_login_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void _publishing_authenticator_shotwell_tumblr_authentication_pane_on_login_button_clicked_gtk_button_clicked (GtkButton* _sender,
+ gpointer self);
GtkWidget* publishing_authenticator_shotwell_tumblr_authentication_pane_get_default_widget (PublishingAuthenticatorShotwellTumblrAuthenticationPane* self);
static void publishing_authenticator_shotwell_tumblr_authentication_pane_update_login_button_sensitivity (PublishingAuthenticatorShotwellTumblrAuthenticationPane* self);
static GtkWidget* publishing_authenticator_shotwell_tumblr_authentication_pane_real_get_widget (SpitPublishingDialogPane* base);
static SpitPublishingDialogPaneGeometryOptions publishing_authenticator_shotwell_tumblr_authentication_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base);
static void publishing_authenticator_shotwell_tumblr_authentication_pane_real_on_pane_installed (SpitPublishingDialogPane* base);
static void publishing_authenticator_shotwell_tumblr_authentication_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base);
-static void g_cclosure_user_marshal_VOID__STRING_STRING (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
+static void g_cclosure_user_marshal_VOID__STRING_STRING (GClosure * closure,
+ GValue * return_value,
+ guint n_param_values,
+ const GValue * param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data);
static void publishing_authenticator_shotwell_tumblr_authentication_pane_finalize (GObject * obj);
GType publishing_authenticator_shotwell_tumblr_access_token_fetch_transaction_get_type (void) G_GNUC_CONST;
-enum {
- PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_ACCESS_TOKEN_FETCH_TRANSACTION_DUMMY_PROPERTY
-};
-PublishingAuthenticatorShotwellTumblrAccessTokenFetchTransaction* publishing_authenticator_shotwell_tumblr_access_token_fetch_transaction_new (PublishingRESTSupportOAuth1Session* session, const gchar* username, const gchar* password);
-PublishingAuthenticatorShotwellTumblrAccessTokenFetchTransaction* publishing_authenticator_shotwell_tumblr_access_token_fetch_transaction_construct (GType object_type, PublishingRESTSupportOAuth1Session* session, const gchar* username, const gchar* password);
+PublishingAuthenticatorShotwellTumblrAccessTokenFetchTransaction* publishing_authenticator_shotwell_tumblr_access_token_fetch_transaction_new (PublishingRESTSupportOAuth1Session* session,
+ const gchar* username,
+ const gchar* password);
+PublishingAuthenticatorShotwellTumblrAccessTokenFetchTransaction* publishing_authenticator_shotwell_tumblr_access_token_fetch_transaction_construct (GType object_type,
+ PublishingRESTSupportOAuth1Session* session,
+ const gchar* username,
+ const gchar* password);
GType publishing_authenticator_shotwell_oauth1_authenticator_get_type (void) G_GNUC_CONST;
GType publishing_authenticator_shotwell_tumblr_tumblr_get_type (void) G_GNUC_CONST;
-enum {
- PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TUMBLR_DUMMY_PROPERTY
-};
PublishingAuthenticatorShotwellTumblrTumblr* publishing_authenticator_shotwell_tumblr_tumblr_new (SpitPublishingPluginHost* host);
-PublishingAuthenticatorShotwellTumblrTumblr* publishing_authenticator_shotwell_tumblr_tumblr_construct (GType object_type, SpitPublishingPluginHost* host);
-PublishingAuthenticatorShotwellOAuth1Authenticator* publishing_authenticator_shotwell_oauth1_authenticator_construct (GType object_type, const gchar* api_key, const gchar* api_secret, SpitPublishingPluginHost* host);
+PublishingAuthenticatorShotwellTumblrTumblr* publishing_authenticator_shotwell_tumblr_tumblr_construct (GType object_type,
+ SpitPublishingPluginHost* host);
+PublishingAuthenticatorShotwellOAuth1Authenticator* publishing_authenticator_shotwell_oauth1_authenticator_construct (GType object_type,
+ const gchar* api_key,
+ const gchar* api_secret,
+ SpitPublishingPluginHost* host);
static void publishing_authenticator_shotwell_tumblr_tumblr_real_authenticate (PublishingAuthenticatorShotwellOAuth1Authenticator* base);
gboolean publishing_authenticator_shotwell_oauth1_authenticator_is_persistent_session_valid (PublishingAuthenticatorShotwellOAuth1Authenticator* self);
gchar* publishing_authenticator_shotwell_oauth1_authenticator_get_persistent_access_phase_token (PublishingAuthenticatorShotwellOAuth1Authenticator* self);
gchar* publishing_authenticator_shotwell_oauth1_authenticator_get_persistent_access_phase_token_secret (PublishingAuthenticatorShotwellOAuth1Authenticator* self);
-static void publishing_authenticator_shotwell_tumblr_tumblr_do_show_authentication_pane (PublishingAuthenticatorShotwellTumblrTumblr* self, PublishingAuthenticatorShotwellTumblrAuthenticationPaneMode mode);
+static void publishing_authenticator_shotwell_tumblr_tumblr_do_show_authentication_pane (PublishingAuthenticatorShotwellTumblrTumblr* self,
+ PublishingAuthenticatorShotwellTumblrAuthenticationPaneMode mode);
static gboolean publishing_authenticator_shotwell_tumblr_tumblr_real_can_logout (PublishingAuthenticatorShotwellOAuth1Authenticator* base);
static void publishing_authenticator_shotwell_tumblr_tumblr_real_logout (PublishingAuthenticatorShotwellOAuth1Authenticator* base);
void publishing_authenticator_shotwell_oauth1_authenticator_invalidate_persistent_session (PublishingAuthenticatorShotwellOAuth1Authenticator* self);
static void publishing_authenticator_shotwell_tumblr_tumblr_real_refresh (PublishingAuthenticatorShotwellOAuth1Authenticator* base);
-static void publishing_authenticator_shotwell_tumblr_tumblr_on_authentication_pane_login_clicked (PublishingAuthenticatorShotwellTumblrTumblr* self, const gchar* username, const gchar* password);
-static void _publishing_authenticator_shotwell_tumblr_tumblr_on_authentication_pane_login_clicked_publishing_authenticator_shotwell_tumblr_authentication_pane_login (PublishingAuthenticatorShotwellTumblrAuthenticationPane* _sender, const gchar* user, const gchar* password, gpointer self);
-static void publishing_authenticator_shotwell_tumblr_tumblr_do_network_login (PublishingAuthenticatorShotwellTumblrTumblr* self, const gchar* username, const gchar* password);
-static void publishing_authenticator_shotwell_tumblr_tumblr_on_auth_request_txn_completed (PublishingAuthenticatorShotwellTumblrTumblr* self, PublishingRESTSupportTransaction* txn);
-static void _publishing_authenticator_shotwell_tumblr_tumblr_on_auth_request_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
-static void publishing_authenticator_shotwell_tumblr_tumblr_on_auth_request_txn_error (PublishingAuthenticatorShotwellTumblrTumblr* self, PublishingRESTSupportTransaction* txn, GError* err);
-static void _publishing_authenticator_shotwell_tumblr_tumblr_on_auth_request_txn_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self);
-static void publishing_authenticator_shotwell_tumblr_tumblr_do_parse_token_info_from_auth_request (PublishingAuthenticatorShotwellTumblrTumblr* self, const gchar* response);
-
-
-GType publishing_authenticator_shotwell_tumblr_authentication_pane_mode_get_type (void) {
+static void publishing_authenticator_shotwell_tumblr_tumblr_on_authentication_pane_login_clicked (PublishingAuthenticatorShotwellTumblrTumblr* self,
+ const gchar* username,
+ const gchar* password);
+static void _publishing_authenticator_shotwell_tumblr_tumblr_on_authentication_pane_login_clicked_publishing_authenticator_shotwell_tumblr_authentication_pane_login (PublishingAuthenticatorShotwellTumblrAuthenticationPane* _sender,
+ const gchar* user,
+ const gchar* password,
+ gpointer self);
+static void publishing_authenticator_shotwell_tumblr_tumblr_do_network_login (PublishingAuthenticatorShotwellTumblrTumblr* self,
+ const gchar* username,
+ const gchar* password);
+static void publishing_authenticator_shotwell_tumblr_tumblr_on_auth_request_txn_completed (PublishingAuthenticatorShotwellTumblrTumblr* self,
+ PublishingRESTSupportTransaction* txn);
+static void _publishing_authenticator_shotwell_tumblr_tumblr_on_auth_request_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+ gpointer self);
+static void publishing_authenticator_shotwell_tumblr_tumblr_on_auth_request_txn_error (PublishingAuthenticatorShotwellTumblrTumblr* self,
+ PublishingRESTSupportTransaction* txn,
+ GError* err);
+static void _publishing_authenticator_shotwell_tumblr_tumblr_on_auth_request_txn_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+ GError* err,
+ gpointer self);
+static void publishing_authenticator_shotwell_tumblr_tumblr_do_parse_token_info_from_auth_request (PublishingAuthenticatorShotwellTumblrTumblr* self,
+ const gchar* response);
+
+
+GType
+publishing_authenticator_shotwell_tumblr_authentication_pane_mode_get_type (void)
+{
static volatile gsize publishing_authenticator_shotwell_tumblr_authentication_pane_mode_type_id__volatile = 0;
if (g_once_init_enter (&publishing_authenticator_shotwell_tumblr_authentication_pane_mode_type_id__volatile)) {
static const GEnumValue values[] = {{PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_AUTHENTICATION_PANE_MODE_INTRO, "PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_AUTHENTICATION_PANE_MODE_INTRO", "intro"}, {PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_AUTHENTICATION_PANE_MODE_FAILED_RETRY_USER, "PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_AUTHENTICATION_PANE_MODE_FAILED_RETRY_USER", "failed-retry-user"}, {0, NULL, NULL}};
@@ -214,35 +251,49 @@ GType publishing_authenticator_shotwell_tumblr_authentication_pane_mode_get_type
}
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
#line 43 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
return self ? g_object_ref (self) : NULL;
-#line 221 "TumblrAuthenticator.c"
+#line 260 "TumblrAuthenticator.c"
}
-static void _publishing_authenticator_shotwell_tumblr_authentication_pane_on_user_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
+static void
+_publishing_authenticator_shotwell_tumblr_authentication_pane_on_user_changed_gtk_editable_changed (GtkEditable* _sender,
+ gpointer self)
+{
#line 65 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
publishing_authenticator_shotwell_tumblr_authentication_pane_on_user_changed ((PublishingAuthenticatorShotwellTumblrAuthenticationPane*) self);
-#line 228 "TumblrAuthenticator.c"
+#line 270 "TumblrAuthenticator.c"
}
-static void _publishing_authenticator_shotwell_tumblr_authentication_pane_on_password_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
+static void
+_publishing_authenticator_shotwell_tumblr_authentication_pane_on_password_changed_gtk_editable_changed (GtkEditable* _sender,
+ gpointer self)
+{
#line 66 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
publishing_authenticator_shotwell_tumblr_authentication_pane_on_password_changed ((PublishingAuthenticatorShotwellTumblrAuthenticationPane*) self);
-#line 235 "TumblrAuthenticator.c"
+#line 280 "TumblrAuthenticator.c"
}
-static void _publishing_authenticator_shotwell_tumblr_authentication_pane_on_login_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+_publishing_authenticator_shotwell_tumblr_authentication_pane_on_login_button_clicked_gtk_button_clicked (GtkButton* _sender,
+ gpointer self)
+{
#line 67 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
publishing_authenticator_shotwell_tumblr_authentication_pane_on_login_button_clicked ((PublishingAuthenticatorShotwellTumblrAuthenticationPane*) self);
-#line 242 "TumblrAuthenticator.c"
+#line 290 "TumblrAuthenticator.c"
}
-PublishingAuthenticatorShotwellTumblrAuthenticationPane* publishing_authenticator_shotwell_tumblr_authentication_pane_construct (GType object_type, PublishingAuthenticatorShotwellTumblrAuthenticationPaneMode mode) {
+PublishingAuthenticatorShotwellTumblrAuthenticationPane*
+publishing_authenticator_shotwell_tumblr_authentication_pane_construct (GType object_type,
+ PublishingAuthenticatorShotwellTumblrAuthenticationPaneMode mode)
+{
PublishingAuthenticatorShotwellTumblrAuthenticationPane * self = NULL;
GtkBox* _tmp0_;
GError * _inner_error_ = NULL;
@@ -256,7 +307,7 @@ PublishingAuthenticatorShotwellTumblrAuthenticationPane* publishing_authenticato
_g_object_unref0 (self->priv->pane_widget);
#line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
self->priv->pane_widget = _tmp0_;
-#line 260 "TumblrAuthenticator.c"
+#line 311 "TumblrAuthenticator.c"
{
GtkBuilder* _tmp1_;
GtkBuilder* _tmp2_;
@@ -269,25 +320,24 @@ PublishingAuthenticatorShotwellTumblrAuthenticationPane* publishing_authenticato
GtkBuilder* _tmp7_;
GObject* _tmp8_;
GtkLabel* _tmp9_;
- PublishingAuthenticatorShotwellTumblrAuthenticationPaneMode _tmp10_;
- GtkBuilder* _tmp17_;
- GObject* _tmp18_;
- GtkEntry* _tmp19_;
- GtkBuilder* _tmp20_;
- GObject* _tmp21_;
- GtkEntry* _tmp22_;
- GtkBuilder* _tmp23_;
- GObject* _tmp24_;
- GtkButton* _tmp25_;
+ GtkBuilder* _tmp16_;
+ GObject* _tmp17_;
+ GtkEntry* _tmp18_;
+ GtkBuilder* _tmp19_;
+ GObject* _tmp20_;
+ GtkEntry* _tmp21_;
+ GtkBuilder* _tmp22_;
+ GObject* _tmp23_;
+ GtkButton* _tmp24_;
+ GtkEntry* _tmp25_;
GtkEntry* _tmp26_;
- GtkEntry* _tmp27_;
- GtkButton* _tmp28_;
- GtkWidget* _tmp29_;
+ GtkButton* _tmp27_;
+ GtkWidget* _tmp28_;
+ GtkContainer* _tmp29_;
GtkContainer* _tmp30_;
- GtkContainer* _tmp31_;
- GtkWidget* _tmp32_;
- GtkBox* _tmp33_;
- GtkWidget* _tmp34_;
+ GtkWidget* _tmp31_;
+ GtkBox* _tmp32_;
+ GtkWidget* _tmp33_;
#line 40 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
_tmp1_ = gtk_builder_new ();
#line 40 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
@@ -300,7 +350,7 @@ PublishingAuthenticatorShotwellTumblrAuthenticationPane* publishing_authenticato
gtk_builder_add_from_resource (_tmp2_, PLUGIN_RESOURCE_PATH "/tumblr_authentication_pane.ui", &_inner_error_);
#line 41 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 304 "TumblrAuthenticator.c"
+#line 354 "TumblrAuthenticator.c"
goto __catch8_g_error;
}
#line 42 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
@@ -324,137 +374,135 @@ PublishingAuthenticatorShotwellTumblrAuthenticationPane* publishing_authenticato
#line 45 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
message_label = _tmp9_;
#line 46 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp10_ = mode;
-#line 46 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- switch (_tmp10_) {
+ switch (mode) {
#line 46 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
case PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_AUTHENTICATION_PANE_MODE_INTRO:
-#line 333 "TumblrAuthenticator.c"
+#line 381 "TumblrAuthenticator.c"
{
- GtkLabel* _tmp11_;
- const gchar* _tmp12_;
+ GtkLabel* _tmp10_;
+ const gchar* _tmp11_;
#line 48 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp11_ = message_label;
+ _tmp10_ = message_label;
#line 48 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp12_ = publishing_authenticator_shotwell_tumblr_authentication_pane_INTRO_MESSAGE;
+ _tmp11_ = publishing_authenticator_shotwell_tumblr_authentication_pane_INTRO_MESSAGE;
#line 48 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- gtk_label_set_text (_tmp11_, _tmp12_);
+ gtk_label_set_text (_tmp10_, _tmp11_);
#line 49 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
break;
-#line 345 "TumblrAuthenticator.c"
+#line 393 "TumblrAuthenticator.c"
}
#line 46 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
case PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_AUTHENTICATION_PANE_MODE_FAILED_RETRY_USER:
-#line 349 "TumblrAuthenticator.c"
+#line 397 "TumblrAuthenticator.c"
{
- GtkLabel* _tmp13_;
- const gchar* _tmp14_;
+ GtkLabel* _tmp12_;
+ const gchar* _tmp13_;
+ gchar* _tmp14_;
gchar* _tmp15_;
- gchar* _tmp16_;
#line 52 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp13_ = message_label;
+ _tmp12_ = message_label;
#line 52 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp14_ = publishing_authenticator_shotwell_tumblr_authentication_pane_FAILED_RETRY_USER_MESSAGE;
+ _tmp13_ = publishing_authenticator_shotwell_tumblr_authentication_pane_FAILED_RETRY_USER_MESSAGE;
#line 52 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp15_ = g_strdup_printf ("<b>%s</b>\n\n%s", _ ("Invalid User Name or Password"), _tmp14_);
+ _tmp14_ = g_strdup_printf ("<b>%s</b>\n\n%s", _ ("Invalid User Name or Password"), _tmp13_);
#line 52 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp16_ = _tmp15_;
+ _tmp15_ = _tmp14_;
#line 52 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- gtk_label_set_markup (_tmp13_, _tmp16_);
+ gtk_label_set_markup (_tmp12_, _tmp15_);
#line 52 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _g_free0 (_tmp16_);
+ _g_free0 (_tmp15_);
#line 54 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
break;
-#line 369 "TumblrAuthenticator.c"
+#line 417 "TumblrAuthenticator.c"
}
default:
#line 46 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
break;
-#line 374 "TumblrAuthenticator.c"
+#line 422 "TumblrAuthenticator.c"
}
#line 57 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp17_ = self->priv->builder;
+ _tmp16_ = self->priv->builder;
#line 57 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp18_ = gtk_builder_get_object (_tmp17_, "username_entry");
+ _tmp17_ = gtk_builder_get_object (_tmp16_, "username_entry");
#line 57 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp19_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp18_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp18_) : NULL);
+ _tmp18_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp17_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp17_) : NULL);
#line 57 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
_g_object_unref0 (self->priv->username_entry);
#line 57 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- self->priv->username_entry = _tmp19_;
+ self->priv->username_entry = _tmp18_;
#line 59 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp20_ = self->priv->builder;
+ _tmp19_ = self->priv->builder;
#line 59 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp21_ = gtk_builder_get_object (_tmp20_, "password_entry");
+ _tmp20_ = gtk_builder_get_object (_tmp19_, "password_entry");
#line 59 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp22_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp21_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp21_) : NULL);
+ _tmp21_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp20_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp20_) : NULL);
#line 59 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
_g_object_unref0 (self->priv->password_entry);
#line 59 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- self->priv->password_entry = _tmp22_;
+ self->priv->password_entry = _tmp21_;
#line 63 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp23_ = self->priv->builder;
+ _tmp22_ = self->priv->builder;
#line 63 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp24_ = gtk_builder_get_object (_tmp23_, "login_button");
+ _tmp23_ = gtk_builder_get_object (_tmp22_, "login_button");
#line 63 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp25_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp24_, gtk_button_get_type ()) ? ((GtkButton*) _tmp24_) : NULL);
+ _tmp24_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp23_, gtk_button_get_type ()) ? ((GtkButton*) _tmp23_) : NULL);
#line 63 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
_g_object_unref0 (self->priv->login_button);
#line 63 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- self->priv->login_button = _tmp25_;
+ self->priv->login_button = _tmp24_;
#line 65 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp26_ = self->priv->username_entry;
+ _tmp25_ = self->priv->username_entry;
#line 65 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_authenticator_shotwell_tumblr_authentication_pane_on_user_changed_gtk_editable_changed, self, 0);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_editable_get_type (), GtkEditable), "changed", (GCallback) _publishing_authenticator_shotwell_tumblr_authentication_pane_on_user_changed_gtk_editable_changed, self, 0);
#line 66 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp27_ = self->priv->password_entry;
+ _tmp26_ = self->priv->password_entry;
#line 66 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_authenticator_shotwell_tumblr_authentication_pane_on_password_changed_gtk_editable_changed, self, 0);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_editable_get_type (), GtkEditable), "changed", (GCallback) _publishing_authenticator_shotwell_tumblr_authentication_pane_on_password_changed_gtk_editable_changed, self, 0);
#line 67 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp28_ = self->priv->login_button;
+ _tmp27_ = self->priv->login_button;
#line 67 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- g_signal_connect_object (_tmp28_, "clicked", (GCallback) _publishing_authenticator_shotwell_tumblr_authentication_pane_on_login_button_clicked_gtk_button_clicked, self, 0);
+ g_signal_connect_object (_tmp27_, "clicked", (GCallback) _publishing_authenticator_shotwell_tumblr_authentication_pane_on_login_button_clicked_gtk_button_clicked, self, 0);
#line 69 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp29_ = content;
+ _tmp28_ = content;
#line 69 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp30_ = gtk_widget_get_parent (_tmp29_);
+ _tmp29_ = gtk_widget_get_parent (_tmp28_);
#line 69 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp31_ = _tmp30_;
+ _tmp30_ = _tmp29_;
#line 69 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp32_ = content;
+ _tmp31_ = content;
#line 69 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- gtk_container_remove (_tmp31_, _tmp32_);
+ gtk_container_remove (_tmp30_, _tmp31_);
#line 70 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp33_ = self->priv->pane_widget;
+ _tmp32_ = self->priv->pane_widget;
#line 70 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp34_ = content;
+ _tmp33_ = content;
#line 70 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_container_get_type (), GtkContainer), _tmp34_);
+ gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_container_get_type (), GtkContainer), _tmp33_);
#line 39 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
_g_object_unref0 (message_label);
#line 39 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
_g_object_unref0 (content);
-#line 438 "TumblrAuthenticator.c"
+#line 486 "TumblrAuthenticator.c"
}
goto __finally8;
__catch8_g_error:
{
GError* e = NULL;
- GError* _tmp35_;
- const gchar* _tmp36_;
+ GError* _tmp34_;
+ const gchar* _tmp35_;
#line 39 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
e = _inner_error_;
#line 39 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
_inner_error_ = NULL;
#line 72 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp35_ = e;
+ _tmp34_ = e;
#line 72 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp36_ = _tmp35_->message;
+ _tmp35_ = _tmp34_->message;
#line 72 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- g_warning (_ ("Could not load UI: %s"), _tmp36_);
+ g_warning (_ ("Could not load UI: %s"), _tmp35_);
#line 39 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
_g_error_free0 (e);
-#line 458 "TumblrAuthenticator.c"
+#line 506 "TumblrAuthenticator.c"
}
__finally8:
#line 39 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
@@ -465,22 +513,26 @@ PublishingAuthenticatorShotwellTumblrAuthenticationPane* publishing_authenticato
g_clear_error (&_inner_error_);
#line 39 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
return NULL;
-#line 469 "TumblrAuthenticator.c"
+#line 517 "TumblrAuthenticator.c"
}
#line 36 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
return self;
-#line 473 "TumblrAuthenticator.c"
+#line 521 "TumblrAuthenticator.c"
}
-PublishingAuthenticatorShotwellTumblrAuthenticationPane* publishing_authenticator_shotwell_tumblr_authentication_pane_new (PublishingAuthenticatorShotwellTumblrAuthenticationPaneMode mode) {
+PublishingAuthenticatorShotwellTumblrAuthenticationPane*
+publishing_authenticator_shotwell_tumblr_authentication_pane_new (PublishingAuthenticatorShotwellTumblrAuthenticationPaneMode mode)
+{
#line 36 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
return publishing_authenticator_shotwell_tumblr_authentication_pane_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TYPE_AUTHENTICATION_PANE, mode);
-#line 480 "TumblrAuthenticator.c"
+#line 530 "TumblrAuthenticator.c"
}
-GtkWidget* publishing_authenticator_shotwell_tumblr_authentication_pane_get_default_widget (PublishingAuthenticatorShotwellTumblrAuthenticationPane* self) {
+GtkWidget*
+publishing_authenticator_shotwell_tumblr_authentication_pane_get_default_widget (PublishingAuthenticatorShotwellTumblrAuthenticationPane* self)
+{
GtkWidget* result = NULL;
GtkButton* _tmp0_;
GtkWidget* _tmp1_;
@@ -494,11 +546,13 @@ GtkWidget* publishing_authenticator_shotwell_tumblr_authentication_pane_get_defa
result = _tmp1_;
#line 77 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
return result;
-#line 498 "TumblrAuthenticator.c"
+#line 550 "TumblrAuthenticator.c"
}
-static void publishing_authenticator_shotwell_tumblr_authentication_pane_on_login_button_clicked (PublishingAuthenticatorShotwellTumblrAuthenticationPane* self) {
+static void
+publishing_authenticator_shotwell_tumblr_authentication_pane_on_login_button_clicked (PublishingAuthenticatorShotwellTumblrAuthenticationPane* self)
+{
GtkEntry* _tmp0_;
const gchar* _tmp1_;
GtkEntry* _tmp2_;
@@ -515,29 +569,35 @@ static void publishing_authenticator_shotwell_tumblr_authentication_pane_on_logi
_tmp3_ = gtk_entry_get_text (_tmp2_);
#line 81 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
g_signal_emit (self, publishing_authenticator_shotwell_tumblr_authentication_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_AUTHENTICATION_PANE_LOGIN_SIGNAL], 0, _tmp1_, _tmp3_);
-#line 519 "TumblrAuthenticator.c"
+#line 573 "TumblrAuthenticator.c"
}
-static void publishing_authenticator_shotwell_tumblr_authentication_pane_on_user_changed (PublishingAuthenticatorShotwellTumblrAuthenticationPane* self) {
+static void
+publishing_authenticator_shotwell_tumblr_authentication_pane_on_user_changed (PublishingAuthenticatorShotwellTumblrAuthenticationPane* self)
+{
#line 86 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_IS_AUTHENTICATION_PANE (self));
#line 87 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
publishing_authenticator_shotwell_tumblr_authentication_pane_update_login_button_sensitivity (self);
-#line 528 "TumblrAuthenticator.c"
+#line 584 "TumblrAuthenticator.c"
}
-static void publishing_authenticator_shotwell_tumblr_authentication_pane_on_password_changed (PublishingAuthenticatorShotwellTumblrAuthenticationPane* self) {
+static void
+publishing_authenticator_shotwell_tumblr_authentication_pane_on_password_changed (PublishingAuthenticatorShotwellTumblrAuthenticationPane* self)
+{
#line 90 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_IS_AUTHENTICATION_PANE (self));
#line 91 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
publishing_authenticator_shotwell_tumblr_authentication_pane_update_login_button_sensitivity (self);
-#line 537 "TumblrAuthenticator.c"
+#line 595 "TumblrAuthenticator.c"
}
-static void publishing_authenticator_shotwell_tumblr_authentication_pane_update_login_button_sensitivity (PublishingAuthenticatorShotwellTumblrAuthenticationPane* self) {
+static void
+publishing_authenticator_shotwell_tumblr_authentication_pane_update_login_button_sensitivity (PublishingAuthenticatorShotwellTumblrAuthenticationPane* self)
+{
gboolean _tmp0_ = FALSE;
GtkEntry* _tmp1_;
guint _tmp2_;
@@ -553,7 +613,7 @@ static void publishing_authenticator_shotwell_tumblr_authentication_pane_update_
_tmp3_ = _tmp2_;
#line 95 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
if (_tmp3_ > ((guint) 0)) {
-#line 557 "TumblrAuthenticator.c"
+#line 617 "TumblrAuthenticator.c"
GtkEntry* _tmp4_;
guint _tmp5_;
guint _tmp6_;
@@ -565,21 +625,23 @@ static void publishing_authenticator_shotwell_tumblr_authentication_pane_update_
_tmp6_ = _tmp5_;
#line 96 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
_tmp0_ = _tmp6_ > ((guint) 0);
-#line 569 "TumblrAuthenticator.c"
+#line 629 "TumblrAuthenticator.c"
} else {
#line 95 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
_tmp0_ = FALSE;
-#line 573 "TumblrAuthenticator.c"
+#line 633 "TumblrAuthenticator.c"
}
#line 95 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
_tmp7_ = self->priv->login_button;
#line 95 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), _tmp0_);
-#line 579 "TumblrAuthenticator.c"
+#line 639 "TumblrAuthenticator.c"
}
-static GtkWidget* publishing_authenticator_shotwell_tumblr_authentication_pane_real_get_widget (SpitPublishingDialogPane* base) {
+static GtkWidget*
+publishing_authenticator_shotwell_tumblr_authentication_pane_real_get_widget (SpitPublishingDialogPane* base)
+{
PublishingAuthenticatorShotwellTumblrAuthenticationPane * self;
GtkWidget* result = NULL;
GtkBox* _tmp0_;
@@ -594,11 +656,13 @@ static GtkWidget* publishing_authenticator_shotwell_tumblr_authentication_pane_r
result = _tmp1_;
#line 100 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
return result;
-#line 598 "TumblrAuthenticator.c"
+#line 660 "TumblrAuthenticator.c"
}
-static SpitPublishingDialogPaneGeometryOptions publishing_authenticator_shotwell_tumblr_authentication_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) {
+static SpitPublishingDialogPaneGeometryOptions
+publishing_authenticator_shotwell_tumblr_authentication_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base)
+{
PublishingAuthenticatorShotwellTumblrAuthenticationPane * self;
SpitPublishingDialogPaneGeometryOptions result = 0;
#line 103 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
@@ -607,11 +671,13 @@ static SpitPublishingDialogPaneGeometryOptions publishing_authenticator_shotwell
result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
#line 104 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
return result;
-#line 611 "TumblrAuthenticator.c"
+#line 675 "TumblrAuthenticator.c"
}
-static void publishing_authenticator_shotwell_tumblr_authentication_pane_real_on_pane_installed (SpitPublishingDialogPane* base) {
+static void
+publishing_authenticator_shotwell_tumblr_authentication_pane_real_on_pane_installed (SpitPublishingDialogPane* base)
+{
PublishingAuthenticatorShotwellTumblrAuthenticationPane * self;
GtkEntry* _tmp0_;
GtkEntry* _tmp1_;
@@ -632,19 +698,28 @@ static void publishing_authenticator_shotwell_tumblr_authentication_pane_real_on
gtk_widget_set_can_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), TRUE);
#line 111 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
publishing_authenticator_shotwell_tumblr_authentication_pane_update_login_button_sensitivity (self);
-#line 636 "TumblrAuthenticator.c"
+#line 702 "TumblrAuthenticator.c"
}
-static void publishing_authenticator_shotwell_tumblr_authentication_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) {
+static void
+publishing_authenticator_shotwell_tumblr_authentication_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base)
+{
PublishingAuthenticatorShotwellTumblrAuthenticationPane * self;
#line 114 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TYPE_AUTHENTICATION_PANE, PublishingAuthenticatorShotwellTumblrAuthenticationPane);
-#line 644 "TumblrAuthenticator.c"
+#line 712 "TumblrAuthenticator.c"
}
-static void g_cclosure_user_marshal_VOID__STRING_STRING (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) {
+static void
+g_cclosure_user_marshal_VOID__STRING_STRING (GClosure * closure,
+ GValue * return_value,
+ guint n_param_values,
+ const GValue * param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data)
+{
typedef void (*GMarshalFunc_VOID__STRING_STRING) (gpointer data1, const char* arg_1, const char* arg_2, gpointer data2);
register GMarshalFunc_VOID__STRING_STRING callback;
register GCClosure * cc;
@@ -659,23 +734,25 @@ static void g_cclosure_user_marshal_VOID__STRING_STRING (GClosure * closure, GVa
data1 = closure->data;
#line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
data2 = param_values->data[0].v_pointer;
-#line 663 "TumblrAuthenticator.c"
+#line 738 "TumblrAuthenticator.c"
} else {
#line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
data1 = param_values->data[0].v_pointer;
#line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
data2 = closure->data;
-#line 669 "TumblrAuthenticator.c"
+#line 744 "TumblrAuthenticator.c"
}
#line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
callback = (GMarshalFunc_VOID__STRING_STRING) (marshal_data ? marshal_data : cc->callback);
#line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
callback (data1, g_value_get_string (param_values + 1), g_value_get_string (param_values + 2), data2);
-#line 675 "TumblrAuthenticator.c"
+#line 750 "TumblrAuthenticator.c"
}
-static void publishing_authenticator_shotwell_tumblr_authentication_pane_class_init (PublishingAuthenticatorShotwellTumblrAuthenticationPaneClass * klass) {
+static void
+publishing_authenticator_shotwell_tumblr_authentication_pane_class_init (PublishingAuthenticatorShotwellTumblrAuthenticationPaneClass * klass)
+{
gchar* _tmp0_;
gchar* _tmp1_;
#line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
@@ -694,11 +771,13 @@ static void publishing_authenticator_shotwell_tumblr_authentication_pane_class_i
_tmp1_ = g_strdup (_ ("Username and/or password invalid. Please try again"));
#line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
publishing_authenticator_shotwell_tumblr_authentication_pane_FAILED_RETRY_USER_MESSAGE = _tmp1_;
-#line 698 "TumblrAuthenticator.c"
+#line 775 "TumblrAuthenticator.c"
}
-static void publishing_authenticator_shotwell_tumblr_authentication_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) {
+static void
+publishing_authenticator_shotwell_tumblr_authentication_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface)
+{
#line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
publishing_authenticator_shotwell_tumblr_authentication_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
#line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
@@ -709,20 +788,24 @@ static void publishing_authenticator_shotwell_tumblr_authentication_pane_spit_pu
iface->on_pane_installed = (void (*) (SpitPublishingDialogPane *)) publishing_authenticator_shotwell_tumblr_authentication_pane_real_on_pane_installed;
#line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
iface->on_pane_uninstalled = (void (*) (SpitPublishingDialogPane *)) publishing_authenticator_shotwell_tumblr_authentication_pane_real_on_pane_uninstalled;
-#line 713 "TumblrAuthenticator.c"
+#line 792 "TumblrAuthenticator.c"
}
-static void publishing_authenticator_shotwell_tumblr_authentication_pane_instance_init (PublishingAuthenticatorShotwellTumblrAuthenticationPane * self) {
+static void
+publishing_authenticator_shotwell_tumblr_authentication_pane_instance_init (PublishingAuthenticatorShotwellTumblrAuthenticationPane * self)
+{
#line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
self->priv = PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_AUTHENTICATION_PANE_GET_PRIVATE (self);
#line 28 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
self->priv->pane_widget = NULL;
-#line 722 "TumblrAuthenticator.c"
+#line 803 "TumblrAuthenticator.c"
}
-static void publishing_authenticator_shotwell_tumblr_authentication_pane_finalize (GObject * obj) {
+static void
+publishing_authenticator_shotwell_tumblr_authentication_pane_finalize (GObject * obj)
+{
PublishingAuthenticatorShotwellTumblrAuthenticationPane * self;
#line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TYPE_AUTHENTICATION_PANE, PublishingAuthenticatorShotwellTumblrAuthenticationPane);
@@ -738,7 +821,7 @@ static void publishing_authenticator_shotwell_tumblr_authentication_pane_finaliz
_g_object_unref0 (self->priv->login_button);
#line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
G_OBJECT_CLASS (publishing_authenticator_shotwell_tumblr_authentication_pane_parent_class)->finalize (obj);
-#line 742 "TumblrAuthenticator.c"
+#line 825 "TumblrAuthenticator.c"
}
@@ -746,7 +829,9 @@ static void publishing_authenticator_shotwell_tumblr_authentication_pane_finaliz
* The authentication pane used when asking service URL, user name and password
* from the user.
*/
-GType publishing_authenticator_shotwell_tumblr_authentication_pane_get_type (void) {
+GType
+publishing_authenticator_shotwell_tumblr_authentication_pane_get_type (void)
+{
static volatile gsize publishing_authenticator_shotwell_tumblr_authentication_pane_type_id__volatile = 0;
if (g_once_init_enter (&publishing_authenticator_shotwell_tumblr_authentication_pane_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingAuthenticatorShotwellTumblrAuthenticationPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_authenticator_shotwell_tumblr_authentication_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingAuthenticatorShotwellTumblrAuthenticationPane), 0, (GInstanceInitFunc) publishing_authenticator_shotwell_tumblr_authentication_pane_instance_init, NULL };
@@ -760,13 +845,15 @@ GType publishing_authenticator_shotwell_tumblr_authentication_pane_get_type (voi
}
-PublishingAuthenticatorShotwellTumblrAccessTokenFetchTransaction* publishing_authenticator_shotwell_tumblr_access_token_fetch_transaction_construct (GType object_type, PublishingRESTSupportOAuth1Session* session, const gchar* username, const gchar* password) {
+PublishingAuthenticatorShotwellTumblrAccessTokenFetchTransaction*
+publishing_authenticator_shotwell_tumblr_access_token_fetch_transaction_construct (GType object_type,
+ PublishingRESTSupportOAuth1Session* session,
+ const gchar* username,
+ const gchar* password)
+{
PublishingAuthenticatorShotwellTumblrAccessTokenFetchTransaction* self = NULL;
- PublishingRESTSupportOAuth1Session* _tmp0_;
- const gchar* _tmp1_;
- gchar* _tmp2_;
- gchar* _tmp3_;
- const gchar* _tmp4_;
+ gchar* _tmp0_;
+ gchar* _tmp1_;
#line 119 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION (session), NULL);
#line 119 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
@@ -774,50 +861,54 @@ PublishingAuthenticatorShotwellTumblrAccessTokenFetchTransaction* publishing_aut
#line 119 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
g_return_val_if_fail (password != NULL, NULL);
#line 120 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp0_ = session;
-#line 120 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- self = (PublishingAuthenticatorShotwellTumblrAccessTokenFetchTransaction*) publishing_rest_support_oauth1_transaction_construct_with_uri (object_type, _tmp0_, "https://www.tumblr.com/oauth/access_token", PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
-#line 122 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp1_ = username;
+ self = (PublishingAuthenticatorShotwellTumblrAccessTokenFetchTransaction*) publishing_rest_support_oauth1_transaction_construct_with_uri (object_type, session, "https://www.tumblr.com/oauth/access_token", PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
#line 122 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp2_ = soup_uri_encode (_tmp1_, PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_ENCODE_RFC_3986_EXTRA);
+ _tmp0_ = soup_uri_encode (username, PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_ENCODE_RFC_3986_EXTRA);
#line 122 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp3_ = _tmp2_;
+ _tmp1_ = _tmp0_;
#line 122 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "x_auth_username", _tmp3_);
+ publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "x_auth_username", _tmp1_);
#line 122 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _g_free0 (_tmp3_);
+ _g_free0 (_tmp1_);
#line 123 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp4_ = password;
-#line 123 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "x_auth_password", _tmp4_);
+ publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "x_auth_password", password);
#line 124 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "x_auth_mode", "client_auth");
#line 119 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
return self;
-#line 799 "TumblrAuthenticator.c"
+#line 880 "TumblrAuthenticator.c"
}
-PublishingAuthenticatorShotwellTumblrAccessTokenFetchTransaction* publishing_authenticator_shotwell_tumblr_access_token_fetch_transaction_new (PublishingRESTSupportOAuth1Session* session, const gchar* username, const gchar* password) {
+PublishingAuthenticatorShotwellTumblrAccessTokenFetchTransaction*
+publishing_authenticator_shotwell_tumblr_access_token_fetch_transaction_new (PublishingRESTSupportOAuth1Session* session,
+ const gchar* username,
+ const gchar* password)
+{
#line 119 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
return publishing_authenticator_shotwell_tumblr_access_token_fetch_transaction_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TYPE_ACCESS_TOKEN_FETCH_TRANSACTION, session, username, password);
-#line 806 "TumblrAuthenticator.c"
+#line 891 "TumblrAuthenticator.c"
}
-static void publishing_authenticator_shotwell_tumblr_access_token_fetch_transaction_class_init (PublishingAuthenticatorShotwellTumblrAccessTokenFetchTransactionClass * klass) {
+static void
+publishing_authenticator_shotwell_tumblr_access_token_fetch_transaction_class_init (PublishingAuthenticatorShotwellTumblrAccessTokenFetchTransactionClass * klass)
+{
#line 118 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
publishing_authenticator_shotwell_tumblr_access_token_fetch_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 813 "TumblrAuthenticator.c"
+#line 900 "TumblrAuthenticator.c"
}
-static void publishing_authenticator_shotwell_tumblr_access_token_fetch_transaction_instance_init (PublishingAuthenticatorShotwellTumblrAccessTokenFetchTransaction * self) {
+static void
+publishing_authenticator_shotwell_tumblr_access_token_fetch_transaction_instance_init (PublishingAuthenticatorShotwellTumblrAccessTokenFetchTransaction * self)
+{
}
-GType publishing_authenticator_shotwell_tumblr_access_token_fetch_transaction_get_type (void) {
+GType
+publishing_authenticator_shotwell_tumblr_access_token_fetch_transaction_get_type (void)
+{
static volatile gsize publishing_authenticator_shotwell_tumblr_access_token_fetch_transaction_type_id__volatile = 0;
if (g_once_init_enter (&publishing_authenticator_shotwell_tumblr_access_token_fetch_transaction_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingAuthenticatorShotwellTumblrAccessTokenFetchTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_authenticator_shotwell_tumblr_access_token_fetch_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingAuthenticatorShotwellTumblrAccessTokenFetchTransaction), 0, (GInstanceInitFunc) publishing_authenticator_shotwell_tumblr_access_token_fetch_transaction_instance_init, NULL };
@@ -829,75 +920,78 @@ GType publishing_authenticator_shotwell_tumblr_access_token_fetch_transaction_ge
}
-PublishingAuthenticatorShotwellTumblrTumblr* publishing_authenticator_shotwell_tumblr_tumblr_construct (GType object_type, SpitPublishingPluginHost* host) {
+PublishingAuthenticatorShotwellTumblrTumblr*
+publishing_authenticator_shotwell_tumblr_tumblr_construct (GType object_type,
+ SpitPublishingPluginHost* host)
+{
PublishingAuthenticatorShotwellTumblrTumblr * self = NULL;
- SpitPublishingPluginHost* _tmp0_;
#line 129 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL);
#line 130 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp0_ = host;
-#line 130 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- self = (PublishingAuthenticatorShotwellTumblrTumblr*) publishing_authenticator_shotwell_oauth1_authenticator_construct (object_type, PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_API_KEY, PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_API_SECRET, _tmp0_);
+ self = (PublishingAuthenticatorShotwellTumblrTumblr*) publishing_authenticator_shotwell_oauth1_authenticator_construct (object_type, PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_API_KEY, PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_API_SECRET, host);
#line 129 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
return self;
-#line 844 "TumblrAuthenticator.c"
+#line 935 "TumblrAuthenticator.c"
}
-PublishingAuthenticatorShotwellTumblrTumblr* publishing_authenticator_shotwell_tumblr_tumblr_new (SpitPublishingPluginHost* host) {
+PublishingAuthenticatorShotwellTumblrTumblr*
+publishing_authenticator_shotwell_tumblr_tumblr_new (SpitPublishingPluginHost* host)
+{
#line 129 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
return publishing_authenticator_shotwell_tumblr_tumblr_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TYPE_TUMBLR, host);
-#line 851 "TumblrAuthenticator.c"
+#line 944 "TumblrAuthenticator.c"
}
-static void publishing_authenticator_shotwell_tumblr_tumblr_real_authenticate (PublishingAuthenticatorShotwellOAuth1Authenticator* base) {
+static void
+publishing_authenticator_shotwell_tumblr_tumblr_real_authenticate (PublishingAuthenticatorShotwellOAuth1Authenticator* base)
+{
PublishingAuthenticatorShotwellTumblrTumblr * self;
- gboolean _tmp0_;
#line 133 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TYPE_TUMBLR, PublishingAuthenticatorShotwellTumblrTumblr);
#line 134 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp0_ = publishing_authenticator_shotwell_oauth1_authenticator_is_persistent_session_valid (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator));
-#line 134 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- if (_tmp0_) {
-#line 864 "TumblrAuthenticator.c"
- PublishingRESTSupportOAuth1Session* _tmp1_;
+ if (publishing_authenticator_shotwell_oauth1_authenticator_is_persistent_session_valid (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator))) {
+#line 956 "TumblrAuthenticator.c"
+ PublishingRESTSupportOAuth1Session* _tmp0_;
+ gchar* _tmp1_;
gchar* _tmp2_;
gchar* _tmp3_;
gchar* _tmp4_;
- gchar* _tmp5_;
#line 135 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
g_debug ("TumblrAuthenticator.vala:135: attempt start: a persistent session is a" \
"vailable; using it");
#line 137 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->session;
+ _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->session;
#line 137 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp2_ = publishing_authenticator_shotwell_oauth1_authenticator_get_persistent_access_phase_token (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator));
+ _tmp1_ = publishing_authenticator_shotwell_oauth1_authenticator_get_persistent_access_phase_token (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator));
#line 137 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp3_ = _tmp2_;
+ _tmp2_ = _tmp1_;
#line 137 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp4_ = publishing_authenticator_shotwell_oauth1_authenticator_get_persistent_access_phase_token_secret (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator));
+ _tmp3_ = publishing_authenticator_shotwell_oauth1_authenticator_get_persistent_access_phase_token_secret (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator));
#line 137 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp5_ = _tmp4_;
+ _tmp4_ = _tmp3_;
#line 137 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- publishing_rest_support_oauth1_session_authenticate_from_persistent_credentials (_tmp1_, _tmp3_, _tmp5_, "");
+ publishing_rest_support_oauth1_session_authenticate_from_persistent_credentials (_tmp0_, _tmp2_, _tmp4_, "");
#line 137 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _g_free0 (_tmp5_);
+ _g_free0 (_tmp4_);
#line 137 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _g_free0 (_tmp3_);
-#line 888 "TumblrAuthenticator.c"
+ _g_free0 (_tmp2_);
+#line 980 "TumblrAuthenticator.c"
} else {
#line 140 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
g_debug ("TumblrAuthenticator.vala:140: attempt start: no persistent session ava" \
"ilable; showing login welcome pane");
#line 142 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
publishing_authenticator_shotwell_tumblr_tumblr_do_show_authentication_pane (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_AUTHENTICATION_PANE_MODE_INTRO);
-#line 894 "TumblrAuthenticator.c"
+#line 986 "TumblrAuthenticator.c"
}
}
-static gboolean publishing_authenticator_shotwell_tumblr_tumblr_real_can_logout (PublishingAuthenticatorShotwellOAuth1Authenticator* base) {
+static gboolean
+publishing_authenticator_shotwell_tumblr_tumblr_real_can_logout (PublishingAuthenticatorShotwellOAuth1Authenticator* base)
+{
PublishingAuthenticatorShotwellTumblrTumblr * self;
gboolean result = FALSE;
#line 146 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
@@ -906,11 +1000,13 @@ static gboolean publishing_authenticator_shotwell_tumblr_tumblr_real_can_logout
result = TRUE;
#line 147 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
return result;
-#line 908 "TumblrAuthenticator.c"
+#line 1002 "TumblrAuthenticator.c"
}
-static void publishing_authenticator_shotwell_tumblr_tumblr_real_logout (PublishingAuthenticatorShotwellOAuth1Authenticator* base) {
+static void
+publishing_authenticator_shotwell_tumblr_tumblr_real_logout (PublishingAuthenticatorShotwellOAuth1Authenticator* base)
+{
PublishingAuthenticatorShotwellTumblrTumblr * self;
PublishingRESTSupportOAuth1Session* _tmp0_;
#line 150 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
@@ -921,15 +1017,17 @@ static void publishing_authenticator_shotwell_tumblr_tumblr_real_logout (Publish
publishing_rest_support_oauth1_session_deauthenticate (_tmp0_);
#line 152 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
publishing_authenticator_shotwell_oauth1_authenticator_invalidate_persistent_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator));
-#line 923 "TumblrAuthenticator.c"
+#line 1019 "TumblrAuthenticator.c"
}
-static void publishing_authenticator_shotwell_tumblr_tumblr_real_refresh (PublishingAuthenticatorShotwellOAuth1Authenticator* base) {
+static void
+publishing_authenticator_shotwell_tumblr_tumblr_real_refresh (PublishingAuthenticatorShotwellOAuth1Authenticator* base)
+{
PublishingAuthenticatorShotwellTumblrTumblr * self;
#line 155 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TYPE_TUMBLR, PublishingAuthenticatorShotwellTumblrTumblr);
-#line 931 "TumblrAuthenticator.c"
+#line 1029 "TumblrAuthenticator.c"
}
@@ -944,22 +1042,29 @@ static void publishing_authenticator_shotwell_tumblr_tumblr_real_refresh (Publis
*
* @param mode the mode for the authentication pane
*/
-static void _publishing_authenticator_shotwell_tumblr_tumblr_on_authentication_pane_login_clicked_publishing_authenticator_shotwell_tumblr_authentication_pane_login (PublishingAuthenticatorShotwellTumblrAuthenticationPane* _sender, const gchar* user, const gchar* password, gpointer self) {
+static void
+_publishing_authenticator_shotwell_tumblr_tumblr_on_authentication_pane_login_clicked_publishing_authenticator_shotwell_tumblr_authentication_pane_login (PublishingAuthenticatorShotwellTumblrAuthenticationPane* _sender,
+ const gchar* user,
+ const gchar* password,
+ gpointer self)
+{
#line 175 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
publishing_authenticator_shotwell_tumblr_tumblr_on_authentication_pane_login_clicked ((PublishingAuthenticatorShotwellTumblrTumblr*) self, user, password);
-#line 949 "TumblrAuthenticator.c"
+#line 1052 "TumblrAuthenticator.c"
}
-static void publishing_authenticator_shotwell_tumblr_tumblr_do_show_authentication_pane (PublishingAuthenticatorShotwellTumblrTumblr* self, PublishingAuthenticatorShotwellTumblrAuthenticationPaneMode mode) {
+static void
+publishing_authenticator_shotwell_tumblr_tumblr_do_show_authentication_pane (PublishingAuthenticatorShotwellTumblrTumblr* self,
+ PublishingAuthenticatorShotwellTumblrAuthenticationPaneMode mode)
+{
SpitPublishingPluginHost* _tmp0_;
PublishingAuthenticatorShotwellTumblrAuthenticationPane* authentication_pane = NULL;
- PublishingAuthenticatorShotwellTumblrAuthenticationPaneMode _tmp1_;
- PublishingAuthenticatorShotwellTumblrAuthenticationPane* _tmp2_;
+ PublishingAuthenticatorShotwellTumblrAuthenticationPane* _tmp1_;
+ SpitPublishingPluginHost* _tmp2_;
SpitPublishingPluginHost* _tmp3_;
- SpitPublishingPluginHost* _tmp4_;
+ GtkWidget* _tmp4_;
GtkWidget* _tmp5_;
- GtkWidget* _tmp6_;
#line 170 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_IS_TUMBLR (self));
#line 171 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
@@ -969,30 +1074,28 @@ static void publishing_authenticator_shotwell_tumblr_tumblr_do_show_authenticati
#line 173 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
spit_publishing_plugin_host_set_service_locked (_tmp0_, FALSE);
#line 174 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp1_ = mode;
+ _tmp1_ = publishing_authenticator_shotwell_tumblr_authentication_pane_new (mode);
#line 174 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp2_ = publishing_authenticator_shotwell_tumblr_authentication_pane_new (_tmp1_);
-#line 174 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- authentication_pane = _tmp2_;
+ authentication_pane = _tmp1_;
#line 175 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
g_signal_connect_object (authentication_pane, "login", (GCallback) _publishing_authenticator_shotwell_tumblr_tumblr_on_authentication_pane_login_clicked_publishing_authenticator_shotwell_tumblr_authentication_pane_login, self, 0);
#line 176 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->host;
+ _tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->host;
#line 176 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- spit_publishing_plugin_host_install_dialog_pane (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (authentication_pane, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CLOSE);
+ spit_publishing_plugin_host_install_dialog_pane (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (authentication_pane, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CLOSE);
#line 177 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->host;
+ _tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->host;
#line 177 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp5_ = publishing_authenticator_shotwell_tumblr_authentication_pane_get_default_widget (authentication_pane);
+ _tmp4_ = publishing_authenticator_shotwell_tumblr_authentication_pane_get_default_widget (authentication_pane);
#line 177 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp6_ = _tmp5_;
+ _tmp5_ = _tmp4_;
#line 177 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- spit_publishing_plugin_host_set_dialog_default_widget (_tmp4_, _tmp6_);
+ spit_publishing_plugin_host_set_dialog_default_widget (_tmp3_, _tmp5_);
#line 177 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _g_object_unref0 (_tmp6_);
+ _g_object_unref0 (_tmp5_);
#line 170 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
_g_object_unref0 (authentication_pane);
-#line 994 "TumblrAuthenticator.c"
+#line 1097 "TumblrAuthenticator.c"
}
@@ -1006,9 +1109,11 @@ static void publishing_authenticator_shotwell_tumblr_tumblr_do_show_authenticati
* @param username the name of the Tumblr user as entered in the dialog
* @param password the password of the Tumblr as entered in the dialog
*/
-static void publishing_authenticator_shotwell_tumblr_tumblr_on_authentication_pane_login_clicked (PublishingAuthenticatorShotwellTumblrTumblr* self, const gchar* username, const gchar* password) {
- const gchar* _tmp0_;
- const gchar* _tmp1_;
+static void
+publishing_authenticator_shotwell_tumblr_tumblr_on_authentication_pane_login_clicked (PublishingAuthenticatorShotwellTumblrTumblr* self,
+ const gchar* username,
+ const gchar* password)
+{
#line 190 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_IS_TUMBLR (self));
#line 190 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
@@ -1019,12 +1124,8 @@ static void publishing_authenticator_shotwell_tumblr_tumblr_on_authentication_pa
g_debug ("TumblrAuthenticator.vala:191: EVENT: on_authentication_pane_login_clic" \
"ked");
#line 193 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp0_ = username;
-#line 193 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp1_ = password;
-#line 193 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- publishing_authenticator_shotwell_tumblr_tumblr_do_network_login (self, _tmp0_, _tmp1_);
-#line 1025 "TumblrAuthenticator.c"
+ publishing_authenticator_shotwell_tumblr_tumblr_do_network_login (self, username, password);
+#line 1126 "TumblrAuthenticator.c"
}
@@ -1036,28 +1137,37 @@ static void publishing_authenticator_shotwell_tumblr_tumblr_on_authentication_pa
* @param username the name of the Tumblr user used to login
* @param password the password of the Tumblr user used to login
*/
-static void _publishing_authenticator_shotwell_tumblr_tumblr_on_auth_request_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
+static void
+_publishing_authenticator_shotwell_tumblr_tumblr_on_auth_request_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+ gpointer self)
+{
#line 210 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
publishing_authenticator_shotwell_tumblr_tumblr_on_auth_request_txn_completed ((PublishingAuthenticatorShotwellTumblrTumblr*) self, _sender);
-#line 1040 "TumblrAuthenticator.c"
+#line 1144 "TumblrAuthenticator.c"
}
-static void _publishing_authenticator_shotwell_tumblr_tumblr_on_auth_request_txn_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
+static void
+_publishing_authenticator_shotwell_tumblr_tumblr_on_auth_request_txn_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+ GError* err,
+ gpointer self)
+{
#line 211 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
publishing_authenticator_shotwell_tumblr_tumblr_on_auth_request_txn_error ((PublishingAuthenticatorShotwellTumblrTumblr*) self, _sender, err);
-#line 1047 "TumblrAuthenticator.c"
+#line 1155 "TumblrAuthenticator.c"
}
-static void publishing_authenticator_shotwell_tumblr_tumblr_do_network_login (PublishingAuthenticatorShotwellTumblrTumblr* self, const gchar* username, const gchar* password) {
+static void
+publishing_authenticator_shotwell_tumblr_tumblr_do_network_login (PublishingAuthenticatorShotwellTumblrTumblr* self,
+ const gchar* username,
+ const gchar* password)
+{
SpitPublishingPluginHost* _tmp0_;
SpitPublishingPluginHost* _tmp1_;
PublishingAuthenticatorShotwellTumblrAccessTokenFetchTransaction* txn = NULL;
PublishingRESTSupportOAuth1Session* _tmp2_;
- const gchar* _tmp3_;
- const gchar* _tmp4_;
- PublishingAuthenticatorShotwellTumblrAccessTokenFetchTransaction* _tmp5_;
+ PublishingAuthenticatorShotwellTumblrAccessTokenFetchTransaction* _tmp3_;
GError * _inner_error_ = NULL;
#line 204 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_IS_TUMBLR (self));
@@ -1078,18 +1188,14 @@ static void publishing_authenticator_shotwell_tumblr_tumblr_do_network_login (Pu
#line 209 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->session;
#line 209 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp3_ = username;
-#line 209 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp4_ = password;
+ _tmp3_ = publishing_authenticator_shotwell_tumblr_access_token_fetch_transaction_new (_tmp2_, username, password);
#line 209 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp5_ = publishing_authenticator_shotwell_tumblr_access_token_fetch_transaction_new (_tmp2_, _tmp3_, _tmp4_);
-#line 209 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- txn = _tmp5_;
+ txn = _tmp3_;
#line 210 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_authenticator_shotwell_tumblr_tumblr_on_auth_request_txn_completed_publishing_rest_support_transaction_completed, self, 0);
#line 211 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_authenticator_shotwell_tumblr_tumblr_on_auth_request_txn_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 1090 "TumblrAuthenticator.c"
+#line 1196 "TumblrAuthenticator.c"
{
#line 214 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
@@ -1097,7 +1203,7 @@ static void publishing_authenticator_shotwell_tumblr_tumblr_do_network_login (Pu
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 214 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 1098 "TumblrAuthenticator.c"
+#line 1204 "TumblrAuthenticator.c"
goto __catch9_spit_publishing_publishing_error;
}
#line 214 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
@@ -1108,28 +1214,28 @@ static void publishing_authenticator_shotwell_tumblr_tumblr_do_network_login (Pu
g_clear_error (&_inner_error_);
#line 214 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
return;
-#line 1109 "TumblrAuthenticator.c"
+#line 1215 "TumblrAuthenticator.c"
}
}
goto __finally9;
__catch9_spit_publishing_publishing_error:
{
GError* err = NULL;
- SpitPublishingPluginHost* _tmp6_;
- GError* _tmp7_;
+ SpitPublishingPluginHost* _tmp4_;
+ GError* _tmp5_;
#line 213 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
err = _inner_error_;
#line 213 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
_inner_error_ = NULL;
#line 216 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->host;
+ _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->host;
#line 216 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp7_ = err;
+ _tmp5_ = err;
#line 216 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- spit_publishing_plugin_host_post_error (_tmp6_, _tmp7_);
+ spit_publishing_plugin_host_post_error (_tmp4_, _tmp5_);
#line 213 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
_g_error_free0 (err);
-#line 1130 "TumblrAuthenticator.c"
+#line 1236 "TumblrAuthenticator.c"
}
__finally9:
#line 213 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
@@ -1142,212 +1248,195 @@ static void publishing_authenticator_shotwell_tumblr_tumblr_do_network_login (Pu
g_clear_error (&_inner_error_);
#line 213 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
return;
-#line 1143 "TumblrAuthenticator.c"
+#line 1249 "TumblrAuthenticator.c"
}
#line 204 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
_publishing_rest_support_transaction_unref0 (txn);
-#line 1147 "TumblrAuthenticator.c"
+#line 1253 "TumblrAuthenticator.c"
}
-static void publishing_authenticator_shotwell_tumblr_tumblr_on_auth_request_txn_completed (PublishingAuthenticatorShotwellTumblrTumblr* self, PublishingRESTSupportTransaction* txn) {
- PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_authenticator_shotwell_tumblr_tumblr_on_auth_request_txn_completed (PublishingAuthenticatorShotwellTumblrTumblr* self,
+ PublishingRESTSupportTransaction* txn)
+{
+ guint _tmp0_;
guint _tmp1_;
- PublishingRESTSupportTransaction* _tmp2_;
- guint _tmp3_;
- PublishingRESTSupportTransaction* _tmp4_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
+ gchar* _tmp4_;
gchar* _tmp5_;
- gchar* _tmp6_;
- PublishingRESTSupportTransaction* _tmp7_;
- gchar* _tmp8_;
- gchar* _tmp9_;
#line 220 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_IS_TUMBLR (self));
#line 220 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
#line 221 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp0_ = txn;
-#line 221 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
+ g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
#line 221 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_tumblr_tumblr_on_auth_request_txn_completed_publishing_rest_support_transaction_completed, self);
+ g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_tumblr_tumblr_on_auth_request_txn_completed_publishing_rest_support_transaction_completed, self);
#line 222 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp2_ = txn;
+ g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
#line 222 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 222 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_tumblr_tumblr_on_auth_request_txn_error_publishing_rest_support_transaction_network_error, self);
-#line 224 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp4_ = txn;
+ g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_tumblr_tumblr_on_auth_request_txn_error_publishing_rest_support_transaction_network_error, self);
#line 224 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp5_ = publishing_rest_support_transaction_get_response (_tmp4_);
+ _tmp2_ = publishing_rest_support_transaction_get_response (txn);
#line 224 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp6_ = _tmp5_;
+ _tmp3_ = _tmp2_;
#line 224 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
g_debug ("TumblrAuthenticator.vala:224: EVENT: OAuth authentication request tran" \
-"saction completed; response = '%s'", _tmp6_);
+"saction completed; response = '%s'", _tmp3_);
#line 224 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _g_free0 (_tmp6_);
-#line 227 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp7_ = txn;
+ _g_free0 (_tmp3_);
#line 227 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp8_ = publishing_rest_support_transaction_get_response (_tmp7_);
+ _tmp4_ = publishing_rest_support_transaction_get_response (txn);
#line 227 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp9_ = _tmp8_;
+ _tmp5_ = _tmp4_;
#line 227 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- publishing_authenticator_shotwell_tumblr_tumblr_do_parse_token_info_from_auth_request (self, _tmp9_);
+ publishing_authenticator_shotwell_tumblr_tumblr_do_parse_token_info_from_auth_request (self, _tmp5_);
#line 227 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _g_free0 (_tmp9_);
-#line 1198 "TumblrAuthenticator.c"
+ _g_free0 (_tmp5_);
+#line 1295 "TumblrAuthenticator.c"
}
-static void publishing_authenticator_shotwell_tumblr_tumblr_on_auth_request_txn_error (PublishingAuthenticatorShotwellTumblrTumblr* self, PublishingRESTSupportTransaction* txn, GError* err) {
- PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_authenticator_shotwell_tumblr_tumblr_on_auth_request_txn_error (PublishingAuthenticatorShotwellTumblrTumblr* self,
+ PublishingRESTSupportTransaction* txn,
+ GError* err)
+{
+ guint _tmp0_;
guint _tmp1_;
- PublishingRESTSupportTransaction* _tmp2_;
- guint _tmp3_;
- SpitPublishingPluginHost* _tmp4_;
- GError* _tmp5_;
+ SpitPublishingPluginHost* _tmp2_;
#line 230 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_IS_TUMBLR (self));
#line 230 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
#line 232 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp0_ = txn;
+ g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
#line 232 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 232 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_tumblr_tumblr_on_auth_request_txn_completed_publishing_rest_support_transaction_completed, self);
-#line 233 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp2_ = txn;
+ g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_tumblr_tumblr_on_auth_request_txn_completed_publishing_rest_support_transaction_completed, self);
#line 233 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
+ g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
#line 233 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_tumblr_tumblr_on_auth_request_txn_error_publishing_rest_support_transaction_network_error, self);
+ g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_tumblr_tumblr_on_auth_request_txn_error_publishing_rest_support_transaction_network_error, self);
#line 235 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
g_debug ("TumblrAuthenticator.vala:235: EVENT: OAuth authentication request tran" \
"saction caused a network error");
#line 236 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->host;
+ _tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->host;
#line 236 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp5_ = err;
-#line 236 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- spit_publishing_plugin_host_post_error (_tmp4_, _tmp5_);
-#line 1233 "TumblrAuthenticator.c"
+ spit_publishing_plugin_host_post_error (_tmp2_, err);
+#line 1325 "TumblrAuthenticator.c"
}
-static void publishing_authenticator_shotwell_tumblr_tumblr_do_parse_token_info_from_auth_request (PublishingAuthenticatorShotwellTumblrTumblr* self, const gchar* response) {
- const gchar* _tmp0_;
+static void
+publishing_authenticator_shotwell_tumblr_tumblr_do_parse_token_info_from_auth_request (PublishingAuthenticatorShotwellTumblrTumblr* self,
+ const gchar* response)
+{
gchar* token = NULL;
gchar* token_secret = NULL;
GHashTable* data = NULL;
- const gchar* _tmp1_;
- GHashTable* _tmp2_;
- GHashTable* _tmp3_;
- gconstpointer _tmp4_ = NULL;
- gchar* _tmp5_;
- GHashTable* _tmp6_;
- gconstpointer _tmp7_ = NULL;
- gchar* _tmp8_;
- const gchar* _tmp9_;
+ GHashTable* _tmp0_;
+ GHashTable* _tmp1_;
+ gconstpointer _tmp2_ = NULL;
+ gchar* _tmp3_;
+ GHashTable* _tmp4_;
+ gconstpointer _tmp5_ = NULL;
+ gchar* _tmp6_;
+ const gchar* _tmp7_;
+ const gchar* _tmp8_;
+ gboolean _tmp9_ = FALSE;
const gchar* _tmp10_;
- gboolean _tmp11_ = FALSE;
- const gchar* _tmp12_;
#line 239 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_IS_TUMBLR (self));
#line 239 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
g_return_if_fail (response != NULL);
#line 240 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp0_ = response;
-#line 240 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
g_debug ("TumblrAuthenticator.vala:240: ACTION: extracting access phase credenti" \
-"als from '%s'", _tmp0_);
+"als from '%s'", response);
#line 242 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
token = NULL;
#line 243 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
token_secret = NULL;
#line 245 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp1_ = response;
-#line 245 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp2_ = soup_form_decode (_tmp1_);
+ _tmp0_ = soup_form_decode (response);
#line 245 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- data = _tmp2_;
+ data = _tmp0_;
#line 246 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp3_ = data;
+ _tmp1_ = data;
#line 246 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- g_hash_table_lookup_extended (_tmp3_, "oauth_token", NULL, &_tmp4_);
+ g_hash_table_lookup_extended (_tmp1_, "oauth_token", NULL, &_tmp2_);
#line 246 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
_g_free0 (token);
#line 246 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp5_ = g_strdup (_tmp4_);
+ _tmp3_ = g_strdup (_tmp2_);
#line 246 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- token = _tmp5_;
+ token = _tmp3_;
#line 247 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp6_ = data;
+ _tmp4_ = data;
#line 247 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- g_hash_table_lookup_extended (_tmp6_, "oauth_token_secret", NULL, &_tmp7_);
+ g_hash_table_lookup_extended (_tmp4_, "oauth_token_secret", NULL, &_tmp5_);
#line 247 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
_g_free0 (token_secret);
#line 247 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp8_ = g_strdup (_tmp7_);
+ _tmp6_ = g_strdup (_tmp5_);
#line 247 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- token_secret = _tmp8_;
+ token_secret = _tmp6_;
#line 249 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp9_ = token;
+ _tmp7_ = token;
#line 249 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp10_ = token_secret;
+ _tmp8_ = token_secret;
#line 249 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
g_debug ("TumblrAuthenticator.vala:249: access phase credentials: { token = '%s'" \
-"; token_secret = '%s' }", _tmp9_, _tmp10_);
+"; token_secret = '%s' }", _tmp7_, _tmp8_);
#line 252 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp12_ = token;
+ _tmp10_ = token;
#line 252 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- if (_tmp12_ == NULL) {
+ if (_tmp10_ == NULL) {
#line 252 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp11_ = TRUE;
-#line 1304 "TumblrAuthenticator.c"
+ _tmp9_ = TRUE;
+#line 1393 "TumblrAuthenticator.c"
} else {
- const gchar* _tmp13_;
+ const gchar* _tmp11_;
#line 252 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp13_ = token_secret;
+ _tmp11_ = token_secret;
#line 252 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp11_ = _tmp13_ == NULL;
-#line 1311 "TumblrAuthenticator.c"
+ _tmp9_ = _tmp11_ == NULL;
+#line 1400 "TumblrAuthenticator.c"
}
#line 252 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- if (_tmp11_) {
-#line 1315 "TumblrAuthenticator.c"
- SpitPublishingPluginHost* _tmp14_;
- GError* _tmp15_;
- GError* _tmp16_;
+ if (_tmp9_) {
+#line 1404 "TumblrAuthenticator.c"
+ SpitPublishingPluginHost* _tmp12_;
+ GError* _tmp13_;
+ GError* _tmp14_;
#line 253 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp14_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->host;
+ _tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->host;
#line 253 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp15_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Expected " "access phase credentials to contain token and token secret but at " "least one of these is absent");
+ _tmp13_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Expected " "access phase credentials to contain token and token secret but at " "least one of these is absent");
#line 253 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp16_ = _tmp15_;
+ _tmp14_ = _tmp13_;
#line 253 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- spit_publishing_plugin_host_post_error (_tmp14_, _tmp16_);
+ spit_publishing_plugin_host_post_error (_tmp12_, _tmp14_);
#line 253 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _g_error_free0 (_tmp16_);
+ _g_error_free0 (_tmp14_);
#line 256 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator), "authentication-failed");
-#line 1331 "TumblrAuthenticator.c"
+#line 1420 "TumblrAuthenticator.c"
} else {
- PublishingRESTSupportOAuth1Session* _tmp17_;
- const gchar* _tmp18_;
- const gchar* _tmp19_;
+ PublishingRESTSupportOAuth1Session* _tmp15_;
+ const gchar* _tmp16_;
+ const gchar* _tmp17_;
#line 258 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp17_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->session;
+ _tmp15_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->session;
#line 258 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp18_ = token;
+ _tmp16_ = token;
#line 258 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- _tmp19_ = token_secret;
+ _tmp17_ = token_secret;
#line 258 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
- publishing_rest_support_oauth1_session_set_access_phase_credentials (_tmp17_, _tmp18_, _tmp19_, "");
-#line 1344 "TumblrAuthenticator.c"
+ publishing_rest_support_oauth1_session_set_access_phase_credentials (_tmp15_, _tmp16_, _tmp17_, "");
+#line 1433 "TumblrAuthenticator.c"
}
#line 239 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
_g_hash_table_unref0 (data);
@@ -1355,11 +1444,13 @@ static void publishing_authenticator_shotwell_tumblr_tumblr_do_parse_token_info_
_g_free0 (token_secret);
#line 239 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
_g_free0 (token);
-#line 1352 "TumblrAuthenticator.c"
+#line 1441 "TumblrAuthenticator.c"
}
-static void publishing_authenticator_shotwell_tumblr_tumblr_class_init (PublishingAuthenticatorShotwellTumblrTumblrClass * klass) {
+static void
+publishing_authenticator_shotwell_tumblr_tumblr_class_init (PublishingAuthenticatorShotwellTumblrTumblrClass * klass)
+{
#line 128 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
publishing_authenticator_shotwell_tumblr_tumblr_parent_class = g_type_class_peek_parent (klass);
#line 128 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
@@ -1370,15 +1461,19 @@ static void publishing_authenticator_shotwell_tumblr_tumblr_class_init (Publishi
((PublishingAuthenticatorShotwellOAuth1AuthenticatorClass *) klass)->logout = (void (*) (PublishingAuthenticatorShotwellOAuth1Authenticator *)) publishing_authenticator_shotwell_tumblr_tumblr_real_logout;
#line 128 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
((PublishingAuthenticatorShotwellOAuth1AuthenticatorClass *) klass)->refresh = (void (*) (PublishingAuthenticatorShotwellOAuth1Authenticator *)) publishing_authenticator_shotwell_tumblr_tumblr_real_refresh;
-#line 1367 "TumblrAuthenticator.c"
+#line 1458 "TumblrAuthenticator.c"
}
-static void publishing_authenticator_shotwell_tumblr_tumblr_instance_init (PublishingAuthenticatorShotwellTumblrTumblr * self) {
+static void
+publishing_authenticator_shotwell_tumblr_tumblr_instance_init (PublishingAuthenticatorShotwellTumblrTumblr * self)
+{
}
-GType publishing_authenticator_shotwell_tumblr_tumblr_get_type (void) {
+GType
+publishing_authenticator_shotwell_tumblr_tumblr_get_type (void)
+{
static volatile gsize publishing_authenticator_shotwell_tumblr_tumblr_type_id__volatile = 0;
if (g_once_init_enter (&publishing_authenticator_shotwell_tumblr_tumblr_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingAuthenticatorShotwellTumblrTumblrClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_authenticator_shotwell_tumblr_tumblr_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingAuthenticatorShotwellTumblrTumblr), 0, (GInstanceInitFunc) publishing_authenticator_shotwell_tumblr_tumblr_instance_init, NULL };
diff --git a/plugins/common/BuilderPane.c b/plugins/common/BuilderPane.c
index 5797f7d..5bfa676 100644
--- a/plugins/common/BuilderPane.c
+++ b/plugins/common/BuilderPane.c
@@ -1,4 +1,4 @@
-/* BuilderPane.c generated by valac 0.36.6, the Vala compiler
+/* BuilderPane.c generated by valac 0.40.4, the Vala compiler
* generated from BuilderPane.vala, do not modify */
/* Copyright 2016 Jens Georg <mail@jensge.org>
@@ -7,6 +7,7 @@
* See the COPYING file in this distribution.
*/
+
#include <glib.h>
#include <glib-object.h>
#include "shotwell-plugin-dev-1.0.h"
@@ -25,6 +26,15 @@
typedef struct _ShotwellPluginsCommonBuilderPane ShotwellPluginsCommonBuilderPane;
typedef struct _ShotwellPluginsCommonBuilderPaneClass ShotwellPluginsCommonBuilderPaneClass;
typedef struct _ShotwellPluginsCommonBuilderPanePrivate ShotwellPluginsCommonBuilderPanePrivate;
+enum {
+ SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_0_PROPERTY,
+ SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_PREFERRED_GEOMETRY_PROPERTY,
+ SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_RESOURCE_PATH_PROPERTY,
+ SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_CONNECT_SIGNALS_PROPERTY,
+ SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_DEFAULT_ID_PROPERTY,
+ SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_NUM_PROPERTIES
+};
+static GParamSpec* shotwell_plugins_common_builder_pane_properties[SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_NUM_PROPERTIES];
#define _g_free0(var) (var = (g_free (var), NULL))
#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
@@ -55,13 +65,6 @@ static SpitPublishingDialogPaneIface * shotwell_plugins_common_builder_pane_spit
GType shotwell_plugins_common_builder_pane_get_type (void) G_GNUC_CONST;
#define SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPanePrivate))
-enum {
- SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_DUMMY_PROPERTY,
- SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_PREFERRED_GEOMETRY_PROPERTY,
- SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_RESOURCE_PATH_PROPERTY,
- SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_CONNECT_SIGNALS_PROPERTY,
- SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_DEFAULT_ID_PROPERTY
-};
static void shotwell_plugins_common_builder_pane_real_constructed (GObject* base);
gchar* shotwell_plugins_common_builder_pane_get_resource_path (ShotwellPluginsCommonBuilderPane* self);
gboolean shotwell_plugins_common_builder_pane_get_connect_signals (ShotwellPluginsCommonBuilderPane* self);
@@ -77,23 +80,37 @@ static void shotwell_plugins_common_builder_pane_real_on_pane_installed (Shotwel
void shotwell_plugins_common_builder_pane_on_pane_uninstalled (ShotwellPluginsCommonBuilderPane* self);
static void shotwell_plugins_common_builder_pane_real_on_pane_uninstalled (ShotwellPluginsCommonBuilderPane* self);
ShotwellPluginsCommonBuilderPane* shotwell_plugins_common_builder_pane_construct (GType object_type);
-static void shotwell_plugins_common_builder_pane_set_preferred_geometry (ShotwellPluginsCommonBuilderPane* self, SpitPublishingDialogPaneGeometryOptions value);
-static void shotwell_plugins_common_builder_pane_set_resource_path (ShotwellPluginsCommonBuilderPane* self, const gchar* value);
-static void shotwell_plugins_common_builder_pane_set_connect_signals (ShotwellPluginsCommonBuilderPane* self, gboolean value);
-static void shotwell_plugins_common_builder_pane_set_default_id (ShotwellPluginsCommonBuilderPane* self, const gchar* value);
+static void shotwell_plugins_common_builder_pane_set_preferred_geometry (ShotwellPluginsCommonBuilderPane* self,
+ SpitPublishingDialogPaneGeometryOptions value);
+static void shotwell_plugins_common_builder_pane_set_resource_path (ShotwellPluginsCommonBuilderPane* self,
+ const gchar* value);
+static void shotwell_plugins_common_builder_pane_set_connect_signals (ShotwellPluginsCommonBuilderPane* self,
+ gboolean value);
+static void shotwell_plugins_common_builder_pane_set_default_id (ShotwellPluginsCommonBuilderPane* self,
+ const gchar* value);
static void shotwell_plugins_common_builder_pane_finalize (GObject * obj);
-static void _vala_shotwell_plugins_common_builder_pane_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
-static void _vala_shotwell_plugins_common_builder_pane_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec);
-
-
-static gpointer _g_object_ref0 (gpointer self) {
+static void _vala_shotwell_plugins_common_builder_pane_get_property (GObject * object,
+ guint property_id,
+ GValue * value,
+ GParamSpec * pspec);
+static void _vala_shotwell_plugins_common_builder_pane_set_property (GObject * object,
+ guint property_id,
+ const GValue * value,
+ GParamSpec * pspec);
+
+
+static gpointer
+_g_object_ref0 (gpointer self)
+{
#line 32 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
return self ? g_object_ref (self) : NULL;
-#line 93 "BuilderPane.c"
+#line 108 "BuilderPane.c"
}
-static void shotwell_plugins_common_builder_pane_real_constructed (GObject* base) {
+static void
+shotwell_plugins_common_builder_pane_real_constructed (GObject* base)
+{
ShotwellPluginsCommonBuilderPane * self;
gchar* _tmp0_;
gchar* _tmp1_;
@@ -141,13 +158,13 @@ static void shotwell_plugins_common_builder_pane_real_constructed (GObject* base
_tmp7_ = self->priv->_connect_signals;
#line 28 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
if (_tmp7_) {
-#line 145 "BuilderPane.c"
+#line 162 "BuilderPane.c"
GtkBuilder* _tmp8_;
#line 29 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
_tmp8_ = self->priv->builder;
#line 29 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
gtk_builder_connect_signals (_tmp8_, NULL);
-#line 151 "BuilderPane.c"
+#line 168 "BuilderPane.c"
}
#line 32 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
_tmp9_ = self->priv->builder;
@@ -167,7 +184,7 @@ static void shotwell_plugins_common_builder_pane_real_constructed (GObject* base
_tmp14_ = _tmp13_;
#line 35 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
if (_tmp14_ != NULL) {
-#line 171 "BuilderPane.c"
+#line 188 "BuilderPane.c"
GtkWidget* _tmp15_;
GtkContainer* _tmp16_;
GtkContainer* _tmp17_;
@@ -182,12 +199,14 @@ static void shotwell_plugins_common_builder_pane_real_constructed (GObject* base
_tmp18_ = self->priv->content;
#line 36 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
gtk_container_remove (_tmp17_, _tmp18_);
-#line 186 "BuilderPane.c"
+#line 203 "BuilderPane.c"
}
}
-static SpitPublishingDialogPaneGeometryOptions shotwell_plugins_common_builder_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) {
+static SpitPublishingDialogPaneGeometryOptions
+shotwell_plugins_common_builder_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base)
+{
ShotwellPluginsCommonBuilderPane * self;
SpitPublishingDialogPaneGeometryOptions result = 0;
SpitPublishingDialogPaneGeometryOptions _tmp0_;
@@ -199,11 +218,13 @@ static SpitPublishingDialogPaneGeometryOptions shotwell_plugins_common_builder_p
result = _tmp0_;
#line 41 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
return result;
-#line 203 "BuilderPane.c"
+#line 222 "BuilderPane.c"
}
-static GtkWidget* shotwell_plugins_common_builder_pane_real_get_widget (SpitPublishingDialogPane* base) {
+static GtkWidget*
+shotwell_plugins_common_builder_pane_real_get_widget (SpitPublishingDialogPane* base)
+{
ShotwellPluginsCommonBuilderPane * self;
GtkWidget* result = NULL;
GtkWidget* _tmp0_;
@@ -218,11 +239,13 @@ static GtkWidget* shotwell_plugins_common_builder_pane_real_get_widget (SpitPubl
result = _tmp1_;
#line 45 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
return result;
-#line 222 "BuilderPane.c"
+#line 243 "BuilderPane.c"
}
-GtkBuilder* shotwell_plugins_common_builder_pane_get_builder (ShotwellPluginsCommonBuilderPane* self) {
+GtkBuilder*
+shotwell_plugins_common_builder_pane_get_builder (ShotwellPluginsCommonBuilderPane* self)
+{
GtkBuilder* result = NULL;
GtkBuilder* _tmp0_;
GtkBuilder* _tmp1_;
@@ -236,11 +259,13 @@ GtkBuilder* shotwell_plugins_common_builder_pane_get_builder (ShotwellPluginsCom
result = _tmp1_;
#line 49 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
return result;
-#line 240 "BuilderPane.c"
+#line 263 "BuilderPane.c"
}
-static GtkWidget* shotwell_plugins_common_builder_pane_real_get_default_widget (ShotwellPluginsCommonBuilderPane* self) {
+static GtkWidget*
+shotwell_plugins_common_builder_pane_real_get_default_widget (ShotwellPluginsCommonBuilderPane* self)
+{
GtkWidget* result = NULL;
GtkBuilder* _tmp0_;
GtkBuilder* _tmp1_;
@@ -274,56 +299,70 @@ static GtkWidget* shotwell_plugins_common_builder_pane_real_get_default_widget (
result = _tmp7_;
#line 53 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
return result;
-#line 278 "BuilderPane.c"
+#line 303 "BuilderPane.c"
}
-GtkWidget* shotwell_plugins_common_builder_pane_get_default_widget (ShotwellPluginsCommonBuilderPane* self) {
+GtkWidget*
+shotwell_plugins_common_builder_pane_get_default_widget (ShotwellPluginsCommonBuilderPane* self)
+{
#line 52 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
g_return_val_if_fail (SHOTWELL_PLUGINS_COMMON_IS_BUILDER_PANE (self), NULL);
#line 52 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
return SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_GET_CLASS (self)->get_default_widget (self);
-#line 287 "BuilderPane.c"
+#line 314 "BuilderPane.c"
}
-static void shotwell_plugins_common_builder_pane_real_on_pane_installed (ShotwellPluginsCommonBuilderPane* self) {
+static void
+shotwell_plugins_common_builder_pane_real_on_pane_installed (ShotwellPluginsCommonBuilderPane* self)
+{
}
-void shotwell_plugins_common_builder_pane_on_pane_installed (ShotwellPluginsCommonBuilderPane* self) {
+void
+shotwell_plugins_common_builder_pane_on_pane_installed (ShotwellPluginsCommonBuilderPane* self)
+{
#line 56 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
g_return_if_fail (SHOTWELL_PLUGINS_COMMON_IS_BUILDER_PANE (self));
#line 56 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_GET_CLASS (self)->on_pane_installed (self);
-#line 300 "BuilderPane.c"
+#line 331 "BuilderPane.c"
}
-static void shotwell_plugins_common_builder_pane_real_on_pane_uninstalled (ShotwellPluginsCommonBuilderPane* self) {
+static void
+shotwell_plugins_common_builder_pane_real_on_pane_uninstalled (ShotwellPluginsCommonBuilderPane* self)
+{
}
-void shotwell_plugins_common_builder_pane_on_pane_uninstalled (ShotwellPluginsCommonBuilderPane* self) {
+void
+shotwell_plugins_common_builder_pane_on_pane_uninstalled (ShotwellPluginsCommonBuilderPane* self)
+{
#line 58 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
g_return_if_fail (SHOTWELL_PLUGINS_COMMON_IS_BUILDER_PANE (self));
#line 58 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_GET_CLASS (self)->on_pane_uninstalled (self);
-#line 313 "BuilderPane.c"
+#line 348 "BuilderPane.c"
}
-ShotwellPluginsCommonBuilderPane* shotwell_plugins_common_builder_pane_construct (GType object_type) {
+ShotwellPluginsCommonBuilderPane*
+shotwell_plugins_common_builder_pane_construct (GType object_type)
+{
ShotwellPluginsCommonBuilderPane * self = NULL;
#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
self = (ShotwellPluginsCommonBuilderPane*) g_object_new (object_type, NULL);
#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
return self;
-#line 323 "BuilderPane.c"
+#line 360 "BuilderPane.c"
}
-SpitPublishingDialogPaneGeometryOptions shotwell_plugins_common_builder_pane_get_preferred_geometry (ShotwellPluginsCommonBuilderPane* self) {
+SpitPublishingDialogPaneGeometryOptions
+shotwell_plugins_common_builder_pane_get_preferred_geometry (ShotwellPluginsCommonBuilderPane* self)
+{
SpitPublishingDialogPaneGeometryOptions result;
SpitPublishingDialogPaneGeometryOptions _tmp0_;
#line 11 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
@@ -334,29 +373,30 @@ SpitPublishingDialogPaneGeometryOptions shotwell_plugins_common_builder_pane_get
result = _tmp0_;
#line 11 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
return result;
-#line 338 "BuilderPane.c"
+#line 377 "BuilderPane.c"
}
-static void shotwell_plugins_common_builder_pane_set_preferred_geometry (ShotwellPluginsCommonBuilderPane* self, SpitPublishingDialogPaneGeometryOptions value) {
+static void
+shotwell_plugins_common_builder_pane_set_preferred_geometry (ShotwellPluginsCommonBuilderPane* self,
+ SpitPublishingDialogPaneGeometryOptions value)
+{
#line 11 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
g_return_if_fail (SHOTWELL_PLUGINS_COMMON_IS_BUILDER_PANE (self));
#line 11 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
if (shotwell_plugins_common_builder_pane_get_preferred_geometry (self) != value) {
-#line 347 "BuilderPane.c"
- SpitPublishingDialogPaneGeometryOptions _tmp0_;
-#line 11 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
- _tmp0_ = value;
#line 11 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
- self->priv->_preferred_geometry = _tmp0_;
+ self->priv->_preferred_geometry = value;
#line 11 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
- g_object_notify ((GObject *) self, "preferred-geometry");
-#line 355 "BuilderPane.c"
+ g_object_notify_by_pspec ((GObject *) self, shotwell_plugins_common_builder_pane_properties[SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_PREFERRED_GEOMETRY_PROPERTY]);
+#line 393 "BuilderPane.c"
}
}
-gchar* shotwell_plugins_common_builder_pane_get_resource_path (ShotwellPluginsCommonBuilderPane* self) {
+gchar*
+shotwell_plugins_common_builder_pane_get_resource_path (ShotwellPluginsCommonBuilderPane* self)
+{
gchar* result;
const gchar* _tmp0_;
gchar* _tmp1_;
@@ -370,34 +410,36 @@ gchar* shotwell_plugins_common_builder_pane_get_resource_path (ShotwellPluginsCo
result = _tmp1_;
#line 13 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
return result;
-#line 374 "BuilderPane.c"
+#line 414 "BuilderPane.c"
}
-static void shotwell_plugins_common_builder_pane_set_resource_path (ShotwellPluginsCommonBuilderPane* self, const gchar* value) {
+static void
+shotwell_plugins_common_builder_pane_set_resource_path (ShotwellPluginsCommonBuilderPane* self,
+ const gchar* value)
+{
#line 13 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
g_return_if_fail (SHOTWELL_PLUGINS_COMMON_IS_BUILDER_PANE (self));
#line 13 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
if (g_strcmp0 (value, shotwell_plugins_common_builder_pane_get_resource_path (self)) != 0) {
-#line 383 "BuilderPane.c"
- const gchar* _tmp0_;
- gchar* _tmp1_;
+#line 426 "BuilderPane.c"
+ gchar* _tmp0_;
#line 13 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
- _tmp0_ = value;
-#line 13 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
- _tmp1_ = g_strdup (_tmp0_);
+ _tmp0_ = g_strdup (value);
#line 13 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
_g_free0 (self->priv->_resource_path);
#line 13 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
- self->priv->_resource_path = _tmp1_;
+ self->priv->_resource_path = _tmp0_;
#line 13 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
- g_object_notify ((GObject *) self, "resource-path");
-#line 396 "BuilderPane.c"
+ g_object_notify_by_pspec ((GObject *) self, shotwell_plugins_common_builder_pane_properties[SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_RESOURCE_PATH_PROPERTY]);
+#line 436 "BuilderPane.c"
}
}
-gboolean shotwell_plugins_common_builder_pane_get_connect_signals (ShotwellPluginsCommonBuilderPane* self) {
+gboolean
+shotwell_plugins_common_builder_pane_get_connect_signals (ShotwellPluginsCommonBuilderPane* self)
+{
gboolean result;
gboolean _tmp0_;
#line 14 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
@@ -408,29 +450,30 @@ gboolean shotwell_plugins_common_builder_pane_get_connect_signals (ShotwellPlugi
result = _tmp0_;
#line 14 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
return result;
-#line 412 "BuilderPane.c"
+#line 454 "BuilderPane.c"
}
-static void shotwell_plugins_common_builder_pane_set_connect_signals (ShotwellPluginsCommonBuilderPane* self, gboolean value) {
+static void
+shotwell_plugins_common_builder_pane_set_connect_signals (ShotwellPluginsCommonBuilderPane* self,
+ gboolean value)
+{
#line 14 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
g_return_if_fail (SHOTWELL_PLUGINS_COMMON_IS_BUILDER_PANE (self));
#line 14 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
if (shotwell_plugins_common_builder_pane_get_connect_signals (self) != value) {
-#line 421 "BuilderPane.c"
- gboolean _tmp0_;
-#line 14 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
- _tmp0_ = value;
#line 14 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
- self->priv->_connect_signals = _tmp0_;
+ self->priv->_connect_signals = value;
#line 14 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
- g_object_notify ((GObject *) self, "connect-signals");
-#line 429 "BuilderPane.c"
+ g_object_notify_by_pspec ((GObject *) self, shotwell_plugins_common_builder_pane_properties[SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_CONNECT_SIGNALS_PROPERTY]);
+#line 470 "BuilderPane.c"
}
}
-gchar* shotwell_plugins_common_builder_pane_get_default_id (ShotwellPluginsCommonBuilderPane* self) {
+gchar*
+shotwell_plugins_common_builder_pane_get_default_id (ShotwellPluginsCommonBuilderPane* self)
+{
gchar* result;
const gchar* _tmp0_;
gchar* _tmp1_;
@@ -444,34 +487,36 @@ gchar* shotwell_plugins_common_builder_pane_get_default_id (ShotwellPluginsCommo
result = _tmp1_;
#line 16 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
return result;
-#line 448 "BuilderPane.c"
+#line 491 "BuilderPane.c"
}
-static void shotwell_plugins_common_builder_pane_set_default_id (ShotwellPluginsCommonBuilderPane* self, const gchar* value) {
+static void
+shotwell_plugins_common_builder_pane_set_default_id (ShotwellPluginsCommonBuilderPane* self,
+ const gchar* value)
+{
#line 16 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
g_return_if_fail (SHOTWELL_PLUGINS_COMMON_IS_BUILDER_PANE (self));
#line 16 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
if (g_strcmp0 (value, shotwell_plugins_common_builder_pane_get_default_id (self)) != 0) {
-#line 457 "BuilderPane.c"
- const gchar* _tmp0_;
- gchar* _tmp1_;
+#line 503 "BuilderPane.c"
+ gchar* _tmp0_;
#line 16 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
- _tmp0_ = value;
-#line 16 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
- _tmp1_ = g_strdup (_tmp0_);
+ _tmp0_ = g_strdup (value);
#line 16 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
_g_free0 (self->priv->_default_id);
#line 16 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
- self->priv->_default_id = _tmp1_;
+ self->priv->_default_id = _tmp0_;
#line 16 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
- g_object_notify ((GObject *) self, "default-id");
-#line 470 "BuilderPane.c"
+ g_object_notify_by_pspec ((GObject *) self, shotwell_plugins_common_builder_pane_properties[SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_DEFAULT_ID_PROPERTY]);
+#line 513 "BuilderPane.c"
}
}
-static void shotwell_plugins_common_builder_pane_class_init (ShotwellPluginsCommonBuilderPaneClass * klass) {
+static void
+shotwell_plugins_common_builder_pane_class_init (ShotwellPluginsCommonBuilderPaneClass * klass)
+{
#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
shotwell_plugins_common_builder_pane_parent_class = g_type_class_peek_parent (klass);
#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
@@ -491,18 +536,20 @@ static void shotwell_plugins_common_builder_pane_class_init (ShotwellPluginsComm
#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
G_OBJECT_CLASS (klass)->finalize = shotwell_plugins_common_builder_pane_finalize;
#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
- g_object_class_install_property (G_OBJECT_CLASS (klass), SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_PREFERRED_GEOMETRY_PROPERTY, g_param_spec_enum ("preferred-geometry", "preferred-geometry", "preferred-geometry", SPIT_PUBLISHING_DIALOG_PANE_TYPE_GEOMETRY_OPTIONS, SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+ g_object_class_install_property (G_OBJECT_CLASS (klass), SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_PREFERRED_GEOMETRY_PROPERTY, shotwell_plugins_common_builder_pane_properties[SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_PREFERRED_GEOMETRY_PROPERTY] = g_param_spec_enum ("preferred-geometry", "preferred-geometry", "preferred-geometry", SPIT_PUBLISHING_DIALOG_PANE_TYPE_GEOMETRY_OPTIONS, SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
- g_object_class_install_property (G_OBJECT_CLASS (klass), SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_RESOURCE_PATH_PROPERTY, g_param_spec_string ("resource-path", "resource-path", "resource-path", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+ g_object_class_install_property (G_OBJECT_CLASS (klass), SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_RESOURCE_PATH_PROPERTY, shotwell_plugins_common_builder_pane_properties[SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_RESOURCE_PATH_PROPERTY] = g_param_spec_string ("resource-path", "resource-path", "resource-path", NULL, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
- g_object_class_install_property (G_OBJECT_CLASS (klass), SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_CONNECT_SIGNALS_PROPERTY, g_param_spec_boolean ("connect-signals", "connect-signals", "connect-signals", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+ g_object_class_install_property (G_OBJECT_CLASS (klass), SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_CONNECT_SIGNALS_PROPERTY, shotwell_plugins_common_builder_pane_properties[SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_CONNECT_SIGNALS_PROPERTY] = g_param_spec_boolean ("connect-signals", "connect-signals", "connect-signals", FALSE, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
- g_object_class_install_property (G_OBJECT_CLASS (klass), SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_DEFAULT_ID_PROPERTY, g_param_spec_string ("default-id", "default-id", "default-id", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
-#line 502 "BuilderPane.c"
+ g_object_class_install_property (G_OBJECT_CLASS (klass), SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_DEFAULT_ID_PROPERTY, shotwell_plugins_common_builder_pane_properties[SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_DEFAULT_ID_PROPERTY] = g_param_spec_string ("default-id", "default-id", "default-id", NULL, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+#line 547 "BuilderPane.c"
}
-static void shotwell_plugins_common_builder_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) {
+static void
+shotwell_plugins_common_builder_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface)
+{
#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
shotwell_plugins_common_builder_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
@@ -513,11 +560,13 @@ static void shotwell_plugins_common_builder_pane_spit_publishing_dialog_pane_int
iface->on_pane_installed = (void (*) (SpitPublishingDialogPane *)) shotwell_plugins_common_builder_pane_on_pane_installed;
#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
iface->on_pane_uninstalled = (void (*) (SpitPublishingDialogPane *)) shotwell_plugins_common_builder_pane_on_pane_uninstalled;
-#line 517 "BuilderPane.c"
+#line 564 "BuilderPane.c"
}
-static void shotwell_plugins_common_builder_pane_instance_init (ShotwellPluginsCommonBuilderPane * self) {
+static void
+shotwell_plugins_common_builder_pane_instance_init (ShotwellPluginsCommonBuilderPane * self)
+{
gchar* _tmp0_;
#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
self->priv = SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_GET_PRIVATE (self);
@@ -529,11 +578,13 @@ static void shotwell_plugins_common_builder_pane_instance_init (ShotwellPluginsC
_tmp0_ = g_strdup ("default");
#line 15 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
self->priv->_default_id = _tmp0_;
-#line 533 "BuilderPane.c"
+#line 582 "BuilderPane.c"
}
-static void shotwell_plugins_common_builder_pane_finalize (GObject * obj) {
+static void
+shotwell_plugins_common_builder_pane_finalize (GObject * obj)
+{
ShotwellPluginsCommonBuilderPane * self;
#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane);
@@ -547,11 +598,13 @@ static void shotwell_plugins_common_builder_pane_finalize (GObject * obj) {
_g_object_unref0 (self->priv->content);
#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
G_OBJECT_CLASS (shotwell_plugins_common_builder_pane_parent_class)->finalize (obj);
-#line 551 "BuilderPane.c"
+#line 602 "BuilderPane.c"
}
-GType shotwell_plugins_common_builder_pane_get_type (void) {
+GType
+shotwell_plugins_common_builder_pane_get_type (void)
+{
static volatile gsize shotwell_plugins_common_builder_pane_type_id__volatile = 0;
if (g_once_init_enter (&shotwell_plugins_common_builder_pane_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (ShotwellPluginsCommonBuilderPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) shotwell_plugins_common_builder_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ShotwellPluginsCommonBuilderPane), 0, (GInstanceInitFunc) shotwell_plugins_common_builder_pane_instance_init, NULL };
@@ -565,7 +618,12 @@ GType shotwell_plugins_common_builder_pane_get_type (void) {
}
-static void _vala_shotwell_plugins_common_builder_pane_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) {
+static void
+_vala_shotwell_plugins_common_builder_pane_get_property (GObject * object,
+ guint property_id,
+ GValue * value,
+ GParamSpec * pspec)
+{
ShotwellPluginsCommonBuilderPane * self;
self = G_TYPE_CHECK_INSTANCE_CAST (object, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane);
#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
@@ -594,18 +652,23 @@ static void _vala_shotwell_plugins_common_builder_pane_get_property (GObject * o
g_value_take_string (value, shotwell_plugins_common_builder_pane_get_default_id (self));
#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
break;
-#line 598 "BuilderPane.c"
+#line 656 "BuilderPane.c"
default:
#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
break;
-#line 604 "BuilderPane.c"
+#line 662 "BuilderPane.c"
}
}
-static void _vala_shotwell_plugins_common_builder_pane_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) {
+static void
+_vala_shotwell_plugins_common_builder_pane_set_property (GObject * object,
+ guint property_id,
+ const GValue * value,
+ GParamSpec * pspec)
+{
ShotwellPluginsCommonBuilderPane * self;
self = G_TYPE_CHECK_INSTANCE_CAST (object, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane);
#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
@@ -634,13 +697,13 @@ static void _vala_shotwell_plugins_common_builder_pane_set_property (GObject * o
shotwell_plugins_common_builder_pane_set_default_id (self, g_value_get_string (value));
#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
break;
-#line 638 "BuilderPane.c"
+#line 701 "BuilderPane.c"
default:
#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
break;
-#line 644 "BuilderPane.c"
+#line 707 "BuilderPane.c"
}
}
diff --git a/plugins/common/OAuth1Support.c b/plugins/common/OAuth1Support.c
index afa6905..70e0dc1 100644
--- a/plugins/common/OAuth1Support.c
+++ b/plugins/common/OAuth1Support.c
@@ -1,4 +1,4 @@
-/* OAuth1Support.c generated by valac 0.36.6, the Vala compiler
+/* OAuth1Support.c generated by valac 0.40.4, the Vala compiler
* generated from OAuth1Support.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -8,6 +8,7 @@
* (version 2.1 or later). See the COPYING file in this distribution.
*/
+
#include <glib.h>
#include <glib-object.h>
#include <stdlib.h>
@@ -198,49 +199,89 @@ static gpointer publishing_rest_support_oauth1_upload_transaction_parent_class =
#define PUBLISHING_REST_SUPPORT_OAUTH1_ENCODE_RFC_3986_EXTRA "!*'();:@&=+$,/?%#[] \\"
gpointer publishing_rest_support_session_ref (gpointer instance);
void publishing_rest_support_session_unref (gpointer instance);
-GParamSpec* publishing_rest_support_param_spec_session (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void publishing_rest_support_value_set_session (GValue* value, gpointer v_object);
-void publishing_rest_support_value_take_session (GValue* value, gpointer v_object);
+GParamSpec* publishing_rest_support_param_spec_session (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void publishing_rest_support_value_set_session (GValue* value,
+ gpointer v_object);
+void publishing_rest_support_value_take_session (GValue* value,
+ gpointer v_object);
gpointer publishing_rest_support_value_get_session (const GValue* value);
GType publishing_rest_support_session_get_type (void) G_GNUC_CONST;
GType publishing_rest_support_oauth1_session_get_type (void) G_GNUC_CONST;
#define PUBLISHING_REST_SUPPORT_OAUTH1_SESSION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_SESSION, PublishingRESTSupportOAuth1SessionPrivate))
-enum {
- PUBLISHING_REST_SUPPORT_OAUTH1_SESSION_DUMMY_PROPERTY
-};
PublishingRESTSupportOAuth1Session* publishing_rest_support_oauth1_session_new (const gchar* endpoint_uri);
-PublishingRESTSupportOAuth1Session* publishing_rest_support_oauth1_session_construct (GType object_type, const gchar* endpoint_uri);
-PublishingRESTSupportSession* publishing_rest_support_session_construct (GType object_type, const gchar* endpoint_url);
+PublishingRESTSupportOAuth1Session* publishing_rest_support_oauth1_session_construct (GType object_type,
+ const gchar* endpoint_uri);
+PublishingRESTSupportSession* publishing_rest_support_session_construct (GType object_type,
+ const gchar* endpoint_url);
static gboolean publishing_rest_support_oauth1_session_real_is_authenticated (PublishingRESTSupportSession* base);
-void publishing_rest_support_oauth1_session_authenticate_from_persistent_credentials (PublishingRESTSupportOAuth1Session* self, const gchar* token, const gchar* secret, const gchar* username);
+void publishing_rest_support_oauth1_session_authenticate_from_persistent_credentials (PublishingRESTSupportOAuth1Session* self,
+ const gchar* token,
+ const gchar* secret,
+ const gchar* username);
void publishing_rest_support_oauth1_session_deauthenticate (PublishingRESTSupportOAuth1Session* self);
-void publishing_rest_support_oauth1_session_set_api_credentials (PublishingRESTSupportOAuth1Session* self, const gchar* consumer_key, const gchar* consumer_secret);
+void publishing_rest_support_oauth1_session_set_api_credentials (PublishingRESTSupportOAuth1Session* self,
+ const gchar* consumer_key,
+ const gchar* consumer_secret);
gpointer publishing_rest_support_transaction_ref (gpointer instance);
void publishing_rest_support_transaction_unref (gpointer instance);
-GParamSpec* publishing_rest_support_param_spec_transaction (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void publishing_rest_support_value_set_transaction (GValue* value, gpointer v_object);
-void publishing_rest_support_value_take_transaction (GValue* value, gpointer v_object);
+GParamSpec* publishing_rest_support_param_spec_transaction (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void publishing_rest_support_value_set_transaction (GValue* value,
+ gpointer v_object);
+void publishing_rest_support_value_take_transaction (GValue* value,
+ gpointer v_object);
gpointer publishing_rest_support_value_get_transaction (const GValue* value);
GType publishing_rest_support_transaction_get_type (void) G_GNUC_CONST;
gpointer publishing_rest_support_argument_ref (gpointer instance);
void publishing_rest_support_argument_unref (gpointer instance);
-GParamSpec* publishing_rest_support_param_spec_argument (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void publishing_rest_support_value_set_argument (GValue* value, gpointer v_object);
-void publishing_rest_support_value_take_argument (GValue* value, gpointer v_object);
+GParamSpec* publishing_rest_support_param_spec_argument (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void publishing_rest_support_value_set_argument (GValue* value,
+ gpointer v_object);
+void publishing_rest_support_value_take_argument (GValue* value,
+ gpointer v_object);
gpointer publishing_rest_support_value_get_argument (const GValue* value);
GType publishing_rest_support_argument_get_type (void) G_GNUC_CONST;
-gchar* publishing_rest_support_oauth1_session_sign_transaction (PublishingRESTSupportOAuth1Session* self, PublishingRESTSupportTransaction* txn, PublishingRESTSupportArgument** extra_arguments, int extra_arguments_length1);
+gchar* publishing_rest_support_oauth1_session_sign_transaction (PublishingRESTSupportOAuth1Session* self,
+ PublishingRESTSupportTransaction* txn,
+ PublishingRESTSupportArgument** extra_arguments,
+ int extra_arguments_length1);
GType publishing_rest_support_http_method_get_type (void) G_GNUC_CONST;
PublishingRESTSupportHttpMethod publishing_rest_support_transaction_get_method (PublishingRESTSupportTransaction* self);
gchar* publishing_rest_support_http_method_to_string (PublishingRESTSupportHttpMethod self);
-PublishingRESTSupportArgument** publishing_rest_support_transaction_get_arguments (PublishingRESTSupportTransaction* self, int* result_length1);
-static void _vala_array_add2 (PublishingRESTSupportArgument** * array, int* length, int* size, PublishingRESTSupportArgument* value);
-PublishingRESTSupportArgument** publishing_rest_support_argument_sort (PublishingRESTSupportArgument** inputArray, int inputArray_length1, int* result_length1);
-gchar* publishing_rest_support_argument_serialize_list (PublishingRESTSupportArgument** args, int args_length1, gboolean escape, const gchar* separator);
+PublishingRESTSupportArgument** publishing_rest_support_transaction_get_arguments (PublishingRESTSupportTransaction* self,
+ int* result_length1);
+static void _vala_array_add2 (PublishingRESTSupportArgument** * array,
+ int* length,
+ int* size,
+ PublishingRESTSupportArgument* value);
+PublishingRESTSupportArgument** publishing_rest_support_argument_sort (PublishingRESTSupportArgument** inputArray,
+ int inputArray_length1,
+ int* result_length1);
+gchar* publishing_rest_support_argument_serialize_list (PublishingRESTSupportArgument** args,
+ int args_length1,
+ gboolean escape,
+ const gchar* separator);
gchar* publishing_rest_support_transaction_get_endpoint_url (PublishingRESTSupportTransaction* self);
-gchar* publishing_rest_support_hmac_sha1 (const gchar* key, const gchar* message);
-void publishing_rest_support_oauth1_session_set_request_phase_credentials (PublishingRESTSupportOAuth1Session* self, const gchar* token, const gchar* secret);
-void publishing_rest_support_oauth1_session_set_access_phase_credentials (PublishingRESTSupportOAuth1Session* self, const gchar* token, const gchar* secret, const gchar* username);
+gchar* publishing_rest_support_hmac_sha1 (const gchar* key,
+ const gchar* message);
+void publishing_rest_support_oauth1_session_set_request_phase_credentials (PublishingRESTSupportOAuth1Session* self,
+ const gchar* token,
+ const gchar* secret);
+void publishing_rest_support_oauth1_session_set_access_phase_credentials (PublishingRESTSupportOAuth1Session* self,
+ const gchar* token,
+ const gchar* secret,
+ const gchar* username);
gchar* publishing_rest_support_oauth1_session_get_oauth_nonce (PublishingRESTSupportOAuth1Session* self);
gchar* publishing_rest_support_oauth1_session_get_oauth_timestamp (PublishingRESTSupportOAuth1Session* self);
gchar* publishing_rest_support_oauth1_session_get_consumer_key (PublishingRESTSupportOAuth1Session* self);
@@ -252,65 +293,107 @@ gchar* publishing_rest_support_oauth1_session_get_username (PublishingRESTSuppor
gboolean publishing_rest_support_session_is_authenticated (PublishingRESTSupportSession* self);
static void publishing_rest_support_oauth1_session_finalize (PublishingRESTSupportSession * obj);
GType publishing_rest_support_oauth1_transaction_get_type (void) G_GNUC_CONST;
-enum {
- PUBLISHING_REST_SUPPORT_OAUTH1_TRANSACTION_DUMMY_PROPERTY
-};
-PublishingRESTSupportOAuth1Transaction* publishing_rest_support_oauth1_transaction_new (PublishingRESTSupportOAuth1Session* session, PublishingRESTSupportHttpMethod method);
-PublishingRESTSupportOAuth1Transaction* publishing_rest_support_oauth1_transaction_construct (GType object_type, PublishingRESTSupportOAuth1Session* session, PublishingRESTSupportHttpMethod method);
-PublishingRESTSupportTransaction* publishing_rest_support_transaction_new (PublishingRESTSupportSession* parent_session, PublishingRESTSupportHttpMethod method);
-PublishingRESTSupportTransaction* publishing_rest_support_transaction_construct (GType object_type, PublishingRESTSupportSession* parent_session, PublishingRESTSupportHttpMethod method);
+PublishingRESTSupportOAuth1Transaction* publishing_rest_support_oauth1_transaction_new (PublishingRESTSupportOAuth1Session* session,
+ PublishingRESTSupportHttpMethod method);
+PublishingRESTSupportOAuth1Transaction* publishing_rest_support_oauth1_transaction_construct (GType object_type,
+ PublishingRESTSupportOAuth1Session* session,
+ PublishingRESTSupportHttpMethod method);
+PublishingRESTSupportTransaction* publishing_rest_support_transaction_new (PublishingRESTSupportSession* parent_session,
+ PublishingRESTSupportHttpMethod method);
+PublishingRESTSupportTransaction* publishing_rest_support_transaction_construct (GType object_type,
+ PublishingRESTSupportSession* parent_session,
+ PublishingRESTSupportHttpMethod method);
static void publishing_rest_support_oauth1_transaction_setup_arguments (PublishingRESTSupportOAuth1Transaction* self);
-PublishingRESTSupportOAuth1Transaction* publishing_rest_support_oauth1_transaction_new_with_uri (PublishingRESTSupportOAuth1Session* session, const gchar* uri, PublishingRESTSupportHttpMethod method);
-PublishingRESTSupportOAuth1Transaction* publishing_rest_support_oauth1_transaction_construct_with_uri (GType object_type, PublishingRESTSupportOAuth1Session* session, const gchar* uri, PublishingRESTSupportHttpMethod method);
-PublishingRESTSupportTransaction* publishing_rest_support_transaction_new_with_endpoint_url (PublishingRESTSupportSession* parent_session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method);
-PublishingRESTSupportTransaction* publishing_rest_support_transaction_construct_with_endpoint_url (GType object_type, PublishingRESTSupportSession* parent_session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method);
+PublishingRESTSupportOAuth1Transaction* publishing_rest_support_oauth1_transaction_new_with_uri (PublishingRESTSupportOAuth1Session* session,
+ const gchar* uri,
+ PublishingRESTSupportHttpMethod method);
+PublishingRESTSupportOAuth1Transaction* publishing_rest_support_oauth1_transaction_construct_with_uri (GType object_type,
+ PublishingRESTSupportOAuth1Session* session,
+ const gchar* uri,
+ PublishingRESTSupportHttpMethod method);
+PublishingRESTSupportTransaction* publishing_rest_support_transaction_new_with_endpoint_url (PublishingRESTSupportSession* parent_session,
+ const gchar* endpoint_url,
+ PublishingRESTSupportHttpMethod method);
+PublishingRESTSupportTransaction* publishing_rest_support_transaction_construct_with_endpoint_url (GType object_type,
+ PublishingRESTSupportSession* parent_session,
+ const gchar* endpoint_url,
+ PublishingRESTSupportHttpMethod method);
PublishingRESTSupportSession* publishing_rest_support_transaction_get_parent_session (PublishingRESTSupportTransaction* self);
-void publishing_rest_support_transaction_add_argument (PublishingRESTSupportTransaction* self, const gchar* name, const gchar* value);
-static void publishing_rest_support_oauth1_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error);
-void publishing_rest_support_transaction_execute (PublishingRESTSupportTransaction* self, GError** error);
+void publishing_rest_support_transaction_add_argument (PublishingRESTSupportTransaction* self,
+ const gchar* name,
+ const gchar* value);
+static void publishing_rest_support_oauth1_transaction_real_execute (PublishingRESTSupportTransaction* base,
+ GError** error);
+void publishing_rest_support_transaction_execute (PublishingRESTSupportTransaction* self,
+ GError** error);
GType publishing_rest_support_upload_transaction_get_type (void) G_GNUC_CONST;
GType publishing_rest_support_oauth1_upload_transaction_get_type (void) G_GNUC_CONST;
#define PUBLISHING_REST_SUPPORT_OAUTH1_UPLOAD_TRANSACTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportOAuth1UploadTransactionPrivate))
-enum {
- PUBLISHING_REST_SUPPORT_OAUTH1_UPLOAD_TRANSACTION_DUMMY_PROPERTY
-};
-PublishingRESTSupportOAuth1UploadTransaction* publishing_rest_support_oauth1_upload_transaction_new (PublishingRESTSupportOAuth1Session* session, SpitPublishingPublishable* publishable, const gchar* endpoint_uri);
-PublishingRESTSupportOAuth1UploadTransaction* publishing_rest_support_oauth1_upload_transaction_construct (GType object_type, PublishingRESTSupportOAuth1Session* session, SpitPublishingPublishable* publishable, const gchar* endpoint_uri);
-PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transaction_new_with_endpoint_url (PublishingRESTSupportSession* session, SpitPublishingPublishable* publishable, const gchar* endpoint_url);
-PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transaction_construct_with_endpoint_url (GType object_type, PublishingRESTSupportSession* session, SpitPublishingPublishable* publishable, const gchar* endpoint_url);
-void publishing_rest_support_oauth1_upload_transaction_add_authorization_header_field (PublishingRESTSupportOAuth1UploadTransaction* self, const gchar* key, const gchar* value);
-PublishingRESTSupportArgument* publishing_rest_support_argument_new (const gchar* key, const gchar* value);
-PublishingRESTSupportArgument* publishing_rest_support_argument_construct (GType object_type, const gchar* key, const gchar* value);
-static void _vala_array_add3 (PublishingRESTSupportArgument** * array, int* length, int* size, PublishingRESTSupportArgument* value);
+PublishingRESTSupportOAuth1UploadTransaction* publishing_rest_support_oauth1_upload_transaction_new (PublishingRESTSupportOAuth1Session* session,
+ SpitPublishingPublishable* publishable,
+ const gchar* endpoint_uri);
+PublishingRESTSupportOAuth1UploadTransaction* publishing_rest_support_oauth1_upload_transaction_construct (GType object_type,
+ PublishingRESTSupportOAuth1Session* session,
+ SpitPublishingPublishable* publishable,
+ const gchar* endpoint_uri);
+PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transaction_new_with_endpoint_url (PublishingRESTSupportSession* session,
+ SpitPublishingPublishable* publishable,
+ const gchar* endpoint_url);
+PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transaction_construct_with_endpoint_url (GType object_type,
+ PublishingRESTSupportSession* session,
+ SpitPublishingPublishable* publishable,
+ const gchar* endpoint_url);
+void publishing_rest_support_oauth1_upload_transaction_add_authorization_header_field (PublishingRESTSupportOAuth1UploadTransaction* self,
+ const gchar* key,
+ const gchar* value);
+PublishingRESTSupportArgument* publishing_rest_support_argument_new (const gchar* key,
+ const gchar* value);
+PublishingRESTSupportArgument* publishing_rest_support_argument_construct (GType object_type,
+ const gchar* key,
+ const gchar* value);
+static void _vala_array_add3 (PublishingRESTSupportArgument** * array,
+ int* length,
+ int* size,
+ PublishingRESTSupportArgument* value);
gchar* publishing_rest_support_oauth1_upload_transaction_get_authorization_header_string (PublishingRESTSupportOAuth1UploadTransaction* self);
void publishing_rest_support_oauth1_upload_transaction_authorize (PublishingRESTSupportOAuth1UploadTransaction* self);
-void publishing_rest_support_transaction_add_header (PublishingRESTSupportTransaction* self, const gchar* key, const gchar* value);
+void publishing_rest_support_transaction_add_header (PublishingRESTSupportTransaction* self,
+ const gchar* key,
+ const gchar* value);
static void publishing_rest_support_oauth1_upload_transaction_finalize (PublishingRESTSupportTransaction * 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);
-
-
-PublishingRESTSupportOAuth1Session* publishing_rest_support_oauth1_session_construct (GType object_type, const gchar* endpoint_uri) {
+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);
+
+
+PublishingRESTSupportOAuth1Session*
+publishing_rest_support_oauth1_session_construct (GType object_type,
+ const gchar* endpoint_uri)
+{
PublishingRESTSupportOAuth1Session* self = NULL;
- const gchar* _tmp0_;
-#line 21 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp0_ = endpoint_uri;
#line 21 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- self = (PublishingRESTSupportOAuth1Session*) publishing_rest_support_session_construct (object_type, _tmp0_);
+ self = (PublishingRESTSupportOAuth1Session*) publishing_rest_support_session_construct (object_type, endpoint_uri);
#line 20 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
return self;
-#line 303 "OAuth1Support.c"
+#line 382 "OAuth1Support.c"
}
-PublishingRESTSupportOAuth1Session* publishing_rest_support_oauth1_session_new (const gchar* endpoint_uri) {
+PublishingRESTSupportOAuth1Session*
+publishing_rest_support_oauth1_session_new (const gchar* endpoint_uri)
+{
#line 20 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
return publishing_rest_support_oauth1_session_construct (PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_SESSION, endpoint_uri);
-#line 310 "OAuth1Support.c"
+#line 391 "OAuth1Support.c"
}
-static gboolean publishing_rest_support_oauth1_session_real_is_authenticated (PublishingRESTSupportSession* base) {
+static gboolean
+publishing_rest_support_oauth1_session_real_is_authenticated (PublishingRESTSupportSession* base)
+{
PublishingRESTSupportOAuth1Session * self;
gboolean result = FALSE;
gboolean _tmp0_ = FALSE;
@@ -322,47 +405,49 @@ static gboolean publishing_rest_support_oauth1_session_real_is_authenticated (Pu
_tmp2_ = self->priv->access_phase_token;
#line 25 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
if (_tmp2_ != NULL) {
-#line 326 "OAuth1Support.c"
+#line 409 "OAuth1Support.c"
const gchar* _tmp3_;
#line 25 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
_tmp3_ = self->priv->access_phase_token_secret;
#line 25 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
_tmp1_ = _tmp3_ != NULL;
-#line 332 "OAuth1Support.c"
+#line 415 "OAuth1Support.c"
} else {
#line 25 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
_tmp1_ = FALSE;
-#line 336 "OAuth1Support.c"
+#line 419 "OAuth1Support.c"
}
#line 25 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
if (_tmp1_) {
-#line 340 "OAuth1Support.c"
+#line 423 "OAuth1Support.c"
const gchar* _tmp4_;
#line 26 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
_tmp4_ = self->priv->username;
#line 26 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
_tmp0_ = _tmp4_ != NULL;
-#line 346 "OAuth1Support.c"
+#line 429 "OAuth1Support.c"
} else {
#line 25 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
_tmp0_ = FALSE;
-#line 350 "OAuth1Support.c"
+#line 433 "OAuth1Support.c"
}
#line 25 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
result = _tmp0_;
#line 25 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
return result;
-#line 356 "OAuth1Support.c"
+#line 439 "OAuth1Support.c"
}
-void publishing_rest_support_oauth1_session_authenticate_from_persistent_credentials (PublishingRESTSupportOAuth1Session* self, const gchar* token, const gchar* secret, const gchar* username) {
- const gchar* _tmp0_;
+void
+publishing_rest_support_oauth1_session_authenticate_from_persistent_credentials (PublishingRESTSupportOAuth1Session* self,
+ const gchar* token,
+ const gchar* secret,
+ const gchar* username)
+{
+ gchar* _tmp0_;
gchar* _tmp1_;
- const gchar* _tmp2_;
- gchar* _tmp3_;
- const gchar* _tmp4_;
- gchar* _tmp5_;
+ gchar* _tmp2_;
#line 29 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION (self));
#line 29 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
@@ -372,36 +457,32 @@ void publishing_rest_support_oauth1_session_authenticate_from_persistent_credent
#line 29 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
g_return_if_fail (username != NULL);
#line 31 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp0_ = token;
-#line 31 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp1_ = g_strdup (_tmp0_);
+ _tmp0_ = g_strdup (token);
#line 31 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
_g_free0 (self->priv->access_phase_token);
#line 31 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- self->priv->access_phase_token = _tmp1_;
-#line 32 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp2_ = secret;
+ self->priv->access_phase_token = _tmp0_;
#line 32 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp3_ = g_strdup (_tmp2_);
+ _tmp1_ = g_strdup (secret);
#line 32 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
_g_free0 (self->priv->access_phase_token_secret);
#line 32 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- self->priv->access_phase_token_secret = _tmp3_;
+ self->priv->access_phase_token_secret = _tmp1_;
#line 33 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp4_ = username;
-#line 33 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp5_ = g_strdup (_tmp4_);
+ _tmp2_ = g_strdup (username);
#line 33 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
_g_free0 (self->priv->username);
#line 33 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- self->priv->username = _tmp5_;
+ self->priv->username = _tmp2_;
#line 35 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), "authenticated");
-#line 401 "OAuth1Support.c"
+#line 480 "OAuth1Support.c"
}
-void publishing_rest_support_oauth1_session_deauthenticate (PublishingRESTSupportOAuth1Session* self) {
+void
+publishing_rest_support_oauth1_session_deauthenticate (PublishingRESTSupportOAuth1Session* self)
+{
#line 38 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION (self));
#line 39 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
@@ -416,15 +497,17 @@ void publishing_rest_support_oauth1_session_deauthenticate (PublishingRESTSuppor
_g_free0 (self->priv->username);
#line 41 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
self->priv->username = NULL;
-#line 420 "OAuth1Support.c"
+#line 501 "OAuth1Support.c"
}
-void publishing_rest_support_oauth1_session_set_api_credentials (PublishingRESTSupportOAuth1Session* self, const gchar* consumer_key, const gchar* consumer_secret) {
- const gchar* _tmp0_;
+void
+publishing_rest_support_oauth1_session_set_api_credentials (PublishingRESTSupportOAuth1Session* self,
+ const gchar* consumer_key,
+ const gchar* consumer_secret)
+{
+ gchar* _tmp0_;
gchar* _tmp1_;
- const gchar* _tmp2_;
- gchar* _tmp3_;
#line 44 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION (self));
#line 44 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
@@ -432,356 +515,346 @@ void publishing_rest_support_oauth1_session_set_api_credentials (PublishingRESTS
#line 44 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
g_return_if_fail (consumer_secret != NULL);
#line 45 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp0_ = consumer_key;
-#line 45 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp1_ = g_strdup (_tmp0_);
+ _tmp0_ = g_strdup (consumer_key);
#line 45 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
_g_free0 (self->priv->consumer_key);
#line 45 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- self->priv->consumer_key = _tmp1_;
+ self->priv->consumer_key = _tmp0_;
#line 46 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp2_ = consumer_secret;
-#line 46 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp3_ = g_strdup (_tmp2_);
+ _tmp1_ = g_strdup (consumer_secret);
#line 46 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
_g_free0 (self->priv->consumer_secret);
#line 46 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- self->priv->consumer_secret = _tmp3_;
-#line 451 "OAuth1Support.c"
+ self->priv->consumer_secret = _tmp1_;
+#line 530 "OAuth1Support.c"
}
-static gpointer _publishing_rest_support_argument_ref0 (gpointer self) {
+static gpointer
+_publishing_rest_support_argument_ref0 (gpointer self)
+{
#line 58 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
return self ? publishing_rest_support_argument_ref (self) : NULL;
-#line 458 "OAuth1Support.c"
+#line 539 "OAuth1Support.c"
}
-static void _vala_array_add2 (PublishingRESTSupportArgument** * array, int* length, int* size, PublishingRESTSupportArgument* value) {
+static void
+_vala_array_add2 (PublishingRESTSupportArgument** * array,
+ int* length,
+ int* size,
+ PublishingRESTSupportArgument* value)
+{
#line 59 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
if ((*length) == (*size)) {
#line 59 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 59 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
*array = g_renew (PublishingRESTSupportArgument*, *array, (*size) + 1);
-#line 469 "OAuth1Support.c"
+#line 555 "OAuth1Support.c"
}
#line 59 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
(*array)[(*length)++] = value;
#line 59 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
(*array)[*length] = NULL;
-#line 475 "OAuth1Support.c"
+#line 561 "OAuth1Support.c"
}
-gchar* publishing_rest_support_oauth1_session_sign_transaction (PublishingRESTSupportOAuth1Session* self, PublishingRESTSupportTransaction* txn, PublishingRESTSupportArgument** extra_arguments, int extra_arguments_length1) {
+gchar*
+publishing_rest_support_oauth1_session_sign_transaction (PublishingRESTSupportOAuth1Session* self,
+ PublishingRESTSupportTransaction* txn,
+ PublishingRESTSupportArgument** extra_arguments,
+ int extra_arguments_length1)
+{
gchar* result = NULL;
gchar* http_method = NULL;
- PublishingRESTSupportTransaction* _tmp0_;
- PublishingRESTSupportHttpMethod _tmp1_;
+ gchar* _tmp0_;
+ const gchar* _tmp1_;
gchar* _tmp2_;
- const gchar* _tmp3_;
- gchar* _tmp4_;
- gchar* _tmp5_;
+ gchar* _tmp3_;
PublishingRESTSupportArgument** base_string_arguments = NULL;
- PublishingRESTSupportTransaction* _tmp6_;
- gint _tmp7_;
- PublishingRESTSupportArgument** _tmp8_;
+ gint _tmp4_;
+ PublishingRESTSupportArgument** _tmp5_;
gint base_string_arguments_length1;
gint _base_string_arguments_size_;
- PublishingRESTSupportArgument** _tmp9_;
- gint _tmp9__length1;
PublishingRESTSupportArgument** sorted_args = NULL;
- PublishingRESTSupportArgument** _tmp14_;
- gint _tmp14__length1;
- gint _tmp15_;
- PublishingRESTSupportArgument** _tmp16_;
+ PublishingRESTSupportArgument** _tmp10_;
+ gint _tmp10__length1;
+ gint _tmp11_;
+ PublishingRESTSupportArgument** _tmp12_;
gint sorted_args_length1;
gint _sorted_args_size_;
gchar* arguments_string = NULL;
- PublishingRESTSupportArgument** _tmp17_;
- gint _tmp17__length1;
- gchar* _tmp18_;
+ PublishingRESTSupportArgument** _tmp13_;
+ gint _tmp13__length1;
+ gchar* _tmp14_;
gchar* signing_key = NULL;
- const gchar* _tmp19_;
+ const gchar* _tmp15_;
gchar* signature_base_string = NULL;
- const gchar* _tmp33_;
+ const gchar* _tmp29_;
+ gchar* _tmp30_;
+ gchar* _tmp31_;
+ gchar* _tmp32_;
+ gchar* _tmp33_;
gchar* _tmp34_;
gchar* _tmp35_;
- PublishingRESTSupportTransaction* _tmp36_;
+ gchar* _tmp36_;
gchar* _tmp37_;
gchar* _tmp38_;
gchar* _tmp39_;
- gchar* _tmp40_;
+ const gchar* _tmp40_;
gchar* _tmp41_;
gchar* _tmp42_;
gchar* _tmp43_;
gchar* _tmp44_;
const gchar* _tmp45_;
- gchar* _tmp46_;
+ gchar* signature = NULL;
+ const gchar* _tmp46_;
gchar* _tmp47_;
- gchar* _tmp48_;
+ const gchar* _tmp48_;
gchar* _tmp49_;
const gchar* _tmp50_;
- gchar* signature = NULL;
- const gchar* _tmp51_;
- gchar* _tmp52_;
- const gchar* _tmp53_;
- gchar* _tmp54_;
- const gchar* _tmp55_;
#line 49 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION (self), NULL);
#line 49 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn), NULL);
#line 51 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp0_ = txn;
-#line 51 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp1_ = publishing_rest_support_transaction_get_method (_tmp0_);
+ _tmp0_ = publishing_rest_support_http_method_to_string (publishing_rest_support_transaction_get_method (txn));
#line 51 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp2_ = publishing_rest_support_http_method_to_string (_tmp1_);
-#line 51 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- http_method = _tmp2_;
+ http_method = _tmp0_;
#line 53 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
g_debug ("OAuth1Support.vala:53: signing transaction with parameters:");
#line 54 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp3_ = http_method;
+ _tmp1_ = http_method;
#line 54 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp4_ = g_strconcat ("HTTP method = ", _tmp3_, NULL);
+ _tmp2_ = g_strconcat ("HTTP method = ", _tmp1_, NULL);
#line 54 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp5_ = _tmp4_;
+ _tmp3_ = _tmp2_;
#line 54 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- g_debug ("OAuth1Support.vala:54: %s", _tmp5_);
+ g_debug ("OAuth1Support.vala:54: %s", _tmp3_);
#line 54 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _g_free0 (_tmp5_);
-#line 56 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp6_ = txn;
+ _g_free0 (_tmp3_);
#line 56 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp8_ = publishing_rest_support_transaction_get_arguments (_tmp6_, &_tmp7_);
+ _tmp5_ = publishing_rest_support_transaction_get_arguments (txn, &_tmp4_);
#line 56 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- base_string_arguments = _tmp8_;
+ base_string_arguments = _tmp5_;
#line 56 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- base_string_arguments_length1 = _tmp7_;
+ base_string_arguments_length1 = _tmp4_;
#line 56 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
_base_string_arguments_size_ = base_string_arguments_length1;
-#line 58 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp9_ = extra_arguments;
-#line 58 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp9__length1 = extra_arguments_length1;
-#line 572 "OAuth1Support.c"
+#line 647 "OAuth1Support.c"
{
PublishingRESTSupportArgument** arg_collection = NULL;
gint arg_collection_length1 = 0;
gint _arg_collection_size_ = 0;
gint arg_it = 0;
#line 58 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- arg_collection = _tmp9_;
+ arg_collection = extra_arguments;
#line 58 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- arg_collection_length1 = _tmp9__length1;
+ arg_collection_length1 = extra_arguments_length1;
#line 58 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- for (arg_it = 0; arg_it < _tmp9__length1; arg_it = arg_it + 1) {
-#line 584 "OAuth1Support.c"
- PublishingRESTSupportArgument* _tmp10_;
+ for (arg_it = 0; arg_it < extra_arguments_length1; arg_it = arg_it + 1) {
+#line 659 "OAuth1Support.c"
+ PublishingRESTSupportArgument* _tmp6_;
PublishingRESTSupportArgument* arg = NULL;
#line 58 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp10_ = _publishing_rest_support_argument_ref0 (arg_collection[arg_it]);
+ _tmp6_ = _publishing_rest_support_argument_ref0 (arg_collection[arg_it]);
#line 58 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- arg = _tmp10_;
-#line 591 "OAuth1Support.c"
+ arg = _tmp6_;
+#line 666 "OAuth1Support.c"
{
- PublishingRESTSupportArgument** _tmp11_;
- gint _tmp11__length1;
- PublishingRESTSupportArgument* _tmp12_;
- PublishingRESTSupportArgument* _tmp13_;
+ PublishingRESTSupportArgument** _tmp7_;
+ gint _tmp7__length1;
+ PublishingRESTSupportArgument* _tmp8_;
+ PublishingRESTSupportArgument* _tmp9_;
#line 59 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp11_ = base_string_arguments;
+ _tmp7_ = base_string_arguments;
#line 59 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp11__length1 = base_string_arguments_length1;
+ _tmp7__length1 = base_string_arguments_length1;
#line 59 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp12_ = arg;
+ _tmp8_ = arg;
#line 59 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp13_ = _publishing_rest_support_argument_ref0 (_tmp12_);
+ _tmp9_ = _publishing_rest_support_argument_ref0 (_tmp8_);
#line 59 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _vala_array_add2 (&base_string_arguments, &base_string_arguments_length1, &_base_string_arguments_size_, _tmp13_);
+ _vala_array_add2 (&base_string_arguments, &base_string_arguments_length1, &_base_string_arguments_size_, _tmp9_);
#line 58 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
_publishing_rest_support_argument_unref0 (arg);
-#line 609 "OAuth1Support.c"
+#line 684 "OAuth1Support.c"
}
}
}
#line 62 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp14_ = base_string_arguments;
+ _tmp10_ = base_string_arguments;
#line 62 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp14__length1 = base_string_arguments_length1;
+ _tmp10__length1 = base_string_arguments_length1;
#line 62 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp16_ = publishing_rest_support_argument_sort (_tmp14_, _tmp14__length1, &_tmp15_);
+ _tmp12_ = publishing_rest_support_argument_sort (_tmp10_, _tmp10__length1, &_tmp11_);
#line 62 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- sorted_args = _tmp16_;
+ sorted_args = _tmp12_;
#line 62 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- sorted_args_length1 = _tmp15_;
+ sorted_args_length1 = _tmp11_;
#line 62 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
_sorted_args_size_ = sorted_args_length1;
#line 65 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp17_ = sorted_args;
+ _tmp13_ = sorted_args;
#line 65 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp17__length1 = sorted_args_length1;
+ _tmp13__length1 = sorted_args_length1;
#line 65 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp18_ = publishing_rest_support_argument_serialize_list (_tmp17_, _tmp17__length1, FALSE, "&");
+ _tmp14_ = publishing_rest_support_argument_serialize_list (_tmp13_, _tmp13__length1, FALSE, "&");
#line 65 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- arguments_string = _tmp18_;
+ arguments_string = _tmp14_;
#line 67 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
signing_key = NULL;
#line 68 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp19_ = self->priv->access_phase_token_secret;
+ _tmp15_ = self->priv->access_phase_token_secret;
#line 68 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- if (_tmp19_ != NULL) {
-#line 639 "OAuth1Support.c"
- const gchar* _tmp20_;
- gchar* _tmp21_;
- gchar* _tmp22_;
- const gchar* _tmp23_;
- gchar* _tmp24_;
+ if (_tmp15_ != NULL) {
+#line 714 "OAuth1Support.c"
+ const gchar* _tmp16_;
+ gchar* _tmp17_;
+ gchar* _tmp18_;
+ const gchar* _tmp19_;
+ gchar* _tmp20_;
#line 69 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
g_debug ("OAuth1Support.vala:69: access phase token secret available; using it a" \
"s signing key");
#line 71 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp20_ = self->priv->consumer_secret;
+ _tmp16_ = self->priv->consumer_secret;
#line 71 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp21_ = g_strconcat (_tmp20_, "&", NULL);
+ _tmp17_ = g_strconcat (_tmp16_, "&", NULL);
#line 71 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp22_ = _tmp21_;
+ _tmp18_ = _tmp17_;
#line 71 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp23_ = self->priv->access_phase_token_secret;
+ _tmp19_ = self->priv->access_phase_token_secret;
#line 71 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp24_ = g_strconcat (_tmp22_, _tmp23_, NULL);
+ _tmp20_ = g_strconcat (_tmp18_, _tmp19_, NULL);
#line 71 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
_g_free0 (signing_key);
#line 71 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- signing_key = _tmp24_;
+ signing_key = _tmp20_;
#line 71 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _g_free0 (_tmp22_);
-#line 663 "OAuth1Support.c"
+ _g_free0 (_tmp18_);
+#line 738 "OAuth1Support.c"
} else {
- const gchar* _tmp25_;
+ const gchar* _tmp21_;
#line 72 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp25_ = self->priv->request_phase_token_secret;
+ _tmp21_ = self->priv->request_phase_token_secret;
#line 72 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- if (_tmp25_ != NULL) {
-#line 670 "OAuth1Support.c"
- const gchar* _tmp26_;
- gchar* _tmp27_;
- gchar* _tmp28_;
- const gchar* _tmp29_;
- gchar* _tmp30_;
+ if (_tmp21_ != NULL) {
+#line 745 "OAuth1Support.c"
+ const gchar* _tmp22_;
+ gchar* _tmp23_;
+ gchar* _tmp24_;
+ const gchar* _tmp25_;
+ gchar* _tmp26_;
#line 73 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
g_debug ("OAuth1Support.vala:73: request phase token secret available; using it " \
"as signing key");
#line 75 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp26_ = self->priv->consumer_secret;
+ _tmp22_ = self->priv->consumer_secret;
#line 75 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp27_ = g_strconcat (_tmp26_, "&", NULL);
+ _tmp23_ = g_strconcat (_tmp22_, "&", NULL);
#line 75 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp28_ = _tmp27_;
+ _tmp24_ = _tmp23_;
#line 75 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp29_ = self->priv->request_phase_token_secret;
+ _tmp25_ = self->priv->request_phase_token_secret;
#line 75 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp30_ = g_strconcat (_tmp28_, _tmp29_, NULL);
+ _tmp26_ = g_strconcat (_tmp24_, _tmp25_, NULL);
#line 75 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
_g_free0 (signing_key);
#line 75 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- signing_key = _tmp30_;
+ signing_key = _tmp26_;
#line 75 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _g_free0 (_tmp28_);
-#line 694 "OAuth1Support.c"
+ _g_free0 (_tmp24_);
+#line 769 "OAuth1Support.c"
} else {
- const gchar* _tmp31_;
- gchar* _tmp32_;
+ const gchar* _tmp27_;
+ gchar* _tmp28_;
#line 77 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
g_debug ("OAuth1Support.vala:77: %s", "neither access phase nor request phase token secrets available; using " \
"API " "key as signing key");
#line 80 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp31_ = self->priv->consumer_secret;
+ _tmp27_ = self->priv->consumer_secret;
#line 80 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp32_ = g_strconcat (_tmp31_, "&", NULL);
+ _tmp28_ = g_strconcat (_tmp27_, "&", NULL);
#line 80 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
_g_free0 (signing_key);
#line 80 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- signing_key = _tmp32_;
-#line 708 "OAuth1Support.c"
+ signing_key = _tmp28_;
+#line 783 "OAuth1Support.c"
}
}
#line 83 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp33_ = http_method;
-#line 83 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp34_ = g_strconcat (_tmp33_, "&", NULL);
+ _tmp29_ = http_method;
#line 83 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp35_ = _tmp34_;
+ _tmp30_ = g_strconcat (_tmp29_, "&", NULL);
#line 83 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp36_ = txn;
+ _tmp31_ = _tmp30_;
#line 83 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp37_ = publishing_rest_support_transaction_get_endpoint_url (_tmp36_);
+ _tmp32_ = publishing_rest_support_transaction_get_endpoint_url (txn);
#line 83 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp38_ = _tmp37_;
+ _tmp33_ = _tmp32_;
#line 83 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp39_ = soup_uri_encode (_tmp38_, PUBLISHING_REST_SUPPORT_OAUTH1_ENCODE_RFC_3986_EXTRA);
+ _tmp34_ = soup_uri_encode (_tmp33_, PUBLISHING_REST_SUPPORT_OAUTH1_ENCODE_RFC_3986_EXTRA);
#line 83 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp40_ = _tmp39_;
+ _tmp35_ = _tmp34_;
#line 83 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp41_ = g_strconcat (_tmp35_, _tmp40_, NULL);
+ _tmp36_ = g_strconcat (_tmp31_, _tmp35_, NULL);
#line 83 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp42_ = _tmp41_;
+ _tmp37_ = _tmp36_;
#line 83 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp43_ = g_strconcat (_tmp42_, "&", NULL);
-#line 83 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp44_ = _tmp43_;
+ _tmp38_ = g_strconcat (_tmp37_, "&", NULL);
#line 83 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp45_ = arguments_string;
+ _tmp39_ = _tmp38_;
#line 83 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp46_ = soup_uri_encode (_tmp45_, PUBLISHING_REST_SUPPORT_OAUTH1_ENCODE_RFC_3986_EXTRA);
+ _tmp40_ = arguments_string;
#line 83 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp47_ = _tmp46_;
+ _tmp41_ = soup_uri_encode (_tmp40_, PUBLISHING_REST_SUPPORT_OAUTH1_ENCODE_RFC_3986_EXTRA);
#line 83 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp48_ = g_strconcat (_tmp44_, _tmp47_, NULL);
-#line 83 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp49_ = _tmp48_;
+ _tmp42_ = _tmp41_;
#line 83 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _g_free0 (_tmp47_);
+ _tmp43_ = g_strconcat (_tmp39_, _tmp42_, NULL);
#line 83 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _g_free0 (_tmp44_);
+ _tmp44_ = _tmp43_;
#line 83 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
_g_free0 (_tmp42_);
#line 83 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _g_free0 (_tmp40_);
+ _g_free0 (_tmp39_);
#line 83 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _g_free0 (_tmp38_);
+ _g_free0 (_tmp37_);
#line 83 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
_g_free0 (_tmp35_);
#line 83 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- signature_base_string = _tmp49_;
+ _g_free0 (_tmp33_);
+#line 83 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _g_free0 (_tmp31_);
+#line 83 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ signature_base_string = _tmp44_;
#line 87 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
g_debug ("OAuth1Support.vala:87: signature base string = '%s'", signature_base_string);
#line 89 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp50_ = signing_key;
+ _tmp45_ = signing_key;
#line 89 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- g_debug ("OAuth1Support.vala:89: signing key = '%s'", _tmp50_);
+ g_debug ("OAuth1Support.vala:89: signing key = '%s'", _tmp45_);
#line 92 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp51_ = signing_key;
+ _tmp46_ = signing_key;
#line 92 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp52_ = publishing_rest_support_hmac_sha1 (_tmp51_, signature_base_string);
+ _tmp47_ = publishing_rest_support_hmac_sha1 (_tmp46_, signature_base_string);
#line 92 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- signature = _tmp52_;
+ signature = _tmp47_;
#line 93 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp53_ = signature;
+ _tmp48_ = signature;
#line 93 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp54_ = soup_uri_encode (_tmp53_, PUBLISHING_REST_SUPPORT_OAUTH1_ENCODE_RFC_3986_EXTRA);
+ _tmp49_ = soup_uri_encode (_tmp48_, PUBLISHING_REST_SUPPORT_OAUTH1_ENCODE_RFC_3986_EXTRA);
#line 93 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
_g_free0 (signature);
#line 93 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- signature = _tmp54_;
+ signature = _tmp49_;
#line 95 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp55_ = signature;
+ _tmp50_ = signature;
#line 95 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- g_debug ("OAuth1Support.vala:95: signature = '%s'", _tmp55_);
+ g_debug ("OAuth1Support.vala:95: signature = '%s'", _tmp50_);
#line 97 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
result = signature;
#line 97 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
@@ -798,15 +871,17 @@ gchar* publishing_rest_support_oauth1_session_sign_transaction (PublishingRESTSu
_g_free0 (http_method);
#line 97 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
return result;
-#line 799 "OAuth1Support.c"
+#line 872 "OAuth1Support.c"
}
-void publishing_rest_support_oauth1_session_set_request_phase_credentials (PublishingRESTSupportOAuth1Session* self, const gchar* token, const gchar* secret) {
- const gchar* _tmp0_;
+void
+publishing_rest_support_oauth1_session_set_request_phase_credentials (PublishingRESTSupportOAuth1Session* self,
+ const gchar* token,
+ const gchar* secret)
+{
+ gchar* _tmp0_;
gchar* _tmp1_;
- const gchar* _tmp2_;
- gchar* _tmp3_;
#line 100 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION (self));
#line 100 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
@@ -814,32 +889,30 @@ void publishing_rest_support_oauth1_session_set_request_phase_credentials (Publi
#line 100 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
g_return_if_fail (secret != NULL);
#line 101 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp0_ = token;
-#line 101 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp1_ = g_strdup (_tmp0_);
+ _tmp0_ = g_strdup (token);
#line 101 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
_g_free0 (self->priv->request_phase_token);
#line 101 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- self->priv->request_phase_token = _tmp1_;
-#line 102 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp2_ = secret;
+ self->priv->request_phase_token = _tmp0_;
#line 102 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp3_ = g_strdup (_tmp2_);
+ _tmp1_ = g_strdup (secret);
#line 102 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
_g_free0 (self->priv->request_phase_token_secret);
#line 102 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- self->priv->request_phase_token_secret = _tmp3_;
-#line 830 "OAuth1Support.c"
+ self->priv->request_phase_token_secret = _tmp1_;
+#line 901 "OAuth1Support.c"
}
-void publishing_rest_support_oauth1_session_set_access_phase_credentials (PublishingRESTSupportOAuth1Session* self, const gchar* token, const gchar* secret, const gchar* username) {
- const gchar* _tmp0_;
+void
+publishing_rest_support_oauth1_session_set_access_phase_credentials (PublishingRESTSupportOAuth1Session* self,
+ const gchar* token,
+ const gchar* secret,
+ const gchar* username)
+{
+ gchar* _tmp0_;
gchar* _tmp1_;
- const gchar* _tmp2_;
- gchar* _tmp3_;
- const gchar* _tmp4_;
- gchar* _tmp5_;
+ gchar* _tmp2_;
#line 105 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION (self));
#line 105 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
@@ -849,36 +922,32 @@ void publishing_rest_support_oauth1_session_set_access_phase_credentials (Publis
#line 105 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
g_return_if_fail (username != NULL);
#line 106 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp0_ = token;
-#line 106 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp1_ = g_strdup (_tmp0_);
+ _tmp0_ = g_strdup (token);
#line 106 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
_g_free0 (self->priv->access_phase_token);
#line 106 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- self->priv->access_phase_token = _tmp1_;
-#line 107 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp2_ = secret;
+ self->priv->access_phase_token = _tmp0_;
#line 107 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp3_ = g_strdup (_tmp2_);
+ _tmp1_ = g_strdup (secret);
#line 107 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
_g_free0 (self->priv->access_phase_token_secret);
#line 107 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- self->priv->access_phase_token_secret = _tmp3_;
+ self->priv->access_phase_token_secret = _tmp1_;
#line 108 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp4_ = username;
-#line 108 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp5_ = g_strdup (_tmp4_);
+ _tmp2_ = g_strdup (username);
#line 108 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
_g_free0 (self->priv->username);
#line 108 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- self->priv->username = _tmp5_;
+ self->priv->username = _tmp2_;
#line 110 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), "authenticated");
-#line 875 "OAuth1Support.c"
+#line 942 "OAuth1Support.c"
}
-gchar* publishing_rest_support_oauth1_session_get_oauth_nonce (PublishingRESTSupportOAuth1Session* self) {
+gchar*
+publishing_rest_support_oauth1_session_get_oauth_nonce (PublishingRESTSupportOAuth1Session* self)
+{
gchar* result = NULL;
GTimeVal currtime = {0};
GTimeVal _tmp0_;
@@ -933,208 +1002,156 @@ gchar* publishing_rest_support_oauth1_session_get_oauth_nonce (PublishingRESTSup
result = _tmp11_;
#line 117 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
return result;
-#line 934 "OAuth1Support.c"
+#line 1003 "OAuth1Support.c"
}
-static glong string_strnlen (gchar* str, glong maxlen) {
+static glong
+string_strnlen (gchar* str,
+ glong maxlen)
+{
glong result = 0L;
gchar* end = NULL;
gchar* _tmp0_;
- glong _tmp1_;
- gchar* _tmp2_;
- gchar* _tmp3_;
-#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp0_ = str;
-#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp1_ = maxlen;
-#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- end = _tmp2_;
-#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp3_ = end;
-#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp3_ == NULL) {
-#line 957 "OAuth1Support.c"
- glong _tmp4_;
-#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp4_ = maxlen;
-#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- result = _tmp4_;
-#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ gchar* _tmp1_;
+#line 1336 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp0_ = memchr (str, 0, (gsize) maxlen);
+#line 1336 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ end = _tmp0_;
+#line 1337 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp1_ = end;
+#line 1337 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (_tmp1_ == NULL) {
+#line 1338 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = maxlen;
+#line 1338 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 965 "OAuth1Support.c"
+#line 1027 "OAuth1Support.c"
} else {
- gchar* _tmp5_;
- gchar* _tmp6_;
-#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp5_ = end;
-#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp6_ = str;
-#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- result = (glong) (_tmp5_ - _tmp6_);
-#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ gchar* _tmp2_;
+#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp2_ = end;
+#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = (glong) (_tmp2_ - str);
+#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 977 "OAuth1Support.c"
+#line 1036 "OAuth1Support.c"
}
}
-static gchar* string_substring (const gchar* self, glong offset, glong len) {
+static gchar*
+string_substring (const gchar* self,
+ glong offset,
+ glong len)
+{
gchar* result = NULL;
glong string_length = 0L;
gboolean _tmp0_ = FALSE;
- glong _tmp1_;
- glong _tmp8_;
- glong _tmp14_;
- glong _tmp17_;
- glong _tmp18_;
- glong _tmp19_;
- glong _tmp20_;
- glong _tmp21_;
- gchar* _tmp22_;
-#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ glong _tmp6_;
+ gchar* _tmp7_;
+#line 1347 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp1_ = offset;
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp1_ >= ((glong) 0)) {
-#line 1001 "OAuth1Support.c"
- glong _tmp2_;
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp2_ = len;
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp0_ = _tmp2_ >= ((glong) 0);
-#line 1007 "OAuth1Support.c"
+#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (offset >= ((glong) 0)) {
+#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp0_ = len >= ((glong) 0);
+#line 1057 "OAuth1Support.c"
} else {
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp0_ = FALSE;
-#line 1011 "OAuth1Support.c"
+#line 1061 "OAuth1Support.c"
}
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
if (_tmp0_) {
-#line 1015 "OAuth1Support.c"
- glong _tmp3_;
- glong _tmp4_;
- glong _tmp5_;
-#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp3_ = offset;
-#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp4_ = len;
-#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- string_length = _tmp5_;
-#line 1027 "OAuth1Support.c"
+#line 1351 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ string_length = string_strnlen ((gchar*) self, offset + len);
+#line 1067 "OAuth1Support.c"
} else {
- gint _tmp6_;
- gint _tmp7_;
-#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp6_ = strlen (self);
-#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp7_ = _tmp6_;
-#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- string_length = (glong) _tmp7_;
-#line 1037 "OAuth1Support.c"
+ gint _tmp1_;
+ gint _tmp2_;
+#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp1_ = strlen (self);
+#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp2_ = _tmp1_;
+#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ string_length = (glong) _tmp2_;
+#line 1077 "OAuth1Support.c"
}
-#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp8_ = offset;
-#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp8_ < ((glong) 0)) {
-#line 1043 "OAuth1Support.c"
- glong _tmp9_;
- glong _tmp10_;
- glong _tmp11_;
-#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp9_ = string_length;
-#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp10_ = offset;
-#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- offset = _tmp9_ + _tmp10_;
-#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp11_ = offset;
-#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 1057 "OAuth1Support.c"
+#line 1356 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (offset < ((glong) 0)) {
+#line 1081 "OAuth1Support.c"
+ glong _tmp3_;
+#line 1357 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp3_ = string_length;
+#line 1357 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ offset = _tmp3_ + offset;
+#line 1358 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ g_return_val_if_fail (offset >= ((glong) 0), NULL);
+#line 1089 "OAuth1Support.c"
} else {
- glong _tmp12_;
- glong _tmp13_;
-#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp12_ = offset;
-#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp13_ = string_length;
-#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 1067 "OAuth1Support.c"
+ glong _tmp4_;
+#line 1360 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp4_ = string_length;
+#line 1360 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ g_return_val_if_fail (offset <= _tmp4_, NULL);
+#line 1096 "OAuth1Support.c"
}
-#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp14_ = len;
-#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp14_ < ((glong) 0)) {
-#line 1073 "OAuth1Support.c"
- glong _tmp15_;
- glong _tmp16_;
-#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp15_ = string_length;
-#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp16_ = offset;
-#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- len = _tmp15_ - _tmp16_;
-#line 1082 "OAuth1Support.c"
+#line 1362 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (len < ((glong) 0)) {
+#line 1100 "OAuth1Support.c"
+ glong _tmp5_;
+#line 1363 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp5_ = string_length;
+#line 1363 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ len = _tmp5_ - offset;
+#line 1106 "OAuth1Support.c"
}
-#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp17_ = offset;
-#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp18_ = len;
-#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp19_ = string_length;
-#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp20_ = offset;
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp21_ = len;
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- result = _tmp22_;
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1365 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp6_ = string_length;
+#line 1365 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ g_return_val_if_fail ((offset + len) <= _tmp6_, NULL);
+#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp7_ = g_strndup (((gchar*) self) + offset, (gsize) len);
+#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = _tmp7_;
+#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 1102 "OAuth1Support.c"
+#line 1118 "OAuth1Support.c"
}
-gchar* publishing_rest_support_oauth1_session_get_oauth_timestamp (PublishingRESTSupportOAuth1Session* self) {
+gchar*
+publishing_rest_support_oauth1_session_get_oauth_timestamp (PublishingRESTSupportOAuth1Session* self)
+{
gchar* result = NULL;
- gint64 _tmp0_;
+ gchar* _tmp0_;
gchar* _tmp1_;
gchar* _tmp2_;
gchar* _tmp3_;
- gchar* _tmp4_;
#line 121 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION (self), NULL);
#line 122 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp0_ = g_get_real_time ();
-#line 122 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp1_ = g_strdup_printf ("%" G_GINT64_FORMAT, _tmp0_);
+ _tmp0_ = g_strdup_printf ("%" G_GINT64_FORMAT, g_get_real_time ());
#line 122 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp2_ = _tmp1_;
+ _tmp1_ = _tmp0_;
#line 122 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp3_ = string_substring (_tmp2_, (glong) 0, (glong) 10);
+ _tmp2_ = string_substring (_tmp1_, (glong) 0, (glong) 10);
#line 122 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp4_ = _tmp3_;
+ _tmp3_ = _tmp2_;
#line 122 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _g_free0 (_tmp2_);
+ _g_free0 (_tmp1_);
#line 122 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- result = _tmp4_;
+ result = _tmp3_;
#line 122 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
return result;
-#line 1131 "OAuth1Support.c"
+#line 1146 "OAuth1Support.c"
}
-gchar* publishing_rest_support_oauth1_session_get_consumer_key (PublishingRESTSupportOAuth1Session* self) {
+gchar*
+publishing_rest_support_oauth1_session_get_consumer_key (PublishingRESTSupportOAuth1Session* self)
+{
gchar* result = NULL;
const gchar* _tmp0_;
const gchar* _tmp1_;
@@ -1153,11 +1170,13 @@ gchar* publishing_rest_support_oauth1_session_get_consumer_key (PublishingRESTSu
result = _tmp2_;
#line 127 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
return result;
-#line 1154 "OAuth1Support.c"
+#line 1171 "OAuth1Support.c"
}
-gchar* publishing_rest_support_oauth1_session_get_request_phase_token (PublishingRESTSupportOAuth1Session* self) {
+gchar*
+publishing_rest_support_oauth1_session_get_request_phase_token (PublishingRESTSupportOAuth1Session* self)
+{
gchar* result = NULL;
const gchar* _tmp0_;
const gchar* _tmp1_;
@@ -1176,11 +1195,13 @@ gchar* publishing_rest_support_oauth1_session_get_request_phase_token (Publishin
result = _tmp2_;
#line 132 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
return result;
-#line 1177 "OAuth1Support.c"
+#line 1196 "OAuth1Support.c"
}
-gchar* publishing_rest_support_oauth1_session_get_access_phase_token (PublishingRESTSupportOAuth1Session* self) {
+gchar*
+publishing_rest_support_oauth1_session_get_access_phase_token (PublishingRESTSupportOAuth1Session* self)
+{
gchar* result = NULL;
const gchar* _tmp0_;
const gchar* _tmp1_;
@@ -1199,11 +1220,13 @@ gchar* publishing_rest_support_oauth1_session_get_access_phase_token (Publishing
result = _tmp2_;
#line 137 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
return result;
-#line 1200 "OAuth1Support.c"
+#line 1221 "OAuth1Support.c"
}
-gboolean publishing_rest_support_oauth1_session_has_access_phase_token (PublishingRESTSupportOAuth1Session* self) {
+gboolean
+publishing_rest_support_oauth1_session_has_access_phase_token (PublishingRESTSupportOAuth1Session* self)
+{
gboolean result = FALSE;
const gchar* _tmp0_;
#line 140 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
@@ -1214,11 +1237,13 @@ gboolean publishing_rest_support_oauth1_session_has_access_phase_token (Publishi
result = _tmp0_ != NULL;
#line 141 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
return result;
-#line 1215 "OAuth1Support.c"
+#line 1238 "OAuth1Support.c"
}
-gchar* publishing_rest_support_oauth1_session_get_access_phase_token_secret (PublishingRESTSupportOAuth1Session* self) {
+gchar*
+publishing_rest_support_oauth1_session_get_access_phase_token_secret (PublishingRESTSupportOAuth1Session* self)
+{
gchar* result = NULL;
const gchar* _tmp0_;
const gchar* _tmp1_;
@@ -1237,34 +1262,35 @@ gchar* publishing_rest_support_oauth1_session_get_access_phase_token_secret (Pub
result = _tmp2_;
#line 146 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
return result;
-#line 1238 "OAuth1Support.c"
+#line 1263 "OAuth1Support.c"
}
-gchar* publishing_rest_support_oauth1_session_get_username (PublishingRESTSupportOAuth1Session* self) {
+gchar*
+publishing_rest_support_oauth1_session_get_username (PublishingRESTSupportOAuth1Session* self)
+{
gchar* result = NULL;
- gboolean _tmp0_;
- const gchar* _tmp1_;
- gchar* _tmp2_;
+ const gchar* _tmp0_;
+ gchar* _tmp1_;
#line 149 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION (self), NULL);
#line 150 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp0_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 150 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _vala_assert (_tmp0_, "is_authenticated()");
+ _vala_assert (publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession)), "is_authenticated()");
#line 151 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp1_ = self->priv->username;
+ _tmp0_ = self->priv->username;
#line 151 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp2_ = g_strdup (_tmp1_);
+ _tmp1_ = g_strdup (_tmp0_);
#line 151 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- result = _tmp2_;
+ result = _tmp1_;
#line 151 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
return result;
-#line 1261 "OAuth1Support.c"
+#line 1285 "OAuth1Support.c"
}
-static void publishing_rest_support_oauth1_session_class_init (PublishingRESTSupportOAuth1SessionClass * klass) {
+static void
+publishing_rest_support_oauth1_session_class_init (PublishingRESTSupportOAuth1SessionClass * klass)
+{
#line 11 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
publishing_rest_support_oauth1_session_parent_class = g_type_class_peek_parent (klass);
#line 11 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
@@ -1273,11 +1299,13 @@ static void publishing_rest_support_oauth1_session_class_init (PublishingRESTSup
g_type_class_add_private (klass, sizeof (PublishingRESTSupportOAuth1SessionPrivate));
#line 11 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*) (PublishingRESTSupportSession *)) publishing_rest_support_oauth1_session_real_is_authenticated;
-#line 1274 "OAuth1Support.c"
+#line 1300 "OAuth1Support.c"
}
-static void publishing_rest_support_oauth1_session_instance_init (PublishingRESTSupportOAuth1Session * self) {
+static void
+publishing_rest_support_oauth1_session_instance_init (PublishingRESTSupportOAuth1Session * self)
+{
#line 11 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
self->priv = PUBLISHING_REST_SUPPORT_OAUTH1_SESSION_GET_PRIVATE (self);
#line 12 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
@@ -1294,11 +1322,13 @@ static void publishing_rest_support_oauth1_session_instance_init (PublishingREST
self->priv->consumer_key = NULL;
#line 18 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
self->priv->consumer_secret = NULL;
-#line 1295 "OAuth1Support.c"
+#line 1323 "OAuth1Support.c"
}
-static void publishing_rest_support_oauth1_session_finalize (PublishingRESTSupportSession * obj) {
+static void
+publishing_rest_support_oauth1_session_finalize (PublishingRESTSupportSession * obj)
+{
PublishingRESTSupportOAuth1Session * self;
#line 11 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_SESSION, PublishingRESTSupportOAuth1Session);
@@ -1318,11 +1348,13 @@ static void publishing_rest_support_oauth1_session_finalize (PublishingRESTSuppo
_g_free0 (self->priv->consumer_secret);
#line 11 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
PUBLISHING_REST_SUPPORT_SESSION_CLASS (publishing_rest_support_oauth1_session_parent_class)->finalize (obj);
-#line 1319 "OAuth1Support.c"
+#line 1349 "OAuth1Support.c"
}
-GType publishing_rest_support_oauth1_session_get_type (void) {
+GType
+publishing_rest_support_oauth1_session_get_type (void)
+{
static volatile gsize publishing_rest_support_oauth1_session_type_id__volatile = 0;
if (g_once_init_enter (&publishing_rest_support_oauth1_session_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingRESTSupportOAuth1SessionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_rest_support_oauth1_session_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingRESTSupportOAuth1Session), 0, (GInstanceInitFunc) publishing_rest_support_oauth1_session_instance_init, NULL };
@@ -1334,66 +1366,69 @@ GType publishing_rest_support_oauth1_session_get_type (void) {
}
-PublishingRESTSupportOAuth1Transaction* publishing_rest_support_oauth1_transaction_construct (GType object_type, PublishingRESTSupportOAuth1Session* session, PublishingRESTSupportHttpMethod method) {
+PublishingRESTSupportOAuth1Transaction*
+publishing_rest_support_oauth1_transaction_construct (GType object_type,
+ PublishingRESTSupportOAuth1Session* session,
+ PublishingRESTSupportHttpMethod method)
+{
PublishingRESTSupportOAuth1Transaction* self = NULL;
- PublishingRESTSupportOAuth1Session* _tmp0_;
- PublishingRESTSupportHttpMethod _tmp1_;
#line 156 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION (session), NULL);
#line 158 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp0_ = session;
-#line 158 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp1_ = method;
-#line 158 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- self = (PublishingRESTSupportOAuth1Transaction*) publishing_rest_support_transaction_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_);
+ self = (PublishingRESTSupportOAuth1Transaction*) publishing_rest_support_transaction_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), method);
#line 159 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
publishing_rest_support_oauth1_transaction_setup_arguments (self);
#line 156 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
return self;
-#line 1351 "OAuth1Support.c"
+#line 1381 "OAuth1Support.c"
}
-PublishingRESTSupportOAuth1Transaction* publishing_rest_support_oauth1_transaction_new (PublishingRESTSupportOAuth1Session* session, PublishingRESTSupportHttpMethod method) {
+PublishingRESTSupportOAuth1Transaction*
+publishing_rest_support_oauth1_transaction_new (PublishingRESTSupportOAuth1Session* session,
+ PublishingRESTSupportHttpMethod method)
+{
#line 156 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
return publishing_rest_support_oauth1_transaction_construct (PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_TRANSACTION, session, method);
-#line 1358 "OAuth1Support.c"
+#line 1391 "OAuth1Support.c"
}
-PublishingRESTSupportOAuth1Transaction* publishing_rest_support_oauth1_transaction_construct_with_uri (GType object_type, PublishingRESTSupportOAuth1Session* session, const gchar* uri, PublishingRESTSupportHttpMethod method) {
+PublishingRESTSupportOAuth1Transaction*
+publishing_rest_support_oauth1_transaction_construct_with_uri (GType object_type,
+ PublishingRESTSupportOAuth1Session* session,
+ const gchar* uri,
+ PublishingRESTSupportHttpMethod method)
+{
PublishingRESTSupportOAuth1Transaction* self = NULL;
- PublishingRESTSupportOAuth1Session* _tmp0_;
- const gchar* _tmp1_;
- PublishingRESTSupportHttpMethod _tmp2_;
#line 162 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION (session), NULL);
#line 162 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
g_return_val_if_fail (uri != NULL, NULL);
#line 164 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp0_ = session;
-#line 164 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp1_ = uri;
-#line 164 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp2_ = method;
-#line 164 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- self = (PublishingRESTSupportOAuth1Transaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, _tmp2_);
+ self = (PublishingRESTSupportOAuth1Transaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), uri, method);
#line 165 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
publishing_rest_support_oauth1_transaction_setup_arguments (self);
#line 162 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
return self;
-#line 1383 "OAuth1Support.c"
+#line 1412 "OAuth1Support.c"
}
-PublishingRESTSupportOAuth1Transaction* publishing_rest_support_oauth1_transaction_new_with_uri (PublishingRESTSupportOAuth1Session* session, const gchar* uri, PublishingRESTSupportHttpMethod method) {
+PublishingRESTSupportOAuth1Transaction*
+publishing_rest_support_oauth1_transaction_new_with_uri (PublishingRESTSupportOAuth1Session* session,
+ const gchar* uri,
+ PublishingRESTSupportHttpMethod method)
+{
#line 162 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
return publishing_rest_support_oauth1_transaction_construct_with_uri (PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_TRANSACTION, session, uri, method);
-#line 1390 "OAuth1Support.c"
+#line 1423 "OAuth1Support.c"
}
-static void publishing_rest_support_oauth1_transaction_setup_arguments (PublishingRESTSupportOAuth1Transaction* self) {
+static void
+publishing_rest_support_oauth1_transaction_setup_arguments (PublishingRESTSupportOAuth1Transaction* self)
+{
PublishingRESTSupportOAuth1Session* session = NULL;
PublishingRESTSupportSession* _tmp0_;
PublishingRESTSupportOAuth1Session* _tmp1_;
@@ -1406,7 +1441,6 @@ static void publishing_rest_support_oauth1_transaction_setup_arguments (Publishi
gchar* _tmp8_;
gchar* _tmp9_;
PublishingRESTSupportOAuth1Session* _tmp10_;
- gboolean _tmp11_;
#line 168 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_TRANSACTION (self));
#line 169 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
@@ -1450,32 +1484,33 @@ static void publishing_rest_support_oauth1_transaction_setup_arguments (Publishi
#line 176 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
_tmp10_ = session;
#line 176 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp11_ = publishing_rest_support_oauth1_session_has_access_phase_token (_tmp10_);
-#line 176 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- if (_tmp11_) {
-#line 1454 "OAuth1Support.c"
- PublishingRESTSupportOAuth1Session* _tmp12_;
+ if (publishing_rest_support_oauth1_session_has_access_phase_token (_tmp10_)) {
+#line 1486 "OAuth1Support.c"
+ PublishingRESTSupportOAuth1Session* _tmp11_;
+ gchar* _tmp12_;
gchar* _tmp13_;
- gchar* _tmp14_;
#line 177 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp12_ = session;
+ _tmp11_ = session;
#line 177 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp13_ = publishing_rest_support_oauth1_session_get_access_phase_token (_tmp12_);
+ _tmp12_ = publishing_rest_support_oauth1_session_get_access_phase_token (_tmp11_);
#line 177 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp14_ = _tmp13_;
+ _tmp13_ = _tmp12_;
#line 177 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_token", _tmp14_);
+ publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_token", _tmp13_);
#line 177 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _g_free0 (_tmp14_);
-#line 1468 "OAuth1Support.c"
+ _g_free0 (_tmp13_);
+#line 1500 "OAuth1Support.c"
}
#line 168 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
_publishing_rest_support_session_unref0 (session);
-#line 1472 "OAuth1Support.c"
+#line 1504 "OAuth1Support.c"
}
-static void publishing_rest_support_oauth1_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error) {
+static void
+publishing_rest_support_oauth1_transaction_real_execute (PublishingRESTSupportTransaction* base,
+ GError** error)
+{
PublishingRESTSupportOAuth1Transaction * self;
gchar* signature = NULL;
PublishingRESTSupportSession* _tmp0_;
@@ -1511,7 +1546,7 @@ static void publishing_rest_support_oauth1_transaction_real_execute (PublishingR
_g_free0 (signature);
#line 186 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
return;
-#line 1512 "OAuth1Support.c"
+#line 1547 "OAuth1Support.c"
} else {
#line 186 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
_g_free0 (signature);
@@ -1521,29 +1556,35 @@ static void publishing_rest_support_oauth1_transaction_real_execute (PublishingR
g_clear_error (&_inner_error_);
#line 186 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
return;
-#line 1522 "OAuth1Support.c"
+#line 1557 "OAuth1Support.c"
}
}
#line 182 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
_g_free0 (signature);
-#line 1527 "OAuth1Support.c"
+#line 1562 "OAuth1Support.c"
}
-static void publishing_rest_support_oauth1_transaction_class_init (PublishingRESTSupportOAuth1TransactionClass * klass) {
+static void
+publishing_rest_support_oauth1_transaction_class_init (PublishingRESTSupportOAuth1TransactionClass * klass)
+{
#line 155 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
publishing_rest_support_oauth1_transaction_parent_class = g_type_class_peek_parent (klass);
#line 155 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*) (PublishingRESTSupportTransaction *, GError**)) publishing_rest_support_oauth1_transaction_real_execute;
-#line 1536 "OAuth1Support.c"
+#line 1573 "OAuth1Support.c"
}
-static void publishing_rest_support_oauth1_transaction_instance_init (PublishingRESTSupportOAuth1Transaction * self) {
+static void
+publishing_rest_support_oauth1_transaction_instance_init (PublishingRESTSupportOAuth1Transaction * self)
+{
}
-GType publishing_rest_support_oauth1_transaction_get_type (void) {
+GType
+publishing_rest_support_oauth1_transaction_get_type (void)
+{
static volatile gsize publishing_rest_support_oauth1_transaction_type_id__volatile = 0;
if (g_once_init_enter (&publishing_rest_support_oauth1_transaction_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingRESTSupportOAuth1TransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_rest_support_oauth1_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingRESTSupportOAuth1Transaction), 0, (GInstanceInitFunc) publishing_rest_support_oauth1_transaction_instance_init, NULL };
@@ -1555,25 +1596,22 @@ GType publishing_rest_support_oauth1_transaction_get_type (void) {
}
-PublishingRESTSupportOAuth1UploadTransaction* publishing_rest_support_oauth1_upload_transaction_construct (GType object_type, PublishingRESTSupportOAuth1Session* session, SpitPublishingPublishable* publishable, const gchar* endpoint_uri) {
+PublishingRESTSupportOAuth1UploadTransaction*
+publishing_rest_support_oauth1_upload_transaction_construct (GType object_type,
+ PublishingRESTSupportOAuth1Session* session,
+ SpitPublishingPublishable* publishable,
+ const gchar* endpoint_uri)
+{
PublishingRESTSupportOAuth1UploadTransaction* self = NULL;
- PublishingRESTSupportOAuth1Session* _tmp0_;
- SpitPublishingPublishable* _tmp1_;
- const gchar* _tmp2_;
- PublishingRESTSupportArgument** _tmp3_;
- PublishingRESTSupportOAuth1Session* _tmp4_;
- PublishingRESTSupportOAuth1Session* _tmp5_;
+ PublishingRESTSupportArgument** _tmp0_;
+ gchar* _tmp1_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
+ gchar* _tmp4_;
+ gchar* _tmp5_;
gchar* _tmp6_;
gchar* _tmp7_;
- PublishingRESTSupportOAuth1Session* _tmp8_;
- gchar* _tmp9_;
- gchar* _tmp10_;
- PublishingRESTSupportOAuth1Session* _tmp11_;
- gchar* _tmp12_;
- gchar* _tmp13_;
- PublishingRESTSupportOAuth1Session* _tmp14_;
- gchar* _tmp15_;
- gchar* _tmp16_;
+ gchar* _tmp8_;
#line 194 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION (session), NULL);
#line 194 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
@@ -1581,107 +1619,102 @@ PublishingRESTSupportOAuth1UploadTransaction* publishing_rest_support_oauth1_upl
#line 194 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
g_return_val_if_fail (endpoint_uri != NULL, NULL);
#line 197 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp0_ = session;
-#line 197 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp1_ = publishable;
-#line 197 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp2_ = endpoint_uri;
-#line 197 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- self = (PublishingRESTSupportOAuth1UploadTransaction*) publishing_rest_support_upload_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, _tmp2_);
+ self = (PublishingRESTSupportOAuth1UploadTransaction*) publishing_rest_support_upload_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), publishable, endpoint_uri);
#line 199 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp3_ = g_new0 (PublishingRESTSupportArgument*, 0 + 1);
+ _tmp0_ = g_new0 (PublishingRESTSupportArgument*, 0 + 1);
#line 199 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
self->priv->auth_header_fields = (_vala_array_free (self->priv->auth_header_fields, self->priv->auth_header_fields_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
#line 199 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- self->priv->auth_header_fields = _tmp3_;
+ self->priv->auth_header_fields = _tmp0_;
#line 199 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
self->priv->auth_header_fields_length1 = 0;
#line 199 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
self->priv->_auth_header_fields_size_ = self->priv->auth_header_fields_length1;
#line 200 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp4_ = session;
-#line 200 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- self->session = _tmp4_;
+ self->session = session;
#line 202 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp5_ = session;
+ _tmp1_ = publishing_rest_support_oauth1_session_get_oauth_nonce (session);
#line 202 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp6_ = publishing_rest_support_oauth1_session_get_oauth_nonce (_tmp5_);
-#line 202 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp7_ = _tmp6_;
+ _tmp2_ = _tmp1_;
#line 202 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- publishing_rest_support_oauth1_upload_transaction_add_authorization_header_field (self, "oauth_nonce", _tmp7_);
+ publishing_rest_support_oauth1_upload_transaction_add_authorization_header_field (self, "oauth_nonce", _tmp2_);
#line 202 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _g_free0 (_tmp7_);
+ _g_free0 (_tmp2_);
#line 203 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
publishing_rest_support_oauth1_upload_transaction_add_authorization_header_field (self, "oauth_signature_method", "HMAC-SHA1");
#line 204 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
publishing_rest_support_oauth1_upload_transaction_add_authorization_header_field (self, "oauth_version", "1.0");
#line 205 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp8_ = session;
-#line 205 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp9_ = publishing_rest_support_oauth1_session_get_oauth_timestamp (_tmp8_);
+ _tmp3_ = publishing_rest_support_oauth1_session_get_oauth_timestamp (session);
#line 205 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp10_ = _tmp9_;
+ _tmp4_ = _tmp3_;
#line 205 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- publishing_rest_support_oauth1_upload_transaction_add_authorization_header_field (self, "oauth_timestamp", _tmp10_);
+ publishing_rest_support_oauth1_upload_transaction_add_authorization_header_field (self, "oauth_timestamp", _tmp4_);
#line 205 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _g_free0 (_tmp10_);
-#line 206 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp11_ = session;
+ _g_free0 (_tmp4_);
#line 206 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp12_ = publishing_rest_support_oauth1_session_get_consumer_key (_tmp11_);
+ _tmp5_ = publishing_rest_support_oauth1_session_get_consumer_key (session);
#line 206 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp13_ = _tmp12_;
+ _tmp6_ = _tmp5_;
#line 206 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- publishing_rest_support_oauth1_upload_transaction_add_authorization_header_field (self, "oauth_consumer_key", _tmp13_);
+ publishing_rest_support_oauth1_upload_transaction_add_authorization_header_field (self, "oauth_consumer_key", _tmp6_);
#line 206 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _g_free0 (_tmp13_);
-#line 207 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp14_ = session;
+ _g_free0 (_tmp6_);
#line 207 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp15_ = publishing_rest_support_oauth1_session_get_access_phase_token (_tmp14_);
+ _tmp7_ = publishing_rest_support_oauth1_session_get_access_phase_token (session);
#line 207 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp16_ = _tmp15_;
+ _tmp8_ = _tmp7_;
#line 207 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- publishing_rest_support_oauth1_upload_transaction_add_authorization_header_field (self, "oauth_token", _tmp16_);
+ publishing_rest_support_oauth1_upload_transaction_add_authorization_header_field (self, "oauth_token", _tmp8_);
#line 207 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _g_free0 (_tmp16_);
+ _g_free0 (_tmp8_);
#line 194 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
return self;
-#line 1649 "OAuth1Support.c"
+#line 1671 "OAuth1Support.c"
}
-PublishingRESTSupportOAuth1UploadTransaction* publishing_rest_support_oauth1_upload_transaction_new (PublishingRESTSupportOAuth1Session* session, SpitPublishingPublishable* publishable, const gchar* endpoint_uri) {
+PublishingRESTSupportOAuth1UploadTransaction*
+publishing_rest_support_oauth1_upload_transaction_new (PublishingRESTSupportOAuth1Session* session,
+ SpitPublishingPublishable* publishable,
+ const gchar* endpoint_uri)
+{
#line 194 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
return publishing_rest_support_oauth1_upload_transaction_construct (PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_UPLOAD_TRANSACTION, session, publishable, endpoint_uri);
-#line 1656 "OAuth1Support.c"
+#line 1682 "OAuth1Support.c"
}
-static void _vala_array_add3 (PublishingRESTSupportArgument** * array, int* length, int* size, PublishingRESTSupportArgument* value) {
+static void
+_vala_array_add3 (PublishingRESTSupportArgument** * array,
+ int* length,
+ int* size,
+ PublishingRESTSupportArgument* value)
+{
#line 211 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
if ((*length) == (*size)) {
#line 211 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 211 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
*array = g_renew (PublishingRESTSupportArgument*, *array, (*size) + 1);
-#line 1667 "OAuth1Support.c"
+#line 1698 "OAuth1Support.c"
}
#line 211 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
(*array)[(*length)++] = value;
#line 211 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
(*array)[*length] = NULL;
-#line 1673 "OAuth1Support.c"
+#line 1704 "OAuth1Support.c"
}
-void publishing_rest_support_oauth1_upload_transaction_add_authorization_header_field (PublishingRESTSupportOAuth1UploadTransaction* self, const gchar* key, const gchar* value) {
+void
+publishing_rest_support_oauth1_upload_transaction_add_authorization_header_field (PublishingRESTSupportOAuth1UploadTransaction* self,
+ const gchar* key,
+ const gchar* value)
+{
PublishingRESTSupportArgument** _tmp0_;
gint _tmp0__length1;
- const gchar* _tmp1_;
- const gchar* _tmp2_;
- PublishingRESTSupportArgument* _tmp3_;
+ PublishingRESTSupportArgument* _tmp1_;
#line 210 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_UPLOAD_TRANSACTION (self));
#line 210 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
@@ -1693,18 +1726,16 @@ void publishing_rest_support_oauth1_upload_transaction_add_authorization_header_
#line 211 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
_tmp0__length1 = self->priv->auth_header_fields_length1;
#line 211 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp1_ = key;
-#line 211 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp2_ = value;
-#line 211 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _tmp3_ = publishing_rest_support_argument_new (_tmp1_, _tmp2_);
+ _tmp1_ = publishing_rest_support_argument_new (key, value);
#line 211 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
- _vala_array_add3 (&self->priv->auth_header_fields, &self->priv->auth_header_fields_length1, &self->priv->_auth_header_fields_size_, _tmp3_);
-#line 1701 "OAuth1Support.c"
+ _vala_array_add3 (&self->priv->auth_header_fields, &self->priv->auth_header_fields_length1, &self->priv->_auth_header_fields_size_, _tmp1_);
+#line 1730 "OAuth1Support.c"
}
-gchar* publishing_rest_support_oauth1_upload_transaction_get_authorization_header_string (PublishingRESTSupportOAuth1UploadTransaction* self) {
+gchar*
+publishing_rest_support_oauth1_upload_transaction_get_authorization_header_string (PublishingRESTSupportOAuth1UploadTransaction* self)
+{
gchar* result = NULL;
PublishingRESTSupportArgument** _tmp0_;
gint _tmp0__length1;
@@ -1732,11 +1763,13 @@ gchar* publishing_rest_support_oauth1_upload_transaction_get_authorization_heade
result = _tmp4_;
#line 215 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
return result;
-#line 1733 "OAuth1Support.c"
+#line 1764 "OAuth1Support.c"
}
-void publishing_rest_support_oauth1_upload_transaction_authorize (PublishingRESTSupportOAuth1UploadTransaction* self) {
+void
+publishing_rest_support_oauth1_upload_transaction_authorize (PublishingRESTSupportOAuth1UploadTransaction* self)
+{
gchar* signature = NULL;
PublishingRESTSupportOAuth1Session* _tmp0_;
PublishingRESTSupportArgument** _tmp1_;
@@ -1771,29 +1804,35 @@ void publishing_rest_support_oauth1_upload_transaction_authorize (PublishingREST
_g_free0 (authorization_header);
#line 218 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
_g_free0 (signature);
-#line 1771 "OAuth1Support.c"
+#line 1804 "OAuth1Support.c"
}
-static void publishing_rest_support_oauth1_upload_transaction_class_init (PublishingRESTSupportOAuth1UploadTransactionClass * klass) {
+static void
+publishing_rest_support_oauth1_upload_transaction_class_init (PublishingRESTSupportOAuth1UploadTransactionClass * klass)
+{
#line 190 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
publishing_rest_support_oauth1_upload_transaction_parent_class = g_type_class_peek_parent (klass);
#line 190 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
((PublishingRESTSupportTransactionClass *) klass)->finalize = publishing_rest_support_oauth1_upload_transaction_finalize;
#line 190 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
g_type_class_add_private (klass, sizeof (PublishingRESTSupportOAuth1UploadTransactionPrivate));
-#line 1782 "OAuth1Support.c"
+#line 1817 "OAuth1Support.c"
}
-static void publishing_rest_support_oauth1_upload_transaction_instance_init (PublishingRESTSupportOAuth1UploadTransaction * self) {
+static void
+publishing_rest_support_oauth1_upload_transaction_instance_init (PublishingRESTSupportOAuth1UploadTransaction * self)
+{
#line 190 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
self->priv = PUBLISHING_REST_SUPPORT_OAUTH1_UPLOAD_TRANSACTION_GET_PRIVATE (self);
-#line 1789 "OAuth1Support.c"
+#line 1826 "OAuth1Support.c"
}
-static void publishing_rest_support_oauth1_upload_transaction_finalize (PublishingRESTSupportTransaction * obj) {
+static void
+publishing_rest_support_oauth1_upload_transaction_finalize (PublishingRESTSupportTransaction * obj)
+{
PublishingRESTSupportOAuth1UploadTransaction * self;
#line 190 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportOAuth1UploadTransaction);
@@ -1801,11 +1840,13 @@ static void publishing_rest_support_oauth1_upload_transaction_finalize (Publishi
self->priv->auth_header_fields = (_vala_array_free (self->priv->auth_header_fields, self->priv->auth_header_fields_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
#line 190 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_rest_support_oauth1_upload_transaction_parent_class)->finalize (obj);
-#line 1801 "OAuth1Support.c"
+#line 1840 "OAuth1Support.c"
}
-GType publishing_rest_support_oauth1_upload_transaction_get_type (void) {
+GType
+publishing_rest_support_oauth1_upload_transaction_get_type (void)
+{
static volatile gsize publishing_rest_support_oauth1_upload_transaction_type_id__volatile = 0;
if (g_once_init_enter (&publishing_rest_support_oauth1_upload_transaction_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingRESTSupportOAuth1UploadTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_rest_support_oauth1_upload_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingRESTSupportOAuth1UploadTransaction), 0, (GInstanceInitFunc) publishing_rest_support_oauth1_upload_transaction_instance_init, NULL };
@@ -1817,7 +1858,11 @@ GType publishing_rest_support_oauth1_upload_transaction_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) {
@@ -1829,7 +1874,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/plugins/common/RESTSupport.c b/plugins/common/RESTSupport.c
index dcae2ed..c19445f 100644
--- a/plugins/common/RESTSupport.c
+++ b/plugins/common/RESTSupport.c
@@ -1,4 +1,4 @@
-/* RESTSupport.c generated by valac 0.36.6, the Vala compiler
+/* RESTSupport.c generated by valac 0.40.4, the Vala compiler
* generated from RESTSupport.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>
@@ -42,9 +43,9 @@ enum {
PUBLISHING_REST_SUPPORT_SESSION_WIRE_MESSAGE_UNQUEUED_SIGNAL,
PUBLISHING_REST_SUPPORT_SESSION_AUTHENTICATED_SIGNAL,
PUBLISHING_REST_SUPPORT_SESSION_AUTHENTICATION_FAILED_SIGNAL,
- PUBLISHING_REST_SUPPORT_SESSION_LAST_SIGNAL
+ PUBLISHING_REST_SUPPORT_SESSION_NUM_SIGNALS
};
-static guint publishing_rest_support_session_signals[PUBLISHING_REST_SUPPORT_SESSION_LAST_SIGNAL] = {0};
+static guint publishing_rest_support_session_signals[PUBLISHING_REST_SUPPORT_SESSION_NUM_SIGNALS] = {0};
#define PUBLISHING_REST_SUPPORT_TYPE_HTTP_METHOD (publishing_rest_support_http_method_get_type ())
@@ -79,9 +80,9 @@ enum {
PUBLISHING_REST_SUPPORT_TRANSACTION_CHUNK_TRANSMITTED_SIGNAL,
PUBLISHING_REST_SUPPORT_TRANSACTION_NETWORK_ERROR_SIGNAL,
PUBLISHING_REST_SUPPORT_TRANSACTION_COMPLETED_SIGNAL,
- PUBLISHING_REST_SUPPORT_TRANSACTION_LAST_SIGNAL
+ PUBLISHING_REST_SUPPORT_TRANSACTION_NUM_SIGNALS
};
-static guint publishing_rest_support_transaction_signals[PUBLISHING_REST_SUPPORT_TRANSACTION_LAST_SIGNAL] = {0};
+static guint publishing_rest_support_transaction_signals[PUBLISHING_REST_SUPPORT_TRANSACTION_NUM_SIGNALS] = {0};
#define PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION (publishing_rest_support_upload_transaction_get_type ())
#define PUBLISHING_REST_SUPPORT_UPLOAD_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction))
@@ -126,9 +127,9 @@ typedef struct _PublishingRESTSupportParamSpecBatchUploader PublishingRESTSuppor
enum {
PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_UPLOAD_COMPLETE_SIGNAL,
PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_UPLOAD_ERROR_SIGNAL,
- PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_LAST_SIGNAL
+ PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_NUM_SIGNALS
};
-static guint publishing_rest_support_batch_uploader_signals[PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_LAST_SIGNAL] = {0};
+static guint publishing_rest_support_batch_uploader_signals[PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_NUM_SIGNALS] = {0};
#define PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_SESSION (publishing_rest_support_google_session_get_type ())
#define PUBLISHING_REST_SUPPORT_GOOGLE_SESSION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_SESSION, PublishingRESTSupportGoogleSession))
@@ -161,6 +162,11 @@ typedef struct _PublishingRESTSupportGooglePublisherPrivate PublishingRESTSuppor
typedef struct _PublishingRESTSupportGooglePublisherGoogleSessionImpl PublishingRESTSupportGooglePublisherGoogleSessionImpl;
typedef struct _PublishingRESTSupportGooglePublisherGoogleSessionImplClass PublishingRESTSupportGooglePublisherGoogleSessionImplClass;
+enum {
+ PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_0_PROPERTY,
+ PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_NUM_PROPERTIES
+};
+static GParamSpec* publishing_rest_support_google_publisher_properties[PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_NUM_PROPERTIES];
#define _g_variant_unref0(var) ((var == NULL) ? NULL : (var = (g_variant_unref (var), NULL)))
typedef struct _PublishingRESTSupportGooglePublisherGoogleSessionImplPrivate PublishingRESTSupportGooglePublisherGoogleSessionImplPrivate;
@@ -383,29 +389,39 @@ static gpointer publishing_rest_support_google_publisher_authenticated_transacti
static SpitPublishingPublisherIface * publishing_rest_support_google_publisher_spit_publishing_publisher_parent_iface = NULL;
#define PUBLISHING_REST_SUPPORT_SHA1_HMAC_LENGTH 20
-gchar* publishing_rest_support_hmac_sha1 (const gchar* key, const gchar* message);
+gchar* publishing_rest_support_hmac_sha1 (const gchar* key,
+ const gchar* message);
gpointer publishing_rest_support_session_ref (gpointer instance);
void publishing_rest_support_session_unref (gpointer instance);
-GParamSpec* publishing_rest_support_param_spec_session (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void publishing_rest_support_value_set_session (GValue* value, gpointer v_object);
-void publishing_rest_support_value_take_session (GValue* value, gpointer v_object);
+GParamSpec* publishing_rest_support_param_spec_session (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void publishing_rest_support_value_set_session (GValue* value,
+ gpointer v_object);
+void publishing_rest_support_value_take_session (GValue* value,
+ gpointer v_object);
gpointer publishing_rest_support_value_get_session (const GValue* value);
GType publishing_rest_support_session_get_type (void) G_GNUC_CONST;
#define PUBLISHING_REST_SUPPORT_SESSION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSessionPrivate))
-enum {
- PUBLISHING_REST_SUPPORT_SESSION_DUMMY_PROPERTY
-};
-PublishingRESTSupportSession* publishing_rest_support_session_construct (GType object_type, const gchar* endpoint_url);
-void publishing_rest_support_session_notify_wire_message_unqueued (PublishingRESTSupportSession* self, SoupMessage* message);
+PublishingRESTSupportSession* publishing_rest_support_session_construct (GType object_type,
+ const gchar* endpoint_url);
+void publishing_rest_support_session_notify_wire_message_unqueued (PublishingRESTSupportSession* self,
+ SoupMessage* message);
void publishing_rest_support_session_notify_authenticated (PublishingRESTSupportSession* self);
-void publishing_rest_support_session_notify_authentication_failed (PublishingRESTSupportSession* self, GError* err);
+void publishing_rest_support_session_notify_authentication_failed (PublishingRESTSupportSession* self,
+ GError* err);
gboolean publishing_rest_support_session_is_authenticated (PublishingRESTSupportSession* self);
static gboolean publishing_rest_support_session_real_is_authenticated (PublishingRESTSupportSession* self);
gchar* publishing_rest_support_session_get_endpoint_url (PublishingRESTSupportSession* self);
void publishing_rest_support_session_stop_transactions (PublishingRESTSupportSession* self);
gboolean publishing_rest_support_session_are_transactions_stopped (PublishingRESTSupportSession* self);
-void publishing_rest_support_session_send_wire_message (PublishingRESTSupportSession* self, SoupMessage* message);
-static void _publishing_rest_support_session_notify_wire_message_unqueued_soup_session_request_unqueued (SoupSession* _sender, SoupMessage* msg, gpointer self);
+void publishing_rest_support_session_send_wire_message (PublishingRESTSupportSession* self,
+ SoupMessage* message);
+static void _publishing_rest_support_session_notify_wire_message_unqueued_soup_session_request_unqueued (SoupSession* _sender,
+ SoupMessage* msg,
+ gpointer self);
void publishing_rest_support_session_set_insecure (PublishingRESTSupportSession* self);
static void publishing_rest_support_session_finalize (PublishingRESTSupportSession * obj);
GType publishing_rest_support_http_method_get_type (void) G_GNUC_CONST;
@@ -413,131 +429,226 @@ gchar* publishing_rest_support_http_method_to_string (PublishingRESTSupportHttpM
PublishingRESTSupportHttpMethod publishing_rest_support_http_method_from_string (const gchar* str);
gpointer publishing_rest_support_argument_ref (gpointer instance);
void publishing_rest_support_argument_unref (gpointer instance);
-GParamSpec* publishing_rest_support_param_spec_argument (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void publishing_rest_support_value_set_argument (GValue* value, gpointer v_object);
-void publishing_rest_support_value_take_argument (GValue* value, gpointer v_object);
+GParamSpec* publishing_rest_support_param_spec_argument (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void publishing_rest_support_value_set_argument (GValue* value,
+ gpointer v_object);
+void publishing_rest_support_value_take_argument (GValue* value,
+ gpointer v_object);
gpointer publishing_rest_support_value_get_argument (const GValue* value);
GType publishing_rest_support_argument_get_type (void) G_GNUC_CONST;
-enum {
- PUBLISHING_REST_SUPPORT_ARGUMENT_DUMMY_PROPERTY
-};
-PublishingRESTSupportArgument* publishing_rest_support_argument_new (const gchar* key, const gchar* value);
-PublishingRESTSupportArgument* publishing_rest_support_argument_construct (GType object_type, const gchar* key, const gchar* value);
-gchar* publishing_rest_support_argument_serialize_list (PublishingRESTSupportArgument** args, int args_length1, gboolean escape, const gchar* separator);
-gchar* publishing_rest_support_argument_to_string (PublishingRESTSupportArgument* self, gboolean escape);
-gint publishing_rest_support_argument_compare (PublishingRESTSupportArgument* arg1, PublishingRESTSupportArgument* arg2);
-PublishingRESTSupportArgument** publishing_rest_support_argument_sort (PublishingRESTSupportArgument** inputArray, int inputArray_length1, int* result_length1);
-static gint _publishing_rest_support_argument_compare_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self);
+PublishingRESTSupportArgument* publishing_rest_support_argument_new (const gchar* key,
+ const gchar* value);
+PublishingRESTSupportArgument* publishing_rest_support_argument_construct (GType object_type,
+ const gchar* key,
+ const gchar* value);
+gchar* publishing_rest_support_argument_serialize_list (PublishingRESTSupportArgument** args,
+ int args_length1,
+ gboolean escape,
+ const gchar* separator);
+gchar* publishing_rest_support_argument_to_string (PublishingRESTSupportArgument* self,
+ gboolean escape);
+gint publishing_rest_support_argument_compare (PublishingRESTSupportArgument* arg1,
+ PublishingRESTSupportArgument* arg2);
+PublishingRESTSupportArgument** publishing_rest_support_argument_sort (PublishingRESTSupportArgument** inputArray,
+ int inputArray_length1,
+ int* result_length1);
+static gint _publishing_rest_support_argument_compare_gcompare_data_func (gconstpointer a,
+ gconstpointer b,
+ gpointer self);
static void publishing_rest_support_argument_finalize (PublishingRESTSupportArgument * obj);
gpointer publishing_rest_support_transaction_ref (gpointer instance);
void publishing_rest_support_transaction_unref (gpointer instance);
-GParamSpec* publishing_rest_support_param_spec_transaction (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void publishing_rest_support_value_set_transaction (GValue* value, gpointer v_object);
-void publishing_rest_support_value_take_transaction (GValue* value, gpointer v_object);
+GParamSpec* publishing_rest_support_param_spec_transaction (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void publishing_rest_support_value_set_transaction (GValue* value,
+ gpointer v_object);
+void publishing_rest_support_value_take_transaction (GValue* value,
+ gpointer v_object);
gpointer publishing_rest_support_value_get_transaction (const GValue* value);
GType publishing_rest_support_transaction_get_type (void) G_GNUC_CONST;
#define PUBLISHING_REST_SUPPORT_TRANSACTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransactionPrivate))
-enum {
- PUBLISHING_REST_SUPPORT_TRANSACTION_DUMMY_PROPERTY
-};
-PublishingRESTSupportTransaction* publishing_rest_support_transaction_new (PublishingRESTSupportSession* parent_session, PublishingRESTSupportHttpMethod method);
-PublishingRESTSupportTransaction* publishing_rest_support_transaction_construct (GType object_type, PublishingRESTSupportSession* parent_session, PublishingRESTSupportHttpMethod method);
-static void publishing_rest_support_transaction_on_wrote_body_data (PublishingRESTSupportTransaction* self, SoupBuffer* written_data);
-static void _publishing_rest_support_transaction_on_wrote_body_data_soup_message_wrote_body_data (SoupMessage* _sender, SoupBuffer* chunk, gpointer self);
-PublishingRESTSupportTransaction* publishing_rest_support_transaction_new_with_endpoint_url (PublishingRESTSupportSession* parent_session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method);
-PublishingRESTSupportTransaction* publishing_rest_support_transaction_construct_with_endpoint_url (GType object_type, PublishingRESTSupportSession* parent_session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method);
-static void publishing_rest_support_transaction_on_message_unqueued (PublishingRESTSupportTransaction* self, SoupMessage* message);
-void publishing_rest_support_transaction_check_response (PublishingRESTSupportTransaction* self, SoupMessage* message, GError** error);
+PublishingRESTSupportTransaction* publishing_rest_support_transaction_new (PublishingRESTSupportSession* parent_session,
+ PublishingRESTSupportHttpMethod method);
+PublishingRESTSupportTransaction* publishing_rest_support_transaction_construct (GType object_type,
+ PublishingRESTSupportSession* parent_session,
+ PublishingRESTSupportHttpMethod method);
+static void publishing_rest_support_transaction_on_wrote_body_data (PublishingRESTSupportTransaction* self,
+ SoupBuffer* written_data);
+static void _publishing_rest_support_transaction_on_wrote_body_data_soup_message_wrote_body_data (SoupMessage* _sender,
+ SoupBuffer* chunk,
+ gpointer self);
+PublishingRESTSupportTransaction* publishing_rest_support_transaction_new_with_endpoint_url (PublishingRESTSupportSession* parent_session,
+ const gchar* endpoint_url,
+ PublishingRESTSupportHttpMethod method);
+PublishingRESTSupportTransaction* publishing_rest_support_transaction_construct_with_endpoint_url (GType object_type,
+ PublishingRESTSupportSession* parent_session,
+ const gchar* endpoint_url,
+ PublishingRESTSupportHttpMethod method);
+static void publishing_rest_support_transaction_on_message_unqueued (PublishingRESTSupportTransaction* self,
+ SoupMessage* message);
+void publishing_rest_support_transaction_check_response (PublishingRESTSupportTransaction* self,
+ SoupMessage* message,
+ GError** error);
gchar* publishing_rest_support_transaction_get_response (PublishingRESTSupportTransaction* self);
-gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (PublishingRESTSupportTransaction* self, GTlsCertificate* * cert);
+gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (PublishingRESTSupportTransaction* self,
+ GTlsCertificate* * cert);
gchar* publishing_rest_support_transaction_get_endpoint_url (PublishingRESTSupportTransaction* self);
-PublishingRESTSupportArgument** publishing_rest_support_transaction_get_arguments (PublishingRESTSupportTransaction* self, int* result_length1);
-static PublishingRESTSupportArgument** _vala_array_dup1 (PublishingRESTSupportArgument** self, int length);
-PublishingRESTSupportArgument** publishing_rest_support_transaction_get_sorted_arguments (PublishingRESTSupportTransaction* self, int* result_length1);
-void publishing_rest_support_transaction_set_is_executed (PublishingRESTSupportTransaction* self, gboolean is_executed);
-void publishing_rest_support_transaction_send (PublishingRESTSupportTransaction* self, GError** error);
-static void _publishing_rest_support_transaction_on_message_unqueued_publishing_rest_support_session_wire_message_unqueued (PublishingRESTSupportSession* _sender, SoupMessage* message, gpointer self);
+PublishingRESTSupportArgument** publishing_rest_support_transaction_get_arguments (PublishingRESTSupportTransaction* self,
+ int* result_length1);
+static PublishingRESTSupportArgument** _vala_array_dup1 (PublishingRESTSupportArgument** self,
+ int length);
+PublishingRESTSupportArgument** publishing_rest_support_transaction_get_sorted_arguments (PublishingRESTSupportTransaction* self,
+ int* result_length1);
+void publishing_rest_support_transaction_set_is_executed (PublishingRESTSupportTransaction* self,
+ gboolean is_executed);
+void publishing_rest_support_transaction_send (PublishingRESTSupportTransaction* self,
+ GError** error);
+static void _publishing_rest_support_transaction_on_message_unqueued_publishing_rest_support_session_wire_message_unqueued (PublishingRESTSupportSession* _sender,
+ SoupMessage* message,
+ gpointer self);
PublishingRESTSupportHttpMethod publishing_rest_support_transaction_get_method (PublishingRESTSupportTransaction* self);
-void publishing_rest_support_transaction_add_header (PublishingRESTSupportTransaction* self, const gchar* key, const gchar* value);
-static void publishing_rest_support_transaction_real_add_header (PublishingRESTSupportTransaction* self, const gchar* key, const gchar* value);
-void publishing_rest_support_transaction_set_custom_payload (PublishingRESTSupportTransaction* self, const gchar* custom_payload, const gchar* payload_content_type, gulong payload_length);
-void publishing_rest_support_transaction_set_message (PublishingRESTSupportTransaction* self, SoupMessage* message);
+void publishing_rest_support_transaction_add_header (PublishingRESTSupportTransaction* self,
+ const gchar* key,
+ const gchar* value);
+static void publishing_rest_support_transaction_real_add_header (PublishingRESTSupportTransaction* self,
+ const gchar* key,
+ const gchar* value);
+void publishing_rest_support_transaction_set_custom_payload (PublishingRESTSupportTransaction* self,
+ const gchar* custom_payload,
+ const gchar* payload_content_type,
+ gulong payload_length);
+void publishing_rest_support_transaction_set_message (PublishingRESTSupportTransaction* self,
+ SoupMessage* message);
gboolean publishing_rest_support_transaction_get_is_executed (PublishingRESTSupportTransaction* self);
guint publishing_rest_support_transaction_get_status_code (PublishingRESTSupportTransaction* self);
-void publishing_rest_support_transaction_execute (PublishingRESTSupportTransaction* self, GError** error);
-static void publishing_rest_support_transaction_real_execute (PublishingRESTSupportTransaction* self, GError** error);
+void publishing_rest_support_transaction_execute (PublishingRESTSupportTransaction* self,
+ GError** error);
+static void publishing_rest_support_transaction_real_execute (PublishingRESTSupportTransaction* self,
+ GError** error);
static void _vala_SoupURI_free (SoupURI* self);
SoupMessageHeaders* publishing_rest_support_transaction_get_response_headers (PublishingRESTSupportTransaction* self);
SoupMessage* publishing_rest_support_transaction_get_message (PublishingRESTSupportTransaction* self);
-void publishing_rest_support_transaction_add_argument (PublishingRESTSupportTransaction* self, const gchar* name, const gchar* value);
-static void _vala_array_add1 (PublishingRESTSupportArgument** * array, int* length, int* size, PublishingRESTSupportArgument* value);
+void publishing_rest_support_transaction_add_argument (PublishingRESTSupportTransaction* self,
+ const gchar* name,
+ const gchar* value);
+static void _vala_array_add1 (PublishingRESTSupportArgument** * array,
+ int* length,
+ int* size,
+ PublishingRESTSupportArgument* value);
PublishingRESTSupportSession* publishing_rest_support_transaction_get_parent_session (PublishingRESTSupportTransaction* self);
-static void g_cclosure_user_marshal_VOID__INT_INT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
+static void g_cclosure_user_marshal_VOID__INT_INT (GClosure * closure,
+ GValue * return_value,
+ guint n_param_values,
+ const GValue * param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data);
static void publishing_rest_support_transaction_finalize (PublishingRESTSupportTransaction * obj);
GType publishing_rest_support_upload_transaction_get_type (void) G_GNUC_CONST;
-enum {
- PUBLISHING_REST_SUPPORT_UPLOAD_TRANSACTION_DUMMY_PROPERTY
-};
-PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transaction_new (PublishingRESTSupportSession* session, SpitPublishingPublishable* publishable);
-PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transaction_construct (GType object_type, PublishingRESTSupportSession* session, SpitPublishingPublishable* publishable);
+PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transaction_new (PublishingRESTSupportSession* session,
+ SpitPublishingPublishable* publishable);
+PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transaction_construct (GType object_type,
+ PublishingRESTSupportSession* session,
+ SpitPublishingPublishable* publishable);
static gchar* publishing_rest_support_upload_transaction_media_type_to_mime_type (SpitPublishingPublisherMediaType media_type);
static GHashTable* publishing_rest_support_upload_transaction_create_default_binary_disposition_table (PublishingRESTSupportUploadTransaction* self);
-PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transaction_new_with_endpoint_url (PublishingRESTSupportSession* session, SpitPublishingPublishable* publishable, const gchar* endpoint_url);
-PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transaction_construct_with_endpoint_url (GType object_type, PublishingRESTSupportSession* session, SpitPublishingPublishable* publishable, const gchar* endpoint_url);
-static void publishing_rest_support_upload_transaction_real_add_header (PublishingRESTSupportTransaction* base, const gchar* key, const gchar* value);
+PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transaction_new_with_endpoint_url (PublishingRESTSupportSession* session,
+ SpitPublishingPublishable* publishable,
+ const gchar* endpoint_url);
+PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transaction_construct_with_endpoint_url (GType object_type,
+ PublishingRESTSupportSession* session,
+ SpitPublishingPublishable* publishable,
+ const gchar* endpoint_url);
+static void publishing_rest_support_upload_transaction_real_add_header (PublishingRESTSupportTransaction* base,
+ const gchar* key,
+ const gchar* value);
const gchar* spit_publishing_publisher_media_type_to_string (SpitPublishingPublisherMediaType self);
static void _g_free0_ (gpointer var);
-void publishing_rest_support_upload_transaction_set_binary_disposition_table (PublishingRESTSupportUploadTransaction* self, GHashTable* new_disp_table);
-static void publishing_rest_support_upload_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error);
+void publishing_rest_support_upload_transaction_set_binary_disposition_table (PublishingRESTSupportUploadTransaction* self,
+ GHashTable* new_disp_table);
+static void publishing_rest_support_upload_transaction_real_execute (PublishingRESTSupportTransaction* base,
+ GError** error);
static void _vala_SoupMultipart_free (SoupMultipart* self);
static void _vala_SoupBuffer_free (SoupBuffer* self);
static void publishing_rest_support_upload_transaction_finalize (PublishingRESTSupportTransaction * obj);
gpointer publishing_rest_support_xml_document_ref (gpointer instance);
void publishing_rest_support_xml_document_unref (gpointer instance);
-GParamSpec* publishing_rest_support_param_spec_xml_document (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void publishing_rest_support_value_set_xml_document (GValue* value, gpointer v_object);
-void publishing_rest_support_value_take_xml_document (GValue* value, gpointer v_object);
+GParamSpec* publishing_rest_support_param_spec_xml_document (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void publishing_rest_support_value_set_xml_document (GValue* value,
+ gpointer v_object);
+void publishing_rest_support_value_take_xml_document (GValue* value,
+ gpointer v_object);
gpointer publishing_rest_support_value_get_xml_document (const GValue* value);
GType publishing_rest_support_xml_document_get_type (void) G_GNUC_CONST;
#define PUBLISHING_REST_SUPPORT_XML_DOCUMENT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_REST_SUPPORT_TYPE_XML_DOCUMENT, PublishingRESTSupportXmlDocumentPrivate))
-enum {
- PUBLISHING_REST_SUPPORT_XML_DOCUMENT_DUMMY_PROPERTY
-};
static PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_new (xmlDoc* doc);
-static PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_construct (GType object_type, xmlDoc* doc);
+static PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_construct (GType object_type,
+ xmlDoc* doc);
xmlNode* publishing_rest_support_xml_document_get_root_node (PublishingRESTSupportXmlDocument* self);
-xmlNode* publishing_rest_support_xml_document_get_named_child (PublishingRESTSupportXmlDocument* self, xmlNode* parent, const gchar* child_name, GError** error);
-gchar* publishing_rest_support_xml_document_get_property_value (PublishingRESTSupportXmlDocument* self, xmlNode* node, const gchar* property_key, GError** error);
-PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_string (const gchar* input_string, PublishingRESTSupportXmlDocumentCheckForErrorResponse check_for_error_response, void* check_for_error_response_target, GError** error);
+xmlNode* publishing_rest_support_xml_document_get_named_child (PublishingRESTSupportXmlDocument* self,
+ xmlNode* parent,
+ const gchar* child_name,
+ GError** error);
+gchar* publishing_rest_support_xml_document_get_property_value (PublishingRESTSupportXmlDocument* self,
+ xmlNode* node,
+ const gchar* property_key,
+ GError** error);
+PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_string (const gchar* input_string,
+ PublishingRESTSupportXmlDocumentCheckForErrorResponse check_for_error_response,
+ void* check_for_error_response_target,
+ GError** error);
static void publishing_rest_support_xml_document_finalize (PublishingRESTSupportXmlDocument * obj);
gchar* publishing_rest_support_decimal_entity_encode (const gchar* source);
gpointer publishing_rest_support_batch_uploader_ref (gpointer instance);
void publishing_rest_support_batch_uploader_unref (gpointer instance);
-GParamSpec* publishing_rest_support_param_spec_batch_uploader (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void publishing_rest_support_value_set_batch_uploader (GValue* value, gpointer v_object);
-void publishing_rest_support_value_take_batch_uploader (GValue* value, gpointer v_object);
+GParamSpec* publishing_rest_support_param_spec_batch_uploader (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void publishing_rest_support_value_set_batch_uploader (GValue* value,
+ gpointer v_object);
+void publishing_rest_support_value_take_batch_uploader (GValue* value,
+ gpointer v_object);
gpointer publishing_rest_support_value_get_batch_uploader (const GValue* value);
GType publishing_rest_support_batch_uploader_get_type (void) G_GNUC_CONST;
#define PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploaderPrivate))
-enum {
- PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_DUMMY_PROPERTY
-};
-PublishingRESTSupportBatchUploader* publishing_rest_support_batch_uploader_construct (GType object_type, PublishingRESTSupportSession* session, SpitPublishingPublishable** publishables, int publishables_length1);
-static SpitPublishingPublishable** _vala_array_dup2 (SpitPublishingPublishable** self, int length);
+PublishingRESTSupportBatchUploader* publishing_rest_support_batch_uploader_construct (GType object_type,
+ PublishingRESTSupportSession* session,
+ SpitPublishingPublishable** publishables,
+ int publishables_length1);
+static SpitPublishingPublishable** _vala_array_dup2 (SpitPublishingPublishable** self,
+ int length);
static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSupportBatchUploader* self);
-PublishingRESTSupportTransaction* publishing_rest_support_batch_uploader_create_transaction (PublishingRESTSupportBatchUploader* self, SpitPublishingPublishable* publishable);
-static void publishing_rest_support_batch_uploader_on_chunk_transmitted (PublishingRESTSupportBatchUploader* self, gint bytes_written_so_far, gint total_bytes);
-static void _publishing_rest_support_batch_uploader_on_chunk_transmitted_publishing_rest_support_transaction_chunk_transmitted (PublishingRESTSupportTransaction* _sender, gint bytes_written_so_far, gint total_bytes, gpointer self);
+PublishingRESTSupportTransaction* publishing_rest_support_batch_uploader_create_transaction (PublishingRESTSupportBatchUploader* self,
+ SpitPublishingPublishable* publishable);
+static void publishing_rest_support_batch_uploader_on_chunk_transmitted (PublishingRESTSupportBatchUploader* self,
+ gint bytes_written_so_far,
+ gint total_bytes);
+static void _publishing_rest_support_batch_uploader_on_chunk_transmitted_publishing_rest_support_transaction_chunk_transmitted (PublishingRESTSupportTransaction* _sender,
+ gint bytes_written_so_far,
+ gint total_bytes,
+ gpointer self);
PublishingRESTSupportSession* publishing_rest_support_batch_uploader_get_session (PublishingRESTSupportBatchUploader* self);
SpitPublishingPublishable* publishing_rest_support_batch_uploader_get_current_publishable (PublishingRESTSupportBatchUploader* self);
-static PublishingRESTSupportTransaction* publishing_rest_support_batch_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* self, SpitPublishingPublishable* publishable);
-void publishing_rest_support_batch_uploader_upload (PublishingRESTSupportBatchUploader* self, SpitPublishingProgressCallback status_updated, void* status_updated_target);
+static PublishingRESTSupportTransaction* publishing_rest_support_batch_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* self,
+ SpitPublishingPublishable* publishable);
+void publishing_rest_support_batch_uploader_upload (PublishingRESTSupportBatchUploader* self,
+ SpitPublishingProgressCallback status_updated,
+ void* status_updated_target);
static void publishing_rest_support_batch_uploader_finalize (PublishingRESTSupportBatchUploader * obj);
gchar* publishing_rest_support_asciify_string (const gchar* s);
GType publishing_rest_support_google_session_get_type (void) G_GNUC_CONST;
-enum {
- PUBLISHING_REST_SUPPORT_GOOGLE_SESSION_DUMMY_PROPERTY
-};
gchar* publishing_rest_support_google_session_get_user_name (PublishingRESTSupportGoogleSession* self);
static gchar* publishing_rest_support_google_session_real_get_user_name (PublishingRESTSupportGoogleSession* self);
gchar* publishing_rest_support_google_session_get_access_token (PublishingRESTSupportGoogleSession* self);
@@ -548,18 +659,19 @@ PublishingRESTSupportGoogleSession* publishing_rest_support_google_session_const
GType publishing_rest_support_google_publisher_get_type (void) G_GNUC_CONST;
static GType publishing_rest_support_google_publisher_google_session_impl_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
#define PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisherPrivate))
-enum {
- PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_DUMMY_PROPERTY
-};
#define PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_OAUTH_CLIENT_ID "1073902228337-gm4uf5etk25s0hnnm0g7uv2tm2bm1j0b.apps.googleusercontent." \
"com"
#define PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_OAUTH_CLIENT_SECRET "_kA4RZz72xqed4DqfO7xMmMN"
-PublishingRESTSupportGooglePublisher* publishing_rest_support_google_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host, const gchar* scope);
+PublishingRESTSupportGooglePublisher* publishing_rest_support_google_publisher_construct (GType object_type,
+ SpitPublishingService* service,
+ SpitPublishingPluginHost* host,
+ const gchar* scope);
static PublishingRESTSupportGooglePublisherGoogleSessionImpl* publishing_rest_support_google_publisher_google_session_impl_new (void);
static PublishingRESTSupportGooglePublisherGoogleSessionImpl* publishing_rest_support_google_publisher_google_session_impl_construct (GType object_type);
SpitPublishingAuthenticator* publishing_rest_support_google_publisher_get_authenticator (PublishingRESTSupportGooglePublisher* self);
static void publishing_rest_support_google_publisher_on_authenticator_authenticated (PublishingRESTSupportGooglePublisher* self);
-static void _publishing_rest_support_google_publisher_on_authenticator_authenticated_spit_publishing_authenticator_authenticated (SpitPublishingAuthenticator* _sender, gpointer self);
+static void _publishing_rest_support_google_publisher_on_authenticator_authenticated_spit_publishing_authenticator_authenticated (SpitPublishingAuthenticator* _sender,
+ gpointer self);
static SpitPublishingAuthenticator* publishing_rest_support_google_publisher_real_get_authenticator (PublishingRESTSupportGooglePublisher* self);
SpitPublishingPluginHost* publishing_rest_support_google_publisher_get_host (PublishingRESTSupportGooglePublisher* self);
PublishingRESTSupportGoogleSession* publishing_rest_support_google_publisher_get_session (PublishingRESTSupportGooglePublisher* self);
@@ -574,28 +686,39 @@ static void publishing_rest_support_google_publisher_real_start (PublishingRESTS
void publishing_rest_support_google_publisher_stop (PublishingRESTSupportGooglePublisher* self);
static void publishing_rest_support_google_publisher_real_stop (PublishingRESTSupportGooglePublisher* self);
static SpitPublishingService* publishing_rest_support_google_publisher_real_get_service (SpitPublishingPublisher* base);
-enum {
- PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GOOGLE_SESSION_IMPL_DUMMY_PROPERTY
-};
static gboolean publishing_rest_support_google_publisher_google_session_impl_real_is_authenticated (PublishingRESTSupportSession* base);
static gchar* publishing_rest_support_google_publisher_google_session_impl_real_get_user_name (PublishingRESTSupportGoogleSession* base);
static gchar* publishing_rest_support_google_publisher_google_session_impl_real_get_access_token (PublishingRESTSupportGoogleSession* base);
static void publishing_rest_support_google_publisher_google_session_impl_real_deauthenticate (PublishingRESTSupportGoogleSession* base);
static void publishing_rest_support_google_publisher_google_session_impl_finalize (PublishingRESTSupportSession * obj);
GType publishing_rest_support_google_publisher_authenticated_transaction_get_type (void) G_GNUC_CONST;
-enum {
- PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_AUTHENTICATED_TRANSACTION_DUMMY_PROPERTY
-};
-static PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_support_google_publisher_authenticated_transaction_new_with_endpoint_url (PublishingRESTSupportGoogleSession* session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method);
-static PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_support_google_publisher_authenticated_transaction_construct_with_endpoint_url (GType object_type, PublishingRESTSupportGoogleSession* session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method);
-PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_support_google_publisher_authenticated_transaction_new (PublishingRESTSupportGoogleSession* session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method);
-PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_support_google_publisher_authenticated_transaction_construct (GType object_type, PublishingRESTSupportGoogleSession* session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method);
+static PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_support_google_publisher_authenticated_transaction_new_with_endpoint_url (PublishingRESTSupportGoogleSession* session,
+ const gchar* endpoint_url,
+ PublishingRESTSupportHttpMethod method);
+static PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_support_google_publisher_authenticated_transaction_construct_with_endpoint_url (GType object_type,
+ PublishingRESTSupportGoogleSession* session,
+ const gchar* endpoint_url,
+ PublishingRESTSupportHttpMethod method);
+PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_support_google_publisher_authenticated_transaction_new (PublishingRESTSupportGoogleSession* session,
+ const gchar* endpoint_url,
+ PublishingRESTSupportHttpMethod method);
+PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_support_google_publisher_authenticated_transaction_construct (GType object_type,
+ PublishingRESTSupportGoogleSession* session,
+ const gchar* endpoint_url,
+ PublishingRESTSupportHttpMethod method);
static void publishing_rest_support_google_publisher_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 guint8* string_get_data (const gchar* self, int* result_length1) {
+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 guint8*
+string_get_data (const gchar* self,
+ int* result_length1)
+{
guint8* result;
guint8* res = NULL;
gint res_length1;
@@ -607,62 +730,63 @@ static guint8* string_get_data (const gchar* self, int* result_length1) {
gint _tmp3__length1;
guint8* _tmp4_;
gint _tmp4__length1;
-#line 1428 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1442 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1443 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
res = (guint8*) self;
-#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1443 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
res_length1 = -1;
-#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1443 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_res_size_ = res_length1;
-#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1444 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp0_ = strlen (self);
-#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1444 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp1_ = _tmp0_;
-#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1444 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
res_length1 = (gint) _tmp1_;
-#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1444 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp2_ = res_length1;
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp3_ = res;
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp3__length1 = res_length1;
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp4_ = _tmp3_;
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp4__length1 = _tmp3__length1;
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
if (result_length1) {
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
*result_length1 = _tmp4__length1;
-#line 638 "RESTSupport.c"
+#line 761 "RESTSupport.c"
}
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
result = _tmp4_;
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 644 "RESTSupport.c"
+#line 767 "RESTSupport.c"
}
-gchar* publishing_rest_support_hmac_sha1 (const gchar* key, const gchar* message) {
+gchar*
+publishing_rest_support_hmac_sha1 (const gchar* key,
+ const gchar* message)
+{
gchar* result = NULL;
guint8 buffer[PUBLISHING_REST_SUPPORT_SHA1_HMAC_LENGTH] = {0};
gsize len = 0UL;
GHmac* mac = NULL;
- const gchar* _tmp0_;
+ guint8* _tmp0_;
+ gint _tmp0__length1;
guint8* _tmp1_;
gint _tmp1__length1;
- guint8* _tmp2_;
- gint _tmp2__length1;
- GHmac* _tmp3_;
- const gchar* _tmp4_;
- guint8* _tmp5_;
- gint _tmp5__length1;
- guint8* _tmp6_;
- gint _tmp6__length1;
- gsize _tmp7_;
- gchar* _tmp8_;
+ GHmac* _tmp2_;
+ guint8* _tmp3_;
+ gint _tmp3__length1;
+ guint8* _tmp4_;
+ gint _tmp4__length1;
+ gsize _tmp5_;
+ gchar* _tmp6_;
#line 14 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (key != NULL, NULL);
#line 14 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -670,130 +794,134 @@ gchar* publishing_rest_support_hmac_sha1 (const gchar* key, const gchar* message
#line 16 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
len = (gsize) PUBLISHING_REST_SUPPORT_SHA1_HMAC_LENGTH;
#line 18 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = key;
-#line 18 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = string_get_data (_tmp0_, &_tmp1__length1);
+ _tmp0_ = string_get_data (key, &_tmp0__length1);
#line 18 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = _tmp1_;
+ _tmp1_ = _tmp0_;
#line 18 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2__length1 = _tmp1__length1;
+ _tmp1__length1 = _tmp0__length1;
#line 18 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = g_hmac_new (G_CHECKSUM_SHA1, _tmp2_, _tmp2__length1);
+ _tmp2_ = g_hmac_new (G_CHECKSUM_SHA1, _tmp1_, _tmp1__length1);
#line 18 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- mac = _tmp3_;
-#line 19 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp4_ = message;
+ mac = _tmp2_;
#line 19 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp5_ = string_get_data (_tmp4_, &_tmp5__length1);
+ _tmp3_ = string_get_data (message, &_tmp3__length1);
#line 19 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp6_ = _tmp5_;
+ _tmp4_ = _tmp3_;
#line 19 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp6__length1 = _tmp5__length1;
+ _tmp4__length1 = _tmp3__length1;
#line 19 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_hmac_update (mac, _tmp6_, (gssize) _tmp6__length1);
+ g_hmac_update (mac, _tmp4_, (gssize) _tmp4__length1);
#line 20 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_hmac_get_digest (mac, buffer, &len);
#line 22 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp7_ = len;
+ _tmp5_ = len;
#line 22 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp8_ = g_base64_encode (buffer + 0, ((gint) _tmp7_) - 0);
+ _tmp6_ = g_base64_encode (buffer + 0, ((gint) _tmp5_) - 0);
#line 22 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- result = _tmp8_;
+ result = _tmp6_;
#line 22 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_hmac_unref0 (mac);
#line 22 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 706 "RESTSupport.c"
+#line 826 "RESTSupport.c"
}
-PublishingRESTSupportSession* publishing_rest_support_session_construct (GType object_type, const gchar* endpoint_url) {
+PublishingRESTSupportSession*
+publishing_rest_support_session_construct (GType object_type,
+ const gchar* endpoint_url)
+{
PublishingRESTSupportSession* self = NULL;
- const gchar* _tmp0_;
- gchar* _tmp1_;
+ gchar* _tmp0_;
+ SoupSession* _tmp1_;
SoupSession* _tmp2_;
- SoupSession* _tmp3_;
#line 34 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = (PublishingRESTSupportSession*) g_type_create_instance (object_type);
#line 35 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = endpoint_url;
-#line 35 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = g_strdup (_tmp0_);
+ _tmp0_ = g_strdup (endpoint_url);
#line 35 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (self->priv->endpoint_url);
#line 35 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->priv->endpoint_url = _tmp1_;
+ self->priv->endpoint_url = _tmp0_;
#line 36 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = soup_session_new ();
+ _tmp1_ = soup_session_new ();
#line 36 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (self->priv->soup_session);
#line 36 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->priv->soup_session = _tmp2_;
+ self->priv->soup_session = _tmp1_;
#line 37 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = self->priv->soup_session;
+ _tmp2_ = self->priv->soup_session;
#line 37 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_object_set (_tmp3_, "ssl-use-system-ca-file", TRUE, NULL);
+ g_object_set (_tmp2_, "ssl-use-system-ca-file", TRUE, NULL);
#line 34 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 738 "RESTSupport.c"
+#line 858 "RESTSupport.c"
}
-void publishing_rest_support_session_notify_wire_message_unqueued (PublishingRESTSupportSession* self, SoupMessage* message) {
- SoupMessage* _tmp0_;
+void
+publishing_rest_support_session_notify_wire_message_unqueued (PublishingRESTSupportSession* self,
+ SoupMessage* message)
+{
#line 40 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (self));
#line 40 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (SOUP_IS_MESSAGE (message));
#line 41 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = message;
-#line 41 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_signal_emit (self, publishing_rest_support_session_signals[PUBLISHING_REST_SUPPORT_SESSION_WIRE_MESSAGE_UNQUEUED_SIGNAL], 0, _tmp0_);
-#line 752 "RESTSupport.c"
+ g_signal_emit (self, publishing_rest_support_session_signals[PUBLISHING_REST_SUPPORT_SESSION_WIRE_MESSAGE_UNQUEUED_SIGNAL], 0, message);
+#line 872 "RESTSupport.c"
}
-void publishing_rest_support_session_notify_authenticated (PublishingRESTSupportSession* self) {
+void
+publishing_rest_support_session_notify_authenticated (PublishingRESTSupportSession* self)
+{
#line 44 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (self));
#line 45 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_emit (self, publishing_rest_support_session_signals[PUBLISHING_REST_SUPPORT_SESSION_AUTHENTICATED_SIGNAL], 0);
-#line 761 "RESTSupport.c"
+#line 883 "RESTSupport.c"
}
-void publishing_rest_support_session_notify_authentication_failed (PublishingRESTSupportSession* self, GError* err) {
- GError* _tmp0_;
+void
+publishing_rest_support_session_notify_authentication_failed (PublishingRESTSupportSession* self,
+ GError* err)
+{
#line 48 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (self));
#line 49 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = err;
-#line 49 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_signal_emit (self, publishing_rest_support_session_signals[PUBLISHING_REST_SUPPORT_SESSION_AUTHENTICATION_FAILED_SIGNAL], 0, _tmp0_);
-#line 773 "RESTSupport.c"
+ g_signal_emit (self, publishing_rest_support_session_signals[PUBLISHING_REST_SUPPORT_SESSION_AUTHENTICATION_FAILED_SIGNAL], 0, err);
+#line 895 "RESTSupport.c"
}
-static gboolean publishing_rest_support_session_real_is_authenticated (PublishingRESTSupportSession* self) {
+static gboolean
+publishing_rest_support_session_real_is_authenticated (PublishingRESTSupportSession* self)
+{
gboolean _tmp0_ = FALSE;
#line 52 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_session_is_authenticated'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 52 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return _tmp0_;
-#line 783 "RESTSupport.c"
+#line 907 "RESTSupport.c"
}
-gboolean publishing_rest_support_session_is_authenticated (PublishingRESTSupportSession* self) {
+gboolean
+publishing_rest_support_session_is_authenticated (PublishingRESTSupportSession* self)
+{
#line 52 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (self), FALSE);
#line 52 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return PUBLISHING_REST_SUPPORT_SESSION_GET_CLASS (self)->is_authenticated (self);
-#line 792 "RESTSupport.c"
+#line 918 "RESTSupport.c"
}
-gchar* publishing_rest_support_session_get_endpoint_url (PublishingRESTSupportSession* self) {
+gchar*
+publishing_rest_support_session_get_endpoint_url (PublishingRESTSupportSession* self)
+{
gchar* result = NULL;
const gchar* _tmp0_;
gchar* _tmp1_;
@@ -807,11 +935,13 @@ gchar* publishing_rest_support_session_get_endpoint_url (PublishingRESTSupportSe
result = _tmp1_;
#line 55 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 810 "RESTSupport.c"
+#line 938 "RESTSupport.c"
}
-void publishing_rest_support_session_stop_transactions (PublishingRESTSupportSession* self) {
+void
+publishing_rest_support_session_stop_transactions (PublishingRESTSupportSession* self)
+{
SoupSession* _tmp0_;
#line 58 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (self));
@@ -821,11 +951,13 @@ void publishing_rest_support_session_stop_transactions (PublishingRESTSupportSes
_tmp0_ = self->priv->soup_session;
#line 60 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
soup_session_abort (_tmp0_);
-#line 824 "RESTSupport.c"
+#line 954 "RESTSupport.c"
}
-gboolean publishing_rest_support_session_are_transactions_stopped (PublishingRESTSupportSession* self) {
+gboolean
+publishing_rest_support_session_are_transactions_stopped (PublishingRESTSupportSession* self)
+{
gboolean result = FALSE;
gboolean _tmp0_;
#line 63 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -836,57 +968,60 @@ gboolean publishing_rest_support_session_are_transactions_stopped (PublishingRES
result = _tmp0_;
#line 64 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 839 "RESTSupport.c"
+#line 971 "RESTSupport.c"
}
-static void _publishing_rest_support_session_notify_wire_message_unqueued_soup_session_request_unqueued (SoupSession* _sender, SoupMessage* msg, gpointer self) {
+static void
+_publishing_rest_support_session_notify_wire_message_unqueued_soup_session_request_unqueued (SoupSession* _sender,
+ SoupMessage* msg,
+ gpointer self)
+{
#line 71 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_session_notify_wire_message_unqueued ((PublishingRESTSupportSession*) self, msg);
-#line 846 "RESTSupport.c"
+#line 982 "RESTSupport.c"
}
-void publishing_rest_support_session_send_wire_message (PublishingRESTSupportSession* self, SoupMessage* message) {
- gboolean _tmp0_;
+void
+publishing_rest_support_session_send_wire_message (PublishingRESTSupportSession* self,
+ SoupMessage* message)
+{
+ SoupSession* _tmp0_;
SoupSession* _tmp1_;
SoupSession* _tmp2_;
- SoupMessage* _tmp3_;
- SoupSession* _tmp4_;
- guint _tmp5_;
+ guint _tmp3_;
#line 67 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (self));
#line 67 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (SOUP_IS_MESSAGE (message));
#line 68 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = publishing_rest_support_session_are_transactions_stopped (self);
-#line 68 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp0_) {
+ if (publishing_rest_support_session_are_transactions_stopped (self)) {
#line 69 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 867 "RESTSupport.c"
+#line 1002 "RESTSupport.c"
}
#line 71 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = self->priv->soup_session;
+ _tmp0_ = self->priv->soup_session;
#line 71 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_signal_connect (_tmp1_, "request-unqueued", (GCallback) _publishing_rest_support_session_notify_wire_message_unqueued_soup_session_request_unqueued, self);
-#line 72 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = self->priv->soup_session;
+ g_signal_connect (_tmp0_, "request-unqueued", (GCallback) _publishing_rest_support_session_notify_wire_message_unqueued_soup_session_request_unqueued, self);
#line 72 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = message;
+ _tmp1_ = self->priv->soup_session;
#line 72 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- soup_session_send_message (_tmp2_, _tmp3_);
+ soup_session_send_message (_tmp1_, message);
#line 74 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp4_ = self->priv->soup_session;
+ _tmp2_ = self->priv->soup_session;
#line 74 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_signal_parse_name ("request-unqueued", soup_session_get_type (), &_tmp5_, NULL, FALSE);
+ g_signal_parse_name ("request-unqueued", soup_session_get_type (), &_tmp3_, NULL, FALSE);
#line 74 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _publishing_rest_support_session_notify_wire_message_unqueued_soup_session_request_unqueued, self);
-#line 885 "RESTSupport.c"
+ g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_rest_support_session_notify_wire_message_unqueued_soup_session_request_unqueued, self);
+#line 1018 "RESTSupport.c"
}
-void publishing_rest_support_session_set_insecure (PublishingRESTSupportSession* self) {
+void
+publishing_rest_support_session_set_insecure (PublishingRESTSupportSession* self)
+{
SoupSession* _tmp0_;
SoupSession* _tmp1_;
#line 77 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -899,108 +1034,133 @@ void publishing_rest_support_session_set_insecure (PublishingRESTSupportSession*
_tmp1_ = self->priv->soup_session;
#line 79 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_object_set (_tmp1_, "ssl-strict", FALSE, NULL);
-#line 902 "RESTSupport.c"
+#line 1037 "RESTSupport.c"
}
-static void publishing_rest_support_value_session_init (GValue* value) {
+static void
+publishing_rest_support_value_session_init (GValue* value)
+{
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 909 "RESTSupport.c"
+#line 1046 "RESTSupport.c"
}
-static void publishing_rest_support_value_session_free_value (GValue* value) {
+static void
+publishing_rest_support_value_session_free_value (GValue* value)
+{
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (value->data[0].v_pointer) {
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_session_unref (value->data[0].v_pointer);
-#line 918 "RESTSupport.c"
+#line 1057 "RESTSupport.c"
}
}
-static void publishing_rest_support_value_session_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+publishing_rest_support_value_session_copy_value (const GValue* src_value,
+ GValue* dest_value)
+{
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (src_value->data[0].v_pointer) {
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
dest_value->data[0].v_pointer = publishing_rest_support_session_ref (src_value->data[0].v_pointer);
-#line 928 "RESTSupport.c"
+#line 1070 "RESTSupport.c"
} else {
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
dest_value->data[0].v_pointer = NULL;
-#line 932 "RESTSupport.c"
+#line 1074 "RESTSupport.c"
}
}
-static gpointer publishing_rest_support_value_session_peek_pointer (const GValue* value) {
+static gpointer
+publishing_rest_support_value_session_peek_pointer (const GValue* value)
+{
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return value->data[0].v_pointer;
-#line 940 "RESTSupport.c"
+#line 1084 "RESTSupport.c"
}
-static gchar* publishing_rest_support_value_session_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_rest_support_value_session_collect_value (GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (collect_values[0].v_pointer) {
-#line 947 "RESTSupport.c"
+#line 1096 "RESTSupport.c"
PublishingRESTSupportSession * object;
object = collect_values[0].v_pointer;
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (object->parent_instance.g_class == NULL) {
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 954 "RESTSupport.c"
+#line 1103 "RESTSupport.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 958 "RESTSupport.c"
+#line 1107 "RESTSupport.c"
}
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = publishing_rest_support_session_ref (object);
-#line 962 "RESTSupport.c"
+#line 1111 "RESTSupport.c"
} else {
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 966 "RESTSupport.c"
+#line 1115 "RESTSupport.c"
}
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 970 "RESTSupport.c"
+#line 1119 "RESTSupport.c"
}
-static gchar* publishing_rest_support_value_session_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_rest_support_value_session_lcopy_value (const GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
PublishingRESTSupportSession ** object_p;
object_p = collect_values[0].v_pointer;
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (!object_p) {
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 981 "RESTSupport.c"
+#line 1135 "RESTSupport.c"
}
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (!value->data[0].v_pointer) {
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*object_p = NULL;
-#line 987 "RESTSupport.c"
+#line 1141 "RESTSupport.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*object_p = value->data[0].v_pointer;
-#line 991 "RESTSupport.c"
+#line 1145 "RESTSupport.c"
} else {
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*object_p = publishing_rest_support_session_ref (value->data[0].v_pointer);
-#line 995 "RESTSupport.c"
+#line 1149 "RESTSupport.c"
}
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 999 "RESTSupport.c"
+#line 1153 "RESTSupport.c"
}
-GParamSpec* publishing_rest_support_param_spec_session (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+publishing_rest_support_param_spec_session (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags)
+{
PublishingRESTSupportParamSpecSession* spec;
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_REST_SUPPORT_TYPE_SESSION), NULL);
@@ -1010,20 +1170,25 @@ GParamSpec* publishing_rest_support_param_spec_session (const gchar* name, const
G_PARAM_SPEC (spec)->value_type = object_type;
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return G_PARAM_SPEC (spec);
-#line 1013 "RESTSupport.c"
+#line 1173 "RESTSupport.c"
}
-gpointer publishing_rest_support_value_get_session (const GValue* value) {
+gpointer
+publishing_rest_support_value_get_session (const GValue* value)
+{
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_SESSION), NULL);
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return value->data[0].v_pointer;
-#line 1022 "RESTSupport.c"
+#line 1184 "RESTSupport.c"
}
-void publishing_rest_support_value_set_session (GValue* value, gpointer v_object) {
+void
+publishing_rest_support_value_set_session (GValue* value,
+ gpointer v_object)
+{
PublishingRESTSupportSession * old;
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_SESSION));
@@ -1039,22 +1204,25 @@ void publishing_rest_support_value_set_session (GValue* value, gpointer v_object
value->data[0].v_pointer = v_object;
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_session_ref (value->data[0].v_pointer);
-#line 1042 "RESTSupport.c"
+#line 1207 "RESTSupport.c"
} else {
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 1046 "RESTSupport.c"
+#line 1211 "RESTSupport.c"
}
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (old) {
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_session_unref (old);
-#line 1052 "RESTSupport.c"
+#line 1217 "RESTSupport.c"
}
}
-void publishing_rest_support_value_take_session (GValue* value, gpointer v_object) {
+void
+publishing_rest_support_value_take_session (GValue* value,
+ gpointer v_object)
+{
PublishingRESTSupportSession * old;
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_SESSION));
@@ -1068,22 +1236,24 @@ void publishing_rest_support_value_take_session (GValue* value, gpointer v_objec
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = v_object;
-#line 1071 "RESTSupport.c"
+#line 1239 "RESTSupport.c"
} else {
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 1075 "RESTSupport.c"
+#line 1243 "RESTSupport.c"
}
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (old) {
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_session_unref (old);
-#line 1081 "RESTSupport.c"
+#line 1249 "RESTSupport.c"
}
}
-static void publishing_rest_support_session_class_init (PublishingRESTSupportSessionClass * klass) {
+static void
+publishing_rest_support_session_class_init (PublishingRESTSupportSessionClass * klass)
+{
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_session_parent_class = g_type_class_peek_parent (klass);
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -1098,11 +1268,13 @@ static void publishing_rest_support_session_class_init (PublishingRESTSupportSes
publishing_rest_support_session_signals[PUBLISHING_REST_SUPPORT_SESSION_AUTHENTICATED_SIGNAL] = g_signal_new ("authenticated", PUBLISHING_REST_SUPPORT_TYPE_SESSION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_session_signals[PUBLISHING_REST_SUPPORT_SESSION_AUTHENTICATION_FAILED_SIGNAL] = g_signal_new ("authentication-failed", PUBLISHING_REST_SUPPORT_TYPE_SESSION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER);
-#line 1101 "RESTSupport.c"
+#line 1271 "RESTSupport.c"
}
-static void publishing_rest_support_session_instance_init (PublishingRESTSupportSession * self) {
+static void
+publishing_rest_support_session_instance_init (PublishingRESTSupportSession * self)
+{
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv = PUBLISHING_REST_SUPPORT_SESSION_GET_PRIVATE (self);
#line 26 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -1113,11 +1285,13 @@ static void publishing_rest_support_session_instance_init (PublishingRESTSupport
self->priv->transactions_stopped = FALSE;
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->ref_count = 1;
-#line 1116 "RESTSupport.c"
+#line 1288 "RESTSupport.c"
}
-static void publishing_rest_support_session_finalize (PublishingRESTSupportSession * obj) {
+static void
+publishing_rest_support_session_finalize (PublishingRESTSupportSession * obj)
+{
PublishingRESTSupportSession * self;
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession);
@@ -1127,11 +1301,13 @@ static void publishing_rest_support_session_finalize (PublishingRESTSupportSessi
_g_free0 (self->priv->endpoint_url);
#line 27 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (self->priv->soup_session);
-#line 1130 "RESTSupport.c"
+#line 1304 "RESTSupport.c"
}
-GType publishing_rest_support_session_get_type (void) {
+GType
+publishing_rest_support_session_get_type (void)
+{
static volatile gsize publishing_rest_support_session_type_id__volatile = 0;
if (g_once_init_enter (&publishing_rest_support_session_type_id__volatile)) {
static const GTypeValueTable g_define_type_value_table = { publishing_rest_support_value_session_init, publishing_rest_support_value_session_free_value, publishing_rest_support_value_session_copy_value, publishing_rest_support_value_session_peek_pointer, "p", publishing_rest_support_value_session_collect_value, "p", publishing_rest_support_value_session_lcopy_value };
@@ -1145,18 +1321,22 @@ GType publishing_rest_support_session_get_type (void) {
}
-gpointer publishing_rest_support_session_ref (gpointer instance) {
+gpointer
+publishing_rest_support_session_ref (gpointer instance)
+{
PublishingRESTSupportSession * self;
self = instance;
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_atomic_int_inc (&self->ref_count);
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return instance;
-#line 1155 "RESTSupport.c"
+#line 1333 "RESTSupport.c"
}
-void publishing_rest_support_session_unref (gpointer instance) {
+void
+publishing_rest_support_session_unref (gpointer instance)
+{
PublishingRESTSupportSession * self;
self = instance;
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -1165,18 +1345,20 @@ void publishing_rest_support_session_unref (gpointer instance) {
PUBLISHING_REST_SUPPORT_SESSION_GET_CLASS (self)->finalize (self);
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 1168 "RESTSupport.c"
+#line 1348 "RESTSupport.c"
}
}
-gchar* publishing_rest_support_http_method_to_string (PublishingRESTSupportHttpMethod self) {
+gchar*
+publishing_rest_support_http_method_to_string (PublishingRESTSupportHttpMethod self)
+{
gchar* result = NULL;
#line 89 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
switch (self) {
#line 89 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
case PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET:
-#line 1179 "RESTSupport.c"
+#line 1361 "RESTSupport.c"
{
gchar* _tmp0_;
#line 91 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -1185,11 +1367,11 @@ gchar* publishing_rest_support_http_method_to_string (PublishingRESTSupportHttpM
result = _tmp0_;
#line 91 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 1188 "RESTSupport.c"
+#line 1370 "RESTSupport.c"
}
#line 89 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
case PUBLISHING_REST_SUPPORT_HTTP_METHOD_PUT:
-#line 1192 "RESTSupport.c"
+#line 1374 "RESTSupport.c"
{
gchar* _tmp1_;
#line 94 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -1198,11 +1380,11 @@ gchar* publishing_rest_support_http_method_to_string (PublishingRESTSupportHttpM
result = _tmp1_;
#line 94 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 1201 "RESTSupport.c"
+#line 1383 "RESTSupport.c"
}
#line 89 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
case PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST:
-#line 1205 "RESTSupport.c"
+#line 1387 "RESTSupport.c"
{
gchar* _tmp2_;
#line 97 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -1211,68 +1393,60 @@ gchar* publishing_rest_support_http_method_to_string (PublishingRESTSupportHttpM
result = _tmp2_;
#line 97 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 1214 "RESTSupport.c"
+#line 1396 "RESTSupport.c"
}
default:
{
#line 100 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_error ("RESTSupport.vala:100: unrecognized HTTP method enumeration value");
-#line 1220 "RESTSupport.c"
+#line 1402 "RESTSupport.c"
}
}
}
-PublishingRESTSupportHttpMethod publishing_rest_support_http_method_from_string (const gchar* str) {
+PublishingRESTSupportHttpMethod
+publishing_rest_support_http_method_from_string (const gchar* str)
+{
PublishingRESTSupportHttpMethod result = 0;
- const gchar* _tmp0_;
#line 104 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (str != NULL, 0);
#line 105 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = str;
-#line 105 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (g_strcmp0 (_tmp0_, "GET") == 0) {
+ if (g_strcmp0 (str, "GET") == 0) {
#line 106 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET;
#line 106 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 1239 "RESTSupport.c"
+#line 1420 "RESTSupport.c"
} else {
- const gchar* _tmp1_;
#line 107 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = str;
-#line 107 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (g_strcmp0 (_tmp1_, "PUT") == 0) {
+ if (g_strcmp0 (str, "PUT") == 0) {
#line 108 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = PUBLISHING_REST_SUPPORT_HTTP_METHOD_PUT;
#line 108 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 1250 "RESTSupport.c"
+#line 1428 "RESTSupport.c"
} else {
- const gchar* _tmp2_;
-#line 109 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = str;
#line 109 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (g_strcmp0 (_tmp2_, "POST") == 0) {
+ if (g_strcmp0 (str, "POST") == 0) {
#line 110 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST;
#line 110 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 1261 "RESTSupport.c"
+#line 1436 "RESTSupport.c"
} else {
- const gchar* _tmp3_;
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = str;
#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_error ("RESTSupport.vala:112: unrecognized HTTP method name: %s", _tmp3_);
-#line 1268 "RESTSupport.c"
+ g_error ("RESTSupport.vala:112: unrecognized HTTP method name: %s", str);
+#line 1440 "RESTSupport.c"
}
}
}
}
-GType publishing_rest_support_http_method_get_type (void) {
+GType
+publishing_rest_support_http_method_get_type (void)
+{
static volatile gsize publishing_rest_support_http_method_type_id__volatile = 0;
if (g_once_init_enter (&publishing_rest_support_http_method_type_id__volatile)) {
static const GEnumValue values[] = {{PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET, "PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET", "get"}, {PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST, "PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST", "post"}, {PUBLISHING_REST_SUPPORT_HTTP_METHOD_PUT, "PUBLISHING_REST_SUPPORT_HTTP_METHOD_PUT", "put"}, {0, NULL, NULL}};
@@ -1284,12 +1458,14 @@ GType publishing_rest_support_http_method_get_type (void) {
}
-PublishingRESTSupportArgument* publishing_rest_support_argument_construct (GType object_type, const gchar* key, const gchar* value) {
+PublishingRESTSupportArgument*
+publishing_rest_support_argument_construct (GType object_type,
+ const gchar* key,
+ const gchar* value)
+{
PublishingRESTSupportArgument* self = NULL;
- const gchar* _tmp0_;
+ gchar* _tmp0_;
gchar* _tmp1_;
- const gchar* _tmp2_;
- gchar* _tmp3_;
#line 121 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (key != NULL, NULL);
#line 121 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -1297,167 +1473,158 @@ PublishingRESTSupportArgument* publishing_rest_support_argument_construct (GType
#line 121 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = (PublishingRESTSupportArgument*) g_type_create_instance (object_type);
#line 122 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = key;
-#line 122 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = g_strdup (_tmp0_);
+ _tmp0_ = g_strdup (key);
#line 122 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (self->key);
#line 122 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->key = _tmp1_;
+ self->key = _tmp0_;
#line 123 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = value;
-#line 123 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = g_strdup (_tmp2_);
+ _tmp1_ = g_strdup (value);
#line 123 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (self->value);
#line 123 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->value = _tmp3_;
+ self->value = _tmp1_;
#line 121 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 1317 "RESTSupport.c"
+#line 1489 "RESTSupport.c"
}
-PublishingRESTSupportArgument* publishing_rest_support_argument_new (const gchar* key, const gchar* value) {
+PublishingRESTSupportArgument*
+publishing_rest_support_argument_new (const gchar* key,
+ const gchar* value)
+{
#line 121 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return publishing_rest_support_argument_construct (PUBLISHING_REST_SUPPORT_TYPE_ARGUMENT, key, value);
-#line 1324 "RESTSupport.c"
+#line 1499 "RESTSupport.c"
}
-static gpointer _publishing_rest_support_argument_ref0 (gpointer self) {
+static gpointer
+_publishing_rest_support_argument_ref0 (gpointer self)
+{
#line 129 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self ? publishing_rest_support_argument_ref (self) : NULL;
-#line 1331 "RESTSupport.c"
+#line 1508 "RESTSupport.c"
}
-gchar* publishing_rest_support_argument_serialize_list (PublishingRESTSupportArgument** args, int args_length1, gboolean escape, const gchar* separator) {
+gchar*
+publishing_rest_support_argument_serialize_list (PublishingRESTSupportArgument** args,
+ int args_length1,
+ gboolean escape,
+ const gchar* separator)
+{
gchar* result = NULL;
GString* builder = NULL;
GString* _tmp0_;
- PublishingRESTSupportArgument** _tmp1_;
- gint _tmp1__length1;
- GString* _tmp10_;
- gssize _tmp11_;
- GString* _tmp18_;
- const gchar* _tmp19_;
- gchar* _tmp20_;
+ GString* _tmp7_;
+ gssize _tmp8_;
+ GString* _tmp14_;
+ const gchar* _tmp15_;
+ gchar* _tmp16_;
#line 127 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = g_string_new ("");
#line 127 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
builder = _tmp0_;
-#line 129 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = args;
-#line 129 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1__length1 = args_length1;
-#line 1354 "RESTSupport.c"
+#line 1530 "RESTSupport.c"
{
PublishingRESTSupportArgument** arg_collection = NULL;
gint arg_collection_length1 = 0;
gint _arg_collection_size_ = 0;
gint arg_it = 0;
#line 129 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- arg_collection = _tmp1_;
+ arg_collection = args;
#line 129 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- arg_collection_length1 = _tmp1__length1;
+ arg_collection_length1 = args_length1;
#line 129 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- for (arg_it = 0; arg_it < _tmp1__length1; arg_it = arg_it + 1) {
-#line 1366 "RESTSupport.c"
- PublishingRESTSupportArgument* _tmp2_;
+ for (arg_it = 0; arg_it < args_length1; arg_it = arg_it + 1) {
+#line 1542 "RESTSupport.c"
+ PublishingRESTSupportArgument* _tmp1_;
PublishingRESTSupportArgument* arg = NULL;
#line 129 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = _publishing_rest_support_argument_ref0 (arg_collection[arg_it]);
+ _tmp1_ = _publishing_rest_support_argument_ref0 (arg_collection[arg_it]);
#line 129 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- arg = _tmp2_;
-#line 1373 "RESTSupport.c"
+ arg = _tmp1_;
+#line 1549 "RESTSupport.c"
{
- GString* _tmp3_;
- PublishingRESTSupportArgument* _tmp4_;
- gboolean _tmp5_;
- gchar* _tmp6_;
- gchar* _tmp7_;
- GString* _tmp8_;
- const gchar* _tmp9_;
-#line 130 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = builder;
+ GString* _tmp2_;
+ PublishingRESTSupportArgument* _tmp3_;
+ gchar* _tmp4_;
+ gchar* _tmp5_;
+ GString* _tmp6_;
#line 130 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp4_ = arg;
+ _tmp2_ = builder;
#line 130 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp5_ = escape;
+ _tmp3_ = arg;
#line 130 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp6_ = publishing_rest_support_argument_to_string (_tmp4_, _tmp5_);
+ _tmp4_ = publishing_rest_support_argument_to_string (_tmp3_, escape);
#line 130 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp7_ = _tmp6_;
+ _tmp5_ = _tmp4_;
#line 130 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_string_append (_tmp3_, _tmp7_);
+ g_string_append (_tmp2_, _tmp5_);
#line 130 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp7_);
+ _g_free0 (_tmp5_);
#line 131 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp8_ = builder;
+ _tmp6_ = builder;
#line 131 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp9_ = separator;
-#line 131 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_string_append (_tmp8_, _tmp9_);
+ g_string_append (_tmp6_, separator);
#line 129 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_publishing_rest_support_argument_unref0 (arg);
-#line 1404 "RESTSupport.c"
+#line 1574 "RESTSupport.c"
}
}
}
#line 134 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp10_ = builder;
+ _tmp7_ = builder;
#line 134 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp11_ = _tmp10_->len;
+ _tmp8_ = _tmp7_->len;
#line 134 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp11_ > ((gssize) 0)) {
-#line 1414 "RESTSupport.c"
- GString* _tmp12_;
- GString* _tmp13_;
- gssize _tmp14_;
- const gchar* _tmp15_;
- gint _tmp16_;
- gint _tmp17_;
-#line 135 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp12_ = builder;
+ if (_tmp8_ > ((gssize) 0)) {
+#line 1584 "RESTSupport.c"
+ GString* _tmp9_;
+ GString* _tmp10_;
+ gssize _tmp11_;
+ gint _tmp12_;
+ gint _tmp13_;
#line 135 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp13_ = builder;
+ _tmp9_ = builder;
#line 135 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp14_ = _tmp13_->len;
+ _tmp10_ = builder;
#line 135 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp15_ = separator;
+ _tmp11_ = _tmp10_->len;
#line 135 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp16_ = strlen (_tmp15_);
+ _tmp12_ = strlen (separator);
#line 135 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp17_ = _tmp16_;
+ _tmp13_ = _tmp12_;
#line 135 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_string_truncate (_tmp12_, (gsize) (_tmp14_ - _tmp17_));
-#line 1435 "RESTSupport.c"
+ g_string_truncate (_tmp9_, (gsize) (_tmp11_ - _tmp13_));
+#line 1602 "RESTSupport.c"
}
#line 137 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp18_ = builder;
+ _tmp14_ = builder;
#line 137 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp19_ = _tmp18_->str;
+ _tmp15_ = _tmp14_->str;
#line 137 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp20_ = g_strdup (_tmp19_);
+ _tmp16_ = g_strdup (_tmp15_);
#line 137 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- result = _tmp20_;
+ result = _tmp16_;
#line 137 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_string_free0 (builder);
#line 137 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 1449 "RESTSupport.c"
+#line 1616 "RESTSupport.c"
}
-gint publishing_rest_support_argument_compare (PublishingRESTSupportArgument* arg1, PublishingRESTSupportArgument* arg2) {
+gint
+publishing_rest_support_argument_compare (PublishingRESTSupportArgument* arg1,
+ PublishingRESTSupportArgument* arg2)
+{
gint result = 0;
GCompareFunc _tmp0_;
- PublishingRESTSupportArgument* _tmp1_;
+ const gchar* _tmp1_;
const gchar* _tmp2_;
- PublishingRESTSupportArgument* _tmp3_;
- const gchar* _tmp4_;
- gint _tmp5_;
#line 140 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_ARGUMENT (arg1), 0);
#line 140 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -1465,257 +1632,275 @@ gint publishing_rest_support_argument_compare (PublishingRESTSupportArgument* ar
#line 141 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = g_strcmp0;
#line 141 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = arg1;
+ _tmp1_ = arg1->key;
#line 141 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = _tmp1_->key;
+ _tmp2_ = arg2->key;
#line 141 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = arg2;
-#line 141 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp4_ = _tmp3_->key;
-#line 141 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp5_ = _tmp0_ (_tmp2_, _tmp4_);
-#line 141 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- result = _tmp5_;
+ result = _tmp0_ (_tmp1_, _tmp2_);
#line 141 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 1481 "RESTSupport.c"
+#line 1642 "RESTSupport.c"
}
-static gint _publishing_rest_support_argument_compare_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self) {
+static gint
+_publishing_rest_support_argument_compare_gcompare_data_func (gconstpointer a,
+ gconstpointer b,
+ gpointer self)
+{
gint result;
result = publishing_rest_support_argument_compare ((PublishingRESTSupportArgument*) a, (PublishingRESTSupportArgument*) b);
#line 145 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 1490 "RESTSupport.c"
+#line 1655 "RESTSupport.c"
}
-PublishingRESTSupportArgument** publishing_rest_support_argument_sort (PublishingRESTSupportArgument** inputArray, int inputArray_length1, int* result_length1) {
+PublishingRESTSupportArgument**
+publishing_rest_support_argument_sort (PublishingRESTSupportArgument** inputArray,
+ int inputArray_length1,
+ int* result_length1)
+{
PublishingRESTSupportArgument** result = NULL;
GeeTreeSet* sorted_args = NULL;
GeeTreeSet* _tmp0_;
- PublishingRESTSupportArgument** _tmp1_;
- gint _tmp1__length1;
- GeeTreeSet* _tmp5_;
- gint _tmp6_;
- gpointer* _tmp7_;
- PublishingRESTSupportArgument** _tmp8_;
- gint _tmp8__length1;
+ GeeTreeSet* _tmp4_;
+ gint _tmp5_;
+ gpointer* _tmp6_;
+ PublishingRESTSupportArgument** _tmp7_;
+ gint _tmp7__length1;
#line 145 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = gee_tree_set_new (PUBLISHING_REST_SUPPORT_TYPE_ARGUMENT, (GBoxedCopyFunc) publishing_rest_support_argument_ref, (GDestroyNotify) publishing_rest_support_argument_unref, _publishing_rest_support_argument_compare_gcompare_data_func, NULL, NULL);
#line 145 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
sorted_args = _tmp0_;
-#line 147 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = inputArray;
-#line 147 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1__length1 = inputArray_length1;
-#line 1513 "RESTSupport.c"
+#line 1676 "RESTSupport.c"
{
PublishingRESTSupportArgument** arg_collection = NULL;
gint arg_collection_length1 = 0;
gint _arg_collection_size_ = 0;
gint arg_it = 0;
#line 147 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- arg_collection = _tmp1_;
+ arg_collection = inputArray;
#line 147 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- arg_collection_length1 = _tmp1__length1;
+ arg_collection_length1 = inputArray_length1;
#line 147 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- for (arg_it = 0; arg_it < _tmp1__length1; arg_it = arg_it + 1) {
-#line 1525 "RESTSupport.c"
- PublishingRESTSupportArgument* _tmp2_;
+ for (arg_it = 0; arg_it < inputArray_length1; arg_it = arg_it + 1) {
+#line 1688 "RESTSupport.c"
+ PublishingRESTSupportArgument* _tmp1_;
PublishingRESTSupportArgument* arg = NULL;
#line 147 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = _publishing_rest_support_argument_ref0 (arg_collection[arg_it]);
+ _tmp1_ = _publishing_rest_support_argument_ref0 (arg_collection[arg_it]);
#line 147 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- arg = _tmp2_;
-#line 1532 "RESTSupport.c"
+ arg = _tmp1_;
+#line 1695 "RESTSupport.c"
{
- GeeTreeSet* _tmp3_;
- PublishingRESTSupportArgument* _tmp4_;
+ GeeTreeSet* _tmp2_;
+ PublishingRESTSupportArgument* _tmp3_;
#line 148 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = sorted_args;
+ _tmp2_ = sorted_args;
#line 148 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp4_ = arg;
+ _tmp3_ = arg;
#line 148 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp4_);
+ gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp3_);
#line 147 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_publishing_rest_support_argument_unref0 (arg);
-#line 1544 "RESTSupport.c"
+#line 1707 "RESTSupport.c"
}
}
}
#line 150 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp5_ = sorted_args;
+ _tmp4_ = sorted_args;
#line 150 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp7_ = gee_collection_to_array (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection), &_tmp6_);
+ _tmp6_ = gee_collection_to_array (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection), &_tmp5_);
#line 150 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp8_ = _tmp7_;
+ _tmp7_ = _tmp6_;
#line 150 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp8__length1 = _tmp6_;
+ _tmp7__length1 = _tmp5_;
#line 150 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (result_length1) {
#line 150 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- *result_length1 = _tmp8__length1;
-#line 1560 "RESTSupport.c"
+ *result_length1 = _tmp7__length1;
+#line 1723 "RESTSupport.c"
}
#line 150 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- result = _tmp8_;
+ result = _tmp7_;
#line 150 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (sorted_args);
#line 150 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 1568 "RESTSupport.c"
+#line 1731 "RESTSupport.c"
}
-gchar* publishing_rest_support_argument_to_string (PublishingRESTSupportArgument* self, gboolean escape) {
+gchar*
+publishing_rest_support_argument_to_string (PublishingRESTSupportArgument* self,
+ gboolean escape)
+{
gchar* result = NULL;
const gchar* _tmp0_ = NULL;
- gboolean _tmp1_;
- const gchar* _tmp2_ = NULL;
- gboolean _tmp3_;
- const gchar* _tmp4_;
- const gchar* _tmp5_;
- gchar* _tmp6_;
+ const gchar* _tmp1_ = NULL;
+ const gchar* _tmp2_;
+ const gchar* _tmp3_;
+ gchar* _tmp4_;
#line 153 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_ARGUMENT (self), NULL);
#line 154 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = escape;
-#line 154 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp1_) {
+ if (escape) {
#line 154 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = "\"";
-#line 1589 "RESTSupport.c"
+#line 1751 "RESTSupport.c"
} else {
#line 154 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = "";
-#line 1593 "RESTSupport.c"
+#line 1755 "RESTSupport.c"
}
#line 154 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = escape;
+ if (escape) {
#line 154 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp3_) {
-#line 154 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = "\"";
-#line 1601 "RESTSupport.c"
+ _tmp1_ = "\"";
+#line 1761 "RESTSupport.c"
} else {
#line 154 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = "";
-#line 1605 "RESTSupport.c"
+ _tmp1_ = "";
+#line 1765 "RESTSupport.c"
}
#line 154 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp4_ = self->key;
+ _tmp2_ = self->key;
#line 154 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp5_ = self->value;
+ _tmp3_ = self->value;
#line 154 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp6_ = g_strdup_printf ("%s=%s%s%s", _tmp4_, _tmp0_, _tmp5_, _tmp2_);
+ _tmp4_ = g_strdup_printf ("%s=%s%s%s", _tmp2_, _tmp0_, _tmp3_, _tmp1_);
#line 154 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- result = _tmp6_;
+ result = _tmp4_;
#line 154 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 1617 "RESTSupport.c"
+#line 1777 "RESTSupport.c"
}
-static void publishing_rest_support_value_argument_init (GValue* value) {
+static void
+publishing_rest_support_value_argument_init (GValue* value)
+{
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 1624 "RESTSupport.c"
+#line 1786 "RESTSupport.c"
}
-static void publishing_rest_support_value_argument_free_value (GValue* value) {
+static void
+publishing_rest_support_value_argument_free_value (GValue* value)
+{
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (value->data[0].v_pointer) {
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_argument_unref (value->data[0].v_pointer);
-#line 1633 "RESTSupport.c"
+#line 1797 "RESTSupport.c"
}
}
-static void publishing_rest_support_value_argument_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+publishing_rest_support_value_argument_copy_value (const GValue* src_value,
+ GValue* dest_value)
+{
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (src_value->data[0].v_pointer) {
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
dest_value->data[0].v_pointer = publishing_rest_support_argument_ref (src_value->data[0].v_pointer);
-#line 1643 "RESTSupport.c"
+#line 1810 "RESTSupport.c"
} else {
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
dest_value->data[0].v_pointer = NULL;
-#line 1647 "RESTSupport.c"
+#line 1814 "RESTSupport.c"
}
}
-static gpointer publishing_rest_support_value_argument_peek_pointer (const GValue* value) {
+static gpointer
+publishing_rest_support_value_argument_peek_pointer (const GValue* value)
+{
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return value->data[0].v_pointer;
-#line 1655 "RESTSupport.c"
+#line 1824 "RESTSupport.c"
}
-static gchar* publishing_rest_support_value_argument_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_rest_support_value_argument_collect_value (GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (collect_values[0].v_pointer) {
-#line 1662 "RESTSupport.c"
+#line 1836 "RESTSupport.c"
PublishingRESTSupportArgument * object;
object = collect_values[0].v_pointer;
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (object->parent_instance.g_class == NULL) {
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1669 "RESTSupport.c"
+#line 1843 "RESTSupport.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1673 "RESTSupport.c"
+#line 1847 "RESTSupport.c"
}
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = publishing_rest_support_argument_ref (object);
-#line 1677 "RESTSupport.c"
+#line 1851 "RESTSupport.c"
} else {
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 1681 "RESTSupport.c"
+#line 1855 "RESTSupport.c"
}
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 1685 "RESTSupport.c"
+#line 1859 "RESTSupport.c"
}
-static gchar* publishing_rest_support_value_argument_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_rest_support_value_argument_lcopy_value (const GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
PublishingRESTSupportArgument ** object_p;
object_p = collect_values[0].v_pointer;
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (!object_p) {
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1696 "RESTSupport.c"
+#line 1875 "RESTSupport.c"
}
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (!value->data[0].v_pointer) {
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*object_p = NULL;
-#line 1702 "RESTSupport.c"
+#line 1881 "RESTSupport.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*object_p = value->data[0].v_pointer;
-#line 1706 "RESTSupport.c"
+#line 1885 "RESTSupport.c"
} else {
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*object_p = publishing_rest_support_argument_ref (value->data[0].v_pointer);
-#line 1710 "RESTSupport.c"
+#line 1889 "RESTSupport.c"
}
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 1714 "RESTSupport.c"
+#line 1893 "RESTSupport.c"
}
-GParamSpec* publishing_rest_support_param_spec_argument (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+publishing_rest_support_param_spec_argument (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags)
+{
PublishingRESTSupportParamSpecArgument* spec;
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_REST_SUPPORT_TYPE_ARGUMENT), NULL);
@@ -1725,20 +1910,25 @@ GParamSpec* publishing_rest_support_param_spec_argument (const gchar* name, cons
G_PARAM_SPEC (spec)->value_type = object_type;
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return G_PARAM_SPEC (spec);
-#line 1728 "RESTSupport.c"
+#line 1913 "RESTSupport.c"
}
-gpointer publishing_rest_support_value_get_argument (const GValue* value) {
+gpointer
+publishing_rest_support_value_get_argument (const GValue* value)
+{
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_ARGUMENT), NULL);
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return value->data[0].v_pointer;
-#line 1737 "RESTSupport.c"
+#line 1924 "RESTSupport.c"
}
-void publishing_rest_support_value_set_argument (GValue* value, gpointer v_object) {
+void
+publishing_rest_support_value_set_argument (GValue* value,
+ gpointer v_object)
+{
PublishingRESTSupportArgument * old;
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_ARGUMENT));
@@ -1754,22 +1944,25 @@ void publishing_rest_support_value_set_argument (GValue* value, gpointer v_objec
value->data[0].v_pointer = v_object;
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_argument_ref (value->data[0].v_pointer);
-#line 1757 "RESTSupport.c"
+#line 1947 "RESTSupport.c"
} else {
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 1761 "RESTSupport.c"
+#line 1951 "RESTSupport.c"
}
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (old) {
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_argument_unref (old);
-#line 1767 "RESTSupport.c"
+#line 1957 "RESTSupport.c"
}
}
-void publishing_rest_support_value_take_argument (GValue* value, gpointer v_object) {
+void
+publishing_rest_support_value_take_argument (GValue* value,
+ gpointer v_object)
+{
PublishingRESTSupportArgument * old;
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_ARGUMENT));
@@ -1783,38 +1976,44 @@ void publishing_rest_support_value_take_argument (GValue* value, gpointer v_obje
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = v_object;
-#line 1786 "RESTSupport.c"
+#line 1979 "RESTSupport.c"
} else {
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 1790 "RESTSupport.c"
+#line 1983 "RESTSupport.c"
}
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (old) {
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_argument_unref (old);
-#line 1796 "RESTSupport.c"
+#line 1989 "RESTSupport.c"
}
}
-static void publishing_rest_support_argument_class_init (PublishingRESTSupportArgumentClass * klass) {
+static void
+publishing_rest_support_argument_class_init (PublishingRESTSupportArgumentClass * klass)
+{
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_argument_parent_class = g_type_class_peek_parent (klass);
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
((PublishingRESTSupportArgumentClass *) klass)->finalize = publishing_rest_support_argument_finalize;
-#line 1806 "RESTSupport.c"
+#line 2001 "RESTSupport.c"
}
-static void publishing_rest_support_argument_instance_init (PublishingRESTSupportArgument * self) {
+static void
+publishing_rest_support_argument_instance_init (PublishingRESTSupportArgument * self)
+{
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->ref_count = 1;
-#line 1813 "RESTSupport.c"
+#line 2010 "RESTSupport.c"
}
-static void publishing_rest_support_argument_finalize (PublishingRESTSupportArgument * obj) {
+static void
+publishing_rest_support_argument_finalize (PublishingRESTSupportArgument * obj)
+{
PublishingRESTSupportArgument * self;
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_REST_SUPPORT_TYPE_ARGUMENT, PublishingRESTSupportArgument);
@@ -1824,11 +2023,13 @@ static void publishing_rest_support_argument_finalize (PublishingRESTSupportArgu
_g_free0 (self->key);
#line 119 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (self->value);
-#line 1827 "RESTSupport.c"
+#line 2026 "RESTSupport.c"
}
-GType publishing_rest_support_argument_get_type (void) {
+GType
+publishing_rest_support_argument_get_type (void)
+{
static volatile gsize publishing_rest_support_argument_type_id__volatile = 0;
if (g_once_init_enter (&publishing_rest_support_argument_type_id__volatile)) {
static const GTypeValueTable g_define_type_value_table = { publishing_rest_support_value_argument_init, publishing_rest_support_value_argument_free_value, publishing_rest_support_value_argument_copy_value, publishing_rest_support_value_argument_peek_pointer, "p", publishing_rest_support_value_argument_collect_value, "p", publishing_rest_support_value_argument_lcopy_value };
@@ -1842,18 +2043,22 @@ GType publishing_rest_support_argument_get_type (void) {
}
-gpointer publishing_rest_support_argument_ref (gpointer instance) {
+gpointer
+publishing_rest_support_argument_ref (gpointer instance)
+{
PublishingRESTSupportArgument * self;
self = instance;
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_atomic_int_inc (&self->ref_count);
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return instance;
-#line 1852 "RESTSupport.c"
+#line 2055 "RESTSupport.c"
}
-void publishing_rest_support_argument_unref (gpointer instance) {
+void
+publishing_rest_support_argument_unref (gpointer instance)
+{
PublishingRESTSupportArgument * self;
self = instance;
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -1862,99 +2067,99 @@ void publishing_rest_support_argument_unref (gpointer instance) {
PUBLISHING_REST_SUPPORT_ARGUMENT_GET_CLASS (self)->finalize (self);
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 1865 "RESTSupport.c"
+#line 2070 "RESTSupport.c"
}
}
-static void _publishing_rest_support_transaction_on_wrote_body_data_soup_message_wrote_body_data (SoupMessage* _sender, SoupBuffer* chunk, gpointer self) {
+static void
+_publishing_rest_support_transaction_on_wrote_body_data_soup_message_wrote_body_data (SoupMessage* _sender,
+ SoupBuffer* chunk,
+ gpointer self)
+{
#line 181 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_transaction_on_wrote_body_data ((PublishingRESTSupportTransaction*) self, chunk);
-#line 1873 "RESTSupport.c"
+#line 2082 "RESTSupport.c"
}
-PublishingRESTSupportTransaction* publishing_rest_support_transaction_construct (GType object_type, PublishingRESTSupportSession* parent_session, PublishingRESTSupportHttpMethod method) {
+PublishingRESTSupportTransaction*
+publishing_rest_support_transaction_construct (GType object_type,
+ PublishingRESTSupportSession* parent_session,
+ PublishingRESTSupportHttpMethod method)
+{
PublishingRESTSupportTransaction* self = NULL;
- PublishingRESTSupportSession* _tmp0_;
+ gchar* _tmp0_;
gchar* _tmp1_;
gchar* _tmp2_;
- PublishingRESTSupportSession* _tmp3_;
- PublishingRESTSupportHttpMethod _tmp4_;
+ gchar* _tmp3_;
+ gchar* _tmp4_;
gchar* _tmp5_;
- gchar* _tmp6_;
- PublishingRESTSupportSession* _tmp7_;
- gchar* _tmp8_;
- gchar* _tmp9_;
- SoupMessage* _tmp10_;
- SoupMessage* _tmp11_;
+ SoupMessage* _tmp6_;
+ SoupMessage* _tmp7_;
#line 173 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (parent_session), NULL);
#line 173 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = (PublishingRESTSupportTransaction*) g_type_create_instance (object_type);
#line 176 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = parent_session;
-#line 176 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = publishing_rest_support_session_get_endpoint_url (_tmp0_);
+ _tmp0_ = publishing_rest_support_session_get_endpoint_url (parent_session);
#line 176 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = _tmp1_;
+ _tmp1_ = _tmp0_;
#line 176 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _vala_assert (_tmp2_ != NULL, "parent_session.get_endpoint_url() != null");
+ _vala_assert (_tmp1_ != NULL, "parent_session.get_endpoint_url() != null");
#line 176 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp2_);
+ _g_free0 (_tmp1_);
#line 178 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = parent_session;
-#line 178 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->priv->parent_session = _tmp3_;
-#line 180 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp4_ = method;
+ self->priv->parent_session = parent_session;
#line 180 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp5_ = publishing_rest_support_http_method_to_string (_tmp4_);
+ _tmp2_ = publishing_rest_support_http_method_to_string (method);
#line 180 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp6_ = _tmp5_;
-#line 180 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp7_ = parent_session;
+ _tmp3_ = _tmp2_;
#line 180 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp8_ = publishing_rest_support_session_get_endpoint_url (_tmp7_);
+ _tmp4_ = publishing_rest_support_session_get_endpoint_url (parent_session);
#line 180 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp9_ = _tmp8_;
+ _tmp5_ = _tmp4_;
#line 180 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp10_ = soup_message_new (_tmp6_, _tmp9_);
+ _tmp6_ = soup_message_new (_tmp3_, _tmp5_);
#line 180 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (self->priv->message);
#line 180 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->priv->message = _tmp10_;
+ self->priv->message = _tmp6_;
#line 180 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp9_);
+ _g_free0 (_tmp5_);
#line 180 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp6_);
+ _g_free0 (_tmp3_);
#line 181 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp11_ = self->priv->message;
+ _tmp7_ = self->priv->message;
#line 181 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_signal_connect (_tmp11_, "wrote-body-data", (GCallback) _publishing_rest_support_transaction_on_wrote_body_data_soup_message_wrote_body_data, self);
+ g_signal_connect (_tmp7_, "wrote-body-data", (GCallback) _publishing_rest_support_transaction_on_wrote_body_data_soup_message_wrote_body_data, self);
#line 173 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 1937 "RESTSupport.c"
+#line 2138 "RESTSupport.c"
}
-PublishingRESTSupportTransaction* publishing_rest_support_transaction_new (PublishingRESTSupportSession* parent_session, PublishingRESTSupportHttpMethod method) {
+PublishingRESTSupportTransaction*
+publishing_rest_support_transaction_new (PublishingRESTSupportSession* parent_session,
+ PublishingRESTSupportHttpMethod method)
+{
#line 173 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return publishing_rest_support_transaction_construct (PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, parent_session, method);
-#line 1944 "RESTSupport.c"
+#line 2148 "RESTSupport.c"
}
-PublishingRESTSupportTransaction* publishing_rest_support_transaction_construct_with_endpoint_url (GType object_type, PublishingRESTSupportSession* parent_session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method) {
+PublishingRESTSupportTransaction*
+publishing_rest_support_transaction_construct_with_endpoint_url (GType object_type,
+ PublishingRESTSupportSession* parent_session,
+ const gchar* endpoint_url,
+ PublishingRESTSupportHttpMethod method)
+{
PublishingRESTSupportTransaction* self = NULL;
- PublishingRESTSupportSession* _tmp0_;
- const gchar* _tmp1_;
+ gchar* _tmp0_;
+ gchar* _tmp1_;
gchar* _tmp2_;
- PublishingRESTSupportHttpMethod _tmp3_;
- gchar* _tmp4_;
- gchar* _tmp5_;
- const gchar* _tmp6_;
- SoupMessage* _tmp7_;
+ SoupMessage* _tmp3_;
#line 184 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (parent_session), NULL);
#line 184 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -1962,54 +2167,52 @@ PublishingRESTSupportTransaction* publishing_rest_support_transaction_construct_
#line 184 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = (PublishingRESTSupportTransaction*) g_type_create_instance (object_type);
#line 186 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = parent_session;
-#line 186 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->priv->parent_session = _tmp0_;
+ self->priv->parent_session = parent_session;
#line 187 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = endpoint_url;
-#line 187 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = g_strdup (_tmp1_);
+ _tmp0_ = g_strdup (endpoint_url);
#line 187 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (self->priv->endpoint_url);
#line 187 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->priv->endpoint_url = _tmp2_;
-#line 188 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = method;
+ self->priv->endpoint_url = _tmp0_;
#line 188 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp4_ = publishing_rest_support_http_method_to_string (_tmp3_);
+ _tmp1_ = publishing_rest_support_http_method_to_string (method);
#line 188 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp5_ = _tmp4_;
-#line 188 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp6_ = endpoint_url;
+ _tmp2_ = _tmp1_;
#line 188 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp7_ = soup_message_new (_tmp5_, _tmp6_);
+ _tmp3_ = soup_message_new (_tmp2_, endpoint_url);
#line 188 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (self->priv->message);
#line 188 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->priv->message = _tmp7_;
+ self->priv->message = _tmp3_;
#line 188 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp5_);
+ _g_free0 (_tmp2_);
#line 184 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 1994 "RESTSupport.c"
+#line 2191 "RESTSupport.c"
}
-PublishingRESTSupportTransaction* publishing_rest_support_transaction_new_with_endpoint_url (PublishingRESTSupportSession* parent_session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method) {
+PublishingRESTSupportTransaction*
+publishing_rest_support_transaction_new_with_endpoint_url (PublishingRESTSupportSession* parent_session,
+ const gchar* endpoint_url,
+ PublishingRESTSupportHttpMethod method)
+{
#line 184 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return publishing_rest_support_transaction_construct_with_endpoint_url (PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, parent_session, endpoint_url, method);
-#line 2001 "RESTSupport.c"
+#line 2202 "RESTSupport.c"
}
-static void publishing_rest_support_transaction_on_wrote_body_data (PublishingRESTSupportTransaction* self, SoupBuffer* written_data) {
+static void
+publishing_rest_support_transaction_on_wrote_body_data (PublishingRESTSupportTransaction* self,
+ SoupBuffer* written_data)
+{
gint _tmp0_;
- SoupBuffer* _tmp1_;
- gsize _tmp2_;
- gint _tmp3_;
- SoupMessage* _tmp4_;
- SoupMessageBody* _tmp5_;
- gint64 _tmp6_;
+ gsize _tmp1_;
+ gint _tmp2_;
+ SoupMessage* _tmp3_;
+ SoupMessageBody* _tmp4_;
+ gint64 _tmp5_;
#line 191 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self));
#line 191 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2017,35 +2220,37 @@ static void publishing_rest_support_transaction_on_wrote_body_data (PublishingRE
#line 192 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = self->priv->bytes_written;
#line 192 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = written_data;
+ _tmp1_ = written_data->length;
#line 192 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = _tmp1_->length;
-#line 192 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->priv->bytes_written = _tmp0_ + ((gint) _tmp2_);
+ self->priv->bytes_written = _tmp0_ + ((gint) _tmp1_);
#line 193 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = self->priv->bytes_written;
+ _tmp2_ = self->priv->bytes_written;
#line 193 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp4_ = self->priv->message;
+ _tmp3_ = self->priv->message;
#line 193 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp5_ = _tmp4_->request_body;
+ _tmp4_ = _tmp3_->request_body;
#line 193 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp6_ = _tmp5_->length;
+ _tmp5_ = _tmp4_->length;
#line 193 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_signal_emit (self, publishing_rest_support_transaction_signals[PUBLISHING_REST_SUPPORT_TRANSACTION_CHUNK_TRANSMITTED_SIGNAL], 0, _tmp3_, (gint) _tmp6_);
-#line 2035 "RESTSupport.c"
+ g_signal_emit (self, publishing_rest_support_transaction_signals[PUBLISHING_REST_SUPPORT_TRANSACTION_CHUNK_TRANSMITTED_SIGNAL], 0, _tmp2_, (gint) _tmp5_);
+#line 2236 "RESTSupport.c"
}
-static gpointer _g_error_copy0 (gpointer self) {
+static gpointer
+_g_error_copy0 (gpointer self)
+{
#line 205 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self ? g_error_copy (self) : NULL;
-#line 2042 "RESTSupport.c"
+#line 2245 "RESTSupport.c"
}
-static void publishing_rest_support_transaction_on_message_unqueued (PublishingRESTSupportTransaction* self, SoupMessage* message) {
+static void
+publishing_rest_support_transaction_on_message_unqueued (PublishingRESTSupportTransaction* self,
+ SoupMessage* message)
+{
SoupMessage* _tmp0_;
- SoupMessage* _tmp1_;
GError * _inner_error_ = NULL;
#line 196 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self));
@@ -2054,24 +2259,19 @@ static void publishing_rest_support_transaction_on_message_unqueued (PublishingR
#line 197 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = self->priv->message;
#line 197 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = message;
-#line 197 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp0_ != _tmp1_) {
+ if (_tmp0_ != message) {
#line 198 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2062 "RESTSupport.c"
+#line 2265 "RESTSupport.c"
}
{
- SoupMessage* _tmp2_;
-#line 201 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = message;
#line 201 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- publishing_rest_support_transaction_check_response (self, _tmp2_, &_inner_error_);
+ publishing_rest_support_transaction_check_response (self, message, &_inner_error_);
#line 201 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 201 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2074 "RESTSupport.c"
+#line 2274 "RESTSupport.c"
goto __catch0_spit_publishing_publishing_error;
}
#line 201 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2080,48 +2280,48 @@ static void publishing_rest_support_transaction_on_message_unqueued (PublishingR
g_clear_error (&_inner_error_);
#line 201 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2083 "RESTSupport.c"
+#line 2283 "RESTSupport.c"
}
}
goto __finally0;
__catch0_spit_publishing_publishing_error:
{
GError* err = NULL;
- GError* _tmp3_;
- const gchar* _tmp4_;
- gchar* _tmp5_;
- gchar* _tmp6_;
- GError* _tmp7_;
- GError* _tmp8_;
+ GError* _tmp1_;
+ const gchar* _tmp2_;
+ gchar* _tmp3_;
+ gchar* _tmp4_;
+ GError* _tmp5_;
+ GError* _tmp6_;
#line 200 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
err = _inner_error_;
#line 200 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_inner_error_ = NULL;
#line 203 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = err;
+ _tmp1_ = err;
#line 203 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp4_ = _tmp3_->message;
+ _tmp2_ = _tmp1_->message;
#line 203 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_warning ("RESTSupport.vala:203: Publishing error: %s", _tmp4_);
+ g_warning ("RESTSupport.vala:203: Publishing error: %s", _tmp2_);
#line 204 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp5_ = publishing_rest_support_transaction_get_response (self);
+ _tmp3_ = publishing_rest_support_transaction_get_response (self);
#line 204 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp6_ = _tmp5_;
+ _tmp4_ = _tmp3_;
#line 204 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_warning ("RESTSupport.vala:204: response validation failed. bad response = '%s'.", _tmp6_);
+ g_warning ("RESTSupport.vala:204: response validation failed. bad response = '%s'.", _tmp4_);
#line 204 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp6_);
+ _g_free0 (_tmp4_);
#line 205 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp7_ = err;
+ _tmp5_ = err;
#line 205 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp8_ = _g_error_copy0 (_tmp7_);
+ _tmp6_ = _g_error_copy0 (_tmp5_);
#line 205 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_error_free0 (self->priv->err);
#line 205 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->priv->err = _tmp8_;
+ self->priv->err = _tmp6_;
#line 200 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_error_free0 (err);
-#line 2124 "RESTSupport.c"
+#line 2324 "RESTSupport.c"
}
__finally0:
#line 200 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2132,19 +2332,24 @@ static void publishing_rest_support_transaction_on_message_unqueued (PublishingR
g_clear_error (&_inner_error_);
#line 200 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2135 "RESTSupport.c"
+#line 2335 "RESTSupport.c"
}
}
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
#line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self ? g_object_ref (self) : NULL;
-#line 2143 "RESTSupport.c"
+#line 2345 "RESTSupport.c"
}
-gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (PublishingRESTSupportTransaction* self, GTlsCertificate* * cert) {
+gchar*
+publishing_rest_support_transaction_detailed_error_from_tls_flags (PublishingRESTSupportTransaction* self,
+ GTlsCertificate* * cert)
+{
GTlsCertificate* _vala_cert = NULL;
gchar* result = NULL;
GTlsCertificateFlags tls_errors = 0;
@@ -2191,92 +2396,92 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
_tmp5_ = tls_errors;
#line 215 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if ((_tmp5_ & G_TLS_CERTIFICATE_BAD_IDENTITY) == G_TLS_CERTIFICATE_BAD_IDENTITY) {
-#line 2194 "RESTSupport.c"
+#line 2399 "RESTSupport.c"
GeeArrayList* _tmp6_;
#line 217 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp6_ = list;
#line 217 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _ ("⚫ This website presented identification that belongs to a different we" \
"bsite."));
-#line 2200 "RESTSupport.c"
+#line 2405 "RESTSupport.c"
}
#line 220 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp7_ = tls_errors;
#line 220 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if ((_tmp7_ & G_TLS_CERTIFICATE_EXPIRED) == G_TLS_CERTIFICATE_EXPIRED) {
-#line 2206 "RESTSupport.c"
+#line 2411 "RESTSupport.c"
GeeArrayList* _tmp8_;
#line 222 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp8_ = list;
#line 222 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _ ("⚫ This website’s identification is too old to trust. Check the date on" \
" your computer’s calendar."));
-#line 2212 "RESTSupport.c"
+#line 2417 "RESTSupport.c"
}
#line 225 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp9_ = tls_errors;
#line 225 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if ((_tmp9_ & G_TLS_CERTIFICATE_UNKNOWN_CA) == G_TLS_CERTIFICATE_UNKNOWN_CA) {
-#line 2218 "RESTSupport.c"
+#line 2423 "RESTSupport.c"
GeeArrayList* _tmp10_;
#line 227 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp10_ = list;
#line 227 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _ ("⚫ This website’s identification was not issued by a trusted organizati" \
"on."));
-#line 2224 "RESTSupport.c"
+#line 2429 "RESTSupport.c"
}
#line 230 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp11_ = tls_errors;
#line 230 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if ((_tmp11_ & G_TLS_CERTIFICATE_GENERIC_ERROR) == G_TLS_CERTIFICATE_GENERIC_ERROR) {
-#line 2230 "RESTSupport.c"
+#line 2435 "RESTSupport.c"
GeeArrayList* _tmp12_;
#line 232 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp12_ = list;
#line 232 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _ ("⚫ This website’s identification could not be processed. It may be corr" \
"upted."));
-#line 2236 "RESTSupport.c"
+#line 2441 "RESTSupport.c"
}
#line 235 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp13_ = tls_errors;
#line 235 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if ((_tmp13_ & G_TLS_CERTIFICATE_REVOKED) == G_TLS_CERTIFICATE_REVOKED) {
-#line 2242 "RESTSupport.c"
+#line 2447 "RESTSupport.c"
GeeArrayList* _tmp14_;
#line 237 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp14_ = list;
#line 237 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _ ("⚫ This website’s identification has been revoked by the trusted organi" \
"zation that issued it."));
-#line 2248 "RESTSupport.c"
+#line 2453 "RESTSupport.c"
}
#line 240 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp15_ = tls_errors;
#line 240 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if ((_tmp15_ & G_TLS_CERTIFICATE_INSECURE) == G_TLS_CERTIFICATE_INSECURE) {
-#line 2254 "RESTSupport.c"
+#line 2459 "RESTSupport.c"
GeeArrayList* _tmp16_;
#line 242 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp16_ = list;
#line 242 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _ ("⚫ This website’s identification cannot be trusted because it uses very" \
" weak encryption."));
-#line 2260 "RESTSupport.c"
+#line 2465 "RESTSupport.c"
}
#line 245 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp17_ = tls_errors;
#line 245 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if ((_tmp17_ & G_TLS_CERTIFICATE_NOT_ACTIVATED) == G_TLS_CERTIFICATE_NOT_ACTIVATED) {
-#line 2266 "RESTSupport.c"
+#line 2471 "RESTSupport.c"
GeeArrayList* _tmp18_;
#line 247 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp18_ = list;
#line 247 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _ ("⚫ This website’s identification is only valid for future dates. Check " \
"the date on your computer’s calendar."));
-#line 2272 "RESTSupport.c"
+#line 2477 "RESTSupport.c"
}
#line 250 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp19_ = g_string_new ("");
@@ -2290,7 +2495,7 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
_tmp22_ = _tmp21_;
#line 251 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp22_ == 1) {
-#line 2286 "RESTSupport.c"
+#line 2491 "RESTSupport.c"
GString* _tmp23_;
GeeArrayList* _tmp24_;
gpointer _tmp25_;
@@ -2307,7 +2512,7 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
g_string_append (_tmp23_, _tmp26_);
#line 252 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp26_);
-#line 2303 "RESTSupport.c"
+#line 2508 "RESTSupport.c"
} else {
{
GeeArrayList* _entry_list = NULL;
@@ -2336,7 +2541,7 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
_entry_index = -1;
#line 254 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
while (TRUE) {
-#line 2332 "RESTSupport.c"
+#line 2537 "RESTSupport.c"
gint _tmp32_;
gint _tmp33_;
gint _tmp34_;
@@ -2358,7 +2563,7 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
if (!(_tmp33_ < _tmp34_)) {
#line 254 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
break;
-#line 2354 "RESTSupport.c"
+#line 2559 "RESTSupport.c"
}
#line 254 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp35_ = _entry_list;
@@ -2376,11 +2581,11 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
g_string_append_printf (_tmp38_, "%s\n", _tmp39_);
#line 254 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (entry);
-#line 2372 "RESTSupport.c"
+#line 2577 "RESTSupport.c"
}
#line 254 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (_entry_list);
-#line 2376 "RESTSupport.c"
+#line 2581 "RESTSupport.c"
}
}
#line 259 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2399,88 +2604,85 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
if (cert) {
#line 259 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*cert = _vala_cert;
-#line 2395 "RESTSupport.c"
+#line 2600 "RESTSupport.c"
} else {
#line 259 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (_vala_cert);
-#line 2399 "RESTSupport.c"
+#line 2604 "RESTSupport.c"
}
#line 259 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 2403 "RESTSupport.c"
+#line 2608 "RESTSupport.c"
}
-void publishing_rest_support_transaction_check_response (PublishingRESTSupportTransaction* self, SoupMessage* message, GError** error) {
- SoupMessage* _tmp0_;
+void
+publishing_rest_support_transaction_check_response (PublishingRESTSupportTransaction* self,
+ SoupMessage* message,
+ GError** error)
+{
+ guint _tmp0_;
guint _tmp1_;
- guint _tmp2_;
- gboolean _tmp42_ = FALSE;
- SoupMessage* _tmp43_;
- SoupMessageBody* _tmp44_;
- guint8* _tmp45_;
- gint _tmp45__length1;
+ gboolean _tmp35_ = FALSE;
+ SoupMessageBody* _tmp36_;
+ guint8* _tmp37_;
+ gint _tmp37__length1;
GError * _inner_error_ = NULL;
#line 262 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self));
#line 262 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (SOUP_IS_MESSAGE (message));
#line 263 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = message;
-#line 263 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_object_get (_tmp0_, "status-code", &_tmp1_, NULL);
+ g_object_get (message, "status-code", &_tmp0_, NULL);
#line 263 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = _tmp1_;
+ _tmp1_ = _tmp0_;
#line 263 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- switch (_tmp2_) {
+ switch (_tmp1_) {
#line 263 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
case SOUP_STATUS_OK:
#line 263 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
case SOUP_STATUS_CREATED:
-#line 2433 "RESTSupport.c"
+#line 2638 "RESTSupport.c"
{
#line 267 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
break;
-#line 2437 "RESTSupport.c"
+#line 2642 "RESTSupport.c"
}
#line 263 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
case SOUP_STATUS_CANT_RESOLVE:
#line 263 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
case SOUP_STATUS_CANT_RESOLVE_PROXY:
-#line 2443 "RESTSupport.c"
+#line 2648 "RESTSupport.c"
{
+ gchar* _tmp2_;
gchar* _tmp3_;
- gchar* _tmp4_;
- SoupMessage* _tmp5_;
- guint _tmp6_;
- guint _tmp7_;
- GError* _tmp8_;
- GError* _tmp9_;
+ guint _tmp4_;
+ guint _tmp5_;
+ GError* _tmp6_;
+ GError* _tmp7_;
#line 271 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = publishing_rest_support_transaction_get_endpoint_url (self);
+ _tmp2_ = publishing_rest_support_transaction_get_endpoint_url (self);
#line 271 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp4_ = _tmp3_;
+ _tmp3_ = _tmp2_;
#line 271 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp5_ = message;
+ g_object_get (message, "status-code", &_tmp4_, NULL);
#line 271 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_object_get (_tmp5_, "status-code", &_tmp6_, NULL);
+ _tmp5_ = _tmp4_;
#line 271 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp7_ = _tmp6_;
+ _tmp6_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_NO_ANSWER, "Unable to resolve %s (error code %u)", _tmp3_, _tmp5_);
#line 271 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp8_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_NO_ANSWER, "Unable to resolve %s (error code %u)", _tmp4_, _tmp7_);
-#line 271 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp9_ = _tmp8_;
+ _tmp7_ = _tmp6_;
#line 271 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp4_);
+ _g_free0 (_tmp3_);
#line 271 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _inner_error_ = _tmp9_;
+ _inner_error_ = _tmp7_;
#line 271 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
#line 271 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_propagate_error (error, _inner_error_);
#line 271 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2476 "RESTSupport.c"
+#line 2678 "RESTSupport.c"
} else {
#line 271 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2488,47 +2690,44 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
g_clear_error (&_inner_error_);
#line 271 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2484 "RESTSupport.c"
+#line 2686 "RESTSupport.c"
}
}
#line 263 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
case SOUP_STATUS_CANT_CONNECT:
#line 263 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
case SOUP_STATUS_CANT_CONNECT_PROXY:
-#line 2491 "RESTSupport.c"
+#line 2693 "RESTSupport.c"
{
- gchar* _tmp10_;
- gchar* _tmp11_;
- SoupMessage* _tmp12_;
- guint _tmp13_;
- guint _tmp14_;
- GError* _tmp15_;
- GError* _tmp16_;
-#line 276 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp10_ = publishing_rest_support_transaction_get_endpoint_url (self);
+ gchar* _tmp8_;
+ gchar* _tmp9_;
+ guint _tmp10_;
+ guint _tmp11_;
+ GError* _tmp12_;
+ GError* _tmp13_;
#line 276 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp11_ = _tmp10_;
+ _tmp8_ = publishing_rest_support_transaction_get_endpoint_url (self);
#line 276 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp12_ = message;
+ _tmp9_ = _tmp8_;
#line 276 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_object_get (_tmp12_, "status-code", &_tmp13_, NULL);
+ g_object_get (message, "status-code", &_tmp10_, NULL);
#line 276 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp14_ = _tmp13_;
+ _tmp11_ = _tmp10_;
#line 276 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp15_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_NO_ANSWER, "Unable to connect to %s (error code %u)", _tmp11_, _tmp14_);
+ _tmp12_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_NO_ANSWER, "Unable to connect to %s (error code %u)", _tmp9_, _tmp11_);
#line 276 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp16_ = _tmp15_;
+ _tmp13_ = _tmp12_;
#line 276 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp11_);
+ _g_free0 (_tmp9_);
#line 276 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _inner_error_ = _tmp16_;
+ _inner_error_ = _tmp13_;
#line 276 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
#line 276 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_propagate_error (error, _inner_error_);
#line 276 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2524 "RESTSupport.c"
+#line 2723 "RESTSupport.c"
} else {
#line 276 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2536,36 +2735,36 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
g_clear_error (&_inner_error_);
#line 276 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2532 "RESTSupport.c"
+#line 2731 "RESTSupport.c"
}
}
#line 263 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
case SOUP_STATUS_SSL_FAILED:
-#line 2537 "RESTSupport.c"
+#line 2736 "RESTSupport.c"
{
- gchar* _tmp17_;
- gchar* _tmp18_;
- GError* _tmp19_;
- GError* _tmp20_;
+ gchar* _tmp14_;
+ gchar* _tmp15_;
+ GError* _tmp16_;
+ GError* _tmp17_;
#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp17_ = publishing_rest_support_transaction_get_endpoint_url (self);
+ _tmp14_ = publishing_rest_support_transaction_get_endpoint_url (self);
#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp18_ = _tmp17_;
+ _tmp15_ = _tmp14_;
#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp19_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_SSL_FAILED, "Unable to connect to %s: Secure connection failed", _tmp18_);
+ _tmp16_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_SSL_FAILED, "Unable to connect to %s: Secure connection failed", _tmp15_);
#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp20_ = _tmp19_;
+ _tmp17_ = _tmp16_;
#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp18_);
+ _g_free0 (_tmp15_);
#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _inner_error_ = _tmp20_;
+ _inner_error_ = _tmp17_;
#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_propagate_error (error, _inner_error_);
#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2561 "RESTSupport.c"
+#line 2760 "RESTSupport.c"
} else {
#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2573,69 +2772,60 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
g_clear_error (&_inner_error_);
#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2569 "RESTSupport.c"
+#line 2768 "RESTSupport.c"
}
}
default:
{
- SoupMessage* _tmp21_;
- guint _tmp22_;
- guint _tmp23_;
+ guint _tmp18_;
+ guint _tmp19_;
#line 284 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp21_ = message;
+ g_object_get (message, "status-code", &_tmp18_, NULL);
#line 284 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_object_get (_tmp21_, "status-code", &_tmp22_, NULL);
-#line 284 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp23_ = _tmp22_;
+ _tmp19_ = _tmp18_;
#line 284 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp23_ >= ((guint) 100)) {
-#line 2585 "RESTSupport.c"
+ if (_tmp19_ >= ((guint) 100)) {
+#line 2781 "RESTSupport.c"
+ gchar* _tmp20_;
+ gchar* _tmp21_;
+ guint _tmp22_;
+ guint _tmp23_;
gchar* _tmp24_;
gchar* _tmp25_;
- SoupMessage* _tmp26_;
- guint _tmp27_;
- guint _tmp28_;
- SoupMessage* _tmp29_;
- gchar* _tmp30_;
- gchar* _tmp31_;
- gchar* _tmp32_;
- GError* _tmp33_;
- GError* _tmp34_;
-#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp24_ = publishing_rest_support_transaction_get_endpoint_url (self);
-#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp25_ = _tmp24_;
+ gchar* _tmp26_;
+ GError* _tmp27_;
+ GError* _tmp28_;
#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp26_ = message;
+ _tmp20_ = publishing_rest_support_transaction_get_endpoint_url (self);
#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_object_get (_tmp26_, "status-code", &_tmp27_, NULL);
+ _tmp21_ = _tmp20_;
#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp28_ = _tmp27_;
+ g_object_get (message, "status-code", &_tmp22_, NULL);
#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp29_ = message;
+ _tmp23_ = _tmp22_;
#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_object_get (_tmp29_, "reason-phrase", &_tmp30_, NULL);
+ g_object_get (message, "reason-phrase", &_tmp24_, NULL);
#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp31_ = _tmp30_;
+ _tmp25_ = _tmp24_;
#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp32_ = _tmp31_;
+ _tmp26_ = _tmp25_;
#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp33_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_NO_ANSWER, "Service %s returned HTTP status code %u %s", _tmp25_, _tmp28_, _tmp32_);
+ _tmp27_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_NO_ANSWER, "Service %s returned HTTP status code %u %s", _tmp21_, _tmp23_, _tmp26_);
#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp34_ = _tmp33_;
+ _tmp28_ = _tmp27_;
#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp32_);
+ _g_free0 (_tmp26_);
#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp25_);
+ _g_free0 (_tmp21_);
#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _inner_error_ = _tmp34_;
+ _inner_error_ = _tmp28_;
#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_propagate_error (error, _inner_error_);
#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2631 "RESTSupport.c"
+#line 2821 "RESTSupport.c"
} else {
#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2643,41 +2833,38 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
g_clear_error (&_inner_error_);
#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2639 "RESTSupport.c"
+#line 2829 "RESTSupport.c"
}
} else {
- gchar* _tmp35_;
- gchar* _tmp36_;
- SoupMessage* _tmp37_;
- guint _tmp38_;
- guint _tmp39_;
- GError* _tmp40_;
- GError* _tmp41_;
-#line 288 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp35_ = publishing_rest_support_transaction_get_endpoint_url (self);
+ gchar* _tmp29_;
+ gchar* _tmp30_;
+ guint _tmp31_;
+ guint _tmp32_;
+ GError* _tmp33_;
+ GError* _tmp34_;
#line 288 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp36_ = _tmp35_;
+ _tmp29_ = publishing_rest_support_transaction_get_endpoint_url (self);
#line 288 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp37_ = message;
+ _tmp30_ = _tmp29_;
#line 288 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_object_get (_tmp37_, "status-code", &_tmp38_, NULL);
+ g_object_get (message, "status-code", &_tmp31_, NULL);
#line 288 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp39_ = _tmp38_;
+ _tmp32_ = _tmp31_;
#line 288 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp40_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_NO_ANSWER, "Failure communicating with %s (error code %u)", _tmp36_, _tmp39_);
+ _tmp33_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_NO_ANSWER, "Failure communicating with %s (error code %u)", _tmp30_, _tmp32_);
#line 288 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp41_ = _tmp40_;
+ _tmp34_ = _tmp33_;
#line 288 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp36_);
+ _g_free0 (_tmp30_);
#line 288 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _inner_error_ = _tmp41_;
+ _inner_error_ = _tmp34_;
#line 288 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
#line 288 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_propagate_error (error, _inner_error_);
#line 288 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2673 "RESTSupport.c"
+#line 2860 "RESTSupport.c"
} else {
#line 288 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2685,67 +2872,62 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
g_clear_error (&_inner_error_);
#line 288 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2681 "RESTSupport.c"
+#line 2868 "RESTSupport.c"
}
}
}
}
#line 294 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp43_ = message;
+ _tmp36_ = message->response_body;
#line 294 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp44_ = _tmp43_->response_body;
+ _tmp37_ = _tmp36_->data;
#line 294 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp45_ = _tmp44_->data;
+ _tmp37__length1 = (gint) _tmp36_->length;
#line 294 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp45__length1 = (gint) _tmp44_->length;
+ if (_tmp37_ == NULL) {
#line 294 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp45_ == NULL) {
-#line 294 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp42_ = TRUE;
-#line 2698 "RESTSupport.c"
+ _tmp35_ = TRUE;
+#line 2883 "RESTSupport.c"
} else {
- SoupMessage* _tmp46_;
- SoupMessageBody* _tmp47_;
- guint8* _tmp48_;
- gint _tmp48__length1;
-#line 294 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp46_ = message;
+ SoupMessageBody* _tmp38_;
+ guint8* _tmp39_;
+ gint _tmp39__length1;
#line 294 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp47_ = _tmp46_->response_body;
+ _tmp38_ = message->response_body;
#line 294 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp48_ = _tmp47_->data;
+ _tmp39_ = _tmp38_->data;
#line 294 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp48__length1 = (gint) _tmp47_->length;
+ _tmp39__length1 = (gint) _tmp38_->length;
#line 294 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp42_ = _tmp48__length1 == 0;
-#line 2714 "RESTSupport.c"
+ _tmp35_ = _tmp39__length1 == 0;
+#line 2896 "RESTSupport.c"
}
#line 294 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp42_) {
-#line 2718 "RESTSupport.c"
- gchar* _tmp49_;
- gchar* _tmp50_;
- GError* _tmp51_;
- GError* _tmp52_;
+ if (_tmp35_) {
+#line 2900 "RESTSupport.c"
+ gchar* _tmp40_;
+ gchar* _tmp41_;
+ GError* _tmp42_;
+ GError* _tmp43_;
#line 295 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp49_ = publishing_rest_support_transaction_get_endpoint_url (self);
+ _tmp40_ = publishing_rest_support_transaction_get_endpoint_url (self);
#line 295 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp50_ = _tmp49_;
+ _tmp41_ = _tmp40_;
#line 295 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp51_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "No response data from %s", _tmp50_);
+ _tmp42_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "No response data from %s", _tmp41_);
#line 295 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp52_ = _tmp51_;
+ _tmp43_ = _tmp42_;
#line 295 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp50_);
+ _g_free0 (_tmp41_);
#line 295 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _inner_error_ = _tmp52_;
+ _inner_error_ = _tmp43_;
#line 295 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
#line 295 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_propagate_error (error, _inner_error_);
#line 295 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2741 "RESTSupport.c"
+#line 2923 "RESTSupport.c"
} else {
#line 295 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2753,34 +2935,40 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
g_clear_error (&_inner_error_);
#line 295 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2749 "RESTSupport.c"
+#line 2931 "RESTSupport.c"
}
}
}
-static PublishingRESTSupportArgument** _vala_array_dup1 (PublishingRESTSupportArgument** self, int length) {
+static PublishingRESTSupportArgument**
+_vala_array_dup1 (PublishingRESTSupportArgument** self,
+ int length)
+{
PublishingRESTSupportArgument** result;
int i;
#line 300 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = g_new0 (PublishingRESTSupportArgument*, length + 1);
#line 300 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
for (i = 0; i < length; i++) {
-#line 2762 "RESTSupport.c"
+#line 2947 "RESTSupport.c"
PublishingRESTSupportArgument* _tmp0_;
#line 300 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = _publishing_rest_support_argument_ref0 (self[i]);
#line 300 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result[i] = _tmp0_;
-#line 2768 "RESTSupport.c"
+#line 2953 "RESTSupport.c"
}
#line 300 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 2772 "RESTSupport.c"
+#line 2957 "RESTSupport.c"
}
-PublishingRESTSupportArgument** publishing_rest_support_transaction_get_arguments (PublishingRESTSupportTransaction* self, int* result_length1) {
+PublishingRESTSupportArgument**
+publishing_rest_support_transaction_get_arguments (PublishingRESTSupportTransaction* self,
+ int* result_length1)
+{
PublishingRESTSupportArgument** result = NULL;
PublishingRESTSupportArgument** _tmp0_;
gint _tmp0__length1;
@@ -2806,17 +2994,20 @@ PublishingRESTSupportArgument** publishing_rest_support_transaction_get_argument
if (result_length1) {
#line 300 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*result_length1 = _tmp2__length1;
-#line 2802 "RESTSupport.c"
+#line 2990 "RESTSupport.c"
}
#line 300 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = _tmp2_;
#line 300 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 2808 "RESTSupport.c"
+#line 2996 "RESTSupport.c"
}
-PublishingRESTSupportArgument** publishing_rest_support_transaction_get_sorted_arguments (PublishingRESTSupportTransaction* self, int* result_length1) {
+PublishingRESTSupportArgument**
+publishing_rest_support_transaction_get_sorted_arguments (PublishingRESTSupportTransaction* self,
+ int* result_length1)
+{
PublishingRESTSupportArgument** result = NULL;
gint _tmp0_;
PublishingRESTSupportArgument** _tmp1_;
@@ -2852,36 +3043,43 @@ PublishingRESTSupportArgument** publishing_rest_support_transaction_get_sorted_a
if (result_length1) {
#line 304 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*result_length1 = _tmp6__length1;
-#line 2848 "RESTSupport.c"
+#line 3039 "RESTSupport.c"
}
#line 304 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = _tmp6_;
#line 304 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 2854 "RESTSupport.c"
+#line 3045 "RESTSupport.c"
}
-void publishing_rest_support_transaction_set_is_executed (PublishingRESTSupportTransaction* self, gboolean is_executed) {
- gboolean _tmp0_;
+void
+publishing_rest_support_transaction_set_is_executed (PublishingRESTSupportTransaction* self,
+ gboolean is_executed)
+{
#line 307 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self));
#line 308 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = is_executed;
-#line 308 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->priv->is_executed = _tmp0_;
-#line 2866 "RESTSupport.c"
+ self->priv->is_executed = is_executed;
+#line 3057 "RESTSupport.c"
}
-static void _publishing_rest_support_transaction_on_message_unqueued_publishing_rest_support_session_wire_message_unqueued (PublishingRESTSupportSession* _sender, SoupMessage* message, gpointer self) {
+static void
+_publishing_rest_support_transaction_on_message_unqueued_publishing_rest_support_session_wire_message_unqueued (PublishingRESTSupportSession* _sender,
+ SoupMessage* message,
+ gpointer self)
+{
#line 312 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_transaction_on_message_unqueued ((PublishingRESTSupportTransaction*) self, message);
-#line 2873 "RESTSupport.c"
+#line 3068 "RESTSupport.c"
}
-void publishing_rest_support_transaction_send (PublishingRESTSupportTransaction* self, GError** error) {
+void
+publishing_rest_support_transaction_send (PublishingRESTSupportTransaction* self,
+ GError** error)
+{
PublishingRESTSupportSession* _tmp0_;
SoupMessage* _tmp1_;
PublishingRESTSupportSession* _tmp2_;
@@ -2925,23 +3123,23 @@ void publishing_rest_support_transaction_send (PublishingRESTSupportTransaction*
_tmp8_ = self->priv->err;
#line 319 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp8_ != NULL) {
-#line 2921 "RESTSupport.c"
+#line 3119 "RESTSupport.c"
GError* _tmp9_;
#line 320 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp9_ = self->priv->err;
#line 320 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_emit (self, publishing_rest_support_transaction_signals[PUBLISHING_REST_SUPPORT_TRANSACTION_NETWORK_ERROR_SIGNAL], 0, _tmp9_);
-#line 2927 "RESTSupport.c"
+#line 3125 "RESTSupport.c"
} else {
#line 322 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_emit (self, publishing_rest_support_transaction_signals[PUBLISHING_REST_SUPPORT_TRANSACTION_COMPLETED_SIGNAL], 0);
-#line 2931 "RESTSupport.c"
+#line 3129 "RESTSupport.c"
}
#line 324 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp10_ = self->priv->err;
#line 324 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp10_ != NULL) {
-#line 2937 "RESTSupport.c"
+#line 3135 "RESTSupport.c"
GError* _tmp11_;
GError* _tmp12_;
#line 325 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2956,7 +3154,7 @@ void publishing_rest_support_transaction_send (PublishingRESTSupportTransaction*
g_propagate_error (error, _inner_error_);
#line 325 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2952 "RESTSupport.c"
+#line 3150 "RESTSupport.c"
} else {
#line 325 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2964,20 +3162,21 @@ void publishing_rest_support_transaction_send (PublishingRESTSupportTransaction*
g_clear_error (&_inner_error_);
#line 325 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2960 "RESTSupport.c"
+#line 3158 "RESTSupport.c"
}
}
}
-PublishingRESTSupportHttpMethod publishing_rest_support_transaction_get_method (PublishingRESTSupportTransaction* self) {
+PublishingRESTSupportHttpMethod
+publishing_rest_support_transaction_get_method (PublishingRESTSupportTransaction* self)
+{
PublishingRESTSupportHttpMethod result = 0;
SoupMessage* _tmp0_;
gchar* _tmp1_;
gchar* _tmp2_;
gchar* _tmp3_;
PublishingRESTSupportHttpMethod _tmp4_;
- PublishingRESTSupportHttpMethod _tmp5_;
#line 328 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self), 0);
#line 329 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2991,22 +3190,22 @@ PublishingRESTSupportHttpMethod publishing_rest_support_transaction_get_method (
#line 329 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp4_ = publishing_rest_support_http_method_from_string (_tmp3_);
#line 329 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp5_ = _tmp4_;
-#line 329 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp3_);
#line 329 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- result = _tmp5_;
+ result = _tmp4_;
#line 329 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 2994 "RESTSupport.c"
+#line 3191 "RESTSupport.c"
}
-static void publishing_rest_support_transaction_real_add_header (PublishingRESTSupportTransaction* self, const gchar* key, const gchar* value) {
+static void
+publishing_rest_support_transaction_real_add_header (PublishingRESTSupportTransaction* self,
+ const gchar* key,
+ const gchar* value)
+{
SoupMessage* _tmp0_;
SoupMessageHeaders* _tmp1_;
- const gchar* _tmp2_;
- const gchar* _tmp3_;
#line 332 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (key != NULL);
#line 332 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -3016,125 +3215,110 @@ static void publishing_rest_support_transaction_real_add_header (PublishingRESTS
#line 333 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = _tmp0_->request_headers;
#line 333 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = key;
-#line 333 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = value;
-#line 333 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- soup_message_headers_append (_tmp1_, _tmp2_, _tmp3_);
-#line 3017 "RESTSupport.c"
+ soup_message_headers_append (_tmp1_, key, value);
+#line 3212 "RESTSupport.c"
}
-void publishing_rest_support_transaction_add_header (PublishingRESTSupportTransaction* self, const gchar* key, const gchar* value) {
+void
+publishing_rest_support_transaction_add_header (PublishingRESTSupportTransaction* self,
+ const gchar* key,
+ const gchar* value)
+{
#line 332 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self));
#line 332 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
PUBLISHING_REST_SUPPORT_TRANSACTION_GET_CLASS (self)->add_header (self, key, value);
-#line 3026 "RESTSupport.c"
+#line 3225 "RESTSupport.c"
}
-void publishing_rest_support_transaction_set_custom_payload (PublishingRESTSupportTransaction* self, const gchar* custom_payload, const gchar* payload_content_type, gulong payload_length) {
- PublishingRESTSupportHttpMethod _tmp0_;
- const gchar* _tmp1_;
- gulong _tmp2_ = 0UL;
- gulong _tmp3_;
+void
+publishing_rest_support_transaction_set_custom_payload (PublishingRESTSupportTransaction* self,
+ const gchar* custom_payload,
+ const gchar* payload_content_type,
+ gulong payload_length)
+{
+ gulong _tmp0_ = 0UL;
gulong length = 0UL;
- SoupMessage* _tmp8_;
- const gchar* _tmp9_;
- const gchar* _tmp10_;
- guint8* _tmp11_;
- gint _tmp11__length1;
- guint8* _tmp12_;
- gint _tmp12__length1;
- gulong _tmp13_;
+ SoupMessage* _tmp3_;
+ guint8* _tmp4_;
+ gint _tmp4__length1;
+ guint8* _tmp5_;
+ gint _tmp5__length1;
+ gulong _tmp6_;
#line 344 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self));
#line 344 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (payload_content_type != NULL);
#line 346 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = publishing_rest_support_transaction_get_method (self);
-#line 346 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _vala_assert (_tmp0_ != PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET, "get_method() != HttpMethod.GET");
-#line 348 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = custom_payload;
+ _vala_assert (publishing_rest_support_transaction_get_method (self) != PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET, "get_method() != HttpMethod.GET");
#line 348 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp1_ == NULL) {
+ if (custom_payload == NULL) {
#line 349 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->use_custom_payload = FALSE;
#line 350 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 3060 "RESTSupport.c"
+#line 3255 "RESTSupport.c"
}
#line 353 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = payload_length;
-#line 353 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp3_ > ((gulong) 0)) {
-#line 3066 "RESTSupport.c"
- gulong _tmp4_;
+ if (payload_length > ((gulong) 0)) {
#line 353 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp4_ = payload_length;
-#line 353 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = _tmp4_;
-#line 3072 "RESTSupport.c"
+ _tmp0_ = payload_length;
+#line 3261 "RESTSupport.c"
} else {
- const gchar* _tmp5_;
- gint _tmp6_;
- gint _tmp7_;
-#line 353 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp5_ = custom_payload;
+ gint _tmp1_;
+ gint _tmp2_;
#line 353 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp6_ = strlen (_tmp5_);
+ _tmp1_ = strlen (custom_payload);
#line 353 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp7_ = _tmp6_;
+ _tmp2_ = _tmp1_;
#line 353 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = (gulong) _tmp7_;
-#line 3085 "RESTSupport.c"
+ _tmp0_ = (gulong) _tmp2_;
+#line 3271 "RESTSupport.c"
}
#line 353 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- length = _tmp2_;
-#line 354 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp8_ = self->priv->message;
-#line 354 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp9_ = payload_content_type;
+ length = _tmp0_;
#line 354 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp10_ = custom_payload;
+ _tmp3_ = self->priv->message;
#line 354 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp11_ = string_get_data (_tmp10_, &_tmp11__length1);
+ _tmp4_ = string_get_data (custom_payload, &_tmp4__length1);
#line 354 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp12_ = _tmp11_;
+ _tmp5_ = _tmp4_;
#line 354 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp12__length1 = _tmp11__length1;
+ _tmp5__length1 = _tmp4__length1;
#line 354 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp13_ = length;
+ _tmp6_ = length;
#line 354 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- soup_message_set_request (_tmp8_, _tmp9_, SOUP_MEMORY_COPY, _tmp12_ + 0, (gsize) (((gint) _tmp13_) - 0));
+ soup_message_set_request (_tmp3_, payload_content_type, SOUP_MEMORY_COPY, _tmp5_ + 0, (gsize) (((gint) _tmp6_) - 0));
#line 356 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->use_custom_payload = TRUE;
-#line 3107 "RESTSupport.c"
+#line 3289 "RESTSupport.c"
}
-void publishing_rest_support_transaction_set_message (PublishingRESTSupportTransaction* self, SoupMessage* message) {
+void
+publishing_rest_support_transaction_set_message (PublishingRESTSupportTransaction* self,
+ SoupMessage* message)
+{
SoupMessage* _tmp0_;
- SoupMessage* _tmp1_;
#line 364 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self));
#line 364 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (SOUP_IS_MESSAGE (message));
#line 365 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = message;
-#line 365 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = _g_object_ref0 (_tmp0_);
+ _tmp0_ = _g_object_ref0 (message);
#line 365 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (self->priv->message);
#line 365 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->priv->message = _tmp1_;
-#line 3126 "RESTSupport.c"
+ self->priv->message = _tmp0_;
+#line 3308 "RESTSupport.c"
}
-gboolean publishing_rest_support_transaction_get_is_executed (PublishingRESTSupportTransaction* self) {
+gboolean
+publishing_rest_support_transaction_get_is_executed (PublishingRESTSupportTransaction* self)
+{
gboolean result = FALSE;
gboolean _tmp0_;
#line 368 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -3145,52 +3329,54 @@ gboolean publishing_rest_support_transaction_get_is_executed (PublishingRESTSupp
result = _tmp0_;
#line 369 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 3141 "RESTSupport.c"
+#line 3325 "RESTSupport.c"
}
-guint publishing_rest_support_transaction_get_status_code (PublishingRESTSupportTransaction* self) {
+guint
+publishing_rest_support_transaction_get_status_code (PublishingRESTSupportTransaction* self)
+{
guint result = 0U;
- gboolean _tmp0_;
- SoupMessage* _tmp1_;
+ SoupMessage* _tmp0_;
+ guint _tmp1_;
guint _tmp2_;
- guint _tmp3_;
#line 372 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self), 0U);
#line 373 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = publishing_rest_support_transaction_get_is_executed (self);
-#line 373 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _vala_assert (_tmp0_, "get_is_executed()");
+ _vala_assert (publishing_rest_support_transaction_get_is_executed (self), "get_is_executed()");
#line 374 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = self->priv->message;
+ _tmp0_ = self->priv->message;
#line 374 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_object_get (_tmp1_, "status-code", &_tmp2_, NULL);
+ g_object_get (_tmp0_, "status-code", &_tmp1_, NULL);
#line 374 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = _tmp2_;
+ _tmp2_ = _tmp1_;
#line 374 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- result = _tmp3_;
+ result = _tmp2_;
#line 374 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 3167 "RESTSupport.c"
+#line 3350 "RESTSupport.c"
}
-static void _vala_SoupURI_free (SoupURI* self) {
+static void
+_vala_SoupURI_free (SoupURI* self)
+{
#line 408 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_boxed_free (soup_uri_get_type (), self);
-#line 3174 "RESTSupport.c"
+#line 3359 "RESTSupport.c"
}
-static void publishing_rest_support_transaction_real_execute (PublishingRESTSupportTransaction* self, GError** error) {
+static void
+publishing_rest_support_transaction_real_execute (PublishingRESTSupportTransaction* self,
+ GError** error)
+{
gboolean _tmp0_;
- PublishingRESTSupportHttpMethod _tmp1_;
gchar* formdata_string = NULL;
- gchar* _tmp3_;
+ gchar* _tmp2_;
gchar* old_url = NULL;
gchar* url_with_query = NULL;
- gboolean _tmp19_ = FALSE;
- PublishingRESTSupportHttpMethod _tmp20_;
+ gboolean _tmp18_ = FALSE;
GError * _inner_error_ = NULL;
#line 381 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = self->priv->use_custom_payload;
@@ -3208,7 +3394,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
g_propagate_error (error, _inner_error_);
#line 383 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 3204 "RESTSupport.c"
+#line 3390 "RESTSupport.c"
} else {
#line 383 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3216,125 +3402,123 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
g_clear_error (&_inner_error_);
#line 383 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 3212 "RESTSupport.c"
+#line 3398 "RESTSupport.c"
}
}
#line 385 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 3217 "RESTSupport.c"
+#line 3403 "RESTSupport.c"
}
#line 389 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = publishing_rest_support_transaction_get_method (self);
-#line 389 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp1_ == PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST) {
-#line 3223 "RESTSupport.c"
- PublishingRESTSupportArgument** _tmp2_;
- gint _tmp2__length1;
+ if (publishing_rest_support_transaction_get_method (self) == PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST) {
+#line 3407 "RESTSupport.c"
+ PublishingRESTSupportArgument** _tmp1_;
+ gint _tmp1__length1;
#line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = self->priv->arguments;
+ _tmp1_ = self->priv->arguments;
#line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2__length1 = self->priv->arguments_length1;
+ _tmp1__length1 = self->priv->arguments_length1;
#line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _vala_assert (_tmp2__length1 > 0, "arguments.length > 0");
-#line 3232 "RESTSupport.c"
+ _vala_assert (_tmp1__length1 > 0, "arguments.length > 0");
+#line 3416 "RESTSupport.c"
}
#line 393 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = g_strdup ("");
+ _tmp2_ = g_strdup ("");
#line 393 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- formdata_string = _tmp3_;
-#line 3238 "RESTSupport.c"
+ formdata_string = _tmp2_;
+#line 3422 "RESTSupport.c"
{
gint i = 0;
#line 394 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
i = 0;
-#line 3243 "RESTSupport.c"
+#line 3427 "RESTSupport.c"
{
- gboolean _tmp4_ = FALSE;
+ gboolean _tmp3_ = FALSE;
#line 394 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp4_ = TRUE;
+ _tmp3_ = TRUE;
#line 394 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
while (TRUE) {
-#line 3250 "RESTSupport.c"
- gint _tmp6_;
- PublishingRESTSupportArgument** _tmp7_;
- gint _tmp7__length1;
- const gchar* _tmp8_;
- PublishingRESTSupportArgument** _tmp9_;
- gint _tmp9__length1;
- gint _tmp10_;
- PublishingRESTSupportArgument* _tmp11_;
+#line 3434 "RESTSupport.c"
+ gint _tmp5_;
+ PublishingRESTSupportArgument** _tmp6_;
+ gint _tmp6__length1;
+ const gchar* _tmp7_;
+ PublishingRESTSupportArgument** _tmp8_;
+ gint _tmp8__length1;
+ gint _tmp9_;
+ PublishingRESTSupportArgument* _tmp10_;
+ gchar* _tmp11_;
gchar* _tmp12_;
gchar* _tmp13_;
- gchar* _tmp14_;
- gint _tmp15_;
- PublishingRESTSupportArgument** _tmp16_;
- gint _tmp16__length1;
+ gint _tmp14_;
+ PublishingRESTSupportArgument** _tmp15_;
+ gint _tmp15__length1;
#line 394 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (!_tmp4_) {
-#line 3267 "RESTSupport.c"
- gint _tmp5_;
+ if (!_tmp3_) {
+#line 3451 "RESTSupport.c"
+ gint _tmp4_;
#line 394 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp5_ = i;
+ _tmp4_ = i;
#line 394 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- i = _tmp5_ + 1;
-#line 3273 "RESTSupport.c"
+ i = _tmp4_ + 1;
+#line 3457 "RESTSupport.c"
}
#line 394 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp4_ = FALSE;
+ _tmp3_ = FALSE;
#line 394 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp6_ = i;
+ _tmp5_ = i;
#line 394 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp7_ = self->priv->arguments;
+ _tmp6_ = self->priv->arguments;
#line 394 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp7__length1 = self->priv->arguments_length1;
+ _tmp6__length1 = self->priv->arguments_length1;
#line 394 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (!(_tmp6_ < _tmp7__length1)) {
+ if (!(_tmp5_ < _tmp6__length1)) {
#line 394 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
break;
-#line 3287 "RESTSupport.c"
+#line 3471 "RESTSupport.c"
}
#line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp8_ = formdata_string;
+ _tmp7_ = formdata_string;
#line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp9_ = self->priv->arguments;
+ _tmp8_ = self->priv->arguments;
#line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp9__length1 = self->priv->arguments_length1;
+ _tmp8__length1 = self->priv->arguments_length1;
#line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp10_ = i;
+ _tmp9_ = i;
#line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp11_ = _tmp9_[_tmp10_];
+ _tmp10_ = _tmp8_[_tmp9_];
#line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp12_ = publishing_rest_support_argument_to_string (_tmp11_, FALSE);
+ _tmp11_ = publishing_rest_support_argument_to_string (_tmp10_, FALSE);
#line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp13_ = _tmp12_;
+ _tmp12_ = _tmp11_;
#line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp14_ = g_strconcat (_tmp8_, _tmp13_, NULL);
+ _tmp13_ = g_strconcat (_tmp7_, _tmp12_, NULL);
#line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (formdata_string);
#line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- formdata_string = _tmp14_;
+ formdata_string = _tmp13_;
#line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp13_);
+ _g_free0 (_tmp12_);
#line 396 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp15_ = i;
+ _tmp14_ = i;
#line 396 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp16_ = self->priv->arguments;
+ _tmp15_ = self->priv->arguments;
#line 396 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp16__length1 = self->priv->arguments_length1;
+ _tmp15__length1 = self->priv->arguments_length1;
#line 396 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp15_ < (_tmp16__length1 - 1)) {
-#line 3319 "RESTSupport.c"
- const gchar* _tmp17_;
- gchar* _tmp18_;
+ if (_tmp14_ < (_tmp15__length1 - 1)) {
+#line 3503 "RESTSupport.c"
+ const gchar* _tmp16_;
+ gchar* _tmp17_;
#line 397 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp17_ = formdata_string;
+ _tmp16_ = formdata_string;
#line 397 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp18_ = g_strconcat (_tmp17_, "&", NULL);
+ _tmp17_ = g_strconcat (_tmp16_, "&", NULL);
#line 397 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (formdata_string);
#line 397 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- formdata_string = _tmp18_;
-#line 3330 "RESTSupport.c"
+ formdata_string = _tmp17_;
+#line 3514 "RESTSupport.c"
}
}
}
@@ -3344,157 +3528,155 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
#line 404 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
url_with_query = NULL;
#line 405 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp20_ = publishing_rest_support_transaction_get_method (self);
-#line 405 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp20_ == PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET) {
-#line 3343 "RESTSupport.c"
- PublishingRESTSupportArgument** _tmp21_;
- gint _tmp21__length1;
+ if (publishing_rest_support_transaction_get_method (self) == PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET) {
+#line 3525 "RESTSupport.c"
+ PublishingRESTSupportArgument** _tmp19_;
+ gint _tmp19__length1;
#line 405 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp21_ = self->priv->arguments;
+ _tmp19_ = self->priv->arguments;
#line 405 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp21__length1 = self->priv->arguments_length1;
+ _tmp19__length1 = self->priv->arguments_length1;
#line 405 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp19_ = _tmp21__length1 > 0;
-#line 3352 "RESTSupport.c"
+ _tmp18_ = _tmp19__length1 > 0;
+#line 3534 "RESTSupport.c"
} else {
#line 405 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp19_ = FALSE;
-#line 3356 "RESTSupport.c"
+ _tmp18_ = FALSE;
+#line 3538 "RESTSupport.c"
}
#line 405 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp19_) {
-#line 3360 "RESTSupport.c"
- SoupMessage* _tmp22_;
- SoupURI* _tmp23_;
+ if (_tmp18_) {
+#line 3542 "RESTSupport.c"
+ SoupMessage* _tmp20_;
+ SoupURI* _tmp21_;
+ gchar* _tmp22_;
+ gchar* _tmp23_;
gchar* _tmp24_;
gchar* _tmp25_;
gchar* _tmp26_;
- gchar* _tmp27_;
+ const gchar* _tmp27_;
gchar* _tmp28_;
- const gchar* _tmp29_;
- gchar* _tmp30_;
- SoupMessage* _tmp31_;
- const gchar* _tmp32_;
- SoupURI* _tmp33_;
- SoupURI* _tmp34_;
+ SoupMessage* _tmp29_;
+ const gchar* _tmp30_;
+ SoupURI* _tmp31_;
+ SoupURI* _tmp32_;
#line 406 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp22_ = self->priv->message;
+ _tmp20_ = self->priv->message;
#line 406 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp23_ = soup_message_get_uri (_tmp22_);
+ _tmp21_ = soup_message_get_uri (_tmp20_);
#line 406 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp24_ = soup_uri_to_string (_tmp23_, FALSE);
+ _tmp22_ = soup_uri_to_string (_tmp21_, FALSE);
#line 406 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (old_url);
#line 406 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- old_url = _tmp24_;
+ old_url = _tmp22_;
#line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp25_ = publishing_rest_support_transaction_get_endpoint_url (self);
+ _tmp23_ = publishing_rest_support_transaction_get_endpoint_url (self);
#line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp26_ = _tmp25_;
+ _tmp24_ = _tmp23_;
#line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp27_ = g_strconcat (_tmp26_, "?", NULL);
+ _tmp25_ = g_strconcat (_tmp24_, "?", NULL);
#line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp28_ = _tmp27_;
+ _tmp26_ = _tmp25_;
#line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp29_ = formdata_string;
+ _tmp27_ = formdata_string;
#line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp30_ = g_strconcat (_tmp28_, _tmp29_, NULL);
+ _tmp28_ = g_strconcat (_tmp26_, _tmp27_, NULL);
#line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (url_with_query);
#line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- url_with_query = _tmp30_;
-#line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp28_);
+ url_with_query = _tmp28_;
#line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp26_);
+#line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _g_free0 (_tmp24_);
#line 408 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp31_ = self->priv->message;
+ _tmp29_ = self->priv->message;
#line 408 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp32_ = url_with_query;
+ _tmp30_ = url_with_query;
#line 408 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp33_ = soup_uri_new (_tmp32_);
+ _tmp31_ = soup_uri_new (_tmp30_);
#line 408 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp34_ = _tmp33_;
+ _tmp32_ = _tmp31_;
#line 408 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- soup_message_set_uri (_tmp31_, _tmp34_);
+ soup_message_set_uri (_tmp29_, _tmp32_);
#line 408 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- __vala_SoupURI_free0 (_tmp34_);
-#line 3416 "RESTSupport.c"
+ __vala_SoupURI_free0 (_tmp32_);
+#line 3598 "RESTSupport.c"
} else {
- SoupMessage* _tmp35_;
- const gchar* _tmp36_;
- guint8* _tmp37_;
- gint _tmp37__length1;
- guint8* _tmp38_;
- gint _tmp38__length1;
+ SoupMessage* _tmp33_;
+ const gchar* _tmp34_;
+ guint8* _tmp35_;
+ gint _tmp35__length1;
+ guint8* _tmp36_;
+ gint _tmp36__length1;
#line 410 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp35_ = self->priv->message;
+ _tmp33_ = self->priv->message;
#line 410 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp36_ = formdata_string;
+ _tmp34_ = formdata_string;
#line 410 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp37_ = string_get_data (_tmp36_, &_tmp37__length1);
+ _tmp35_ = string_get_data (_tmp34_, &_tmp35__length1);
#line 410 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp38_ = _tmp37_;
+ _tmp36_ = _tmp35_;
#line 410 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp38__length1 = _tmp37__length1;
+ _tmp36__length1 = _tmp35__length1;
#line 410 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- soup_message_set_request (_tmp35_, "application/x-www-form-urlencoded", SOUP_MEMORY_COPY, _tmp38_, (gsize) _tmp38__length1);
-#line 3436 "RESTSupport.c"
+ soup_message_set_request (_tmp33_, "application/x-www-form-urlencoded", SOUP_MEMORY_COPY, _tmp36_, (gsize) _tmp36__length1);
+#line 3618 "RESTSupport.c"
}
#line 414 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->is_executed = TRUE;
-#line 3440 "RESTSupport.c"
+#line 3622 "RESTSupport.c"
{
- SoupMessage* _tmp39_;
- SoupURI* _tmp40_;
- gchar* _tmp41_;
- gchar* _tmp42_;
+ SoupMessage* _tmp37_;
+ SoupURI* _tmp38_;
+ gchar* _tmp39_;
+ gchar* _tmp40_;
#line 417 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp39_ = self->priv->message;
+ _tmp37_ = self->priv->message;
#line 417 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp40_ = soup_message_get_uri (_tmp39_);
+ _tmp38_ = soup_message_get_uri (_tmp37_);
#line 417 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp41_ = soup_uri_to_string (_tmp40_, FALSE);
+ _tmp39_ = soup_uri_to_string (_tmp38_, FALSE);
#line 417 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp42_ = _tmp41_;
+ _tmp40_ = _tmp39_;
#line 417 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_debug ("RESTSupport.vala:417: sending message to URI = '%s'", _tmp42_);
+ g_debug ("RESTSupport.vala:417: sending message to URI = '%s'", _tmp40_);
#line 417 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp42_);
+ _g_free0 (_tmp40_);
#line 418 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_transaction_send (self, &_inner_error_);
#line 418 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3462 "RESTSupport.c"
+#line 3644 "RESTSupport.c"
goto __finally1;
}
}
__finally1:
{
- const gchar* _tmp43_;
+ const gchar* _tmp41_;
#line 421 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp43_ = old_url;
+ _tmp41_ = old_url;
#line 421 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp43_ != NULL) {
-#line 3473 "RESTSupport.c"
- SoupMessage* _tmp44_;
- const gchar* _tmp45_;
- SoupURI* _tmp46_;
- SoupURI* _tmp47_;
+ if (_tmp41_ != NULL) {
+#line 3655 "RESTSupport.c"
+ SoupMessage* _tmp42_;
+ const gchar* _tmp43_;
+ SoupURI* _tmp44_;
+ SoupURI* _tmp45_;
#line 422 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp44_ = self->priv->message;
+ _tmp42_ = self->priv->message;
#line 422 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp45_ = old_url;
+ _tmp43_ = old_url;
#line 422 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp46_ = soup_uri_new (_tmp45_);
+ _tmp44_ = soup_uri_new (_tmp43_);
#line 422 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp47_ = _tmp46_;
+ _tmp45_ = _tmp44_;
#line 422 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- soup_message_set_uri (_tmp44_, _tmp47_);
+ soup_message_set_uri (_tmp42_, _tmp45_);
#line 422 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- __vala_SoupURI_free0 (_tmp47_);
-#line 3490 "RESTSupport.c"
+ __vala_SoupURI_free0 (_tmp45_);
+#line 3672 "RESTSupport.c"
}
}
#line 416 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -3511,7 +3693,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
_g_free0 (formdata_string);
#line 416 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 3507 "RESTSupport.c"
+#line 3689 "RESTSupport.c"
} else {
#line 416 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (url_with_query);
@@ -3525,7 +3707,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
g_clear_error (&_inner_error_);
#line 416 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 3521 "RESTSupport.c"
+#line 3703 "RESTSupport.c"
}
}
#line 377 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -3534,120 +3716,127 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
_g_free0 (old_url);
#line 377 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (formdata_string);
-#line 3530 "RESTSupport.c"
+#line 3712 "RESTSupport.c"
}
-void publishing_rest_support_transaction_execute (PublishingRESTSupportTransaction* self, GError** error) {
+void
+publishing_rest_support_transaction_execute (PublishingRESTSupportTransaction* self,
+ GError** error)
+{
#line 377 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self));
#line 377 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
PUBLISHING_REST_SUPPORT_TRANSACTION_GET_CLASS (self)->execute (self, error);
-#line 3539 "RESTSupport.c"
+#line 3724 "RESTSupport.c"
}
-gchar* publishing_rest_support_transaction_get_response (PublishingRESTSupportTransaction* self) {
+gchar*
+publishing_rest_support_transaction_get_response (PublishingRESTSupportTransaction* self)
+{
gchar* result = NULL;
- gboolean _tmp0_;
- SoupMessage* _tmp1_;
- SoupMessageBody* _tmp2_;
- guint8* _tmp3_;
- gint _tmp3__length1;
- gchar* _tmp4_;
+ SoupMessage* _tmp0_;
+ SoupMessageBody* _tmp1_;
+ guint8* _tmp2_;
+ gint _tmp2__length1;
+ gchar* _tmp3_;
#line 426 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self), NULL);
#line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = publishing_rest_support_transaction_get_is_executed (self);
-#line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _vala_assert (_tmp0_, "get_is_executed()");
+ _vala_assert (publishing_rest_support_transaction_get_is_executed (self), "get_is_executed()");
#line 428 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = self->priv->message;
+ _tmp0_ = self->priv->message;
#line 428 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = _tmp1_->response_body;
+ _tmp1_ = _tmp0_->response_body;
#line 428 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = _tmp2_->data;
+ _tmp2_ = _tmp1_->data;
#line 428 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3__length1 = (gint) _tmp2_->length;
+ _tmp2__length1 = (gint) _tmp1_->length;
#line 428 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp4_ = g_strdup ((const gchar*) _tmp3_);
+ _tmp3_ = g_strdup ((const gchar*) _tmp2_);
#line 428 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- result = _tmp4_;
+ result = _tmp3_;
#line 428 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 3571 "RESTSupport.c"
+#line 3755 "RESTSupport.c"
}
-SoupMessageHeaders* publishing_rest_support_transaction_get_response_headers (PublishingRESTSupportTransaction* self) {
+SoupMessageHeaders*
+publishing_rest_support_transaction_get_response_headers (PublishingRESTSupportTransaction* self)
+{
SoupMessageHeaders* result = NULL;
- gboolean _tmp0_;
- SoupMessage* _tmp1_;
- SoupMessageHeaders* _tmp2_;
+ SoupMessage* _tmp0_;
+ SoupMessageHeaders* _tmp1_;
#line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self), NULL);
#line 432 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = publishing_rest_support_transaction_get_is_executed (self);
-#line 432 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _vala_assert (_tmp0_, "get_is_executed()");
+ _vala_assert (publishing_rest_support_transaction_get_is_executed (self), "get_is_executed()");
#line 433 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = self->priv->message;
+ _tmp0_ = self->priv->message;
#line 433 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = _tmp1_->response_headers;
+ _tmp1_ = _tmp0_->response_headers;
#line 433 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- result = _tmp2_;
+ result = _tmp1_;
#line 433 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 3594 "RESTSupport.c"
+#line 3777 "RESTSupport.c"
}
-SoupMessage* publishing_rest_support_transaction_get_message (PublishingRESTSupportTransaction* self) {
+SoupMessage*
+publishing_rest_support_transaction_get_message (PublishingRESTSupportTransaction* self)
+{
SoupMessage* result = NULL;
- gboolean _tmp0_;
+ SoupMessage* _tmp0_;
SoupMessage* _tmp1_;
- SoupMessage* _tmp2_;
#line 436 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self), NULL);
#line 437 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = publishing_rest_support_transaction_get_is_executed (self);
-#line 437 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _vala_assert (_tmp0_, "get_is_executed()");
+ _vala_assert (publishing_rest_support_transaction_get_is_executed (self), "get_is_executed()");
#line 438 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = self->priv->message;
+ _tmp0_ = self->priv->message;
#line 438 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = _g_object_ref0 (_tmp1_);
+ _tmp1_ = _g_object_ref0 (_tmp0_);
#line 438 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- result = _tmp2_;
+ result = _tmp1_;
#line 438 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 3617 "RESTSupport.c"
+#line 3799 "RESTSupport.c"
}
-static void _vala_array_add1 (PublishingRESTSupportArgument** * array, int* length, int* size, PublishingRESTSupportArgument* value) {
+static void
+_vala_array_add1 (PublishingRESTSupportArgument** * array,
+ int* length,
+ int* size,
+ PublishingRESTSupportArgument* value)
+{
#line 442 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if ((*length) == (*size)) {
#line 442 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 442 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*array = g_renew (PublishingRESTSupportArgument*, *array, (*size) + 1);
-#line 3628 "RESTSupport.c"
+#line 3815 "RESTSupport.c"
}
#line 442 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
(*array)[(*length)++] = value;
#line 442 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
(*array)[*length] = NULL;
-#line 3634 "RESTSupport.c"
+#line 3821 "RESTSupport.c"
}
-void publishing_rest_support_transaction_add_argument (PublishingRESTSupportTransaction* self, const gchar* name, const gchar* value) {
+void
+publishing_rest_support_transaction_add_argument (PublishingRESTSupportTransaction* self,
+ const gchar* name,
+ const gchar* value)
+{
PublishingRESTSupportArgument** _tmp0_;
gint _tmp0__length1;
- const gchar* _tmp1_;
- const gchar* _tmp2_;
- PublishingRESTSupportArgument* _tmp3_;
+ PublishingRESTSupportArgument* _tmp1_;
#line 441 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self));
#line 441 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -3659,18 +3848,16 @@ void publishing_rest_support_transaction_add_argument (PublishingRESTSupportTran
#line 442 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0__length1 = self->priv->arguments_length1;
#line 442 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = name;
-#line 442 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = value;
+ _tmp1_ = publishing_rest_support_argument_new (name, value);
#line 442 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = publishing_rest_support_argument_new (_tmp1_, _tmp2_);
-#line 442 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _vala_array_add1 (&self->priv->arguments, &self->priv->arguments_length1, &self->priv->_arguments_size_, _tmp3_);
-#line 3662 "RESTSupport.c"
+ _vala_array_add1 (&self->priv->arguments, &self->priv->arguments_length1, &self->priv->_arguments_size_, _tmp1_);
+#line 3847 "RESTSupport.c"
}
-gchar* publishing_rest_support_transaction_get_endpoint_url (PublishingRESTSupportTransaction* self) {
+gchar*
+publishing_rest_support_transaction_get_endpoint_url (PublishingRESTSupportTransaction* self)
+{
gchar* result = NULL;
gchar* _tmp0_ = NULL;
const gchar* _tmp1_;
@@ -3680,7 +3867,7 @@ gchar* publishing_rest_support_transaction_get_endpoint_url (PublishingRESTSuppo
_tmp1_ = self->priv->endpoint_url;
#line 446 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp1_ != NULL) {
-#line 3676 "RESTSupport.c"
+#line 3863 "RESTSupport.c"
const gchar* _tmp2_;
gchar* _tmp3_;
#line 446 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -3691,7 +3878,7 @@ gchar* publishing_rest_support_transaction_get_endpoint_url (PublishingRESTSuppo
_g_free0 (_tmp0_);
#line 446 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = _tmp3_;
-#line 3687 "RESTSupport.c"
+#line 3874 "RESTSupport.c"
} else {
PublishingRESTSupportSession* _tmp4_;
gchar* _tmp5_;
@@ -3703,24 +3890,28 @@ gchar* publishing_rest_support_transaction_get_endpoint_url (PublishingRESTSuppo
_g_free0 (_tmp0_);
#line 446 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = _tmp5_;
-#line 3699 "RESTSupport.c"
+#line 3886 "RESTSupport.c"
}
#line 446 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = _tmp0_;
#line 446 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 3705 "RESTSupport.c"
+#line 3892 "RESTSupport.c"
}
-static gpointer _publishing_rest_support_session_ref0 (gpointer self) {
+static gpointer
+_publishing_rest_support_session_ref0 (gpointer self)
+{
#line 450 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self ? publishing_rest_support_session_ref (self) : NULL;
-#line 3712 "RESTSupport.c"
+#line 3901 "RESTSupport.c"
}
-PublishingRESTSupportSession* publishing_rest_support_transaction_get_parent_session (PublishingRESTSupportTransaction* self) {
+PublishingRESTSupportSession*
+publishing_rest_support_transaction_get_parent_session (PublishingRESTSupportTransaction* self)
+{
PublishingRESTSupportSession* result = NULL;
PublishingRESTSupportSession* _tmp0_;
PublishingRESTSupportSession* _tmp1_;
@@ -3734,11 +3925,18 @@ PublishingRESTSupportSession* publishing_rest_support_transaction_get_parent_ses
result = _tmp1_;
#line 450 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 3730 "RESTSupport.c"
+#line 3921 "RESTSupport.c"
}
-static void g_cclosure_user_marshal_VOID__INT_INT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) {
+static void
+g_cclosure_user_marshal_VOID__INT_INT (GClosure * closure,
+ GValue * return_value,
+ guint n_param_values,
+ const GValue * param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data)
+{
typedef void (*GMarshalFunc_VOID__INT_INT) (gpointer data1, gint arg_1, gint arg_2, gpointer data2);
register GMarshalFunc_VOID__INT_INT callback;
register GCClosure * cc;
@@ -3753,120 +3951,145 @@ static void g_cclosure_user_marshal_VOID__INT_INT (GClosure * closure, GValue *
data1 = closure->data;
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
data2 = param_values->data[0].v_pointer;
-#line 3749 "RESTSupport.c"
+#line 3947 "RESTSupport.c"
} else {
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
data1 = param_values->data[0].v_pointer;
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
data2 = closure->data;
-#line 3755 "RESTSupport.c"
+#line 3953 "RESTSupport.c"
}
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
callback = (GMarshalFunc_VOID__INT_INT) (marshal_data ? marshal_data : cc->callback);
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
callback (data1, g_value_get_int (param_values + 1), g_value_get_int (param_values + 2), data2);
-#line 3761 "RESTSupport.c"
+#line 3959 "RESTSupport.c"
}
-static void publishing_rest_support_value_transaction_init (GValue* value) {
+static void
+publishing_rest_support_value_transaction_init (GValue* value)
+{
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 3768 "RESTSupport.c"
+#line 3968 "RESTSupport.c"
}
-static void publishing_rest_support_value_transaction_free_value (GValue* value) {
+static void
+publishing_rest_support_value_transaction_free_value (GValue* value)
+{
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (value->data[0].v_pointer) {
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_transaction_unref (value->data[0].v_pointer);
-#line 3777 "RESTSupport.c"
+#line 3979 "RESTSupport.c"
}
}
-static void publishing_rest_support_value_transaction_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+publishing_rest_support_value_transaction_copy_value (const GValue* src_value,
+ GValue* dest_value)
+{
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (src_value->data[0].v_pointer) {
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
dest_value->data[0].v_pointer = publishing_rest_support_transaction_ref (src_value->data[0].v_pointer);
-#line 3787 "RESTSupport.c"
+#line 3992 "RESTSupport.c"
} else {
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
dest_value->data[0].v_pointer = NULL;
-#line 3791 "RESTSupport.c"
+#line 3996 "RESTSupport.c"
}
}
-static gpointer publishing_rest_support_value_transaction_peek_pointer (const GValue* value) {
+static gpointer
+publishing_rest_support_value_transaction_peek_pointer (const GValue* value)
+{
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return value->data[0].v_pointer;
-#line 3799 "RESTSupport.c"
+#line 4006 "RESTSupport.c"
}
-static gchar* publishing_rest_support_value_transaction_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_rest_support_value_transaction_collect_value (GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (collect_values[0].v_pointer) {
-#line 3806 "RESTSupport.c"
+#line 4018 "RESTSupport.c"
PublishingRESTSupportTransaction * object;
object = collect_values[0].v_pointer;
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (object->parent_instance.g_class == NULL) {
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3813 "RESTSupport.c"
+#line 4025 "RESTSupport.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3817 "RESTSupport.c"
+#line 4029 "RESTSupport.c"
}
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = publishing_rest_support_transaction_ref (object);
-#line 3821 "RESTSupport.c"
+#line 4033 "RESTSupport.c"
} else {
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 3825 "RESTSupport.c"
+#line 4037 "RESTSupport.c"
}
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 3829 "RESTSupport.c"
+#line 4041 "RESTSupport.c"
}
-static gchar* publishing_rest_support_value_transaction_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_rest_support_value_transaction_lcopy_value (const GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
PublishingRESTSupportTransaction ** object_p;
object_p = collect_values[0].v_pointer;
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (!object_p) {
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 3840 "RESTSupport.c"
+#line 4057 "RESTSupport.c"
}
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (!value->data[0].v_pointer) {
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*object_p = NULL;
-#line 3846 "RESTSupport.c"
+#line 4063 "RESTSupport.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*object_p = value->data[0].v_pointer;
-#line 3850 "RESTSupport.c"
+#line 4067 "RESTSupport.c"
} else {
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*object_p = publishing_rest_support_transaction_ref (value->data[0].v_pointer);
-#line 3854 "RESTSupport.c"
+#line 4071 "RESTSupport.c"
}
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 3858 "RESTSupport.c"
+#line 4075 "RESTSupport.c"
}
-GParamSpec* publishing_rest_support_param_spec_transaction (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+publishing_rest_support_param_spec_transaction (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags)
+{
PublishingRESTSupportParamSpecTransaction* spec;
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION), NULL);
@@ -3876,20 +4099,25 @@ GParamSpec* publishing_rest_support_param_spec_transaction (const gchar* name, c
G_PARAM_SPEC (spec)->value_type = object_type;
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return G_PARAM_SPEC (spec);
-#line 3872 "RESTSupport.c"
+#line 4095 "RESTSupport.c"
}
-gpointer publishing_rest_support_value_get_transaction (const GValue* value) {
+gpointer
+publishing_rest_support_value_get_transaction (const GValue* value)
+{
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION), NULL);
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return value->data[0].v_pointer;
-#line 3881 "RESTSupport.c"
+#line 4106 "RESTSupport.c"
}
-void publishing_rest_support_value_set_transaction (GValue* value, gpointer v_object) {
+void
+publishing_rest_support_value_set_transaction (GValue* value,
+ gpointer v_object)
+{
PublishingRESTSupportTransaction * old;
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION));
@@ -3905,22 +4133,25 @@ void publishing_rest_support_value_set_transaction (GValue* value, gpointer v_ob
value->data[0].v_pointer = v_object;
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_transaction_ref (value->data[0].v_pointer);
-#line 3901 "RESTSupport.c"
+#line 4129 "RESTSupport.c"
} else {
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 3905 "RESTSupport.c"
+#line 4133 "RESTSupport.c"
}
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (old) {
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_transaction_unref (old);
-#line 3911 "RESTSupport.c"
+#line 4139 "RESTSupport.c"
}
}
-void publishing_rest_support_value_take_transaction (GValue* value, gpointer v_object) {
+void
+publishing_rest_support_value_take_transaction (GValue* value,
+ gpointer v_object)
+{
PublishingRESTSupportTransaction * old;
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION));
@@ -3934,22 +4165,24 @@ void publishing_rest_support_value_take_transaction (GValue* value, gpointer v_o
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = v_object;
-#line 3930 "RESTSupport.c"
+#line 4161 "RESTSupport.c"
} else {
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 3934 "RESTSupport.c"
+#line 4165 "RESTSupport.c"
}
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (old) {
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_transaction_unref (old);
-#line 3940 "RESTSupport.c"
+#line 4171 "RESTSupport.c"
}
}
-static void publishing_rest_support_transaction_class_init (PublishingRESTSupportTransactionClass * klass) {
+static void
+publishing_rest_support_transaction_class_init (PublishingRESTSupportTransactionClass * klass)
+{
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_transaction_parent_class = g_type_class_peek_parent (klass);
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -3966,11 +4199,13 @@ static void publishing_rest_support_transaction_class_init (PublishingRESTSuppor
publishing_rest_support_transaction_signals[PUBLISHING_REST_SUPPORT_TRANSACTION_NETWORK_ERROR_SIGNAL] = g_signal_new ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER);
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_transaction_signals[PUBLISHING_REST_SUPPORT_TRANSACTION_COMPLETED_SIGNAL] = g_signal_new ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 3962 "RESTSupport.c"
+#line 4195 "RESTSupport.c"
}
-static void publishing_rest_support_transaction_instance_init (PublishingRESTSupportTransaction * self) {
+static void
+publishing_rest_support_transaction_instance_init (PublishingRESTSupportTransaction * self)
+{
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv = PUBLISHING_REST_SUPPORT_TRANSACTION_GET_PRIVATE (self);
#line 160 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -3987,11 +4222,13 @@ static void publishing_rest_support_transaction_instance_init (PublishingRESTSup
self->priv->endpoint_url = NULL;
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->ref_count = 1;
-#line 3983 "RESTSupport.c"
+#line 4218 "RESTSupport.c"
}
-static void publishing_rest_support_transaction_finalize (PublishingRESTSupportTransaction * obj) {
+static void
+publishing_rest_support_transaction_finalize (PublishingRESTSupportTransaction * obj)
+{
PublishingRESTSupportTransaction * self;
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction);
@@ -4005,11 +4242,13 @@ static void publishing_rest_support_transaction_finalize (PublishingRESTSupportT
_g_error_free0 (self->priv->err);
#line 165 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (self->priv->endpoint_url);
-#line 4001 "RESTSupport.c"
+#line 4238 "RESTSupport.c"
}
-GType publishing_rest_support_transaction_get_type (void) {
+GType
+publishing_rest_support_transaction_get_type (void)
+{
static volatile gsize publishing_rest_support_transaction_type_id__volatile = 0;
if (g_once_init_enter (&publishing_rest_support_transaction_type_id__volatile)) {
static const GTypeValueTable g_define_type_value_table = { publishing_rest_support_value_transaction_init, publishing_rest_support_value_transaction_free_value, publishing_rest_support_value_transaction_copy_value, publishing_rest_support_value_transaction_peek_pointer, "p", publishing_rest_support_value_transaction_collect_value, "p", publishing_rest_support_value_transaction_lcopy_value };
@@ -4023,18 +4262,22 @@ GType publishing_rest_support_transaction_get_type (void) {
}
-gpointer publishing_rest_support_transaction_ref (gpointer instance) {
+gpointer
+publishing_rest_support_transaction_ref (gpointer instance)
+{
PublishingRESTSupportTransaction * self;
self = instance;
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_atomic_int_inc (&self->ref_count);
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return instance;
-#line 4026 "RESTSupport.c"
+#line 4267 "RESTSupport.c"
}
-void publishing_rest_support_transaction_unref (gpointer instance) {
+void
+publishing_rest_support_transaction_unref (gpointer instance)
+{
PublishingRESTSupportTransaction * self;
self = instance;
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -4043,83 +4286,78 @@ void publishing_rest_support_transaction_unref (gpointer instance) {
PUBLISHING_REST_SUPPORT_TRANSACTION_GET_CLASS (self)->finalize (self);
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 4039 "RESTSupport.c"
+#line 4282 "RESTSupport.c"
}
}
-PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transaction_construct (GType object_type, PublishingRESTSupportSession* session, SpitPublishingPublishable* publishable) {
+PublishingRESTSupportUploadTransaction*
+publishing_rest_support_upload_transaction_construct (GType object_type,
+ PublishingRESTSupportSession* session,
+ SpitPublishingPublishable* publishable)
+{
PublishingRESTSupportUploadTransaction* self = NULL;
- PublishingRESTSupportSession* _tmp0_;
- SpitPublishingPublishable* _tmp1_;
- SpitPublishingPublishable* _tmp2_;
- SpitPublishingPublishable* _tmp3_;
- SpitPublishingPublisherMediaType _tmp4_;
- gchar* _tmp5_;
- GHashTable* _tmp6_;
- GeeHashMap* _tmp7_;
+ SpitPublishingPublishable* _tmp0_;
+ gchar* _tmp1_;
+ GHashTable* _tmp2_;
+ GeeHashMap* _tmp3_;
#line 460 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (session), NULL);
#line 460 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL);
#line 461 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = session;
-#line 461 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self = (PublishingRESTSupportUploadTransaction*) publishing_rest_support_transaction_construct (object_type, _tmp0_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
-#line 462 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = publishable;
+ self = (PublishingRESTSupportUploadTransaction*) publishing_rest_support_transaction_construct (object_type, session, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
#line 462 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = _g_object_ref0 (_tmp1_);
+ _tmp0_ = _g_object_ref0 (publishable);
#line 462 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (self->publishable);
#line 462 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->publishable = _tmp2_;
+ self->publishable = _tmp0_;
#line 463 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = publishable;
-#line 463 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp4_ = spit_publishing_publishable_get_media_type (_tmp3_);
-#line 463 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp5_ = publishing_rest_support_upload_transaction_media_type_to_mime_type (_tmp4_);
+ _tmp1_ = publishing_rest_support_upload_transaction_media_type_to_mime_type (spit_publishing_publishable_get_media_type (publishable));
#line 463 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (self->mime_type);
#line 463 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->mime_type = _tmp5_;
+ self->mime_type = _tmp1_;
#line 465 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp6_ = publishing_rest_support_upload_transaction_create_default_binary_disposition_table (self);
+ _tmp2_ = publishing_rest_support_upload_transaction_create_default_binary_disposition_table (self);
#line 465 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_hash_table_unref0 (self->binary_disposition_table);
#line 465 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->binary_disposition_table = _tmp6_;
+ self->binary_disposition_table = _tmp2_;
#line 467 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp7_ = 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);
+ _tmp3_ = 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 467 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (self->message_headers);
#line 467 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->message_headers = _tmp7_;
+ self->message_headers = _tmp3_;
#line 460 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 4094 "RESTSupport.c"
+#line 4329 "RESTSupport.c"
}
-PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transaction_new (PublishingRESTSupportSession* session, SpitPublishingPublishable* publishable) {
+PublishingRESTSupportUploadTransaction*
+publishing_rest_support_upload_transaction_new (PublishingRESTSupportSession* session,
+ SpitPublishingPublishable* publishable)
+{
#line 460 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return publishing_rest_support_upload_transaction_construct (PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, session, publishable);
-#line 4101 "RESTSupport.c"
+#line 4339 "RESTSupport.c"
}
-PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transaction_construct_with_endpoint_url (GType object_type, PublishingRESTSupportSession* session, SpitPublishingPublishable* publishable, const gchar* endpoint_url) {
+PublishingRESTSupportUploadTransaction*
+publishing_rest_support_upload_transaction_construct_with_endpoint_url (GType object_type,
+ PublishingRESTSupportSession* session,
+ SpitPublishingPublishable* publishable,
+ const gchar* endpoint_url)
+{
PublishingRESTSupportUploadTransaction* self = NULL;
- PublishingRESTSupportSession* _tmp0_;
- const gchar* _tmp1_;
- SpitPublishingPublishable* _tmp2_;
- SpitPublishingPublishable* _tmp3_;
- SpitPublishingPublishable* _tmp4_;
- SpitPublishingPublisherMediaType _tmp5_;
- gchar* _tmp6_;
- GHashTable* _tmp7_;
- GeeHashMap* _tmp8_;
+ SpitPublishingPublishable* _tmp0_;
+ gchar* _tmp1_;
+ GHashTable* _tmp2_;
+ GeeHashMap* _tmp3_;
#line 470 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (session), NULL);
#line 470 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -4127,59 +4365,55 @@ PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transacti
#line 470 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (endpoint_url != NULL, NULL);
#line 472 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = session;
-#line 472 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = endpoint_url;
-#line 472 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self = (PublishingRESTSupportUploadTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, _tmp0_, _tmp1_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
+ self = (PublishingRESTSupportUploadTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, session, endpoint_url, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
#line 473 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = publishable;
-#line 473 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = _g_object_ref0 (_tmp2_);
+ _tmp0_ = _g_object_ref0 (publishable);
#line 473 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (self->publishable);
#line 473 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->publishable = _tmp3_;
+ self->publishable = _tmp0_;
#line 474 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp4_ = publishable;
-#line 474 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp5_ = spit_publishing_publishable_get_media_type (_tmp4_);
-#line 474 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp6_ = publishing_rest_support_upload_transaction_media_type_to_mime_type (_tmp5_);
+ _tmp1_ = publishing_rest_support_upload_transaction_media_type_to_mime_type (spit_publishing_publishable_get_media_type (publishable));
#line 474 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (self->mime_type);
#line 474 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->mime_type = _tmp6_;
+ self->mime_type = _tmp1_;
#line 476 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp7_ = publishing_rest_support_upload_transaction_create_default_binary_disposition_table (self);
+ _tmp2_ = publishing_rest_support_upload_transaction_create_default_binary_disposition_table (self);
#line 476 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_hash_table_unref0 (self->binary_disposition_table);
#line 476 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->binary_disposition_table = _tmp7_;
+ self->binary_disposition_table = _tmp2_;
#line 478 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp8_ = 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);
+ _tmp3_ = 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 478 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (self->message_headers);
#line 478 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->message_headers = _tmp8_;
+ self->message_headers = _tmp3_;
#line 470 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 4160 "RESTSupport.c"
+#line 4388 "RESTSupport.c"
}
-PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transaction_new_with_endpoint_url (PublishingRESTSupportSession* session, SpitPublishingPublishable* publishable, const gchar* endpoint_url) {
+PublishingRESTSupportUploadTransaction*
+publishing_rest_support_upload_transaction_new_with_endpoint_url (PublishingRESTSupportSession* session,
+ SpitPublishingPublishable* publishable,
+ const gchar* endpoint_url)
+{
#line 470 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return publishing_rest_support_upload_transaction_construct_with_endpoint_url (PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, session, publishable, endpoint_url);
-#line 4167 "RESTSupport.c"
+#line 4399 "RESTSupport.c"
}
-static void publishing_rest_support_upload_transaction_real_add_header (PublishingRESTSupportTransaction* base, const gchar* key, const gchar* value) {
+static void
+publishing_rest_support_upload_transaction_real_add_header (PublishingRESTSupportTransaction* base,
+ const gchar* key,
+ const gchar* value)
+{
PublishingRESTSupportUploadTransaction * self;
GeeHashMap* _tmp0_;
- const gchar* _tmp1_;
- const gchar* _tmp2_;
#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction);
#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -4189,69 +4423,62 @@ static void publishing_rest_support_upload_transaction_real_add_header (Publishi
#line 482 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = self->message_headers;
#line 482 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = key;
-#line 482 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = value;
-#line 482 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_, _tmp2_);
-#line 4190 "RESTSupport.c"
+ gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), key, value);
+#line 4420 "RESTSupport.c"
}
-static gchar* publishing_rest_support_upload_transaction_media_type_to_mime_type (SpitPublishingPublisherMediaType media_type) {
+static gchar*
+publishing_rest_support_upload_transaction_media_type_to_mime_type (SpitPublishingPublisherMediaType media_type)
+{
gchar* result = NULL;
- SpitPublishingPublisherMediaType _tmp0_;
-#line 486 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = media_type;
#line 486 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp0_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) {
-#line 4201 "RESTSupport.c"
- gchar* _tmp1_;
+ if (media_type == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) {
+#line 4430 "RESTSupport.c"
+ gchar* _tmp0_;
#line 487 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = g_strdup ("image/jpeg");
+ _tmp0_ = g_strdup ("image/jpeg");
#line 487 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- result = _tmp1_;
+ result = _tmp0_;
#line 487 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 4209 "RESTSupport.c"
+#line 4438 "RESTSupport.c"
} else {
- SpitPublishingPublisherMediaType _tmp2_;
-#line 488 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = media_type;
#line 488 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp2_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 4216 "RESTSupport.c"
- gchar* _tmp3_;
+ if (media_type == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
+#line 4442 "RESTSupport.c"
+ gchar* _tmp1_;
#line 489 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = g_strdup ("video/mpeg");
+ _tmp1_ = g_strdup ("video/mpeg");
#line 489 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- result = _tmp3_;
+ result = _tmp1_;
#line 489 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 4224 "RESTSupport.c"
+#line 4450 "RESTSupport.c"
} else {
- SpitPublishingPublisherMediaType _tmp4_;
- GEnumValue* _tmp5_;
+ GEnumValue* _tmp2_;
#line 491 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp4_ = media_type;
+ _tmp2_ = g_enum_get_value (g_type_class_ref (SPIT_PUBLISHING_PUBLISHER_TYPE_MEDIA_TYPE), media_type);
#line 491 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp5_ = g_enum_get_value (g_type_class_ref (SPIT_PUBLISHING_PUBLISHER_TYPE_MEDIA_TYPE), _tmp4_);
-#line 491 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_error ("RESTSupport.vala:491: UploadTransaction: unknown media type %s.", (_tmp5_ != NULL) ? _tmp5_->value_name : NULL);
-#line 4234 "RESTSupport.c"
+ g_error ("RESTSupport.vala:491: UploadTransaction: unknown media type %s.", (_tmp2_ != NULL) ? _tmp2_->value_name : NULL);
+#line 4457 "RESTSupport.c"
}
}
}
-static void _g_free0_ (gpointer var) {
+static void
+_g_free0_ (gpointer var)
+{
#line 495 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
var = (g_free (var), NULL);
-#line 4243 "RESTSupport.c"
+#line 4468 "RESTSupport.c"
}
-static GHashTable* publishing_rest_support_upload_transaction_create_default_binary_disposition_table (PublishingRESTSupportUploadTransaction* self) {
+static GHashTable*
+publishing_rest_support_upload_transaction_create_default_binary_disposition_table (PublishingRESTSupportUploadTransaction* self)
+{
GHashTable* result = NULL;
GHashTable* _result_ = NULL;
GHashFunc _tmp0_;
@@ -4298,51 +4525,60 @@ static GHashTable* publishing_rest_support_upload_transaction_create_default_bin
result = _result_;
#line 501 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 4294 "RESTSupport.c"
+#line 4521 "RESTSupport.c"
}
-static gpointer _g_hash_table_ref0 (gpointer self) {
+static gpointer
+_g_hash_table_ref0 (gpointer self)
+{
#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self ? g_hash_table_ref (self) : NULL;
-#line 4301 "RESTSupport.c"
+#line 4530 "RESTSupport.c"
}
-void publishing_rest_support_upload_transaction_set_binary_disposition_table (PublishingRESTSupportUploadTransaction* self, GHashTable* new_disp_table) {
+void
+publishing_rest_support_upload_transaction_set_binary_disposition_table (PublishingRESTSupportUploadTransaction* self,
+ GHashTable* new_disp_table)
+{
GHashTable* _tmp0_;
- GHashTable* _tmp1_;
#line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_UPLOAD_TRANSACTION (self));
#line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (new_disp_table != NULL);
#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = new_disp_table;
-#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = _g_hash_table_ref0 (_tmp0_);
+ _tmp0_ = _g_hash_table_ref0 (new_disp_table);
#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_hash_table_unref0 (self->binary_disposition_table);
#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->binary_disposition_table = _tmp1_;
-#line 4320 "RESTSupport.c"
+ self->binary_disposition_table = _tmp0_;
+#line 4549 "RESTSupport.c"
}
-static void _vala_SoupMultipart_free (SoupMultipart* self) {
+static void
+_vala_SoupMultipart_free (SoupMultipart* self)
+{
#line 520 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_boxed_free (soup_multipart_get_type (), self);
-#line 4327 "RESTSupport.c"
+#line 4558 "RESTSupport.c"
}
-static void _vala_SoupBuffer_free (SoupBuffer* self) {
+static void
+_vala_SoupBuffer_free (SoupBuffer* self)
+{
#line 550 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_boxed_free (soup_buffer_get_type (), self);
-#line 4334 "RESTSupport.c"
+#line 4567 "RESTSupport.c"
}
-static void publishing_rest_support_upload_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error) {
+static void
+publishing_rest_support_upload_transaction_real_execute (PublishingRESTSupportTransaction* base,
+ GError** error)
+{
PublishingRESTSupportUploadTransaction * self;
PublishingRESTSupportArgument** request_arguments = NULL;
gint _tmp0_;
@@ -4359,44 +4595,42 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
gsize payload_length = 0UL;
gint payload_part_num = 0;
SoupMultipart* _tmp19_;
- gint _tmp20_;
SoupBuffer* bindable_data = NULL;
- const gchar* _tmp21_;
+ const gchar* _tmp20_;
+ guint8* _tmp21_;
+ gint _tmp21__length1;
guint8* _tmp22_;
gint _tmp22__length1;
- guint8* _tmp23_;
- gint _tmp23__length1;
- gsize _tmp24_;
- SoupBuffer* _tmp25_;
- SoupMultipart* _tmp26_;
- SpitPublishingPublishable* _tmp27_;
+ gsize _tmp23_;
+ SoupBuffer* _tmp24_;
+ SoupMultipart* _tmp25_;
+ SpitPublishingPublishable* _tmp26_;
+ GFile* _tmp27_;
GFile* _tmp28_;
- GFile* _tmp29_;
+ gchar* _tmp29_;
gchar* _tmp30_;
- gchar* _tmp31_;
- const gchar* _tmp32_;
- SoupBuffer* _tmp33_;
+ const gchar* _tmp31_;
+ SoupBuffer* _tmp32_;
SoupMessageHeaders* image_part_header = NULL;
SoupBuffer* image_part_body = NULL;
- SoupMultipart* _tmp34_;
- gint _tmp35_;
- SoupMessageHeaders* _tmp36_ = NULL;
- SoupBuffer* _tmp37_ = NULL;
- SoupMessageHeaders* _tmp38_;
- GHashTable* _tmp39_;
+ SoupMultipart* _tmp33_;
+ gint _tmp34_;
+ SoupMessageHeaders* _tmp35_ = NULL;
+ SoupBuffer* _tmp36_ = NULL;
+ SoupMessageHeaders* _tmp37_;
+ GHashTable* _tmp38_;
SoupMessage* outbound_message = NULL;
+ gchar* _tmp39_;
gchar* _tmp40_;
- gchar* _tmp41_;
- SoupMultipart* _tmp42_;
+ SoupMultipart* _tmp41_;
+ SoupMessage* _tmp42_;
SoupMessage* _tmp43_;
- SoupMessage* _tmp44_;
GeeMapIterator* i = NULL;
- GeeHashMap* _tmp45_;
- GeeMapIterator* _tmp46_;
+ GeeHashMap* _tmp44_;
+ GeeMapIterator* _tmp45_;
gboolean cont = FALSE;
- GeeMapIterator* _tmp47_;
- gboolean _tmp48_;
- SoupMessage* _tmp60_;
+ GeeMapIterator* _tmp46_;
+ SoupMessage* _tmp57_;
GError * _inner_error_ = NULL;
#line 508 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction);
@@ -4422,7 +4656,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
_tmp4_ = request_arguments;
#line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp4__length1 = request_arguments_length1;
-#line 4418 "RESTSupport.c"
+#line 4652 "RESTSupport.c"
{
PublishingRESTSupportArgument** arg_collection = NULL;
gint arg_collection_length1 = 0;
@@ -4434,14 +4668,14 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
arg_collection_length1 = _tmp4__length1;
#line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
for (arg_it = 0; arg_it < _tmp4__length1; arg_it = arg_it + 1) {
-#line 4430 "RESTSupport.c"
+#line 4664 "RESTSupport.c"
PublishingRESTSupportArgument* _tmp5_;
PublishingRESTSupportArgument* arg = NULL;
#line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp5_ = _publishing_rest_support_argument_ref0 (arg_collection[arg_it]);
#line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
arg = _tmp5_;
-#line 4437 "RESTSupport.c"
+#line 4671 "RESTSupport.c"
{
SoupMultipart* _tmp6_;
PublishingRESTSupportArgument* _tmp7_;
@@ -4462,7 +4696,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
soup_multipart_append_form_string (_tmp6_, _tmp8_, _tmp10_);
#line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_publishing_rest_support_argument_unref0 (arg);
-#line 4458 "RESTSupport.c"
+#line 4692 "RESTSupport.c"
}
}
}
@@ -4500,7 +4734,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 520 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == G_FILE_ERROR) {
-#line 4496 "RESTSupport.c"
+#line 4730 "RESTSupport.c"
goto __catch2_g_file_error;
}
#line 520 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -4515,7 +4749,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
g_clear_error (&_inner_error_);
#line 520 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 4511 "RESTSupport.c"
+#line 4745 "RESTSupport.c"
}
}
goto __finally2;
@@ -4533,7 +4767,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
_inner_error_ = _tmp18_;
#line 523 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_error_free0 (e);
-#line 4529 "RESTSupport.c"
+#line 4763 "RESTSupport.c"
goto __finally2;
}
__finally2:
@@ -4551,7 +4785,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
request_arguments = (_vala_array_free (request_arguments, request_arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
#line 519 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 4547 "RESTSupport.c"
+#line 4781 "RESTSupport.c"
} else {
#line 519 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (payload);
@@ -4565,149 +4799,142 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
g_clear_error (&_inner_error_);
#line 519 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 4561 "RESTSupport.c"
+#line 4795 "RESTSupport.c"
}
}
#line 527 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp19_ = message_parts;
#line 527 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp20_ = soup_multipart_get_length (_tmp19_);
-#line 527 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- payload_part_num = _tmp20_;
+ payload_part_num = soup_multipart_get_length (_tmp19_);
#line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp21_ = payload;
+ _tmp20_ = payload;
#line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp22_ = string_get_data (_tmp21_, &_tmp22__length1);
+ _tmp21_ = string_get_data (_tmp20_, &_tmp21__length1);
#line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp23_ = _tmp22_;
+ _tmp22_ = _tmp21_;
#line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp23__length1 = _tmp22__length1;
+ _tmp22__length1 = _tmp21__length1;
#line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp24_ = payload_length;
+ _tmp23_ = payload_length;
#line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp25_ = soup_buffer_new (SOUP_MEMORY_COPY, _tmp23_ + 0, ((gint) _tmp24_) - 0);
+ _tmp24_ = soup_buffer_new (SOUP_MEMORY_COPY, _tmp22_ + 0, ((gint) _tmp23_) - 0);
#line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- bindable_data = _tmp25_;
+ bindable_data = _tmp24_;
#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp26_ = message_parts;
+ _tmp25_ = message_parts;
#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp27_ = self->publishable;
+ _tmp26_ = self->publishable;
#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp28_ = spit_publishing_publishable_get_serialized_file (_tmp27_);
+ _tmp27_ = spit_publishing_publishable_get_serialized_file (_tmp26_);
#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp29_ = _tmp28_;
+ _tmp28_ = _tmp27_;
#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp30_ = g_file_get_path (_tmp29_);
+ _tmp29_ = g_file_get_path (_tmp28_);
#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp31_ = _tmp30_;
+ _tmp30_ = _tmp29_;
#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp32_ = self->mime_type;
+ _tmp31_ = self->mime_type;
#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp33_ = bindable_data;
+ _tmp32_ = bindable_data;
#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- soup_multipart_append_form_file (_tmp26_, "", _tmp31_, _tmp32_, _tmp33_);
+ soup_multipart_append_form_file (_tmp25_, "", _tmp30_, _tmp31_, _tmp32_);
#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp31_);
+ _g_free0 (_tmp30_);
#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_object_unref0 (_tmp29_);
+ _g_object_unref0 (_tmp28_);
#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp34_ = message_parts;
+ _tmp33_ = message_parts;
#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp35_ = payload_part_num;
+ _tmp34_ = payload_part_num;
#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- soup_multipart_get_part (_tmp34_, _tmp35_, &_tmp36_, &_tmp37_);
+ soup_multipart_get_part (_tmp33_, _tmp34_, &_tmp35_, &_tmp36_);
#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- image_part_header = _tmp36_;
+ image_part_header = _tmp35_;
#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- image_part_body = _tmp37_;
+ image_part_body = _tmp36_;
#line 536 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp38_ = image_part_header;
+ _tmp37_ = image_part_header;
#line 536 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp39_ = self->binary_disposition_table;
+ _tmp38_ = self->binary_disposition_table;
#line 536 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- soup_message_headers_set_content_disposition (_tmp38_, "form-data", _tmp39_);
+ soup_message_headers_set_content_disposition (_tmp37_, "form-data", _tmp38_);
#line 538 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp40_ = publishing_rest_support_transaction_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
+ _tmp39_ = publishing_rest_support_transaction_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
#line 538 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp41_ = _tmp40_;
+ _tmp40_ = _tmp39_;
#line 538 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp42_ = message_parts;
+ _tmp41_ = message_parts;
#line 538 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp43_ = soup_form_request_new_from_multipart (_tmp41_, _tmp42_);
+ _tmp42_ = soup_form_request_new_from_multipart (_tmp40_, _tmp41_);
#line 538 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp44_ = _tmp43_;
+ _tmp43_ = _tmp42_;
#line 538 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp41_);
+ _g_free0 (_tmp40_);
#line 538 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- outbound_message = _tmp44_;
+ outbound_message = _tmp43_;
#line 541 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp45_ = self->message_headers;
+ _tmp44_ = self->message_headers;
#line 541 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp46_ = gee_abstract_map_map_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
+ _tmp45_ = gee_abstract_map_map_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
#line 541 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- i = _tmp46_;
-#line 542 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp47_ = i;
+ i = _tmp45_;
#line 542 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp48_ = gee_map_iterator_next (_tmp47_);
+ _tmp46_ = i;
#line 542 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- cont = _tmp48_;
+ cont = gee_map_iterator_next (_tmp46_);
#line 543 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
while (TRUE) {
-#line 4650 "RESTSupport.c"
- gboolean _tmp49_;
- SoupMessage* _tmp50_;
- SoupMessageHeaders* _tmp51_;
- GeeMapIterator* _tmp52_;
- gpointer _tmp53_;
- gchar* _tmp54_;
- GeeMapIterator* _tmp55_;
- gpointer _tmp56_;
- gchar* _tmp57_;
- GeeMapIterator* _tmp58_;
- gboolean _tmp59_;
+#line 4880 "RESTSupport.c"
+ gboolean _tmp47_;
+ SoupMessage* _tmp48_;
+ SoupMessageHeaders* _tmp49_;
+ GeeMapIterator* _tmp50_;
+ gpointer _tmp51_;
+ gchar* _tmp52_;
+ GeeMapIterator* _tmp53_;
+ gpointer _tmp54_;
+ gchar* _tmp55_;
+ GeeMapIterator* _tmp56_;
#line 543 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp49_ = cont;
+ _tmp47_ = cont;
#line 543 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (!_tmp49_) {
+ if (!_tmp47_) {
#line 543 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
break;
-#line 4668 "RESTSupport.c"
+#line 4897 "RESTSupport.c"
}
#line 544 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp50_ = outbound_message;
+ _tmp48_ = outbound_message;
#line 544 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp51_ = _tmp50_->request_headers;
+ _tmp49_ = _tmp48_->request_headers;
#line 544 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp52_ = i;
+ _tmp50_ = i;
#line 544 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp53_ = gee_map_iterator_get_key (_tmp52_);
+ _tmp51_ = gee_map_iterator_get_key (_tmp50_);
#line 544 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp54_ = (gchar*) _tmp53_;
+ _tmp52_ = (gchar*) _tmp51_;
#line 544 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp55_ = i;
+ _tmp53_ = i;
#line 544 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp56_ = gee_map_iterator_get_value (_tmp55_);
+ _tmp54_ = gee_map_iterator_get_value (_tmp53_);
#line 544 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp57_ = (gchar*) _tmp56_;
+ _tmp55_ = (gchar*) _tmp54_;
#line 544 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- soup_message_headers_append (_tmp51_, _tmp54_, _tmp57_);
+ soup_message_headers_append (_tmp49_, _tmp52_, _tmp55_);
#line 544 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp57_);
+ _g_free0 (_tmp55_);
#line 544 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp54_);
+ _g_free0 (_tmp52_);
#line 545 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp58_ = i;
+ _tmp56_ = i;
#line 545 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp59_ = gee_map_iterator_next (_tmp58_);
-#line 545 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- cont = _tmp59_;
-#line 4698 "RESTSupport.c"
+ cont = gee_map_iterator_next (_tmp56_);
+#line 4925 "RESTSupport.c"
}
#line 547 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp60_ = outbound_message;
+ _tmp57_ = outbound_message;
#line 547 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- publishing_rest_support_transaction_set_message (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp60_);
+ publishing_rest_support_transaction_set_message (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp57_);
#line 549 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_transaction_set_is_executed (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), TRUE);
#line 550 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -4732,7 +4959,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
request_arguments = (_vala_array_free (request_arguments, request_arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
#line 550 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 4728 "RESTSupport.c"
+#line 4955 "RESTSupport.c"
} else {
#line 550 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (i);
@@ -4752,7 +4979,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
g_clear_error (&_inner_error_);
#line 550 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 4748 "RESTSupport.c"
+#line 4975 "RESTSupport.c"
}
}
#line 508 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -4767,11 +4994,13 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
__vala_SoupMultipart_free0 (message_parts);
#line 508 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
request_arguments = (_vala_array_free (request_arguments, request_arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
-#line 4763 "RESTSupport.c"
+#line 4990 "RESTSupport.c"
}
-static void publishing_rest_support_upload_transaction_class_init (PublishingRESTSupportUploadTransactionClass * klass) {
+static void
+publishing_rest_support_upload_transaction_class_init (PublishingRESTSupportUploadTransactionClass * klass)
+{
#line 454 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_upload_transaction_parent_class = g_type_class_peek_parent (klass);
#line 454 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -4780,22 +5009,26 @@ static void publishing_rest_support_upload_transaction_class_init (PublishingRES
((PublishingRESTSupportTransactionClass *) klass)->add_header = (void (*) (PublishingRESTSupportTransaction *, const gchar*, const gchar*)) publishing_rest_support_upload_transaction_real_add_header;
#line 454 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*) (PublishingRESTSupportTransaction *, GError**)) publishing_rest_support_upload_transaction_real_execute;
-#line 4776 "RESTSupport.c"
+#line 5005 "RESTSupport.c"
}
-static void publishing_rest_support_upload_transaction_instance_init (PublishingRESTSupportUploadTransaction * self) {
+static void
+publishing_rest_support_upload_transaction_instance_init (PublishingRESTSupportUploadTransaction * self)
+{
#line 455 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->binary_disposition_table = NULL;
#line 456 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->publishable = NULL;
#line 458 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->message_headers = NULL;
-#line 4787 "RESTSupport.c"
+#line 5018 "RESTSupport.c"
}
-static void publishing_rest_support_upload_transaction_finalize (PublishingRESTSupportTransaction * obj) {
+static void
+publishing_rest_support_upload_transaction_finalize (PublishingRESTSupportTransaction * obj)
+{
PublishingRESTSupportUploadTransaction * self;
#line 454 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction);
@@ -4809,11 +5042,13 @@ static void publishing_rest_support_upload_transaction_finalize (PublishingRESTS
_g_object_unref0 (self->message_headers);
#line 454 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_rest_support_upload_transaction_parent_class)->finalize (obj);
-#line 4805 "RESTSupport.c"
+#line 5038 "RESTSupport.c"
}
-GType publishing_rest_support_upload_transaction_get_type (void) {
+GType
+publishing_rest_support_upload_transaction_get_type (void)
+{
static volatile gsize publishing_rest_support_upload_transaction_type_id__volatile = 0;
if (g_once_init_enter (&publishing_rest_support_upload_transaction_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingRESTSupportUploadTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_rest_support_upload_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingRESTSupportUploadTransaction), 0, (GInstanceInitFunc) publishing_rest_support_upload_transaction_instance_init, NULL };
@@ -4825,29 +5060,33 @@ GType publishing_rest_support_upload_transaction_get_type (void) {
}
-static PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_construct (GType object_type, xmlDoc* doc) {
+static PublishingRESTSupportXmlDocument*
+publishing_rest_support_xml_document_construct (GType object_type,
+ xmlDoc* doc)
+{
PublishingRESTSupportXmlDocument* self = NULL;
- xmlDoc* _tmp0_;
#line 562 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = (PublishingRESTSupportXmlDocument*) g_type_create_instance (object_type);
#line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = doc;
-#line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->priv->document = _tmp0_;
+ self->priv->document = doc;
#line 562 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 4832 "RESTSupport.c"
+#line 5067 "RESTSupport.c"
}
-static PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_new (xmlDoc* doc) {
+static PublishingRESTSupportXmlDocument*
+publishing_rest_support_xml_document_new (xmlDoc* doc)
+{
#line 562 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return publishing_rest_support_xml_document_construct (PUBLISHING_REST_SUPPORT_TYPE_XML_DOCUMENT, doc);
-#line 4839 "RESTSupport.c"
+#line 5076 "RESTSupport.c"
}
-xmlNode* publishing_rest_support_xml_document_get_root_node (PublishingRESTSupportXmlDocument* self) {
+xmlNode*
+publishing_rest_support_xml_document_get_root_node (PublishingRESTSupportXmlDocument* self)
+{
xmlNode* result = NULL;
xmlDoc* _tmp0_;
xmlNode* _tmp1_;
@@ -4861,96 +5100,92 @@ xmlNode* publishing_rest_support_xml_document_get_root_node (PublishingRESTSuppo
result = _tmp1_;
#line 571 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 4857 "RESTSupport.c"
+#line 5096 "RESTSupport.c"
}
-xmlNode* publishing_rest_support_xml_document_get_named_child (PublishingRESTSupportXmlDocument* self, xmlNode* parent, const gchar* child_name, GError** error) {
+xmlNode*
+publishing_rest_support_xml_document_get_named_child (PublishingRESTSupportXmlDocument* self,
+ xmlNode* parent,
+ const gchar* child_name,
+ GError** error)
+{
xmlNode* result = NULL;
xmlNode* doc_node_iter = NULL;
xmlNode* _tmp0_;
- xmlNode* _tmp1_;
- const gchar* _tmp10_;
- GError* _tmp11_;
+ GError* _tmp8_;
GError * _inner_error_ = NULL;
#line 574 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_XML_DOCUMENT (self), NULL);
#line 574 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (child_name != NULL, NULL);
#line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = parent;
+ _tmp0_ = parent->children;
#line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = _tmp0_->children;
-#line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- doc_node_iter = _tmp1_;
-#line 4879 "RESTSupport.c"
+ doc_node_iter = _tmp0_;
+#line 5119 "RESTSupport.c"
{
- gboolean _tmp2_ = FALSE;
+ gboolean _tmp1_ = FALSE;
#line 578 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = TRUE;
+ _tmp1_ = TRUE;
#line 578 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
while (TRUE) {
-#line 4886 "RESTSupport.c"
+#line 5126 "RESTSupport.c"
+ xmlNode* _tmp4_;
xmlNode* _tmp5_;
- xmlNode* _tmp6_;
- const gchar* _tmp7_;
- const gchar* _tmp8_;
+ const gchar* _tmp6_;
#line 578 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (!_tmp2_) {
-#line 4893 "RESTSupport.c"
+ if (!_tmp1_) {
+#line 5132 "RESTSupport.c"
+ xmlNode* _tmp2_;
xmlNode* _tmp3_;
- xmlNode* _tmp4_;
#line 578 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = doc_node_iter;
+ _tmp2_ = doc_node_iter;
#line 578 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp4_ = _tmp3_->next;
+ _tmp3_ = _tmp2_->next;
#line 578 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- doc_node_iter = _tmp4_;
-#line 4902 "RESTSupport.c"
+ doc_node_iter = _tmp3_;
+#line 5141 "RESTSupport.c"
}
#line 578 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = FALSE;
+ _tmp1_ = FALSE;
#line 578 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp5_ = doc_node_iter;
+ _tmp4_ = doc_node_iter;
#line 578 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (!(_tmp5_ != NULL)) {
+ if (!(_tmp4_ != NULL)) {
#line 578 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
break;
-#line 4912 "RESTSupport.c"
+#line 5151 "RESTSupport.c"
}
#line 579 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp6_ = doc_node_iter;
-#line 579 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp7_ = _tmp6_->name;
+ _tmp5_ = doc_node_iter;
#line 579 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp8_ = child_name;
+ _tmp6_ = _tmp5_->name;
#line 579 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (g_strcmp0 (_tmp7_, _tmp8_) == 0) {
-#line 4922 "RESTSupport.c"
- xmlNode* _tmp9_;
+ if (g_strcmp0 (_tmp6_, child_name) == 0) {
+#line 5159 "RESTSupport.c"
+ xmlNode* _tmp7_;
#line 580 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp9_ = doc_node_iter;
+ _tmp7_ = doc_node_iter;
#line 580 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- result = _tmp9_;
+ result = _tmp7_;
#line 580 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 4930 "RESTSupport.c"
+#line 5167 "RESTSupport.c"
}
}
}
#line 583 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp10_ = child_name;
+ _tmp8_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Can't find XML node %s", child_name);
#line 583 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp11_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Can't find XML node %s", _tmp10_);
-#line 583 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _inner_error_ = _tmp11_;
+ _inner_error_ = _tmp8_;
#line 583 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
#line 583 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_propagate_error (error, _inner_error_);
#line 583 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 4946 "RESTSupport.c"
+#line 5181 "RESTSupport.c"
} else {
#line 583 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4958,50 +5193,43 @@ xmlNode* publishing_rest_support_xml_document_get_named_child (PublishingRESTSup
g_clear_error (&_inner_error_);
#line 583 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 4954 "RESTSupport.c"
+#line 5189 "RESTSupport.c"
}
}
-gchar* publishing_rest_support_xml_document_get_property_value (PublishingRESTSupportXmlDocument* self, xmlNode* node, const gchar* property_key, GError** error) {
+gchar*
+publishing_rest_support_xml_document_get_property_value (PublishingRESTSupportXmlDocument* self,
+ xmlNode* node,
+ const gchar* property_key,
+ GError** error)
+{
gchar* result = NULL;
gchar* value_string = NULL;
- xmlNode* _tmp0_;
+ gchar* _tmp0_;
const gchar* _tmp1_;
- gchar* _tmp2_;
- const gchar* _tmp3_;
GError * _inner_error_ = NULL;
#line 587 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_XML_DOCUMENT (self), NULL);
#line 587 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (property_key != NULL, NULL);
#line 589 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = node;
-#line 589 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = property_key;
-#line 589 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = (gchar*) xmlGetProp (_tmp0_, (xmlChar*) _tmp1_);
+ _tmp0_ = (gchar*) xmlGetProp (node, (xmlChar*) property_key);
#line 589 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- value_string = _tmp2_;
+ value_string = _tmp0_;
#line 590 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = value_string;
+ _tmp1_ = value_string;
#line 590 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp3_ == NULL) {
-#line 4983 "RESTSupport.c"
- const gchar* _tmp4_;
- xmlNode* _tmp5_;
- const gchar* _tmp6_;
- GError* _tmp7_;
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp4_ = property_key;
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp5_ = node;
+ if (_tmp1_ == NULL) {
+#line 5217 "RESTSupport.c"
+ const gchar* _tmp2_;
+ GError* _tmp3_;
#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp6_ = _tmp5_->name;
+ _tmp2_ = node->name;
#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp7_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Can't find XML " "property %s on node %s", _tmp4_, _tmp6_);
+ _tmp3_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Can't find XML " "property %s on node %s", property_key, _tmp2_);
#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _inner_error_ = _tmp7_;
+ _inner_error_ = _tmp3_;
#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -5010,7 +5238,7 @@ gchar* publishing_rest_support_xml_document_get_property_value (PublishingRESTSu
_g_free0 (value_string);
#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 5006 "RESTSupport.c"
+#line 5234 "RESTSupport.c"
} else {
#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (value_string);
@@ -5020,130 +5248,127 @@ gchar* publishing_rest_support_xml_document_get_property_value (PublishingRESTSu
g_clear_error (&_inner_error_);
#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 5016 "RESTSupport.c"
+#line 5244 "RESTSupport.c"
}
}
#line 594 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = value_string;
#line 594 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 5023 "RESTSupport.c"
+#line 5251 "RESTSupport.c"
}
-static gchar* string_chug (const gchar* self) {
+static gchar*
+string_chug (const gchar* self)
+{
gchar* result = NULL;
gchar* _result_ = NULL;
gchar* _tmp0_;
const gchar* _tmp1_;
-#line 1226 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1240 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1227 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1241 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp0_ = g_strdup (self);
-#line 1227 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1241 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_result_ = _tmp0_;
-#line 1228 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1242 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp1_ = _result_;
-#line 1228 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1242 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_strchug (_tmp1_);
-#line 1229 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1243 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
result = _result_;
-#line 1229 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1243 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 5046 "RESTSupport.c"
+#line 5276 "RESTSupport.c"
}
-static gchar* string_chomp (const gchar* self) {
+static gchar*
+string_chomp (const gchar* self)
+{
gchar* result = NULL;
gchar* _result_ = NULL;
gchar* _tmp0_;
const gchar* _tmp1_;
-#line 1218 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1232 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1219 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1233 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp0_ = g_strdup (self);
-#line 1219 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1233 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_result_ = _tmp0_;
-#line 1220 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1234 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp1_ = _result_;
-#line 1220 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1234 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_strchomp (_tmp1_);
-#line 1221 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1235 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
result = _result_;
-#line 1221 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1235 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 5069 "RESTSupport.c"
+#line 5301 "RESTSupport.c"
}
-PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_string (const gchar* input_string, PublishingRESTSupportXmlDocumentCheckForErrorResponse check_for_error_response, void* check_for_error_response_target, GError** error) {
+PublishingRESTSupportXmlDocument*
+publishing_rest_support_xml_document_parse_string (const gchar* input_string,
+ PublishingRESTSupportXmlDocumentCheckForErrorResponse check_for_error_response,
+ void* check_for_error_response_target,
+ GError** error)
+{
PublishingRESTSupportXmlDocument* result = NULL;
gboolean _tmp0_ = FALSE;
- const gchar* _tmp1_;
- gboolean _tmp6_ = FALSE;
- const gchar* _tmp7_;
+ gboolean _tmp4_ = FALSE;
+ gchar* _tmp5_;
+ gchar* _tmp6_;
+ gchar* _tmp7_;
gchar* _tmp8_;
- gchar* _tmp9_;
- gchar* _tmp10_;
- gchar* _tmp11_;
- gboolean _tmp12_;
- gboolean _tmp13_;
+ gboolean _tmp9_;
xmlDoc* doc = NULL;
- const gchar* _tmp21_;
- const gchar* _tmp22_;
- gint _tmp23_;
- gint _tmp24_;
- xmlDoc* _tmp25_;
- xmlDoc* _tmp26_;
- xmlDoc* _tmp28_;
- xmlNode* _tmp29_;
+ gint _tmp15_;
+ gint _tmp16_;
+ xmlDoc* _tmp17_;
+ xmlDoc* _tmp18_;
+ xmlDoc* _tmp20_;
+ xmlNode* _tmp21_;
PublishingRESTSupportXmlDocument* rest_doc = NULL;
- xmlDoc* _tmp31_;
- PublishingRESTSupportXmlDocument* _tmp32_;
+ xmlDoc* _tmp23_;
+ PublishingRESTSupportXmlDocument* _tmp24_;
gchar* _result_ = NULL;
- PublishingRESTSupportXmlDocumentCheckForErrorResponse _tmp33_;
- void* _tmp33__target;
- PublishingRESTSupportXmlDocument* _tmp34_;
- gchar* _tmp35_;
- const gchar* _tmp36_;
+ PublishingRESTSupportXmlDocument* _tmp25_;
+ gchar* _tmp26_;
+ const gchar* _tmp27_;
GError * _inner_error_ = NULL;
#line 599 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = input_string;
-#line 599 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp1_ == NULL) {
+ if (input_string == NULL) {
#line 599 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = TRUE;
-#line 5110 "RESTSupport.c"
+#line 5338 "RESTSupport.c"
} else {
- const gchar* _tmp2_;
- gint _tmp3_;
- gint _tmp4_;
+ gint _tmp1_;
+ gint _tmp2_;
#line 599 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = input_string;
+ _tmp1_ = strlen (input_string);
#line 599 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = strlen (_tmp2_);
-#line 599 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp4_ = _tmp3_;
+ _tmp2_ = _tmp1_;
#line 599 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = _tmp4_ == 0;
-#line 5123 "RESTSupport.c"
+ _tmp0_ = _tmp2_ == 0;
+#line 5348 "RESTSupport.c"
}
#line 599 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp0_) {
-#line 5127 "RESTSupport.c"
- GError* _tmp5_;
+#line 5352 "RESTSupport.c"
+ GError* _tmp3_;
#line 600 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp5_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Empty XML string");
+ _tmp3_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Empty XML string");
#line 600 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _inner_error_ = _tmp5_;
+ _inner_error_ = _tmp3_;
#line 600 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
#line 600 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_propagate_error (error, _inner_error_);
#line 600 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 5139 "RESTSupport.c"
+#line 5364 "RESTSupport.c"
} else {
#line 600 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5151,74 +5376,64 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
g_clear_error (&_inner_error_);
#line 600 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 5147 "RESTSupport.c"
+#line 5372 "RESTSupport.c"
}
}
#line 603 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp7_ = input_string;
-#line 603 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp8_ = string_chug (_tmp7_);
-#line 603 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp9_ = _tmp8_;
+ _tmp5_ = string_chug (input_string);
#line 603 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp10_ = string_chomp (_tmp9_);
+ _tmp6_ = _tmp5_;
#line 603 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp11_ = _tmp10_;
+ _tmp7_ = string_chomp (_tmp6_);
#line 603 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp12_ = g_str_has_prefix (_tmp11_, "<");
+ _tmp8_ = _tmp7_;
#line 603 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp13_ = !_tmp12_;
+ _tmp9_ = !g_str_has_prefix (_tmp8_, "<");
#line 603 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp11_);
+ _g_free0 (_tmp8_);
#line 603 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp9_);
+ _g_free0 (_tmp6_);
#line 603 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp13_) {
+ if (_tmp9_) {
#line 603 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp6_ = TRUE;
-#line 5172 "RESTSupport.c"
+ _tmp4_ = TRUE;
+#line 5393 "RESTSupport.c"
} else {
- const gchar* _tmp14_;
- gchar* _tmp15_;
- gchar* _tmp16_;
- gchar* _tmp17_;
- gchar* _tmp18_;
- gboolean _tmp19_;
+ gchar* _tmp10_;
+ gchar* _tmp11_;
+ gchar* _tmp12_;
+ gchar* _tmp13_;
#line 604 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp14_ = input_string;
+ _tmp10_ = string_chug (input_string);
#line 604 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp15_ = string_chug (_tmp14_);
+ _tmp11_ = _tmp10_;
#line 604 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp16_ = _tmp15_;
+ _tmp12_ = string_chomp (_tmp11_);
#line 604 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp17_ = string_chomp (_tmp16_);
-#line 604 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp18_ = _tmp17_;
-#line 604 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp19_ = g_str_has_suffix (_tmp18_, ">");
+ _tmp13_ = _tmp12_;
#line 604 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp6_ = !_tmp19_;
+ _tmp4_ = !g_str_has_suffix (_tmp13_, ">");
#line 604 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp18_);
+ _g_free0 (_tmp13_);
#line 604 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp16_);
-#line 5198 "RESTSupport.c"
+ _g_free0 (_tmp11_);
+#line 5413 "RESTSupport.c"
}
#line 603 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp6_) {
-#line 5202 "RESTSupport.c"
- GError* _tmp20_;
+ if (_tmp4_) {
+#line 5417 "RESTSupport.c"
+ GError* _tmp14_;
#line 606 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp20_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Unable to parse XML " "document");
+ _tmp14_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Unable to parse XML " "document");
#line 606 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _inner_error_ = _tmp20_;
+ _inner_error_ = _tmp14_;
#line 606 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
#line 606 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_propagate_error (error, _inner_error_);
#line 606 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 5214 "RESTSupport.c"
+#line 5429 "RESTSupport.c"
} else {
#line 606 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5226,38 +5441,34 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
g_clear_error (&_inner_error_);
#line 606 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 5222 "RESTSupport.c"
+#line 5437 "RESTSupport.c"
}
}
#line 612 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp21_ = input_string;
+ _tmp15_ = strlen (input_string);
#line 612 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp22_ = input_string;
+ _tmp16_ = _tmp15_;
#line 612 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp23_ = strlen (_tmp22_);
+ _tmp17_ = xmlReadMemory (input_string, (gint) _tmp16_, NULL, NULL, (gint) (XML_PARSE_NOBLANKS | XML_PARSE_RECOVER));
#line 612 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp24_ = _tmp23_;
-#line 612 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp25_ = xmlReadMemory (_tmp21_, (gint) _tmp24_, NULL, NULL, (gint) (XML_PARSE_NOBLANKS | XML_PARSE_RECOVER));
-#line 612 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- doc = _tmp25_;
+ doc = _tmp17_;
#line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp26_ = doc;
+ _tmp18_ = doc;
#line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp26_ == NULL) {
-#line 5241 "RESTSupport.c"
- GError* _tmp27_;
+ if (_tmp18_ == NULL) {
+#line 5452 "RESTSupport.c"
+ GError* _tmp19_;
#line 615 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp27_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Unable to parse XML " "document");
+ _tmp19_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Unable to parse XML " "document");
#line 615 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _inner_error_ = _tmp27_;
+ _inner_error_ = _tmp19_;
#line 615 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
#line 615 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_propagate_error (error, _inner_error_);
#line 615 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 5253 "RESTSupport.c"
+#line 5464 "RESTSupport.c"
} else {
#line 615 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5265,28 +5476,28 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
g_clear_error (&_inner_error_);
#line 615 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 5261 "RESTSupport.c"
+#line 5472 "RESTSupport.c"
}
}
#line 620 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp28_ = doc;
+ _tmp20_ = doc;
#line 620 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp29_ = _tmp28_->children;
+ _tmp21_ = _tmp20_->children;
#line 620 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp29_ == NULL) {
-#line 5270 "RESTSupport.c"
- GError* _tmp30_;
+ if (_tmp21_ == NULL) {
+#line 5481 "RESTSupport.c"
+ GError* _tmp22_;
#line 621 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp30_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Unable to parse XML " "document");
+ _tmp22_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Unable to parse XML " "document");
#line 621 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _inner_error_ = _tmp30_;
+ _inner_error_ = _tmp22_;
#line 621 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
#line 621 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_propagate_error (error, _inner_error_);
#line 621 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 5282 "RESTSupport.c"
+#line 5493 "RESTSupport.c"
} else {
#line 621 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5294,38 +5505,34 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
g_clear_error (&_inner_error_);
#line 621 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 5290 "RESTSupport.c"
+#line 5501 "RESTSupport.c"
}
}
#line 625 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp31_ = doc;
+ _tmp23_ = doc;
#line 625 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp32_ = publishing_rest_support_xml_document_new (_tmp31_);
+ _tmp24_ = publishing_rest_support_xml_document_new (_tmp23_);
#line 625 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- rest_doc = _tmp32_;
-#line 627 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp33_ = check_for_error_response;
+ rest_doc = _tmp24_;
#line 627 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp33__target = check_for_error_response_target;
+ _tmp25_ = rest_doc;
#line 627 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp34_ = rest_doc;
+ _tmp26_ = check_for_error_response (_tmp25_, check_for_error_response_target);
#line 627 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp35_ = _tmp33_ (_tmp34_, _tmp33__target);
-#line 627 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _result_ = _tmp35_;
+ _result_ = _tmp26_;
#line 628 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp36_ = _result_;
+ _tmp27_ = _result_;
#line 628 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp36_ != NULL) {
-#line 5313 "RESTSupport.c"
- const gchar* _tmp37_;
- GError* _tmp38_;
+ if (_tmp27_ != NULL) {
+#line 5520 "RESTSupport.c"
+ const gchar* _tmp28_;
+ GError* _tmp29_;
#line 629 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp37_ = _result_;
+ _tmp28_ = _result_;
#line 629 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp38_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_SERVICE_ERROR, "%s", _tmp37_);
+ _tmp29_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_SERVICE_ERROR, "%s", _tmp28_);
#line 629 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _inner_error_ = _tmp38_;
+ _inner_error_ = _tmp29_;
#line 629 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
#line 629 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -5336,7 +5543,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
_publishing_rest_support_xml_document_unref0 (rest_doc);
#line 629 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 5332 "RESTSupport.c"
+#line 5539 "RESTSupport.c"
} else {
#line 629 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_result_);
@@ -5348,7 +5555,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
g_clear_error (&_inner_error_);
#line 629 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 5344 "RESTSupport.c"
+#line 5551 "RESTSupport.c"
}
}
#line 631 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -5357,108 +5564,133 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
_g_free0 (_result_);
#line 631 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 5353 "RESTSupport.c"
+#line 5560 "RESTSupport.c"
}
-static void publishing_rest_support_value_xml_document_init (GValue* value) {
+static void
+publishing_rest_support_value_xml_document_init (GValue* value)
+{
#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 5360 "RESTSupport.c"
+#line 5569 "RESTSupport.c"
}
-static void publishing_rest_support_value_xml_document_free_value (GValue* value) {
+static void
+publishing_rest_support_value_xml_document_free_value (GValue* value)
+{
#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (value->data[0].v_pointer) {
#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_xml_document_unref (value->data[0].v_pointer);
-#line 5369 "RESTSupport.c"
+#line 5580 "RESTSupport.c"
}
}
-static void publishing_rest_support_value_xml_document_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+publishing_rest_support_value_xml_document_copy_value (const GValue* src_value,
+ GValue* dest_value)
+{
#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (src_value->data[0].v_pointer) {
#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
dest_value->data[0].v_pointer = publishing_rest_support_xml_document_ref (src_value->data[0].v_pointer);
-#line 5379 "RESTSupport.c"
+#line 5593 "RESTSupport.c"
} else {
#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
dest_value->data[0].v_pointer = NULL;
-#line 5383 "RESTSupport.c"
+#line 5597 "RESTSupport.c"
}
}
-static gpointer publishing_rest_support_value_xml_document_peek_pointer (const GValue* value) {
+static gpointer
+publishing_rest_support_value_xml_document_peek_pointer (const GValue* value)
+{
#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return value->data[0].v_pointer;
-#line 5391 "RESTSupport.c"
+#line 5607 "RESTSupport.c"
}
-static gchar* publishing_rest_support_value_xml_document_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_rest_support_value_xml_document_collect_value (GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (collect_values[0].v_pointer) {
-#line 5398 "RESTSupport.c"
+#line 5619 "RESTSupport.c"
PublishingRESTSupportXmlDocument * object;
object = collect_values[0].v_pointer;
#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (object->parent_instance.g_class == NULL) {
#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 5405 "RESTSupport.c"
+#line 5626 "RESTSupport.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 5409 "RESTSupport.c"
+#line 5630 "RESTSupport.c"
}
#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = publishing_rest_support_xml_document_ref (object);
-#line 5413 "RESTSupport.c"
+#line 5634 "RESTSupport.c"
} else {
#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 5417 "RESTSupport.c"
+#line 5638 "RESTSupport.c"
}
#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 5421 "RESTSupport.c"
+#line 5642 "RESTSupport.c"
}
-static gchar* publishing_rest_support_value_xml_document_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_rest_support_value_xml_document_lcopy_value (const GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
PublishingRESTSupportXmlDocument ** object_p;
object_p = collect_values[0].v_pointer;
#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (!object_p) {
#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 5432 "RESTSupport.c"
+#line 5658 "RESTSupport.c"
}
#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (!value->data[0].v_pointer) {
#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*object_p = NULL;
-#line 5438 "RESTSupport.c"
+#line 5664 "RESTSupport.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*object_p = value->data[0].v_pointer;
-#line 5442 "RESTSupport.c"
+#line 5668 "RESTSupport.c"
} else {
#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*object_p = publishing_rest_support_xml_document_ref (value->data[0].v_pointer);
-#line 5446 "RESTSupport.c"
+#line 5672 "RESTSupport.c"
}
#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 5450 "RESTSupport.c"
+#line 5676 "RESTSupport.c"
}
-GParamSpec* publishing_rest_support_param_spec_xml_document (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+publishing_rest_support_param_spec_xml_document (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags)
+{
PublishingRESTSupportParamSpecXmlDocument* spec;
#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_REST_SUPPORT_TYPE_XML_DOCUMENT), NULL);
@@ -5468,20 +5700,25 @@ GParamSpec* publishing_rest_support_param_spec_xml_document (const gchar* name,
G_PARAM_SPEC (spec)->value_type = object_type;
#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return G_PARAM_SPEC (spec);
-#line 5464 "RESTSupport.c"
+#line 5696 "RESTSupport.c"
}
-gpointer publishing_rest_support_value_get_xml_document (const GValue* value) {
+gpointer
+publishing_rest_support_value_get_xml_document (const GValue* value)
+{
#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_XML_DOCUMENT), NULL);
#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return value->data[0].v_pointer;
-#line 5473 "RESTSupport.c"
+#line 5707 "RESTSupport.c"
}
-void publishing_rest_support_value_set_xml_document (GValue* value, gpointer v_object) {
+void
+publishing_rest_support_value_set_xml_document (GValue* value,
+ gpointer v_object)
+{
PublishingRESTSupportXmlDocument * old;
#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_XML_DOCUMENT));
@@ -5497,22 +5734,25 @@ void publishing_rest_support_value_set_xml_document (GValue* value, gpointer v_o
value->data[0].v_pointer = v_object;
#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_xml_document_ref (value->data[0].v_pointer);
-#line 5493 "RESTSupport.c"
+#line 5730 "RESTSupport.c"
} else {
#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 5497 "RESTSupport.c"
+#line 5734 "RESTSupport.c"
}
#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (old) {
#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_xml_document_unref (old);
-#line 5503 "RESTSupport.c"
+#line 5740 "RESTSupport.c"
}
}
-void publishing_rest_support_value_take_xml_document (GValue* value, gpointer v_object) {
+void
+publishing_rest_support_value_take_xml_document (GValue* value,
+ gpointer v_object)
+{
PublishingRESTSupportXmlDocument * old;
#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_XML_DOCUMENT));
@@ -5526,42 +5766,48 @@ void publishing_rest_support_value_take_xml_document (GValue* value, gpointer v_
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = v_object;
-#line 5522 "RESTSupport.c"
+#line 5762 "RESTSupport.c"
} else {
#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 5526 "RESTSupport.c"
+#line 5766 "RESTSupport.c"
}
#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (old) {
#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_xml_document_unref (old);
-#line 5532 "RESTSupport.c"
+#line 5772 "RESTSupport.c"
}
}
-static void publishing_rest_support_xml_document_class_init (PublishingRESTSupportXmlDocumentClass * klass) {
+static void
+publishing_rest_support_xml_document_class_init (PublishingRESTSupportXmlDocumentClass * klass)
+{
#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_xml_document_parent_class = g_type_class_peek_parent (klass);
#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
((PublishingRESTSupportXmlDocumentClass *) klass)->finalize = publishing_rest_support_xml_document_finalize;
#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_type_class_add_private (klass, sizeof (PublishingRESTSupportXmlDocumentPrivate));
-#line 5544 "RESTSupport.c"
+#line 5786 "RESTSupport.c"
}
-static void publishing_rest_support_xml_document_instance_init (PublishingRESTSupportXmlDocument * self) {
+static void
+publishing_rest_support_xml_document_instance_init (PublishingRESTSupportXmlDocument * self)
+{
#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv = PUBLISHING_REST_SUPPORT_XML_DOCUMENT_GET_PRIVATE (self);
#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->ref_count = 1;
-#line 5553 "RESTSupport.c"
+#line 5797 "RESTSupport.c"
}
-static void publishing_rest_support_xml_document_finalize (PublishingRESTSupportXmlDocument * obj) {
+static void
+publishing_rest_support_xml_document_finalize (PublishingRESTSupportXmlDocument * obj)
+{
PublishingRESTSupportXmlDocument * self;
xmlDoc* _tmp0_;
#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -5572,11 +5818,13 @@ static void publishing_rest_support_xml_document_finalize (PublishingRESTSupport
_tmp0_ = self->priv->document;
#line 567 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
xmlFreeDoc (_tmp0_);
-#line 5568 "RESTSupport.c"
+#line 5814 "RESTSupport.c"
}
-GType publishing_rest_support_xml_document_get_type (void) {
+GType
+publishing_rest_support_xml_document_get_type (void)
+{
static volatile gsize publishing_rest_support_xml_document_type_id__volatile = 0;
if (g_once_init_enter (&publishing_rest_support_xml_document_type_id__volatile)) {
static const GTypeValueTable g_define_type_value_table = { publishing_rest_support_value_xml_document_init, publishing_rest_support_value_xml_document_free_value, publishing_rest_support_value_xml_document_copy_value, publishing_rest_support_value_xml_document_peek_pointer, "p", publishing_rest_support_value_xml_document_collect_value, "p", publishing_rest_support_value_xml_document_lcopy_value };
@@ -5590,18 +5838,22 @@ GType publishing_rest_support_xml_document_get_type (void) {
}
-gpointer publishing_rest_support_xml_document_ref (gpointer instance) {
+gpointer
+publishing_rest_support_xml_document_ref (gpointer instance)
+{
PublishingRESTSupportXmlDocument * self;
self = instance;
#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_atomic_int_inc (&self->ref_count);
#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return instance;
-#line 5593 "RESTSupport.c"
+#line 5843 "RESTSupport.c"
}
-void publishing_rest_support_xml_document_unref (gpointer instance) {
+void
+publishing_rest_support_xml_document_unref (gpointer instance)
+{
PublishingRESTSupportXmlDocument * self;
self = instance;
#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -5610,21 +5862,22 @@ void publishing_rest_support_xml_document_unref (gpointer instance) {
PUBLISHING_REST_SUPPORT_XML_DOCUMENT_GET_CLASS (self)->finalize (self);
#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 5606 "RESTSupport.c"
+#line 5858 "RESTSupport.c"
}
}
-gchar* publishing_rest_support_decimal_entity_encode (const gchar* source) {
+gchar*
+publishing_rest_support_decimal_entity_encode (const gchar* source)
+{
gchar* result = NULL;
GString* encoded_str_builder = NULL;
GString* _tmp0_;
gchar* current_char = NULL;
- const gchar* _tmp1_;
- gchar* _tmp2_;
- GString* _tmp23_;
- const gchar* _tmp24_;
- gchar* _tmp25_;
+ gchar* _tmp1_;
+ GString* _tmp20_;
+ const gchar* _tmp21_;
+ gchar* _tmp22_;
#line 640 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (source != NULL, NULL);
#line 641 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -5632,218 +5885,216 @@ gchar* publishing_rest_support_decimal_entity_encode (const gchar* source) {
#line 641 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
encoded_str_builder = _tmp0_;
#line 642 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = source;
+ _tmp1_ = g_strdup (source);
#line 642 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = g_strdup (_tmp1_);
-#line 642 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- current_char = _tmp2_;
+ current_char = _tmp1_;
#line 643 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
while (TRUE) {
-#line 5635 "RESTSupport.c"
+#line 5886 "RESTSupport.c"
gint current_char_value = 0;
- const gchar* _tmp3_;
- gunichar _tmp4_;
- gint _tmp5_;
+ const gchar* _tmp2_;
+ gint _tmp3_;
+ gboolean _tmp4_ = FALSE;
+ gboolean _tmp5_ = FALSE;
gboolean _tmp6_ = FALSE;
- gboolean _tmp7_ = FALSE;
- gboolean _tmp8_ = FALSE;
- gint _tmp9_;
- const gchar* _tmp20_;
- const gchar* _tmp21_;
- gchar* _tmp22_;
-#line 644 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = current_char;
+ gint _tmp7_;
+ const gchar* _tmp17_;
+ const gchar* _tmp18_;
+ gchar* _tmp19_;
#line 644 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp4_ = g_utf8_get_char_validated (_tmp3_, (gssize) -1);
+ _tmp2_ = current_char;
#line 644 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- current_char_value = (gint) _tmp4_;
+ current_char_value = (gint) g_utf8_get_char_validated (_tmp2_, (gssize) -1);
#line 647 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp5_ = current_char_value;
+ _tmp3_ = current_char_value;
#line 647 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp5_ < 1) {
+ if (_tmp3_ < 1) {
#line 648 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
break;
-#line 5659 "RESTSupport.c"
+#line 5907 "RESTSupport.c"
}
#line 652 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp9_ = current_char_value;
+ _tmp7_ = current_char_value;
#line 652 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp9_ < 128) {
-#line 5665 "RESTSupport.c"
- gint _tmp10_;
+ if (_tmp7_ < 128) {
+#line 5913 "RESTSupport.c"
+ gint _tmp8_;
#line 652 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp10_ = current_char_value;
+ _tmp8_ = current_char_value;
#line 652 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp8_ = _tmp10_ != ((gint) '&');
-#line 5671 "RESTSupport.c"
+ _tmp6_ = _tmp8_ != ((gint) '&');
+#line 5919 "RESTSupport.c"
} else {
#line 652 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp8_ = FALSE;
-#line 5675 "RESTSupport.c"
+ _tmp6_ = FALSE;
+#line 5923 "RESTSupport.c"
}
#line 652 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp8_) {
-#line 5679 "RESTSupport.c"
- gint _tmp11_;
+ if (_tmp6_) {
+#line 5927 "RESTSupport.c"
+ gint _tmp9_;
#line 652 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp11_ = current_char_value;
+ _tmp9_ = current_char_value;
#line 652 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp7_ = _tmp11_ != ((gint) '<');
-#line 5685 "RESTSupport.c"
+ _tmp5_ = _tmp9_ != ((gint) '<');
+#line 5933 "RESTSupport.c"
} else {
#line 652 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp7_ = FALSE;
-#line 5689 "RESTSupport.c"
+ _tmp5_ = FALSE;
+#line 5937 "RESTSupport.c"
}
#line 652 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp7_) {
-#line 5693 "RESTSupport.c"
- gint _tmp12_;
+ if (_tmp5_) {
+#line 5941 "RESTSupport.c"
+ gint _tmp10_;
#line 653 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp12_ = current_char_value;
+ _tmp10_ = current_char_value;
#line 653 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp6_ = _tmp12_ != ((gint) '>');
-#line 5699 "RESTSupport.c"
+ _tmp4_ = _tmp10_ != ((gint) '>');
+#line 5947 "RESTSupport.c"
} else {
#line 652 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp6_ = FALSE;
-#line 5703 "RESTSupport.c"
+ _tmp4_ = FALSE;
+#line 5951 "RESTSupport.c"
}
#line 652 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp6_) {
-#line 5707 "RESTSupport.c"
- GString* _tmp13_;
- const gchar* _tmp14_;
- gunichar _tmp15_;
+ if (_tmp4_) {
+#line 5955 "RESTSupport.c"
+ GString* _tmp11_;
+ const gchar* _tmp12_;
#line 654 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp13_ = encoded_str_builder;
-#line 654 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp14_ = current_char;
+ _tmp11_ = encoded_str_builder;
#line 654 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp15_ = g_utf8_get_char_validated (_tmp14_, (gssize) -1);
+ _tmp12_ = current_char;
#line 654 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_string_append_unichar (_tmp13_, _tmp15_);
-#line 5719 "RESTSupport.c"
+ g_string_append_unichar (_tmp11_, g_utf8_get_char_validated (_tmp12_, (gssize) -1));
+#line 5964 "RESTSupport.c"
} else {
- GString* _tmp16_;
- gint _tmp17_;
- gchar* _tmp18_;
- gchar* _tmp19_;
+ GString* _tmp13_;
+ gint _tmp14_;
+ gchar* _tmp15_;
+ gchar* _tmp16_;
#line 656 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp16_ = encoded_str_builder;
+ _tmp13_ = encoded_str_builder;
#line 656 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp17_ = current_char_value;
+ _tmp14_ = current_char_value;
#line 656 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp18_ = g_strdup_printf ("&#%d;", _tmp17_);
+ _tmp15_ = g_strdup_printf ("&#%d;", _tmp14_);
#line 656 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp19_ = _tmp18_;
+ _tmp16_ = _tmp15_;
#line 656 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_string_append (_tmp16_, _tmp19_);
+ g_string_append (_tmp13_, _tmp16_);
#line 656 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp19_);
-#line 5737 "RESTSupport.c"
+ _g_free0 (_tmp16_);
+#line 5982 "RESTSupport.c"
}
#line 658 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp20_ = current_char;
+ _tmp17_ = current_char;
#line 658 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp21_ = g_utf8_next_char (_tmp20_);
+ _tmp18_ = g_utf8_next_char (_tmp17_);
#line 658 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp22_ = g_strdup (_tmp21_);
+ _tmp19_ = g_strdup (_tmp18_);
#line 658 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (current_char);
#line 658 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- current_char = _tmp22_;
-#line 5749 "RESTSupport.c"
+ current_char = _tmp19_;
+#line 5994 "RESTSupport.c"
}
#line 661 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp23_ = encoded_str_builder;
+ _tmp20_ = encoded_str_builder;
#line 661 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp24_ = _tmp23_->str;
+ _tmp21_ = _tmp20_->str;
#line 661 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp25_ = g_strdup (_tmp24_);
+ _tmp22_ = g_strdup (_tmp21_);
#line 661 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- result = _tmp25_;
+ result = _tmp22_;
#line 661 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (current_char);
#line 661 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_string_free0 (encoded_str_builder);
#line 661 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 5765 "RESTSupport.c"
+#line 6010 "RESTSupport.c"
}
-static SpitPublishingPublishable** _vala_array_dup2 (SpitPublishingPublishable** self, int length) {
+static SpitPublishingPublishable**
+_vala_array_dup2 (SpitPublishingPublishable** self,
+ int length)
+{
SpitPublishingPublishable** result;
int i;
#line 674 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = g_new0 (SpitPublishingPublishable*, length + 1);
#line 674 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
for (i = 0; i < length; i++) {
-#line 5776 "RESTSupport.c"
+#line 6024 "RESTSupport.c"
SpitPublishingPublishable* _tmp0_;
#line 674 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = _g_object_ref0 (self[i]);
#line 674 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result[i] = _tmp0_;
-#line 5782 "RESTSupport.c"
+#line 6030 "RESTSupport.c"
}
#line 674 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 5786 "RESTSupport.c"
+#line 6034 "RESTSupport.c"
}
-PublishingRESTSupportBatchUploader* publishing_rest_support_batch_uploader_construct (GType object_type, PublishingRESTSupportSession* session, SpitPublishingPublishable** publishables, int publishables_length1) {
+PublishingRESTSupportBatchUploader*
+publishing_rest_support_batch_uploader_construct (GType object_type,
+ PublishingRESTSupportSession* session,
+ SpitPublishingPublishable** publishables,
+ int publishables_length1)
+{
PublishingRESTSupportBatchUploader* self = NULL;
SpitPublishingPublishable** _tmp0_;
gint _tmp0__length1;
- SpitPublishingPublishable** _tmp1_;
- gint _tmp1__length1;
- PublishingRESTSupportSession* _tmp2_;
- PublishingRESTSupportSession* _tmp3_;
+ PublishingRESTSupportSession* _tmp1_;
#line 673 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (session), NULL);
#line 673 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = (PublishingRESTSupportBatchUploader*) g_type_create_instance (object_type);
#line 674 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = publishables;
+ _tmp0_ = (publishables != NULL) ? _vala_array_dup2 (publishables, publishables_length1) : ((gpointer) publishables);
#line 674 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0__length1 = publishables_length1;
#line 674 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup2 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
-#line 674 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1__length1 = _tmp0__length1;
-#line 674 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->publishables = (_vala_array_free (self->priv->publishables, self->priv->publishables_length1, (GDestroyNotify) g_object_unref), NULL);
#line 674 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->priv->publishables = _tmp1_;
+ self->priv->publishables = _tmp0_;
#line 674 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->priv->publishables_length1 = _tmp1__length1;
+ self->priv->publishables_length1 = _tmp0__length1;
#line 674 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->_publishables_size_ = self->priv->publishables_length1;
#line 675 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = session;
-#line 675 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = _publishing_rest_support_session_ref0 (_tmp2_);
+ _tmp1_ = _publishing_rest_support_session_ref0 (session);
#line 675 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_publishing_rest_support_session_unref0 (self->priv->session);
#line 675 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->priv->session = _tmp3_;
+ self->priv->session = _tmp1_;
#line 673 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 5828 "RESTSupport.c"
+#line 6072 "RESTSupport.c"
}
-static void _publishing_rest_support_batch_uploader_on_chunk_transmitted_publishing_rest_support_transaction_chunk_transmitted (PublishingRESTSupportTransaction* _sender, gint bytes_written_so_far, gint total_bytes, gpointer self) {
+static void
+_publishing_rest_support_batch_uploader_on_chunk_transmitted_publishing_rest_support_transaction_chunk_transmitted (PublishingRESTSupportTransaction* _sender,
+ gint bytes_written_so_far,
+ gint total_bytes,
+ gpointer self)
+{
#line 696 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_batch_uploader_on_chunk_transmitted ((PublishingRESTSupportBatchUploader*) self, bytes_written_so_far, total_bytes);
-#line 5835 "RESTSupport.c"
+#line 6084 "RESTSupport.c"
}
-static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSupportBatchUploader* self) {
+static void
+publishing_rest_support_batch_uploader_send_files (PublishingRESTSupportBatchUploader* self)
+{
gboolean stop = FALSE;
SpitPublishingPublishable** _tmp0_;
gint _tmp0__length1;
@@ -5859,7 +6110,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
_tmp0_ = self->priv->publishables;
#line 681 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0__length1 = self->priv->publishables_length1;
-#line 5855 "RESTSupport.c"
+#line 6106 "RESTSupport.c"
{
SpitPublishingPublishable** publishable_collection = NULL;
gint publishable_collection_length1 = 0;
@@ -5871,14 +6122,14 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
publishable_collection_length1 = _tmp0__length1;
#line 681 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
for (publishable_it = 0; publishable_it < _tmp0__length1; publishable_it = publishable_it + 1) {
-#line 5867 "RESTSupport.c"
+#line 6118 "RESTSupport.c"
SpitPublishingPublishable* _tmp1_;
SpitPublishingPublishable* publishable = NULL;
#line 681 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = _g_object_ref0 (publishable_collection[publishable_it]);
#line 681 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishable = _tmp1_;
-#line 5874 "RESTSupport.c"
+#line 6125 "RESTSupport.c"
{
GFile* file = NULL;
SpitPublishingPublishable* _tmp2_;
@@ -5911,7 +6162,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
_tmp4_ = file;
#line 685 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp4_ == NULL) {
-#line 5907 "RESTSupport.c"
+#line 6158 "RESTSupport.c"
gint _tmp5_;
#line 686 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp5_ = self->priv->current_file;
@@ -5923,7 +6174,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
_g_object_unref0 (publishable);
#line 687 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
continue;
-#line 5919 "RESTSupport.c"
+#line 6170 "RESTSupport.c"
}
#line 690 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp6_ = self->priv->current_file;
@@ -5939,7 +6190,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
_tmp8__target = self->priv->status_updated_target;
#line 691 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp8_ != NULL) {
-#line 5935 "RESTSupport.c"
+#line 6186 "RESTSupport.c"
SpitPublishingProgressCallback _tmp9_;
void* _tmp9__target;
gint _tmp10_;
@@ -5954,7 +6205,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
_tmp11_ = fraction_complete;
#line 692 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp9_ (_tmp10_ + 1, _tmp11_, _tmp9__target);
-#line 5950 "RESTSupport.c"
+#line 6201 "RESTSupport.c"
}
#line 694 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp12_ = self->priv->publishables;
@@ -5972,7 +6223,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
_tmp16_ = txn;
#line 696 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_connect (_tmp16_, "chunk-transmitted", (GCallback) _publishing_rest_support_batch_uploader_on_chunk_transmitted_publishing_rest_support_transaction_chunk_transmitted, self);
-#line 5968 "RESTSupport.c"
+#line 6219 "RESTSupport.c"
{
PublishingRESTSupportTransaction* _tmp17_;
#line 699 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -5983,7 +6234,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 699 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 5979 "RESTSupport.c"
+#line 6230 "RESTSupport.c"
goto __catch3_spit_publishing_publishing_error;
}
#line 699 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -5998,7 +6249,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
g_clear_error (&_inner_error_);
#line 699 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 5994 "RESTSupport.c"
+#line 6245 "RESTSupport.c"
}
}
goto __finally3;
@@ -6018,7 +6269,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
stop = TRUE;
#line 698 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_error_free0 (err);
-#line 6014 "RESTSupport.c"
+#line 6265 "RESTSupport.c"
}
__finally3:
#line 698 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -6035,7 +6286,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
g_clear_error (&_inner_error_);
#line 698 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 6031 "RESTSupport.c"
+#line 6282 "RESTSupport.c"
}
#line 705 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp19_ = txn;
@@ -6055,7 +6306,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
_g_object_unref0 (publishable);
#line 708 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
break;
-#line 6051 "RESTSupport.c"
+#line 6302 "RESTSupport.c"
}
#line 710 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp22_ = self->priv->current_file;
@@ -6067,7 +6318,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
_g_object_unref0 (file);
#line 681 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (publishable);
-#line 6063 "RESTSupport.c"
+#line 6314 "RESTSupport.c"
}
}
}
@@ -6075,31 +6326,33 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
_tmp23_ = stop;
#line 713 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (!_tmp23_) {
-#line 6071 "RESTSupport.c"
+#line 6322 "RESTSupport.c"
gint _tmp24_;
#line 714 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp24_ = self->priv->current_file;
#line 714 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_emit (self, publishing_rest_support_batch_uploader_signals[PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_UPLOAD_COMPLETE_SIGNAL], 0, _tmp24_);
-#line 6077 "RESTSupport.c"
+#line 6328 "RESTSupport.c"
}
}
-static void publishing_rest_support_batch_uploader_on_chunk_transmitted (PublishingRESTSupportBatchUploader* self, gint bytes_written_so_far, gint total_bytes) {
+static void
+publishing_rest_support_batch_uploader_on_chunk_transmitted (PublishingRESTSupportBatchUploader* self,
+ gint bytes_written_so_far,
+ gint total_bytes)
+{
gdouble file_span = 0.0;
SpitPublishingPublishable** _tmp0_;
gint _tmp0__length1;
gdouble this_file_fraction_complete = 0.0;
- gint _tmp1_;
- gint _tmp2_;
gdouble fraction_complete = 0.0;
- gint _tmp3_;
+ gint _tmp1_;
+ gdouble _tmp2_;
+ gdouble _tmp3_;
gdouble _tmp4_;
- gdouble _tmp5_;
- gdouble _tmp6_;
- SpitPublishingProgressCallback _tmp7_;
- void* _tmp7__target;
+ SpitPublishingProgressCallback _tmp5_;
+ void* _tmp5__target;
#line 717 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (self));
#line 718 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -6109,48 +6362,46 @@ static void publishing_rest_support_batch_uploader_on_chunk_transmitted (Publish
#line 718 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
file_span = 1.0 / _tmp0__length1;
#line 719 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = bytes_written_so_far;
-#line 719 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = total_bytes;
-#line 719 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- this_file_fraction_complete = ((gdouble) _tmp1_) / _tmp2_;
+ this_file_fraction_complete = ((gdouble) bytes_written_so_far) / total_bytes;
#line 720 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = self->priv->current_file;
+ _tmp1_ = self->priv->current_file;
#line 720 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp4_ = file_span;
+ _tmp2_ = file_span;
#line 720 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp5_ = this_file_fraction_complete;
+ _tmp3_ = this_file_fraction_complete;
#line 720 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp6_ = file_span;
+ _tmp4_ = file_span;
#line 720 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- fraction_complete = (_tmp3_ * _tmp4_) + (_tmp5_ * _tmp6_);
+ fraction_complete = (_tmp1_ * _tmp2_) + (_tmp3_ * _tmp4_);
#line 723 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp7_ = self->priv->status_updated;
+ _tmp5_ = self->priv->status_updated;
#line 723 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp7__target = self->priv->status_updated_target;
+ _tmp5__target = self->priv->status_updated_target;
#line 723 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp7_ != NULL) {
-#line 6126 "RESTSupport.c"
- SpitPublishingProgressCallback _tmp8_;
- void* _tmp8__target;
- gint _tmp9_;
- gdouble _tmp10_;
+ if (_tmp5_ != NULL) {
+#line 6375 "RESTSupport.c"
+ SpitPublishingProgressCallback _tmp6_;
+ void* _tmp6__target;
+ gint _tmp7_;
+ gdouble _tmp8_;
#line 724 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp8_ = self->priv->status_updated;
+ _tmp6_ = self->priv->status_updated;
#line 724 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp8__target = self->priv->status_updated_target;
+ _tmp6__target = self->priv->status_updated_target;
#line 724 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp9_ = self->priv->current_file;
+ _tmp7_ = self->priv->current_file;
#line 724 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp10_ = fraction_complete;
+ _tmp8_ = fraction_complete;
#line 724 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp8_ (_tmp9_ + 1, _tmp10_, _tmp8__target);
-#line 6141 "RESTSupport.c"
+ _tmp6_ (_tmp7_ + 1, _tmp8_, _tmp6__target);
+#line 6390 "RESTSupport.c"
}
}
-PublishingRESTSupportSession* publishing_rest_support_batch_uploader_get_session (PublishingRESTSupportBatchUploader* self) {
+PublishingRESTSupportSession*
+publishing_rest_support_batch_uploader_get_session (PublishingRESTSupportBatchUploader* self)
+{
PublishingRESTSupportSession* result = NULL;
PublishingRESTSupportSession* _tmp0_;
PublishingRESTSupportSession* _tmp1_;
@@ -6164,11 +6415,13 @@ PublishingRESTSupportSession* publishing_rest_support_batch_uploader_get_session
result = _tmp1_;
#line 728 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 6160 "RESTSupport.c"
+#line 6411 "RESTSupport.c"
}
-SpitPublishingPublishable* publishing_rest_support_batch_uploader_get_current_publishable (PublishingRESTSupportBatchUploader* self) {
+SpitPublishingPublishable*
+publishing_rest_support_batch_uploader_get_current_publishable (PublishingRESTSupportBatchUploader* self)
+{
SpitPublishingPublishable* result = NULL;
SpitPublishingPublishable** _tmp0_;
gint _tmp0__length1;
@@ -6191,154 +6444,183 @@ SpitPublishingPublishable* publishing_rest_support_batch_uploader_get_current_pu
result = _tmp3_;
#line 732 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 6187 "RESTSupport.c"
+#line 6440 "RESTSupport.c"
}
-static PublishingRESTSupportTransaction* publishing_rest_support_batch_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* self, SpitPublishingPublishable* publishable) {
+static PublishingRESTSupportTransaction*
+publishing_rest_support_batch_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* self,
+ SpitPublishingPublishable* publishable)
+{
#line 735 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_batch_uploader_create_transaction'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 735 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 6196 "RESTSupport.c"
+#line 6452 "RESTSupport.c"
}
-PublishingRESTSupportTransaction* publishing_rest_support_batch_uploader_create_transaction (PublishingRESTSupportBatchUploader* self, SpitPublishingPublishable* publishable) {
+PublishingRESTSupportTransaction*
+publishing_rest_support_batch_uploader_create_transaction (PublishingRESTSupportBatchUploader* self,
+ SpitPublishingPublishable* publishable)
+{
#line 735 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (self), NULL);
#line 735 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_GET_CLASS (self)->create_transaction (self, publishable);
-#line 6205 "RESTSupport.c"
+#line 6464 "RESTSupport.c"
}
-void publishing_rest_support_batch_uploader_upload (PublishingRESTSupportBatchUploader* self, SpitPublishingProgressCallback status_updated, void* status_updated_target) {
- SpitPublishingProgressCallback _tmp0_;
- void* _tmp0__target;
- SpitPublishingPublishable** _tmp1_;
- gint _tmp1__length1;
+void
+publishing_rest_support_batch_uploader_upload (PublishingRESTSupportBatchUploader* self,
+ SpitPublishingProgressCallback status_updated,
+ void* status_updated_target)
+{
+ SpitPublishingPublishable** _tmp0_;
+ gint _tmp0__length1;
#line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (self));
#line 738 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = status_updated;
+ self->priv->status_updated = status_updated;
#line 738 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0__target = status_updated_target;
-#line 738 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->priv->status_updated = _tmp0_;
-#line 738 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->priv->status_updated_target = _tmp0__target;
+ self->priv->status_updated_target = status_updated_target;
#line 740 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = self->priv->publishables;
+ _tmp0_ = self->priv->publishables;
#line 740 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1__length1 = self->priv->publishables_length1;
+ _tmp0__length1 = self->priv->publishables_length1;
#line 740 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp1__length1 > 0) {
+ if (_tmp0__length1 > 0) {
#line 741 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_batch_uploader_send_files (self);
-#line 6232 "RESTSupport.c"
+#line 6489 "RESTSupport.c"
}
}
-static void publishing_rest_support_value_batch_uploader_init (GValue* value) {
+static void
+publishing_rest_support_value_batch_uploader_init (GValue* value)
+{
#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 6240 "RESTSupport.c"
+#line 6499 "RESTSupport.c"
}
-static void publishing_rest_support_value_batch_uploader_free_value (GValue* value) {
+static void
+publishing_rest_support_value_batch_uploader_free_value (GValue* value)
+{
#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (value->data[0].v_pointer) {
#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_batch_uploader_unref (value->data[0].v_pointer);
-#line 6249 "RESTSupport.c"
+#line 6510 "RESTSupport.c"
}
}
-static void publishing_rest_support_value_batch_uploader_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+publishing_rest_support_value_batch_uploader_copy_value (const GValue* src_value,
+ GValue* dest_value)
+{
#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (src_value->data[0].v_pointer) {
#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
dest_value->data[0].v_pointer = publishing_rest_support_batch_uploader_ref (src_value->data[0].v_pointer);
-#line 6259 "RESTSupport.c"
+#line 6523 "RESTSupport.c"
} else {
#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
dest_value->data[0].v_pointer = NULL;
-#line 6263 "RESTSupport.c"
+#line 6527 "RESTSupport.c"
}
}
-static gpointer publishing_rest_support_value_batch_uploader_peek_pointer (const GValue* value) {
+static gpointer
+publishing_rest_support_value_batch_uploader_peek_pointer (const GValue* value)
+{
#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return value->data[0].v_pointer;
-#line 6271 "RESTSupport.c"
+#line 6537 "RESTSupport.c"
}
-static gchar* publishing_rest_support_value_batch_uploader_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_rest_support_value_batch_uploader_collect_value (GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (collect_values[0].v_pointer) {
-#line 6278 "RESTSupport.c"
+#line 6549 "RESTSupport.c"
PublishingRESTSupportBatchUploader * object;
object = collect_values[0].v_pointer;
#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (object->parent_instance.g_class == NULL) {
#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 6285 "RESTSupport.c"
+#line 6556 "RESTSupport.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 6289 "RESTSupport.c"
+#line 6560 "RESTSupport.c"
}
#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = publishing_rest_support_batch_uploader_ref (object);
-#line 6293 "RESTSupport.c"
+#line 6564 "RESTSupport.c"
} else {
#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 6297 "RESTSupport.c"
+#line 6568 "RESTSupport.c"
}
#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 6301 "RESTSupport.c"
+#line 6572 "RESTSupport.c"
}
-static gchar* publishing_rest_support_value_batch_uploader_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_rest_support_value_batch_uploader_lcopy_value (const GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
PublishingRESTSupportBatchUploader ** object_p;
object_p = collect_values[0].v_pointer;
#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (!object_p) {
#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 6312 "RESTSupport.c"
+#line 6588 "RESTSupport.c"
}
#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (!value->data[0].v_pointer) {
#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*object_p = NULL;
-#line 6318 "RESTSupport.c"
+#line 6594 "RESTSupport.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*object_p = value->data[0].v_pointer;
-#line 6322 "RESTSupport.c"
+#line 6598 "RESTSupport.c"
} else {
#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*object_p = publishing_rest_support_batch_uploader_ref (value->data[0].v_pointer);
-#line 6326 "RESTSupport.c"
+#line 6602 "RESTSupport.c"
}
#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 6330 "RESTSupport.c"
+#line 6606 "RESTSupport.c"
}
-GParamSpec* publishing_rest_support_param_spec_batch_uploader (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+publishing_rest_support_param_spec_batch_uploader (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags)
+{
PublishingRESTSupportParamSpecBatchUploader* spec;
#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER), NULL);
@@ -6348,20 +6630,25 @@ GParamSpec* publishing_rest_support_param_spec_batch_uploader (const gchar* name
G_PARAM_SPEC (spec)->value_type = object_type;
#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return G_PARAM_SPEC (spec);
-#line 6344 "RESTSupport.c"
+#line 6626 "RESTSupport.c"
}
-gpointer publishing_rest_support_value_get_batch_uploader (const GValue* value) {
+gpointer
+publishing_rest_support_value_get_batch_uploader (const GValue* value)
+{
#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER), NULL);
#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return value->data[0].v_pointer;
-#line 6353 "RESTSupport.c"
+#line 6637 "RESTSupport.c"
}
-void publishing_rest_support_value_set_batch_uploader (GValue* value, gpointer v_object) {
+void
+publishing_rest_support_value_set_batch_uploader (GValue* value,
+ gpointer v_object)
+{
PublishingRESTSupportBatchUploader * old;
#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER));
@@ -6377,22 +6664,25 @@ void publishing_rest_support_value_set_batch_uploader (GValue* value, gpointer v
value->data[0].v_pointer = v_object;
#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_batch_uploader_ref (value->data[0].v_pointer);
-#line 6373 "RESTSupport.c"
+#line 6660 "RESTSupport.c"
} else {
#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 6377 "RESTSupport.c"
+#line 6664 "RESTSupport.c"
}
#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (old) {
#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_batch_uploader_unref (old);
-#line 6383 "RESTSupport.c"
+#line 6670 "RESTSupport.c"
}
}
-void publishing_rest_support_value_take_batch_uploader (GValue* value, gpointer v_object) {
+void
+publishing_rest_support_value_take_batch_uploader (GValue* value,
+ gpointer v_object)
+{
PublishingRESTSupportBatchUploader * old;
#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER));
@@ -6406,22 +6696,24 @@ void publishing_rest_support_value_take_batch_uploader (GValue* value, gpointer
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = v_object;
-#line 6402 "RESTSupport.c"
+#line 6692 "RESTSupport.c"
} else {
#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 6406 "RESTSupport.c"
+#line 6696 "RESTSupport.c"
}
#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (old) {
#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_batch_uploader_unref (old);
-#line 6412 "RESTSupport.c"
+#line 6702 "RESTSupport.c"
}
}
-static void publishing_rest_support_batch_uploader_class_init (PublishingRESTSupportBatchUploaderClass * klass) {
+static void
+publishing_rest_support_batch_uploader_class_init (PublishingRESTSupportBatchUploaderClass * klass)
+{
#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_batch_uploader_parent_class = g_type_class_peek_parent (klass);
#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -6434,11 +6726,13 @@ static void publishing_rest_support_batch_uploader_class_init (PublishingRESTSup
publishing_rest_support_batch_uploader_signals[PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_UPLOAD_COMPLETE_SIGNAL] = g_signal_new ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT);
#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_batch_uploader_signals[PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_UPLOAD_ERROR_SIGNAL] = g_signal_new ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER);
-#line 6430 "RESTSupport.c"
+#line 6722 "RESTSupport.c"
}
-static void publishing_rest_support_batch_uploader_instance_init (PublishingRESTSupportBatchUploader * self) {
+static void
+publishing_rest_support_batch_uploader_instance_init (PublishingRESTSupportBatchUploader * self)
+{
#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv = PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_GET_PRIVATE (self);
#line 665 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -6457,11 +6751,13 @@ static void publishing_rest_support_batch_uploader_instance_init (PublishingREST
self->priv->status_updated_target = self;
#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->ref_count = 1;
-#line 6453 "RESTSupport.c"
+#line 6747 "RESTSupport.c"
}
-static void publishing_rest_support_batch_uploader_finalize (PublishingRESTSupportBatchUploader * obj) {
+static void
+publishing_rest_support_batch_uploader_finalize (PublishingRESTSupportBatchUploader * obj)
+{
PublishingRESTSupportBatchUploader * self;
#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader);
@@ -6471,11 +6767,13 @@ static void publishing_rest_support_batch_uploader_finalize (PublishingRESTSuppo
self->priv->publishables = (_vala_array_free (self->priv->publishables, self->priv->publishables_length1, (GDestroyNotify) g_object_unref), NULL);
#line 667 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_publishing_rest_support_session_unref0 (self->priv->session);
-#line 6467 "RESTSupport.c"
+#line 6763 "RESTSupport.c"
}
-GType publishing_rest_support_batch_uploader_get_type (void) {
+GType
+publishing_rest_support_batch_uploader_get_type (void)
+{
static volatile gsize publishing_rest_support_batch_uploader_type_id__volatile = 0;
if (g_once_init_enter (&publishing_rest_support_batch_uploader_type_id__volatile)) {
static const GTypeValueTable g_define_type_value_table = { publishing_rest_support_value_batch_uploader_init, publishing_rest_support_value_batch_uploader_free_value, publishing_rest_support_value_batch_uploader_copy_value, publishing_rest_support_value_batch_uploader_peek_pointer, "p", publishing_rest_support_value_batch_uploader_collect_value, "p", publishing_rest_support_value_batch_uploader_lcopy_value };
@@ -6489,18 +6787,22 @@ GType publishing_rest_support_batch_uploader_get_type (void) {
}
-gpointer publishing_rest_support_batch_uploader_ref (gpointer instance) {
+gpointer
+publishing_rest_support_batch_uploader_ref (gpointer instance)
+{
PublishingRESTSupportBatchUploader * self;
self = instance;
#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_atomic_int_inc (&self->ref_count);
#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return instance;
-#line 6492 "RESTSupport.c"
+#line 6792 "RESTSupport.c"
}
-void publishing_rest_support_batch_uploader_unref (gpointer instance) {
+void
+publishing_rest_support_batch_uploader_unref (gpointer instance)
+{
PublishingRESTSupportBatchUploader * self;
self = instance;
#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -6509,205 +6811,211 @@ void publishing_rest_support_batch_uploader_unref (gpointer instance) {
PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_GET_CLASS (self)->finalize (self);
#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 6505 "RESTSupport.c"
+#line 6807 "RESTSupport.c"
}
}
-static gunichar string_get_char (const gchar* self, glong index) {
+static gunichar
+string_get_char (const gchar* self,
+ glong index)
+{
gunichar result = 0U;
- glong _tmp0_;
- gunichar _tmp1_;
-#line 1140 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1154 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, 0U);
-#line 1141 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp0_ = index;
-#line 1141 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp1_ = g_utf8_get_char (((gchar*) self) + _tmp0_);
-#line 1141 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- result = _tmp1_;
-#line 1141 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1155 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = g_utf8_get_char (((gchar*) self) + index);
+#line 1155 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 6524 "RESTSupport.c"
+#line 6823 "RESTSupport.c"
}
-gchar* publishing_rest_support_asciify_string (const gchar* s) {
+gchar*
+publishing_rest_support_asciify_string (const gchar* s)
+{
gchar* result = NULL;
gchar* t = NULL;
- const gchar* _tmp0_;
- gchar* _tmp1_;
+ gchar* _tmp0_;
GString* b = NULL;
- GString* _tmp2_;
- GString* _tmp14_;
- const gchar* _tmp15_;
- gchar* _tmp16_;
+ GString* _tmp1_;
+ GString* _tmp11_;
+ const gchar* _tmp12_;
+ gchar* _tmp13_;
#line 748 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (s != NULL, NULL);
#line 749 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = s;
-#line 749 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = g_utf8_normalize (_tmp0_, (gssize) -1, G_NORMALIZE_DEFAULT);
+ _tmp0_ = g_utf8_normalize (s, (gssize) -1, G_NORMALIZE_DEFAULT);
#line 749 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- t = _tmp1_;
+ t = _tmp0_;
#line 751 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = g_string_new ("");
+ _tmp1_ = g_string_new ("");
#line 751 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- b = _tmp2_;
-#line 6550 "RESTSupport.c"
+ b = _tmp1_;
+#line 6848 "RESTSupport.c"
{
const gchar* u = NULL;
- const gchar* _tmp3_;
+ const gchar* _tmp2_;
#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = t;
+ _tmp2_ = t;
#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- u = _tmp3_;
-#line 6558 "RESTSupport.c"
+ u = _tmp2_;
+#line 6856 "RESTSupport.c"
{
- gboolean _tmp4_ = FALSE;
+ gboolean _tmp3_ = FALSE;
#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp4_ = TRUE;
+ _tmp3_ = TRUE;
#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
while (TRUE) {
-#line 6565 "RESTSupport.c"
+#line 6863 "RESTSupport.c"
+ const gchar* _tmp6_;
+ gunichar c = 0U;
const gchar* _tmp7_;
gunichar _tmp8_;
- gunichar c = 0U;
- const gchar* _tmp9_;
- gunichar _tmp10_;
- gunichar _tmp11_;
#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (!_tmp4_) {
-#line 6574 "RESTSupport.c"
+ if (!_tmp3_) {
+#line 6870 "RESTSupport.c"
+ const gchar* _tmp4_;
const gchar* _tmp5_;
- const gchar* _tmp6_;
#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp5_ = u;
+ _tmp4_ = u;
#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp6_ = g_utf8_next_char (_tmp5_);
+ _tmp5_ = g_utf8_next_char (_tmp4_);
#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- u = _tmp6_;
-#line 6583 "RESTSupport.c"
+ u = _tmp5_;
+#line 6879 "RESTSupport.c"
}
#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp4_ = FALSE;
-#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp7_ = u;
+ _tmp3_ = FALSE;
#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp8_ = string_get_char (_tmp7_, (glong) 0);
+ _tmp6_ = u;
#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (!(_tmp8_ != ((gunichar) 0))) {
+ if (!(string_get_char (_tmp6_, (glong) 0) != ((gunichar) 0))) {
#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
break;
-#line 6595 "RESTSupport.c"
+#line 6889 "RESTSupport.c"
}
#line 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp9_ = u;
-#line 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp10_ = string_get_char (_tmp9_, (glong) 0);
+ _tmp7_ = u;
#line 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- c = _tmp10_;
+ c = string_get_char (_tmp7_, (glong) 0);
#line 754 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp11_ = c;
+ _tmp8_ = c;
#line 754 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (((gint) _tmp11_) < 128) {
-#line 6607 "RESTSupport.c"
- GString* _tmp12_;
- gunichar _tmp13_;
+ if (((gint) _tmp8_) < 128) {
+#line 6899 "RESTSupport.c"
+ GString* _tmp9_;
+ gunichar _tmp10_;
#line 755 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp12_ = b;
+ _tmp9_ = b;
#line 755 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp13_ = c;
+ _tmp10_ = c;
#line 755 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_string_append_unichar (_tmp12_, _tmp13_);
-#line 6616 "RESTSupport.c"
+ g_string_append_unichar (_tmp9_, _tmp10_);
+#line 6908 "RESTSupport.c"
}
}
}
}
#line 758 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp14_ = b;
+ _tmp11_ = b;
#line 758 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp15_ = _tmp14_->str;
+ _tmp12_ = _tmp11_->str;
#line 758 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp16_ = g_strdup (_tmp15_);
+ _tmp13_ = g_strdup (_tmp12_);
#line 758 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- result = _tmp16_;
+ result = _tmp13_;
#line 758 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_string_free0 (b);
#line 758 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (t);
#line 758 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 6635 "RESTSupport.c"
+#line 6927 "RESTSupport.c"
}
-static gchar* publishing_rest_support_google_session_real_get_user_name (PublishingRESTSupportGoogleSession* self) {
+static gchar*
+publishing_rest_support_google_session_real_get_user_name (PublishingRESTSupportGoogleSession* self)
+{
#line 762 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_session_get_user_name'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 762 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 6644 "RESTSupport.c"
+#line 6938 "RESTSupport.c"
}
-gchar* publishing_rest_support_google_session_get_user_name (PublishingRESTSupportGoogleSession* self) {
+gchar*
+publishing_rest_support_google_session_get_user_name (PublishingRESTSupportGoogleSession* self)
+{
#line 762 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (self), NULL);
#line 762 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return PUBLISHING_REST_SUPPORT_GOOGLE_SESSION_GET_CLASS (self)->get_user_name (self);
-#line 6653 "RESTSupport.c"
+#line 6949 "RESTSupport.c"
}
-static gchar* publishing_rest_support_google_session_real_get_access_token (PublishingRESTSupportGoogleSession* self) {
+static gchar*
+publishing_rest_support_google_session_real_get_access_token (PublishingRESTSupportGoogleSession* self)
+{
#line 763 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_session_get_access_token'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 763 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 6662 "RESTSupport.c"
+#line 6960 "RESTSupport.c"
}
-gchar* publishing_rest_support_google_session_get_access_token (PublishingRESTSupportGoogleSession* self) {
+gchar*
+publishing_rest_support_google_session_get_access_token (PublishingRESTSupportGoogleSession* self)
+{
#line 763 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (self), NULL);
#line 763 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return PUBLISHING_REST_SUPPORT_GOOGLE_SESSION_GET_CLASS (self)->get_access_token (self);
-#line 6671 "RESTSupport.c"
+#line 6971 "RESTSupport.c"
}
-static void publishing_rest_support_google_session_real_deauthenticate (PublishingRESTSupportGoogleSession* self) {
+static void
+publishing_rest_support_google_session_real_deauthenticate (PublishingRESTSupportGoogleSession* self)
+{
#line 764 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_session_deauthenticate'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 764 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 6680 "RESTSupport.c"
+#line 6982 "RESTSupport.c"
}
-void publishing_rest_support_google_session_deauthenticate (PublishingRESTSupportGoogleSession* self) {
+void
+publishing_rest_support_google_session_deauthenticate (PublishingRESTSupportGoogleSession* self)
+{
#line 764 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (self));
#line 764 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
PUBLISHING_REST_SUPPORT_GOOGLE_SESSION_GET_CLASS (self)->deauthenticate (self);
-#line 6689 "RESTSupport.c"
+#line 6993 "RESTSupport.c"
}
-PublishingRESTSupportGoogleSession* publishing_rest_support_google_session_construct (GType object_type) {
+PublishingRESTSupportGoogleSession*
+publishing_rest_support_google_session_construct (GType object_type)
+{
PublishingRESTSupportGoogleSession* self = NULL;
#line 761 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = (PublishingRESTSupportGoogleSession*) publishing_rest_support_session_construct (object_type, NULL);
#line 761 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 6699 "RESTSupport.c"
+#line 7005 "RESTSupport.c"
}
-static void publishing_rest_support_google_session_class_init (PublishingRESTSupportGoogleSessionClass * klass) {
+static void
+publishing_rest_support_google_session_class_init (PublishingRESTSupportGoogleSessionClass * klass)
+{
#line 761 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_google_session_parent_class = g_type_class_peek_parent (klass);
#line 761 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -6716,15 +7024,19 @@ static void publishing_rest_support_google_session_class_init (PublishingRESTSup
((PublishingRESTSupportGoogleSessionClass *) klass)->get_access_token = (gchar* (*) (PublishingRESTSupportGoogleSession *)) publishing_rest_support_google_session_real_get_access_token;
#line 761 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
((PublishingRESTSupportGoogleSessionClass *) klass)->deauthenticate = (void (*) (PublishingRESTSupportGoogleSession *)) publishing_rest_support_google_session_real_deauthenticate;
-#line 6712 "RESTSupport.c"
+#line 7020 "RESTSupport.c"
}
-static void publishing_rest_support_google_session_instance_init (PublishingRESTSupportGoogleSession * self) {
+static void
+publishing_rest_support_google_session_instance_init (PublishingRESTSupportGoogleSession * self)
+{
}
-GType publishing_rest_support_google_session_get_type (void) {
+GType
+publishing_rest_support_google_session_get_type (void)
+{
static volatile gsize publishing_rest_support_google_session_type_id__volatile = 0;
if (g_once_init_enter (&publishing_rest_support_google_session_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingRESTSupportGoogleSessionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_rest_support_google_session_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingRESTSupportGoogleSession), 0, (GInstanceInitFunc) publishing_rest_support_google_session_instance_init, NULL };
@@ -6736,22 +7048,27 @@ GType publishing_rest_support_google_session_get_type (void) {
}
-static void _publishing_rest_support_google_publisher_on_authenticator_authenticated_spit_publishing_authenticator_authenticated (SpitPublishingAuthenticator* _sender, gpointer self) {
+static void
+_publishing_rest_support_google_publisher_on_authenticator_authenticated_spit_publishing_authenticator_authenticated (SpitPublishingAuthenticator* _sender,
+ gpointer self)
+{
#line 831 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_google_publisher_on_authenticator_authenticated ((PublishingRESTSupportGooglePublisher*) self);
-#line 6735 "RESTSupport.c"
+#line 7050 "RESTSupport.c"
}
-PublishingRESTSupportGooglePublisher* publishing_rest_support_google_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host, const gchar* scope) {
+PublishingRESTSupportGooglePublisher*
+publishing_rest_support_google_publisher_construct (GType object_type,
+ SpitPublishingService* service,
+ SpitPublishingPluginHost* host,
+ const gchar* scope)
+{
PublishingRESTSupportGooglePublisher * self = NULL;
- const gchar* _tmp0_;
- gchar* _tmp1_;
- PublishingRESTSupportGooglePublisherGoogleSessionImpl* _tmp2_;
- SpitPublishingService* _tmp3_;
- SpitPublishingPluginHost* _tmp4_;
- SpitPublishingAuthenticator* _tmp5_;
- SpitPublishingAuthenticator* _tmp6_;
+ gchar* _tmp0_;
+ PublishingRESTSupportGooglePublisherGoogleSessionImpl* _tmp1_;
+ SpitPublishingAuthenticator* _tmp2_;
+ SpitPublishingAuthenticator* _tmp3_;
#line 824 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (SPIT_PUBLISHING_IS_SERVICE (service), NULL);
#line 824 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -6761,62 +7078,62 @@ PublishingRESTSupportGooglePublisher* publishing_rest_support_google_publisher_c
#line 824 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = (PublishingRESTSupportGooglePublisher*) g_object_new (object_type, NULL);
#line 826 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = scope;
-#line 826 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = g_strdup (_tmp0_);
+ _tmp0_ = g_strdup (scope);
#line 826 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (self->priv->scope);
#line 826 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->priv->scope = _tmp1_;
+ self->priv->scope = _tmp0_;
#line 827 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = publishing_rest_support_google_publisher_google_session_impl_new ();
+ _tmp1_ = publishing_rest_support_google_publisher_google_session_impl_new ();
#line 827 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_publishing_rest_support_session_unref0 (self->priv->session);
#line 827 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->priv->session = _tmp2_;
-#line 828 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = service;
+ self->priv->session = _tmp1_;
#line 828 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->priv->service = _tmp3_;
+ self->priv->service = service;
#line 829 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp4_ = host;
-#line 829 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->priv->host = _tmp4_;
+ self->priv->host = host;
#line 830 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp5_ = publishing_rest_support_google_publisher_get_authenticator (self);
+ _tmp2_ = publishing_rest_support_google_publisher_get_authenticator (self);
#line 830 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (self->priv->authenticator);
#line 830 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->priv->authenticator = _tmp5_;
+ self->priv->authenticator = _tmp2_;
#line 831 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp6_ = self->priv->authenticator;
+ _tmp3_ = self->priv->authenticator;
#line 831 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_signal_connect_object (_tmp6_, "authenticated", (GCallback) _publishing_rest_support_google_publisher_on_authenticator_authenticated_spit_publishing_authenticator_authenticated, self, 0);
+ g_signal_connect_object (_tmp3_, "authenticated", (GCallback) _publishing_rest_support_google_publisher_on_authenticator_authenticated_spit_publishing_authenticator_authenticated, self, 0);
#line 824 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 6790 "RESTSupport.c"
+#line 7101 "RESTSupport.c"
}
-static SpitPublishingAuthenticator* publishing_rest_support_google_publisher_real_get_authenticator (PublishingRESTSupportGooglePublisher* self) {
+static SpitPublishingAuthenticator*
+publishing_rest_support_google_publisher_real_get_authenticator (PublishingRESTSupportGooglePublisher* self)
+{
#line 834 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_publisher_get_authenticator'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 834 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 6799 "RESTSupport.c"
+#line 7112 "RESTSupport.c"
}
-SpitPublishingAuthenticator* publishing_rest_support_google_publisher_get_authenticator (PublishingRESTSupportGooglePublisher* self) {
+SpitPublishingAuthenticator*
+publishing_rest_support_google_publisher_get_authenticator (PublishingRESTSupportGooglePublisher* self)
+{
#line 834 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self), NULL);
#line 834 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_CLASS (self)->get_authenticator (self);
-#line 6808 "RESTSupport.c"
+#line 7123 "RESTSupport.c"
}
-SpitPublishingPluginHost* publishing_rest_support_google_publisher_get_host (PublishingRESTSupportGooglePublisher* self) {
+SpitPublishingPluginHost*
+publishing_rest_support_google_publisher_get_host (PublishingRESTSupportGooglePublisher* self)
+{
SpitPublishingPluginHost* result = NULL;
SpitPublishingPluginHost* _tmp0_;
#line 836 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -6827,11 +7144,13 @@ SpitPublishingPluginHost* publishing_rest_support_google_publisher_get_host (Pub
result = _tmp0_;
#line 837 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 6823 "RESTSupport.c"
+#line 7140 "RESTSupport.c"
}
-PublishingRESTSupportGoogleSession* publishing_rest_support_google_publisher_get_session (PublishingRESTSupportGooglePublisher* self) {
+PublishingRESTSupportGoogleSession*
+publishing_rest_support_google_publisher_get_session (PublishingRESTSupportGooglePublisher* self)
+{
PublishingRESTSupportGoogleSession* result = NULL;
PublishingRESTSupportGooglePublisherGoogleSessionImpl* _tmp0_;
PublishingRESTSupportGoogleSession* _tmp1_;
@@ -6845,102 +7164,124 @@ PublishingRESTSupportGoogleSession* publishing_rest_support_google_publisher_get
result = _tmp1_;
#line 841 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 6841 "RESTSupport.c"
+#line 7160 "RESTSupport.c"
}
-static void publishing_rest_support_google_publisher_real_on_login_flow_complete (PublishingRESTSupportGooglePublisher* self) {
+static void
+publishing_rest_support_google_publisher_real_on_login_flow_complete (PublishingRESTSupportGooglePublisher* self)
+{
#line 844 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_publisher_on_login_flow_complete'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 844 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 6850 "RESTSupport.c"
+#line 7171 "RESTSupport.c"
}
-void publishing_rest_support_google_publisher_on_login_flow_complete (PublishingRESTSupportGooglePublisher* self) {
+void
+publishing_rest_support_google_publisher_on_login_flow_complete (PublishingRESTSupportGooglePublisher* self)
+{
#line 844 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
#line 844 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_CLASS (self)->on_login_flow_complete (self);
-#line 6859 "RESTSupport.c"
+#line 7182 "RESTSupport.c"
}
-static void publishing_rest_support_google_publisher_real_do_logout (PublishingRESTSupportGooglePublisher* self) {
+static void
+publishing_rest_support_google_publisher_real_do_logout (PublishingRESTSupportGooglePublisher* self)
+{
#line 846 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_publisher_do_logout'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 846 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 6868 "RESTSupport.c"
+#line 7193 "RESTSupport.c"
}
-void publishing_rest_support_google_publisher_do_logout (PublishingRESTSupportGooglePublisher* self) {
+void
+publishing_rest_support_google_publisher_do_logout (PublishingRESTSupportGooglePublisher* self)
+{
#line 846 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
#line 846 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_CLASS (self)->do_logout (self);
-#line 6877 "RESTSupport.c"
+#line 7204 "RESTSupport.c"
}
-static gboolean publishing_rest_support_google_publisher_real_is_running (PublishingRESTSupportGooglePublisher* self) {
+static gboolean
+publishing_rest_support_google_publisher_real_is_running (PublishingRESTSupportGooglePublisher* self)
+{
gboolean _tmp0_ = FALSE;
#line 848 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_publisher_is_running'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 848 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return _tmp0_;
-#line 6887 "RESTSupport.c"
+#line 7216 "RESTSupport.c"
}
-gboolean publishing_rest_support_google_publisher_is_running (PublishingRESTSupportGooglePublisher* self) {
+gboolean
+publishing_rest_support_google_publisher_is_running (PublishingRESTSupportGooglePublisher* self)
+{
#line 848 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self), FALSE);
#line 848 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_CLASS (self)->is_running (self);
-#line 6896 "RESTSupport.c"
+#line 7227 "RESTSupport.c"
}
-static void publishing_rest_support_google_publisher_real_start (PublishingRESTSupportGooglePublisher* self) {
+static void
+publishing_rest_support_google_publisher_real_start (PublishingRESTSupportGooglePublisher* self)
+{
#line 850 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_publisher_start'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 850 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 6905 "RESTSupport.c"
+#line 7238 "RESTSupport.c"
}
-void publishing_rest_support_google_publisher_start (PublishingRESTSupportGooglePublisher* self) {
+void
+publishing_rest_support_google_publisher_start (PublishingRESTSupportGooglePublisher* self)
+{
#line 850 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
#line 850 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_CLASS (self)->start (self);
-#line 6914 "RESTSupport.c"
+#line 7249 "RESTSupport.c"
}
-static void publishing_rest_support_google_publisher_real_stop (PublishingRESTSupportGooglePublisher* self) {
+static void
+publishing_rest_support_google_publisher_real_stop (PublishingRESTSupportGooglePublisher* self)
+{
#line 852 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_publisher_stop'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 852 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 6923 "RESTSupport.c"
+#line 7260 "RESTSupport.c"
}
-void publishing_rest_support_google_publisher_stop (PublishingRESTSupportGooglePublisher* self) {
+void
+publishing_rest_support_google_publisher_stop (PublishingRESTSupportGooglePublisher* self)
+{
#line 852 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
#line 852 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_CLASS (self)->stop (self);
-#line 6932 "RESTSupport.c"
+#line 7271 "RESTSupport.c"
}
-static SpitPublishingService* publishing_rest_support_google_publisher_real_get_service (SpitPublishingPublisher* base) {
+static SpitPublishingService*
+publishing_rest_support_google_publisher_real_get_service (SpitPublishingPublisher* base)
+{
PublishingRESTSupportGooglePublisher * self;
SpitPublishingService* result = NULL;
SpitPublishingService* _tmp0_;
@@ -6955,18 +7296,22 @@ static SpitPublishingService* publishing_rest_support_google_publisher_real_get_
result = _tmp1_;
#line 855 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 6951 "RESTSupport.c"
+#line 7292 "RESTSupport.c"
}
-static gpointer _g_variant_ref0 (gpointer self) {
+static gpointer
+_g_variant_ref0 (gpointer self)
+{
#line 864 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self ? g_variant_ref (self) : NULL;
-#line 6958 "RESTSupport.c"
+#line 7301 "RESTSupport.c"
}
-static void publishing_rest_support_google_publisher_on_authenticator_authenticated (PublishingRESTSupportGooglePublisher* self) {
+static void
+publishing_rest_support_google_publisher_on_authenticator_authenticated (PublishingRESTSupportGooglePublisher* self)
+{
GHashTable* params = NULL;
SpitPublishingAuthenticator* _tmp0_;
GHashTable* _tmp1_;
@@ -7075,11 +7420,13 @@ static void publishing_rest_support_google_publisher_on_authenticator_authentica
_g_variant_unref0 (refresh_token);
#line 858 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_hash_table_unref0 (params);
-#line 7071 "RESTSupport.c"
+#line 7416 "RESTSupport.c"
}
-static PublishingRESTSupportGooglePublisherGoogleSessionImpl* publishing_rest_support_google_publisher_google_session_impl_construct (GType object_type) {
+static PublishingRESTSupportGooglePublisherGoogleSessionImpl*
+publishing_rest_support_google_publisher_google_session_impl_construct (GType object_type)
+{
PublishingRESTSupportGooglePublisherGoogleSessionImpl* self = NULL;
#line 776 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = (PublishingRESTSupportGooglePublisherGoogleSessionImpl*) publishing_rest_support_google_session_construct (object_type);
@@ -7097,18 +7444,22 @@ static PublishingRESTSupportGooglePublisherGoogleSessionImpl* publishing_rest_su
self->refresh_token = NULL;
#line 776 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 7093 "RESTSupport.c"
+#line 7440 "RESTSupport.c"
}
-static PublishingRESTSupportGooglePublisherGoogleSessionImpl* publishing_rest_support_google_publisher_google_session_impl_new (void) {
+static PublishingRESTSupportGooglePublisherGoogleSessionImpl*
+publishing_rest_support_google_publisher_google_session_impl_new (void)
+{
#line 776 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return publishing_rest_support_google_publisher_google_session_impl_construct (PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_GOOGLE_SESSION_IMPL);
-#line 7100 "RESTSupport.c"
+#line 7449 "RESTSupport.c"
}
-static gboolean publishing_rest_support_google_publisher_google_session_impl_real_is_authenticated (PublishingRESTSupportSession* base) {
+static gboolean
+publishing_rest_support_google_publisher_google_session_impl_real_is_authenticated (PublishingRESTSupportSession* base)
+{
PublishingRESTSupportGooglePublisherGoogleSessionImpl * self;
gboolean result = FALSE;
const gchar* _tmp0_;
@@ -7120,11 +7471,13 @@ static gboolean publishing_rest_support_google_publisher_google_session_impl_rea
result = _tmp0_ != NULL;
#line 783 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 7116 "RESTSupport.c"
+#line 7467 "RESTSupport.c"
}
-static gchar* publishing_rest_support_google_publisher_google_session_impl_real_get_user_name (PublishingRESTSupportGoogleSession* base) {
+static gchar*
+publishing_rest_support_google_publisher_google_session_impl_real_get_user_name (PublishingRESTSupportGoogleSession* base)
+{
PublishingRESTSupportGooglePublisherGoogleSessionImpl * self;
gchar* result = NULL;
const gchar* _tmp0_;
@@ -7144,35 +7497,36 @@ static gchar* publishing_rest_support_google_publisher_google_session_impl_real_
result = _tmp2_;
#line 788 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 7140 "RESTSupport.c"
+#line 7493 "RESTSupport.c"
}
-static gchar* publishing_rest_support_google_publisher_google_session_impl_real_get_access_token (PublishingRESTSupportGoogleSession* base) {
+static gchar*
+publishing_rest_support_google_publisher_google_session_impl_real_get_access_token (PublishingRESTSupportGoogleSession* base)
+{
PublishingRESTSupportGooglePublisherGoogleSessionImpl * self;
gchar* result = NULL;
- gboolean _tmp0_;
- const gchar* _tmp1_;
- gchar* _tmp2_;
+ const gchar* _tmp0_;
+ gchar* _tmp1_;
#line 791 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_GOOGLE_SESSION_IMPL, PublishingRESTSupportGooglePublisherGoogleSessionImpl);
#line 792 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 792 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _vala_assert (_tmp0_, "is_authenticated()");
+ _vala_assert (publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession)), "is_authenticated()");
#line 793 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = self->access_token;
+ _tmp0_ = self->access_token;
#line 793 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = g_strdup (_tmp1_);
+ _tmp1_ = g_strdup (_tmp0_);
#line 793 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- result = _tmp2_;
+ result = _tmp1_;
#line 793 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 7164 "RESTSupport.c"
+#line 7516 "RESTSupport.c"
}
-static void publishing_rest_support_google_publisher_google_session_impl_real_deauthenticate (PublishingRESTSupportGoogleSession* base) {
+static void
+publishing_rest_support_google_publisher_google_session_impl_real_deauthenticate (PublishingRESTSupportGoogleSession* base)
+{
PublishingRESTSupportGooglePublisherGoogleSessionImpl * self;
#line 796 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_GOOGLE_SESSION_IMPL, PublishingRESTSupportGooglePublisherGoogleSessionImpl);
@@ -7188,11 +7542,13 @@ static void publishing_rest_support_google_publisher_google_session_impl_real_de
_g_free0 (self->refresh_token);
#line 799 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->refresh_token = NULL;
-#line 7184 "RESTSupport.c"
+#line 7538 "RESTSupport.c"
}
-static void publishing_rest_support_google_publisher_google_session_impl_class_init (PublishingRESTSupportGooglePublisherGoogleSessionImplClass * klass) {
+static void
+publishing_rest_support_google_publisher_google_session_impl_class_init (PublishingRESTSupportGooglePublisherGoogleSessionImplClass * klass)
+{
#line 771 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_google_publisher_google_session_impl_parent_class = g_type_class_peek_parent (klass);
#line 771 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -7205,15 +7561,19 @@ static void publishing_rest_support_google_publisher_google_session_impl_class_i
((PublishingRESTSupportGoogleSessionClass *) klass)->get_access_token = (gchar* (*) (PublishingRESTSupportGoogleSession *)) publishing_rest_support_google_publisher_google_session_impl_real_get_access_token;
#line 771 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
((PublishingRESTSupportGoogleSessionClass *) klass)->deauthenticate = (void (*) (PublishingRESTSupportGoogleSession *)) publishing_rest_support_google_publisher_google_session_impl_real_deauthenticate;
-#line 7201 "RESTSupport.c"
+#line 7557 "RESTSupport.c"
}
-static void publishing_rest_support_google_publisher_google_session_impl_instance_init (PublishingRESTSupportGooglePublisherGoogleSessionImpl * self) {
+static void
+publishing_rest_support_google_publisher_google_session_impl_instance_init (PublishingRESTSupportGooglePublisherGoogleSessionImpl * self)
+{
}
-static void publishing_rest_support_google_publisher_google_session_impl_finalize (PublishingRESTSupportSession * obj) {
+static void
+publishing_rest_support_google_publisher_google_session_impl_finalize (PublishingRESTSupportSession * obj)
+{
PublishingRESTSupportGooglePublisherGoogleSessionImpl * self;
#line 771 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_GOOGLE_SESSION_IMPL, PublishingRESTSupportGooglePublisherGoogleSessionImpl);
@@ -7225,11 +7585,13 @@ static void publishing_rest_support_google_publisher_google_session_impl_finaliz
_g_free0 (self->refresh_token);
#line 771 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
PUBLISHING_REST_SUPPORT_SESSION_CLASS (publishing_rest_support_google_publisher_google_session_impl_parent_class)->finalize (obj);
-#line 7221 "RESTSupport.c"
+#line 7581 "RESTSupport.c"
}
-static GType publishing_rest_support_google_publisher_google_session_impl_get_type (void) {
+static GType
+publishing_rest_support_google_publisher_google_session_impl_get_type (void)
+{
static volatile gsize publishing_rest_support_google_publisher_google_session_impl_type_id__volatile = 0;
if (g_once_init_enter (&publishing_rest_support_google_publisher_google_session_impl_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingRESTSupportGooglePublisherGoogleSessionImplClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_rest_support_google_publisher_google_session_impl_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingRESTSupportGooglePublisherGoogleSessionImpl), 0, (GInstanceInitFunc) publishing_rest_support_google_publisher_google_session_impl_instance_init, NULL };
@@ -7241,107 +7603,104 @@ static GType publishing_rest_support_google_publisher_google_session_impl_get_ty
}
-static PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_support_google_publisher_authenticated_transaction_construct_with_endpoint_url (GType object_type, PublishingRESTSupportGoogleSession* session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method) {
+static PublishingRESTSupportGooglePublisherAuthenticatedTransaction*
+publishing_rest_support_google_publisher_authenticated_transaction_construct_with_endpoint_url (GType object_type,
+ PublishingRESTSupportGoogleSession* session,
+ const gchar* endpoint_url,
+ PublishingRESTSupportHttpMethod method)
+{
PublishingRESTSupportGooglePublisherAuthenticatedTransaction* self = NULL;
- PublishingRESTSupportGoogleSession* _tmp0_;
- const gchar* _tmp1_;
- PublishingRESTSupportHttpMethod _tmp2_;
#line 804 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (session), NULL);
#line 804 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (endpoint_url != NULL, NULL);
#line 806 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = session;
-#line 806 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = endpoint_url;
-#line 806 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = method;
-#line 806 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self = (PublishingRESTSupportGooglePublisherAuthenticatedTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, _tmp2_);
+ self = (PublishingRESTSupportGooglePublisherAuthenticatedTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), endpoint_url, method);
#line 804 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 7256 "RESTSupport.c"
+#line 7614 "RESTSupport.c"
}
-static PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_support_google_publisher_authenticated_transaction_new_with_endpoint_url (PublishingRESTSupportGoogleSession* session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method) {
+static PublishingRESTSupportGooglePublisherAuthenticatedTransaction*
+publishing_rest_support_google_publisher_authenticated_transaction_new_with_endpoint_url (PublishingRESTSupportGoogleSession* session,
+ const gchar* endpoint_url,
+ PublishingRESTSupportHttpMethod method)
+{
#line 804 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return publishing_rest_support_google_publisher_authenticated_transaction_construct_with_endpoint_url (PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_AUTHENTICATED_TRANSACTION, session, endpoint_url, method);
-#line 7263 "RESTSupport.c"
+#line 7625 "RESTSupport.c"
}
-PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_support_google_publisher_authenticated_transaction_construct (GType object_type, PublishingRESTSupportGoogleSession* session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method) {
+PublishingRESTSupportGooglePublisherAuthenticatedTransaction*
+publishing_rest_support_google_publisher_authenticated_transaction_construct (GType object_type,
+ PublishingRESTSupportGoogleSession* session,
+ const gchar* endpoint_url,
+ PublishingRESTSupportHttpMethod method)
+{
PublishingRESTSupportGooglePublisherAuthenticatedTransaction* self = NULL;
- PublishingRESTSupportGoogleSession* _tmp0_;
- const gchar* _tmp1_;
- PublishingRESTSupportHttpMethod _tmp2_;
- PublishingRESTSupportGoogleSession* _tmp3_;
- gboolean _tmp4_;
- PublishingRESTSupportGoogleSession* _tmp5_;
- gchar* _tmp6_;
- gchar* _tmp7_;
- gchar* _tmp8_;
- gchar* _tmp9_;
+ gchar* _tmp0_;
+ gchar* _tmp1_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
#line 809 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (session), NULL);
#line 809 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (endpoint_url != NULL, NULL);
#line 811 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = session;
-#line 811 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = endpoint_url;
-#line 811 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = method;
-#line 811 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self = (PublishingRESTSupportGooglePublisherAuthenticatedTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, _tmp2_);
-#line 812 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = session;
+ self = (PublishingRESTSupportGooglePublisherAuthenticatedTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), endpoint_url, method);
#line 812 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp4_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 812 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _vala_assert (_tmp4_, "session.is_authenticated()");
-#line 814 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp5_ = session;
+ _vala_assert (publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession)), "session.is_authenticated()");
#line 814 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp6_ = publishing_rest_support_google_session_get_access_token (_tmp5_);
+ _tmp0_ = publishing_rest_support_google_session_get_access_token (session);
#line 814 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp7_ = _tmp6_;
+ _tmp1_ = _tmp0_;
#line 814 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp8_ = g_strconcat ("Bearer ", _tmp7_, NULL);
+ _tmp2_ = g_strconcat ("Bearer ", _tmp1_, NULL);
#line 814 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp9_ = _tmp8_;
+ _tmp3_ = _tmp2_;
#line 814 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "Authorization", _tmp9_);
+ publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "Authorization", _tmp3_);
#line 814 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp9_);
+ _g_free0 (_tmp3_);
#line 814 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp7_);
+ _g_free0 (_tmp1_);
#line 809 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 7315 "RESTSupport.c"
+#line 7664 "RESTSupport.c"
}
-PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_support_google_publisher_authenticated_transaction_new (PublishingRESTSupportGoogleSession* session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method) {
+PublishingRESTSupportGooglePublisherAuthenticatedTransaction*
+publishing_rest_support_google_publisher_authenticated_transaction_new (PublishingRESTSupportGoogleSession* session,
+ const gchar* endpoint_url,
+ PublishingRESTSupportHttpMethod method)
+{
#line 809 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return publishing_rest_support_google_publisher_authenticated_transaction_construct (PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_AUTHENTICATED_TRANSACTION, session, endpoint_url, method);
-#line 7322 "RESTSupport.c"
+#line 7675 "RESTSupport.c"
}
-static void publishing_rest_support_google_publisher_authenticated_transaction_class_init (PublishingRESTSupportGooglePublisherAuthenticatedTransactionClass * klass) {
+static void
+publishing_rest_support_google_publisher_authenticated_transaction_class_init (PublishingRESTSupportGooglePublisherAuthenticatedTransactionClass * klass)
+{
#line 803 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_google_publisher_authenticated_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 7329 "RESTSupport.c"
+#line 7684 "RESTSupport.c"
}
-static void publishing_rest_support_google_publisher_authenticated_transaction_instance_init (PublishingRESTSupportGooglePublisherAuthenticatedTransaction * self) {
+static void
+publishing_rest_support_google_publisher_authenticated_transaction_instance_init (PublishingRESTSupportGooglePublisherAuthenticatedTransaction * self)
+{
}
-GType publishing_rest_support_google_publisher_authenticated_transaction_get_type (void) {
+GType
+publishing_rest_support_google_publisher_authenticated_transaction_get_type (void)
+{
static volatile gsize publishing_rest_support_google_publisher_authenticated_transaction_type_id__volatile = 0;
if (g_once_init_enter (&publishing_rest_support_google_publisher_authenticated_transaction_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingRESTSupportGooglePublisherAuthenticatedTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_rest_support_google_publisher_authenticated_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingRESTSupportGooglePublisherAuthenticatedTransaction), 0, (GInstanceInitFunc) publishing_rest_support_google_publisher_authenticated_transaction_instance_init, NULL };
@@ -7353,7 +7712,9 @@ GType publishing_rest_support_google_publisher_authenticated_transaction_get_typ
}
-static void publishing_rest_support_google_publisher_class_init (PublishingRESTSupportGooglePublisherClass * klass) {
+static void
+publishing_rest_support_google_publisher_class_init (PublishingRESTSupportGooglePublisherClass * klass)
+{
#line 767 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_google_publisher_parent_class = g_type_class_peek_parent (klass);
#line 767 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -7372,11 +7733,13 @@ static void publishing_rest_support_google_publisher_class_init (PublishingRESTS
((PublishingRESTSupportGooglePublisherClass *) klass)->stop = (void (*) (PublishingRESTSupportGooglePublisher *)) publishing_rest_support_google_publisher_real_stop;
#line 767 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
G_OBJECT_CLASS (klass)->finalize = publishing_rest_support_google_publisher_finalize;
-#line 7368 "RESTSupport.c"
+#line 7729 "RESTSupport.c"
}
-static void publishing_rest_support_google_publisher_spit_publishing_publisher_interface_init (SpitPublishingPublisherIface * iface) {
+static void
+publishing_rest_support_google_publisher_spit_publishing_publisher_interface_init (SpitPublishingPublisherIface * iface)
+{
#line 767 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_google_publisher_spit_publishing_publisher_parent_iface = g_type_interface_peek_parent (iface);
#line 767 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -7387,18 +7750,22 @@ static void publishing_rest_support_google_publisher_spit_publishing_publisher_i
iface->stop = (void (*) (SpitPublishingPublisher *)) publishing_rest_support_google_publisher_stop;
#line 767 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
iface->get_service = (SpitPublishingService* (*) (SpitPublishingPublisher *)) publishing_rest_support_google_publisher_real_get_service;
-#line 7383 "RESTSupport.c"
+#line 7746 "RESTSupport.c"
}
-static void publishing_rest_support_google_publisher_instance_init (PublishingRESTSupportGooglePublisher * self) {
+static void
+publishing_rest_support_google_publisher_instance_init (PublishingRESTSupportGooglePublisher * self)
+{
#line 767 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv = PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_PRIVATE (self);
-#line 7390 "RESTSupport.c"
+#line 7755 "RESTSupport.c"
}
-static void publishing_rest_support_google_publisher_finalize (GObject * obj) {
+static void
+publishing_rest_support_google_publisher_finalize (GObject * obj)
+{
PublishingRESTSupportGooglePublisher * self;
#line 767 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher);
@@ -7410,11 +7777,13 @@ static void publishing_rest_support_google_publisher_finalize (GObject * obj) {
_g_object_unref0 (self->priv->authenticator);
#line 767 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
G_OBJECT_CLASS (publishing_rest_support_google_publisher_parent_class)->finalize (obj);
-#line 7406 "RESTSupport.c"
+#line 7773 "RESTSupport.c"
}
-GType publishing_rest_support_google_publisher_get_type (void) {
+GType
+publishing_rest_support_google_publisher_get_type (void)
+{
static volatile gsize publishing_rest_support_google_publisher_type_id__volatile = 0;
if (g_once_init_enter (&publishing_rest_support_google_publisher_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingRESTSupportGooglePublisherClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_rest_support_google_publisher_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingRESTSupportGooglePublisher), 0, (GInstanceInitFunc) publishing_rest_support_google_publisher_instance_init, NULL };
@@ -7428,7 +7797,11 @@ GType publishing_rest_support_google_publisher_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) {
@@ -7440,7 +7813,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/plugins/common/Resources.c b/plugins/common/Resources.c
index 9558cc1..828d6df 100644
--- a/plugins/common/Resources.c
+++ b/plugins/common/Resources.c
@@ -1,4 +1,4 @@
-/* Resources.c generated by valac 0.36.6, the Vala compiler
+/* Resources.c generated by valac 0.40.4, the Vala compiler
* generated from Resources.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>
@@ -46,113 +47,129 @@
"c., \n" \
"51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA\n"
#define RESOURCES_TRANSLATORS _ ("translator-credits")
-GdkPixbuf** resources_load_icon_set (GFile* icon_file, int* result_length1);
-static void _vala_array_add4 (GdkPixbuf** * array, int* length, int* size, GdkPixbuf* value);
-GdkPixbuf** resources_load_from_resource (const gchar* resource_path, int* result_length1);
-static void _vala_array_add5 (GdkPixbuf** * array, int* length, int* size, GdkPixbuf* 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);
+GdkPixbuf** resources_load_icon_set (GFile* icon_file,
+ int* result_length1);
+static void _vala_array_add4 (GdkPixbuf** * array,
+ int* length,
+ int* size,
+ GdkPixbuf* value);
+GdkPixbuf** resources_load_from_resource (const gchar* resource_path,
+ int* result_length1);
+static void _vala_array_add5 (GdkPixbuf** * array,
+ int* length,
+ int* size,
+ GdkPixbuf* 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 gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
#line 50 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
return self ? g_object_ref (self) : NULL;
-#line 40 "Resources.c"
+#line 55 "Resources.c"
}
-static void _vala_array_add4 (GdkPixbuf** * array, int* length, int* size, GdkPixbuf* value) {
+static void
+_vala_array_add4 (GdkPixbuf** * array,
+ int* length,
+ int* size,
+ GdkPixbuf* value)
+{
#line 50 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
if ((*length) == (*size)) {
#line 50 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 50 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
*array = g_renew (GdkPixbuf*, *array, (*size) + 1);
-#line 51 "Resources.c"
+#line 71 "Resources.c"
}
#line 50 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
(*array)[(*length)++] = value;
#line 50 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
(*array)[*length] = NULL;
-#line 57 "Resources.c"
+#line 77 "Resources.c"
}
-GdkPixbuf** resources_load_icon_set (GFile* icon_file, int* result_length1) {
+GdkPixbuf**
+resources_load_icon_set (GFile* icon_file,
+ int* result_length1)
+{
GdkPixbuf** result = NULL;
GdkPixbuf* icon = NULL;
- GdkPixbuf* _tmp10_;
- GdkPixbuf** _tmp16_;
- gint _tmp16__length1;
+ GdkPixbuf* _tmp8_;
+ GdkPixbuf** _tmp14_;
+ gint _tmp14__length1;
GError * _inner_error_ = NULL;
#line 40 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
g_return_val_if_fail ((icon_file == NULL) || G_IS_FILE (icon_file), NULL);
#line 41 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
icon = NULL;
-#line 72 "Resources.c"
+#line 95 "Resources.c"
{
GdkPixbuf* _tmp0_ = NULL;
- GFile* _tmp1_;
+ gchar* _tmp1_;
gchar* _tmp2_;
- gchar* _tmp3_;
+ GdkPixbuf* _tmp3_;
GdkPixbuf* _tmp4_;
GdkPixbuf* _tmp5_;
- GdkPixbuf* _tmp6_;
#line 43 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _tmp1_ = icon_file;
+ _tmp1_ = g_file_get_path (icon_file);
#line 43 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _tmp2_ = g_file_get_path (_tmp1_);
+ _tmp2_ = _tmp1_;
#line 43 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _tmp3_ = _tmp2_;
+ _tmp3_ = gdk_pixbuf_new_from_file (_tmp2_, &_inner_error_);
#line 43 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _tmp4_ = gdk_pixbuf_new_from_file (_tmp3_, &_inner_error_);
+ _tmp4_ = _tmp3_;
#line 43 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _tmp5_ = _tmp4_;
+ _g_free0 (_tmp2_);
#line 43 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _g_free0 (_tmp3_);
-#line 43 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _tmp0_ = _tmp5_;
+ _tmp0_ = _tmp4_;
#line 43 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 97 "Resources.c"
+#line 117 "Resources.c"
goto __catch4_g_error;
}
#line 43 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _tmp6_ = _tmp0_;
+ _tmp5_ = _tmp0_;
#line 43 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
_tmp0_ = NULL;
#line 43 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
_g_object_unref0 (icon);
#line 43 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- icon = _tmp6_;
+ icon = _tmp5_;
#line 42 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
_g_object_unref0 (_tmp0_);
-#line 110 "Resources.c"
+#line 130 "Resources.c"
}
goto __finally4;
__catch4_g_error:
{
GError* err = NULL;
- GFile* _tmp7_;
- gchar* _tmp8_;
- gchar* _tmp9_;
+ gchar* _tmp6_;
+ gchar* _tmp7_;
#line 42 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
err = _inner_error_;
#line 42 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
_inner_error_ = NULL;
#line 45 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _tmp7_ = icon_file;
-#line 45 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _tmp8_ = g_file_get_path (_tmp7_);
+ _tmp6_ = g_file_get_path (icon_file);
#line 45 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _tmp9_ = _tmp8_;
+ _tmp7_ = _tmp6_;
#line 45 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- g_warning ("Resources.vala:45: couldn't load icon set from %s.", _tmp9_);
+ g_warning ("Resources.vala:45: couldn't load icon set from %s.", _tmp7_);
#line 45 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _g_free0 (_tmp9_);
+ _g_free0 (_tmp7_);
#line 42 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
_g_error_free0 (err);
-#line 135 "Resources.c"
+#line 152 "Resources.c"
}
__finally4:
#line 42 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
@@ -165,152 +182,154 @@ GdkPixbuf** resources_load_icon_set (GFile* icon_file, int* result_length1) {
g_clear_error (&_inner_error_);
#line 42 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
return NULL;
-#line 148 "Resources.c"
+#line 165 "Resources.c"
}
#line 48 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _tmp10_ = icon;
+ _tmp8_ = icon;
#line 48 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- if (_tmp10_ != NULL) {
-#line 154 "Resources.c"
+ if (_tmp8_ != NULL) {
+#line 171 "Resources.c"
GdkPixbuf** icon_pixbuf_set = NULL;
- GdkPixbuf** _tmp11_;
+ GdkPixbuf** _tmp9_;
gint icon_pixbuf_set_length1;
gint _icon_pixbuf_set_size_;
- GdkPixbuf** _tmp12_;
- gint _tmp12__length1;
- GdkPixbuf* _tmp13_;
- GdkPixbuf* _tmp14_;
- GdkPixbuf** _tmp15_;
- gint _tmp15__length1;
+ GdkPixbuf** _tmp10_;
+ gint _tmp10__length1;
+ GdkPixbuf* _tmp11_;
+ GdkPixbuf* _tmp12_;
+ GdkPixbuf** _tmp13_;
+ gint _tmp13__length1;
#line 49 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _tmp11_ = g_new0 (GdkPixbuf*, 0 + 1);
+ _tmp9_ = g_new0 (GdkPixbuf*, 0 + 1);
#line 49 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- icon_pixbuf_set = _tmp11_;
+ icon_pixbuf_set = _tmp9_;
#line 49 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
icon_pixbuf_set_length1 = 0;
#line 49 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
_icon_pixbuf_set_size_ = icon_pixbuf_set_length1;
#line 50 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _tmp12_ = icon_pixbuf_set;
+ _tmp10_ = icon_pixbuf_set;
#line 50 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _tmp12__length1 = icon_pixbuf_set_length1;
+ _tmp10__length1 = icon_pixbuf_set_length1;
#line 50 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _tmp13_ = icon;
+ _tmp11_ = icon;
#line 50 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _tmp14_ = _g_object_ref0 (_tmp13_);
+ _tmp12_ = _g_object_ref0 (_tmp11_);
#line 50 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _vala_array_add4 (&icon_pixbuf_set, &icon_pixbuf_set_length1, &_icon_pixbuf_set_size_, _tmp14_);
+ _vala_array_add4 (&icon_pixbuf_set, &icon_pixbuf_set_length1, &_icon_pixbuf_set_size_, _tmp12_);
#line 51 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _tmp15_ = icon_pixbuf_set;
+ _tmp13_ = icon_pixbuf_set;
#line 51 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _tmp15__length1 = icon_pixbuf_set_length1;
+ _tmp13__length1 = icon_pixbuf_set_length1;
#line 51 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
if (result_length1) {
#line 51 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- *result_length1 = _tmp15__length1;
-#line 191 "Resources.c"
+ *result_length1 = _tmp13__length1;
+#line 208 "Resources.c"
}
#line 51 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- result = _tmp15_;
+ result = _tmp13_;
#line 51 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
_g_object_unref0 (icon);
#line 51 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
return result;
-#line 199 "Resources.c"
+#line 216 "Resources.c"
}
#line 54 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _tmp16_ = NULL;
+ _tmp14_ = NULL;
#line 54 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _tmp16__length1 = 0;
+ _tmp14__length1 = 0;
#line 54 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
if (result_length1) {
#line 54 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- *result_length1 = _tmp16__length1;
-#line 209 "Resources.c"
+ *result_length1 = _tmp14__length1;
+#line 226 "Resources.c"
}
#line 54 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- result = _tmp16_;
+ result = _tmp14_;
#line 54 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
_g_object_unref0 (icon);
#line 54 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
return result;
-#line 217 "Resources.c"
+#line 234 "Resources.c"
}
-static void _vala_array_add5 (GdkPixbuf** * array, int* length, int* size, GdkPixbuf* value) {
+static void
+_vala_array_add5 (GdkPixbuf** * array,
+ int* length,
+ int* size,
+ GdkPixbuf* value)
+{
#line 67 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
if ((*length) == (*size)) {
#line 67 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 67 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
*array = g_renew (GdkPixbuf*, *array, (*size) + 1);
-#line 228 "Resources.c"
+#line 250 "Resources.c"
}
#line 67 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
(*array)[(*length)++] = value;
#line 67 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
(*array)[*length] = NULL;
-#line 234 "Resources.c"
+#line 256 "Resources.c"
}
-GdkPixbuf** resources_load_from_resource (const gchar* resource_path, int* result_length1) {
+GdkPixbuf**
+resources_load_from_resource (const gchar* resource_path,
+ int* result_length1)
+{
GdkPixbuf** result = NULL;
GdkPixbuf* icon = NULL;
- GdkPixbuf* _tmp5_;
- GdkPixbuf** _tmp11_;
- gint _tmp11__length1;
+ GdkPixbuf* _tmp3_;
+ GdkPixbuf** _tmp9_;
+ gint _tmp9__length1;
GError * _inner_error_ = NULL;
#line 57 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
g_return_val_if_fail (resource_path != NULL, NULL);
#line 58 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
icon = NULL;
-#line 249 "Resources.c"
+#line 274 "Resources.c"
{
GdkPixbuf* _tmp0_ = NULL;
- const gchar* _tmp1_;
+ GdkPixbuf* _tmp1_;
GdkPixbuf* _tmp2_;
- GdkPixbuf* _tmp3_;
-#line 60 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _tmp1_ = resource_path;
#line 60 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _tmp2_ = gdk_pixbuf_new_from_resource (_tmp1_, &_inner_error_);
+ _tmp1_ = gdk_pixbuf_new_from_resource (resource_path, &_inner_error_);
#line 60 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _tmp0_ = _tmp2_;
+ _tmp0_ = _tmp1_;
#line 60 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 263 "Resources.c"
+#line 285 "Resources.c"
goto __catch5_g_error;
}
#line 60 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _tmp3_ = _tmp0_;
+ _tmp2_ = _tmp0_;
#line 60 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
_tmp0_ = NULL;
#line 60 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
_g_object_unref0 (icon);
#line 60 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- icon = _tmp3_;
+ icon = _tmp2_;
#line 59 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
_g_object_unref0 (_tmp0_);
-#line 276 "Resources.c"
+#line 298 "Resources.c"
}
goto __finally5;
__catch5_g_error:
{
GError* _error_ = NULL;
- const gchar* _tmp4_;
#line 59 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
_error_ = _inner_error_;
#line 59 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
_inner_error_ = NULL;
#line 62 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _tmp4_ = resource_path;
-#line 62 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- g_warning ("Resources.vala:62: Couldn't load icon set from %s", _tmp4_);
+ g_warning ("Resources.vala:62: Couldn't load icon set from %s", resource_path);
#line 59 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
_g_error_free0 (_error_);
-#line 293 "Resources.c"
+#line 312 "Resources.c"
}
__finally5:
#line 59 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
@@ -323,80 +342,84 @@ GdkPixbuf** resources_load_from_resource (const gchar* resource_path, int* resul
g_clear_error (&_inner_error_);
#line 59 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
return NULL;
-#line 306 "Resources.c"
+#line 325 "Resources.c"
}
#line 65 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _tmp5_ = icon;
+ _tmp3_ = icon;
#line 65 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- if (_tmp5_ != NULL) {
-#line 312 "Resources.c"
+ if (_tmp3_ != NULL) {
+#line 331 "Resources.c"
GdkPixbuf** icon_pixbuf_set = NULL;
- GdkPixbuf** _tmp6_;
+ GdkPixbuf** _tmp4_;
gint icon_pixbuf_set_length1;
gint _icon_pixbuf_set_size_;
- GdkPixbuf** _tmp7_;
- gint _tmp7__length1;
- GdkPixbuf* _tmp8_;
- GdkPixbuf* _tmp9_;
- GdkPixbuf** _tmp10_;
- gint _tmp10__length1;
+ GdkPixbuf** _tmp5_;
+ gint _tmp5__length1;
+ GdkPixbuf* _tmp6_;
+ GdkPixbuf* _tmp7_;
+ GdkPixbuf** _tmp8_;
+ gint _tmp8__length1;
#line 66 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _tmp6_ = g_new0 (GdkPixbuf*, 0 + 1);
+ _tmp4_ = g_new0 (GdkPixbuf*, 0 + 1);
#line 66 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- icon_pixbuf_set = _tmp6_;
+ icon_pixbuf_set = _tmp4_;
#line 66 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
icon_pixbuf_set_length1 = 0;
#line 66 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
_icon_pixbuf_set_size_ = icon_pixbuf_set_length1;
#line 67 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _tmp7_ = icon_pixbuf_set;
+ _tmp5_ = icon_pixbuf_set;
#line 67 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _tmp7__length1 = icon_pixbuf_set_length1;
+ _tmp5__length1 = icon_pixbuf_set_length1;
#line 67 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _tmp8_ = icon;
+ _tmp6_ = icon;
#line 67 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _tmp9_ = _g_object_ref0 (_tmp8_);
+ _tmp7_ = _g_object_ref0 (_tmp6_);
#line 67 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _vala_array_add5 (&icon_pixbuf_set, &icon_pixbuf_set_length1, &_icon_pixbuf_set_size_, _tmp9_);
+ _vala_array_add5 (&icon_pixbuf_set, &icon_pixbuf_set_length1, &_icon_pixbuf_set_size_, _tmp7_);
#line 68 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _tmp10_ = icon_pixbuf_set;
+ _tmp8_ = icon_pixbuf_set;
#line 68 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _tmp10__length1 = icon_pixbuf_set_length1;
+ _tmp8__length1 = icon_pixbuf_set_length1;
#line 68 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
if (result_length1) {
#line 68 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- *result_length1 = _tmp10__length1;
-#line 349 "Resources.c"
+ *result_length1 = _tmp8__length1;
+#line 368 "Resources.c"
}
#line 68 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- result = _tmp10_;
+ result = _tmp8_;
#line 68 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
_g_object_unref0 (icon);
#line 68 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
return result;
-#line 357 "Resources.c"
+#line 376 "Resources.c"
}
#line 71 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _tmp11_ = NULL;
+ _tmp9_ = NULL;
#line 71 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _tmp11__length1 = 0;
+ _tmp9__length1 = 0;
#line 71 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
if (result_length1) {
#line 71 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- *result_length1 = _tmp11__length1;
-#line 367 "Resources.c"
+ *result_length1 = _tmp9__length1;
+#line 386 "Resources.c"
}
#line 71 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- result = _tmp11_;
+ result = _tmp9_;
#line 71 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
_g_object_unref0 (icon);
#line 71 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
return result;
-#line 375 "Resources.c"
+#line 394 "Resources.c"
}
-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) {
@@ -408,7 +431,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/plugins/common/WebAuthenticationPane.c b/plugins/common/WebAuthenticationPane.c
index 8b6c4c9..dd556c2 100644
--- a/plugins/common/WebAuthenticationPane.c
+++ b/plugins/common/WebAuthenticationPane.c
@@ -1,4 +1,4 @@
-/* WebAuthenticationPane.c generated by valac 0.36.6, the Vala compiler
+/* WebAuthenticationPane.c generated by valac 0.40.4, the Vala compiler
* generated from WebAuthenticationPane.vala, do not modify */
/* Copyright 2016 Jens Georg <mail@jensge.org>
@@ -7,6 +7,7 @@
* See the COPYING file in this distribution.
*/
+
#include <glib.h>
#include <glib-object.h>
#include "shotwell-plugin-dev-1.0.h"
@@ -27,6 +28,13 @@
typedef struct _ShotwellPluginsCommonWebAuthenticationPane ShotwellPluginsCommonWebAuthenticationPane;
typedef struct _ShotwellPluginsCommonWebAuthenticationPaneClass ShotwellPluginsCommonWebAuthenticationPaneClass;
typedef struct _ShotwellPluginsCommonWebAuthenticationPanePrivate ShotwellPluginsCommonWebAuthenticationPanePrivate;
+enum {
+ SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_0_PROPERTY,
+ SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_PREFERRED_GEOMETRY_PROPERTY,
+ SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_LOGIN_URI_PROPERTY,
+ SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_NUM_PROPERTIES
+};
+static GParamSpec* shotwell_plugins_common_web_authentication_pane_properties[SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_NUM_PROPERTIES];
#define _g_free0(var) (var = (g_free (var), NULL))
#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
@@ -52,19 +60,22 @@ static SpitPublishingDialogPaneIface * shotwell_plugins_common_web_authenticatio
GType shotwell_plugins_common_web_authentication_pane_get_type (void) G_GNUC_CONST;
#define SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPanePrivate))
-enum {
- SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_DUMMY_PROPERTY,
- SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_PREFERRED_GEOMETRY_PROPERTY,
- SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_LOGIN_URI_PROPERTY
-};
static void shotwell_plugins_common_web_authentication_pane_real_constructed (GObject* base);
-static void shotwell_plugins_common_web_authentication_pane_on_page_load_changed (ShotwellPluginsCommonWebAuthenticationPane* self, WebKitLoadEvent load_event);
-static void _shotwell_plugins_common_web_authentication_pane_on_page_load_changed_webkit_web_view_load_changed (WebKitWebView* _sender, WebKitLoadEvent load_event, gpointer self);
+static void shotwell_plugins_common_web_authentication_pane_on_page_load_changed (ShotwellPluginsCommonWebAuthenticationPane* self,
+ WebKitLoadEvent load_event);
+static void _shotwell_plugins_common_web_authentication_pane_on_page_load_changed_webkit_web_view_load_changed (WebKitWebView* _sender,
+ WebKitLoadEvent load_event,
+ gpointer self);
static gboolean __lambda4_ (ShotwellPluginsCommonWebAuthenticationPane* self);
-static gboolean ___lambda4__webkit_web_view_context_menu (WebKitWebView* _sender, WebKitContextMenu* context_menu, GdkEvent* event, WebKitHitTestResult* hit_test_result, gpointer self);
+static gboolean ___lambda4__webkit_web_view_context_menu (WebKitWebView* _sender,
+ WebKitContextMenu* context_menu,
+ GdkEvent* event,
+ WebKitHitTestResult* hit_test_result,
+ gpointer self);
void shotwell_plugins_common_web_authentication_pane_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* self);
static void shotwell_plugins_common_web_authentication_pane_real_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* self);
-void shotwell_plugins_common_web_authentication_pane_set_cursor (ShotwellPluginsCommonWebAuthenticationPane* self, GdkCursorType type);
+void shotwell_plugins_common_web_authentication_pane_set_cursor (ShotwellPluginsCommonWebAuthenticationPane* self,
+ GdkCursorType type);
WebKitWebView* shotwell_plugins_common_web_authentication_pane_get_view (ShotwellPluginsCommonWebAuthenticationPane* self);
static SpitPublishingDialogPaneGeometryOptions shotwell_plugins_common_web_authentication_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base);
SpitPublishingDialogPaneGeometryOptions shotwell_plugins_common_web_authentication_pane_get_preferred_geometry (ShotwellPluginsCommonWebAuthenticationPane* self);
@@ -73,40 +84,62 @@ static void shotwell_plugins_common_web_authentication_pane_real_on_pane_install
gchar* shotwell_plugins_common_web_authentication_pane_get_login_uri (ShotwellPluginsCommonWebAuthenticationPane* self);
static void shotwell_plugins_common_web_authentication_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base);
ShotwellPluginsCommonWebAuthenticationPane* shotwell_plugins_common_web_authentication_pane_construct (GType object_type);
-static void shotwell_plugins_common_web_authentication_pane_set_preferred_geometry (ShotwellPluginsCommonWebAuthenticationPane* self, SpitPublishingDialogPaneGeometryOptions value);
-static void shotwell_plugins_common_web_authentication_pane_set_login_uri (ShotwellPluginsCommonWebAuthenticationPane* self, const gchar* value);
+static void shotwell_plugins_common_web_authentication_pane_set_preferred_geometry (ShotwellPluginsCommonWebAuthenticationPane* self,
+ SpitPublishingDialogPaneGeometryOptions value);
+static void shotwell_plugins_common_web_authentication_pane_set_login_uri (ShotwellPluginsCommonWebAuthenticationPane* self,
+ const gchar* value);
static void shotwell_plugins_common_web_authentication_pane_finalize (GObject * obj);
-static void _vala_shotwell_plugins_common_web_authentication_pane_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
-static void _vala_shotwell_plugins_common_web_authentication_pane_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec);
-
-
-static void _shotwell_plugins_common_web_authentication_pane_on_page_load_changed_webkit_web_view_load_changed (WebKitWebView* _sender, WebKitLoadEvent load_event, gpointer self) {
+static void _vala_shotwell_plugins_common_web_authentication_pane_get_property (GObject * object,
+ guint property_id,
+ GValue * value,
+ GParamSpec * pspec);
+static void _vala_shotwell_plugins_common_web_authentication_pane_set_property (GObject * object,
+ guint property_id,
+ const GValue * value,
+ GParamSpec * pspec);
+
+
+static void
+_shotwell_plugins_common_web_authentication_pane_on_page_load_changed_webkit_web_view_load_changed (WebKitWebView* _sender,
+ WebKitLoadEvent load_event,
+ gpointer self)
+{
#line 24 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
shotwell_plugins_common_web_authentication_pane_on_page_load_changed ((ShotwellPluginsCommonWebAuthenticationPane*) self, load_event);
-#line 87 "WebAuthenticationPane.c"
+#line 110 "WebAuthenticationPane.c"
}
-static gboolean __lambda4_ (ShotwellPluginsCommonWebAuthenticationPane* self) {
+static gboolean
+__lambda4_ (ShotwellPluginsCommonWebAuthenticationPane* self)
+{
gboolean result = FALSE;
#line 25 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
result = FALSE;
#line 25 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
return result;
-#line 97 "WebAuthenticationPane.c"
+#line 122 "WebAuthenticationPane.c"
}
-static gboolean ___lambda4__webkit_web_view_context_menu (WebKitWebView* _sender, WebKitContextMenu* context_menu, GdkEvent* event, WebKitHitTestResult* hit_test_result, gpointer self) {
+static gboolean
+___lambda4__webkit_web_view_context_menu (WebKitWebView* _sender,
+ WebKitContextMenu* context_menu,
+ GdkEvent* event,
+ WebKitHitTestResult* hit_test_result,
+ gpointer self)
+{
gboolean result;
result = __lambda4_ ((ShotwellPluginsCommonWebAuthenticationPane*) self);
#line 25 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
return result;
-#line 106 "WebAuthenticationPane.c"
+#line 137 "WebAuthenticationPane.c"
}
-static void shotwell_plugins_common_web_authentication_pane_real_constructed (GObject* base) {
+static void
+shotwell_plugins_common_web_authentication_pane_real_constructed (GObject* base)
+{
ShotwellPluginsCommonWebAuthenticationPane * self;
WebKitWebView* _tmp0_;
WebKitWebView* _tmp1_;
@@ -139,36 +172,45 @@ static void shotwell_plugins_common_web_authentication_pane_real_constructed (GO
_tmp4_ = self->priv->webview;
#line 25 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
g_signal_connect_object (_tmp4_, "context-menu", (GCallback) ___lambda4__webkit_web_view_context_menu, self, 0);
-#line 143 "WebAuthenticationPane.c"
+#line 176 "WebAuthenticationPane.c"
}
-static void shotwell_plugins_common_web_authentication_pane_real_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* self) {
+static void
+shotwell_plugins_common_web_authentication_pane_real_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* self)
+{
#line 28 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
g_critical ("Type `%s' does not implement abstract method `shotwell_plugins_common_web_authentication_pane_on_page_load'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 28 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
return;
-#line 152 "WebAuthenticationPane.c"
+#line 187 "WebAuthenticationPane.c"
}
-void shotwell_plugins_common_web_authentication_pane_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* self) {
+void
+shotwell_plugins_common_web_authentication_pane_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* self)
+{
#line 28 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
g_return_if_fail (SHOTWELL_PLUGINS_COMMON_IS_WEB_AUTHENTICATION_PANE (self));
#line 28 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_GET_CLASS (self)->on_page_load (self);
-#line 161 "WebAuthenticationPane.c"
+#line 198 "WebAuthenticationPane.c"
}
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
#line 31 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
return self ? g_object_ref (self) : NULL;
-#line 168 "WebAuthenticationPane.c"
+#line 207 "WebAuthenticationPane.c"
}
-void shotwell_plugins_common_web_authentication_pane_set_cursor (ShotwellPluginsCommonWebAuthenticationPane* self, GdkCursorType type) {
+void
+shotwell_plugins_common_web_authentication_pane_set_cursor (ShotwellPluginsCommonWebAuthenticationPane* self,
+ GdkCursorType type)
+{
GdkWindow* window = NULL;
WebKitWebView* _tmp0_;
GdkWindow* _tmp1_;
@@ -177,8 +219,7 @@ void shotwell_plugins_common_web_authentication_pane_set_cursor (ShotwellPlugins
GdkDisplay* _tmp3_;
GdkDisplay* _tmp4_;
GdkCursor* cursor = NULL;
- GdkCursorType _tmp5_;
- GdkCursor* _tmp6_;
+ GdkCursor* _tmp5_;
#line 30 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
g_return_if_fail (SHOTWELL_PLUGINS_COMMON_IS_WEB_AUTHENTICATION_PANE (self));
#line 31 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
@@ -196,11 +237,9 @@ void shotwell_plugins_common_web_authentication_pane_set_cursor (ShotwellPlugins
#line 32 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
display = _tmp4_;
#line 33 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
- _tmp5_ = type;
+ _tmp5_ = gdk_cursor_new_for_display (display, type);
#line 33 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
- _tmp6_ = gdk_cursor_new_for_display (display, _tmp5_);
-#line 33 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
- cursor = _tmp6_;
+ cursor = _tmp5_;
#line 34 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
gdk_window_set_cursor (window, cursor);
#line 30 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
@@ -209,33 +248,33 @@ void shotwell_plugins_common_web_authentication_pane_set_cursor (ShotwellPlugins
_g_object_unref0 (display);
#line 30 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
_g_object_unref0 (window);
-#line 213 "WebAuthenticationPane.c"
+#line 252 "WebAuthenticationPane.c"
}
-static void shotwell_plugins_common_web_authentication_pane_on_page_load_changed (ShotwellPluginsCommonWebAuthenticationPane* self, WebKitLoadEvent load_event) {
- WebKitLoadEvent _tmp0_;
+static void
+shotwell_plugins_common_web_authentication_pane_on_page_load_changed (ShotwellPluginsCommonWebAuthenticationPane* self,
+ WebKitLoadEvent load_event)
+{
#line 37 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
g_return_if_fail (SHOTWELL_PLUGINS_COMMON_IS_WEB_AUTHENTICATION_PANE (self));
#line 38 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
- _tmp0_ = load_event;
-#line 38 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
- switch (_tmp0_) {
+ switch (load_event) {
#line 38 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
case WEBKIT_LOAD_STARTED:
#line 38 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
case WEBKIT_LOAD_REDIRECTED:
-#line 229 "WebAuthenticationPane.c"
+#line 268 "WebAuthenticationPane.c"
{
#line 41 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
shotwell_plugins_common_web_authentication_pane_set_cursor (self, GDK_WATCH);
#line 42 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
break;
-#line 235 "WebAuthenticationPane.c"
+#line 274 "WebAuthenticationPane.c"
}
#line 38 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
case WEBKIT_LOAD_FINISHED:
-#line 239 "WebAuthenticationPane.c"
+#line 278 "WebAuthenticationPane.c"
{
#line 44 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
shotwell_plugins_common_web_authentication_pane_set_cursor (self, GDK_LEFT_PTR);
@@ -243,19 +282,21 @@ static void shotwell_plugins_common_web_authentication_pane_on_page_load_changed
shotwell_plugins_common_web_authentication_pane_on_page_load (self);
#line 46 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
break;
-#line 247 "WebAuthenticationPane.c"
+#line 286 "WebAuthenticationPane.c"
}
default:
{
#line 48 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
break;
-#line 253 "WebAuthenticationPane.c"
+#line 292 "WebAuthenticationPane.c"
}
}
}
-WebKitWebView* shotwell_plugins_common_web_authentication_pane_get_view (ShotwellPluginsCommonWebAuthenticationPane* self) {
+WebKitWebView*
+shotwell_plugins_common_web_authentication_pane_get_view (ShotwellPluginsCommonWebAuthenticationPane* self)
+{
WebKitWebView* result = NULL;
WebKitWebView* _tmp0_;
WebKitWebView* _tmp1_;
@@ -269,11 +310,13 @@ WebKitWebView* shotwell_plugins_common_web_authentication_pane_get_view (Shotwel
result = _tmp1_;
#line 53 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
return result;
-#line 273 "WebAuthenticationPane.c"
+#line 314 "WebAuthenticationPane.c"
}
-static SpitPublishingDialogPaneGeometryOptions shotwell_plugins_common_web_authentication_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) {
+static SpitPublishingDialogPaneGeometryOptions
+shotwell_plugins_common_web_authentication_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base)
+{
ShotwellPluginsCommonWebAuthenticationPane * self;
SpitPublishingDialogPaneGeometryOptions result = 0;
SpitPublishingDialogPaneGeometryOptions _tmp0_;
@@ -285,11 +328,13 @@ static SpitPublishingDialogPaneGeometryOptions shotwell_plugins_common_web_authe
result = _tmp0_;
#line 57 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
return result;
-#line 289 "WebAuthenticationPane.c"
+#line 332 "WebAuthenticationPane.c"
}
-static GtkWidget* shotwell_plugins_common_web_authentication_pane_real_get_widget (SpitPublishingDialogPane* base) {
+static GtkWidget*
+shotwell_plugins_common_web_authentication_pane_real_get_widget (SpitPublishingDialogPane* base)
+{
ShotwellPluginsCommonWebAuthenticationPane * self;
GtkWidget* result = NULL;
WebKitWebView* _tmp0_;
@@ -304,11 +349,13 @@ static GtkWidget* shotwell_plugins_common_web_authentication_pane_real_get_widge
result = _tmp1_;
#line 61 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
return result;
-#line 308 "WebAuthenticationPane.c"
+#line 353 "WebAuthenticationPane.c"
}
-static void shotwell_plugins_common_web_authentication_pane_real_on_pane_installed (SpitPublishingDialogPane* base) {
+static void
+shotwell_plugins_common_web_authentication_pane_real_on_pane_installed (SpitPublishingDialogPane* base)
+{
ShotwellPluginsCommonWebAuthenticationPane * self;
WebKitWebView* _tmp0_;
WebKitWebView* _tmp1_;
@@ -333,29 +380,35 @@ static void shotwell_plugins_common_web_authentication_pane_real_on_pane_install
_g_free0 (_tmp4_);
#line 65 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
_g_object_unref0 (_tmp1_);
-#line 337 "WebAuthenticationPane.c"
+#line 384 "WebAuthenticationPane.c"
}
-static void shotwell_plugins_common_web_authentication_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) {
+static void
+shotwell_plugins_common_web_authentication_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base)
+{
ShotwellPluginsCommonWebAuthenticationPane * self;
#line 68 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPane);
-#line 345 "WebAuthenticationPane.c"
+#line 394 "WebAuthenticationPane.c"
}
-ShotwellPluginsCommonWebAuthenticationPane* shotwell_plugins_common_web_authentication_pane_construct (GType object_type) {
+ShotwellPluginsCommonWebAuthenticationPane*
+shotwell_plugins_common_web_authentication_pane_construct (GType object_type)
+{
ShotwellPluginsCommonWebAuthenticationPane * self = NULL;
#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
self = (ShotwellPluginsCommonWebAuthenticationPane*) g_object_new (object_type, NULL);
#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
return self;
-#line 355 "WebAuthenticationPane.c"
+#line 406 "WebAuthenticationPane.c"
}
-SpitPublishingDialogPaneGeometryOptions shotwell_plugins_common_web_authentication_pane_get_preferred_geometry (ShotwellPluginsCommonWebAuthenticationPane* self) {
+SpitPublishingDialogPaneGeometryOptions
+shotwell_plugins_common_web_authentication_pane_get_preferred_geometry (ShotwellPluginsCommonWebAuthenticationPane* self)
+{
SpitPublishingDialogPaneGeometryOptions result;
SpitPublishingDialogPaneGeometryOptions _tmp0_;
#line 11 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
@@ -366,29 +419,30 @@ SpitPublishingDialogPaneGeometryOptions shotwell_plugins_common_web_authenticati
result = _tmp0_;
#line 11 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
return result;
-#line 370 "WebAuthenticationPane.c"
+#line 423 "WebAuthenticationPane.c"
}
-static void shotwell_plugins_common_web_authentication_pane_set_preferred_geometry (ShotwellPluginsCommonWebAuthenticationPane* self, SpitPublishingDialogPaneGeometryOptions value) {
+static void
+shotwell_plugins_common_web_authentication_pane_set_preferred_geometry (ShotwellPluginsCommonWebAuthenticationPane* self,
+ SpitPublishingDialogPaneGeometryOptions value)
+{
#line 11 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
g_return_if_fail (SHOTWELL_PLUGINS_COMMON_IS_WEB_AUTHENTICATION_PANE (self));
#line 11 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
if (shotwell_plugins_common_web_authentication_pane_get_preferred_geometry (self) != value) {
-#line 379 "WebAuthenticationPane.c"
- SpitPublishingDialogPaneGeometryOptions _tmp0_;
-#line 11 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
- _tmp0_ = value;
#line 11 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
- self->priv->_preferred_geometry = _tmp0_;
+ self->priv->_preferred_geometry = value;
#line 11 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
- g_object_notify ((GObject *) self, "preferred-geometry");
-#line 387 "WebAuthenticationPane.c"
+ g_object_notify_by_pspec ((GObject *) self, shotwell_plugins_common_web_authentication_pane_properties[SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_PREFERRED_GEOMETRY_PROPERTY]);
+#line 439 "WebAuthenticationPane.c"
}
}
-gchar* shotwell_plugins_common_web_authentication_pane_get_login_uri (ShotwellPluginsCommonWebAuthenticationPane* self) {
+gchar*
+shotwell_plugins_common_web_authentication_pane_get_login_uri (ShotwellPluginsCommonWebAuthenticationPane* self)
+{
gchar* result;
const gchar* _tmp0_;
gchar* _tmp1_;
@@ -402,34 +456,36 @@ gchar* shotwell_plugins_common_web_authentication_pane_get_login_uri (ShotwellPl
result = _tmp1_;
#line 14 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
return result;
-#line 406 "WebAuthenticationPane.c"
+#line 460 "WebAuthenticationPane.c"
}
-static void shotwell_plugins_common_web_authentication_pane_set_login_uri (ShotwellPluginsCommonWebAuthenticationPane* self, const gchar* value) {
+static void
+shotwell_plugins_common_web_authentication_pane_set_login_uri (ShotwellPluginsCommonWebAuthenticationPane* self,
+ const gchar* value)
+{
#line 14 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
g_return_if_fail (SHOTWELL_PLUGINS_COMMON_IS_WEB_AUTHENTICATION_PANE (self));
#line 14 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
if (g_strcmp0 (value, shotwell_plugins_common_web_authentication_pane_get_login_uri (self)) != 0) {
-#line 415 "WebAuthenticationPane.c"
- const gchar* _tmp0_;
- gchar* _tmp1_;
-#line 14 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
- _tmp0_ = value;
+#line 472 "WebAuthenticationPane.c"
+ gchar* _tmp0_;
#line 14 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
- _tmp1_ = g_strdup (_tmp0_);
+ _tmp0_ = g_strdup (value);
#line 14 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
_g_free0 (self->priv->_login_uri);
#line 14 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
- self->priv->_login_uri = _tmp1_;
+ self->priv->_login_uri = _tmp0_;
#line 14 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
- g_object_notify ((GObject *) self, "login-uri");
-#line 428 "WebAuthenticationPane.c"
+ g_object_notify_by_pspec ((GObject *) self, shotwell_plugins_common_web_authentication_pane_properties[SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_LOGIN_URI_PROPERTY]);
+#line 482 "WebAuthenticationPane.c"
}
}
-static void shotwell_plugins_common_web_authentication_pane_class_init (ShotwellPluginsCommonWebAuthenticationPaneClass * klass) {
+static void
+shotwell_plugins_common_web_authentication_pane_class_init (ShotwellPluginsCommonWebAuthenticationPaneClass * klass)
+{
#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
shotwell_plugins_common_web_authentication_pane_parent_class = g_type_class_peek_parent (klass);
#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
@@ -445,14 +501,16 @@ static void shotwell_plugins_common_web_authentication_pane_class_init (Shotwell
#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
G_OBJECT_CLASS (klass)->finalize = shotwell_plugins_common_web_authentication_pane_finalize;
#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
- g_object_class_install_property (G_OBJECT_CLASS (klass), SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_PREFERRED_GEOMETRY_PROPERTY, g_param_spec_enum ("preferred-geometry", "preferred-geometry", "preferred-geometry", SPIT_PUBLISHING_DIALOG_PANE_TYPE_GEOMETRY_OPTIONS, SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+ g_object_class_install_property (G_OBJECT_CLASS (klass), SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_PREFERRED_GEOMETRY_PROPERTY, shotwell_plugins_common_web_authentication_pane_properties[SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_PREFERRED_GEOMETRY_PROPERTY] = g_param_spec_enum ("preferred-geometry", "preferred-geometry", "preferred-geometry", SPIT_PUBLISHING_DIALOG_PANE_TYPE_GEOMETRY_OPTIONS, SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
- g_object_class_install_property (G_OBJECT_CLASS (klass), SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_LOGIN_URI_PROPERTY, g_param_spec_string ("login-uri", "login-uri", "login-uri", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
-#line 452 "WebAuthenticationPane.c"
+ g_object_class_install_property (G_OBJECT_CLASS (klass), SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_LOGIN_URI_PROPERTY, shotwell_plugins_common_web_authentication_pane_properties[SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_LOGIN_URI_PROPERTY] = g_param_spec_string ("login-uri", "login-uri", "login-uri", NULL, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+#line 508 "WebAuthenticationPane.c"
}
-static void shotwell_plugins_common_web_authentication_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) {
+static void
+shotwell_plugins_common_web_authentication_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface)
+{
#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
shotwell_plugins_common_web_authentication_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
@@ -463,20 +521,24 @@ static void shotwell_plugins_common_web_authentication_pane_spit_publishing_dial
iface->on_pane_installed = (void (*) (SpitPublishingDialogPane *)) shotwell_plugins_common_web_authentication_pane_real_on_pane_installed;
#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
iface->on_pane_uninstalled = (void (*) (SpitPublishingDialogPane *)) shotwell_plugins_common_web_authentication_pane_real_on_pane_uninstalled;
-#line 467 "WebAuthenticationPane.c"
+#line 525 "WebAuthenticationPane.c"
}
-static void shotwell_plugins_common_web_authentication_pane_instance_init (ShotwellPluginsCommonWebAuthenticationPane * self) {
+static void
+shotwell_plugins_common_web_authentication_pane_instance_init (ShotwellPluginsCommonWebAuthenticationPane * self)
+{
#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
self->priv = SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_GET_PRIVATE (self);
#line 10 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
self->priv->_preferred_geometry = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
-#line 476 "WebAuthenticationPane.c"
+#line 536 "WebAuthenticationPane.c"
}
-static void shotwell_plugins_common_web_authentication_pane_finalize (GObject * obj) {
+static void
+shotwell_plugins_common_web_authentication_pane_finalize (GObject * obj)
+{
ShotwellPluginsCommonWebAuthenticationPane * self;
#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPane);
@@ -486,11 +548,13 @@ static void shotwell_plugins_common_web_authentication_pane_finalize (GObject *
_g_object_unref0 (self->priv->webview);
#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
G_OBJECT_CLASS (shotwell_plugins_common_web_authentication_pane_parent_class)->finalize (obj);
-#line 490 "WebAuthenticationPane.c"
+#line 552 "WebAuthenticationPane.c"
}
-GType shotwell_plugins_common_web_authentication_pane_get_type (void) {
+GType
+shotwell_plugins_common_web_authentication_pane_get_type (void)
+{
static volatile gsize shotwell_plugins_common_web_authentication_pane_type_id__volatile = 0;
if (g_once_init_enter (&shotwell_plugins_common_web_authentication_pane_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (ShotwellPluginsCommonWebAuthenticationPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) shotwell_plugins_common_web_authentication_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ShotwellPluginsCommonWebAuthenticationPane), 0, (GInstanceInitFunc) shotwell_plugins_common_web_authentication_pane_instance_init, NULL };
@@ -504,7 +568,12 @@ GType shotwell_plugins_common_web_authentication_pane_get_type (void) {
}
-static void _vala_shotwell_plugins_common_web_authentication_pane_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) {
+static void
+_vala_shotwell_plugins_common_web_authentication_pane_get_property (GObject * object,
+ guint property_id,
+ GValue * value,
+ GParamSpec * pspec)
+{
ShotwellPluginsCommonWebAuthenticationPane * self;
self = G_TYPE_CHECK_INSTANCE_CAST (object, SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPane);
#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
@@ -521,18 +590,23 @@ static void _vala_shotwell_plugins_common_web_authentication_pane_get_property (
g_value_take_string (value, shotwell_plugins_common_web_authentication_pane_get_login_uri (self));
#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
break;
-#line 525 "WebAuthenticationPane.c"
+#line 594 "WebAuthenticationPane.c"
default:
#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
break;
-#line 531 "WebAuthenticationPane.c"
+#line 600 "WebAuthenticationPane.c"
}
}
-static void _vala_shotwell_plugins_common_web_authentication_pane_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) {
+static void
+_vala_shotwell_plugins_common_web_authentication_pane_set_property (GObject * object,
+ guint property_id,
+ const GValue * value,
+ GParamSpec * pspec)
+{
ShotwellPluginsCommonWebAuthenticationPane * self;
self = G_TYPE_CHECK_INSTANCE_CAST (object, SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPane);
#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
@@ -549,13 +623,13 @@ static void _vala_shotwell_plugins_common_web_authentication_pane_set_property (
shotwell_plugins_common_web_authentication_pane_set_login_uri (self, g_value_get_string (value));
#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
break;
-#line 553 "WebAuthenticationPane.c"
+#line 627 "WebAuthenticationPane.c"
default:
#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
break;
-#line 559 "WebAuthenticationPane.c"
+#line 633 "WebAuthenticationPane.c"
}
}
diff --git a/plugins/shotwell-plugin-common.h b/plugins/shotwell-plugin-common.h
index a4e0d62..f1561a0 100644
--- a/plugins/shotwell-plugin-common.h
+++ b/plugins/shotwell-plugin-common.h
@@ -1,4 +1,4 @@
-/* shotwell-plugin-common.h generated by valac 0.36.6, the Vala compiler, do not modify */
+/* shotwell-plugin-common.h generated by valac 0.40.4, the Vala compiler, do not modify */
#ifndef __PLUGINS_SHOTWELL_PLUGIN_COMMON_H__
@@ -345,100 +345,193 @@ struct _ShotwellPluginsCommonBuilderPaneClass {
};
-gchar* publishing_rest_support_hmac_sha1 (const gchar* key, const gchar* message);
+gchar* publishing_rest_support_hmac_sha1 (const gchar* key,
+ const gchar* message);
gpointer publishing_rest_support_session_ref (gpointer instance);
void publishing_rest_support_session_unref (gpointer instance);
-GParamSpec* publishing_rest_support_param_spec_session (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void publishing_rest_support_value_set_session (GValue* value, gpointer v_object);
-void publishing_rest_support_value_take_session (GValue* value, gpointer v_object);
+GParamSpec* publishing_rest_support_param_spec_session (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void publishing_rest_support_value_set_session (GValue* value,
+ gpointer v_object);
+void publishing_rest_support_value_take_session (GValue* value,
+ gpointer v_object);
gpointer publishing_rest_support_value_get_session (const GValue* value);
GType publishing_rest_support_session_get_type (void) G_GNUC_CONST;
-PublishingRESTSupportSession* publishing_rest_support_session_construct (GType object_type, const gchar* endpoint_url);
-void publishing_rest_support_session_notify_wire_message_unqueued (PublishingRESTSupportSession* self, SoupMessage* message);
+PublishingRESTSupportSession* publishing_rest_support_session_construct (GType object_type,
+ const gchar* endpoint_url);
+void publishing_rest_support_session_notify_wire_message_unqueued (PublishingRESTSupportSession* self,
+ SoupMessage* message);
void publishing_rest_support_session_notify_authenticated (PublishingRESTSupportSession* self);
-void publishing_rest_support_session_notify_authentication_failed (PublishingRESTSupportSession* self, GError* err);
+void publishing_rest_support_session_notify_authentication_failed (PublishingRESTSupportSession* self,
+ GError* err);
gboolean publishing_rest_support_session_is_authenticated (PublishingRESTSupportSession* self);
gchar* publishing_rest_support_session_get_endpoint_url (PublishingRESTSupportSession* self);
void publishing_rest_support_session_stop_transactions (PublishingRESTSupportSession* self);
gboolean publishing_rest_support_session_are_transactions_stopped (PublishingRESTSupportSession* self);
-void publishing_rest_support_session_send_wire_message (PublishingRESTSupportSession* self, SoupMessage* message);
+void publishing_rest_support_session_send_wire_message (PublishingRESTSupportSession* self,
+ SoupMessage* message);
void publishing_rest_support_session_set_insecure (PublishingRESTSupportSession* self);
GType publishing_rest_support_http_method_get_type (void) G_GNUC_CONST;
gchar* publishing_rest_support_http_method_to_string (PublishingRESTSupportHttpMethod self);
PublishingRESTSupportHttpMethod publishing_rest_support_http_method_from_string (const gchar* str);
gpointer publishing_rest_support_argument_ref (gpointer instance);
void publishing_rest_support_argument_unref (gpointer instance);
-GParamSpec* publishing_rest_support_param_spec_argument (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void publishing_rest_support_value_set_argument (GValue* value, gpointer v_object);
-void publishing_rest_support_value_take_argument (GValue* value, gpointer v_object);
+GParamSpec* publishing_rest_support_param_spec_argument (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void publishing_rest_support_value_set_argument (GValue* value,
+ gpointer v_object);
+void publishing_rest_support_value_take_argument (GValue* value,
+ gpointer v_object);
gpointer publishing_rest_support_value_get_argument (const GValue* value);
GType publishing_rest_support_argument_get_type (void) G_GNUC_CONST;
-PublishingRESTSupportArgument* publishing_rest_support_argument_new (const gchar* key, const gchar* value);
-PublishingRESTSupportArgument* publishing_rest_support_argument_construct (GType object_type, const gchar* key, const gchar* value);
-gchar* publishing_rest_support_argument_serialize_list (PublishingRESTSupportArgument** args, int args_length1, gboolean escape, const gchar* separator);
-gint publishing_rest_support_argument_compare (PublishingRESTSupportArgument* arg1, PublishingRESTSupportArgument* arg2);
-PublishingRESTSupportArgument** publishing_rest_support_argument_sort (PublishingRESTSupportArgument** inputArray, int inputArray_length1, int* result_length1);
-gchar* publishing_rest_support_argument_to_string (PublishingRESTSupportArgument* self, gboolean escape);
+PublishingRESTSupportArgument* publishing_rest_support_argument_new (const gchar* key,
+ const gchar* value);
+PublishingRESTSupportArgument* publishing_rest_support_argument_construct (GType object_type,
+ const gchar* key,
+ const gchar* value);
+gchar* publishing_rest_support_argument_serialize_list (PublishingRESTSupportArgument** args,
+ int args_length1,
+ gboolean escape,
+ const gchar* separator);
+gint publishing_rest_support_argument_compare (PublishingRESTSupportArgument* arg1,
+ PublishingRESTSupportArgument* arg2);
+PublishingRESTSupportArgument** publishing_rest_support_argument_sort (PublishingRESTSupportArgument** inputArray,
+ int inputArray_length1,
+ int* result_length1);
+gchar* publishing_rest_support_argument_to_string (PublishingRESTSupportArgument* self,
+ gboolean escape);
gpointer publishing_rest_support_transaction_ref (gpointer instance);
void publishing_rest_support_transaction_unref (gpointer instance);
-GParamSpec* publishing_rest_support_param_spec_transaction (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void publishing_rest_support_value_set_transaction (GValue* value, gpointer v_object);
-void publishing_rest_support_value_take_transaction (GValue* value, gpointer v_object);
+GParamSpec* publishing_rest_support_param_spec_transaction (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void publishing_rest_support_value_set_transaction (GValue* value,
+ gpointer v_object);
+void publishing_rest_support_value_take_transaction (GValue* value,
+ gpointer v_object);
gpointer publishing_rest_support_value_get_transaction (const GValue* value);
GType publishing_rest_support_transaction_get_type (void) G_GNUC_CONST;
-PublishingRESTSupportTransaction* publishing_rest_support_transaction_new (PublishingRESTSupportSession* parent_session, PublishingRESTSupportHttpMethod method);
-PublishingRESTSupportTransaction* publishing_rest_support_transaction_construct (GType object_type, PublishingRESTSupportSession* parent_session, PublishingRESTSupportHttpMethod method);
-PublishingRESTSupportTransaction* publishing_rest_support_transaction_new_with_endpoint_url (PublishingRESTSupportSession* parent_session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method);
-PublishingRESTSupportTransaction* publishing_rest_support_transaction_construct_with_endpoint_url (GType object_type, PublishingRESTSupportSession* parent_session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method);
-gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (PublishingRESTSupportTransaction* self, GTlsCertificate* * cert);
-void publishing_rest_support_transaction_check_response (PublishingRESTSupportTransaction* self, SoupMessage* message, GError** error);
-PublishingRESTSupportArgument** publishing_rest_support_transaction_get_arguments (PublishingRESTSupportTransaction* self, int* result_length1);
-PublishingRESTSupportArgument** publishing_rest_support_transaction_get_sorted_arguments (PublishingRESTSupportTransaction* self, int* result_length1);
-void publishing_rest_support_transaction_set_is_executed (PublishingRESTSupportTransaction* self, gboolean is_executed);
-void publishing_rest_support_transaction_send (PublishingRESTSupportTransaction* self, GError** error);
+PublishingRESTSupportTransaction* publishing_rest_support_transaction_new (PublishingRESTSupportSession* parent_session,
+ PublishingRESTSupportHttpMethod method);
+PublishingRESTSupportTransaction* publishing_rest_support_transaction_construct (GType object_type,
+ PublishingRESTSupportSession* parent_session,
+ PublishingRESTSupportHttpMethod method);
+PublishingRESTSupportTransaction* publishing_rest_support_transaction_new_with_endpoint_url (PublishingRESTSupportSession* parent_session,
+ const gchar* endpoint_url,
+ PublishingRESTSupportHttpMethod method);
+PublishingRESTSupportTransaction* publishing_rest_support_transaction_construct_with_endpoint_url (GType object_type,
+ PublishingRESTSupportSession* parent_session,
+ const gchar* endpoint_url,
+ PublishingRESTSupportHttpMethod method);
+gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (PublishingRESTSupportTransaction* self,
+ GTlsCertificate* * cert);
+void publishing_rest_support_transaction_check_response (PublishingRESTSupportTransaction* self,
+ SoupMessage* message,
+ GError** error);
+PublishingRESTSupportArgument** publishing_rest_support_transaction_get_arguments (PublishingRESTSupportTransaction* self,
+ int* result_length1);
+PublishingRESTSupportArgument** publishing_rest_support_transaction_get_sorted_arguments (PublishingRESTSupportTransaction* self,
+ int* result_length1);
+void publishing_rest_support_transaction_set_is_executed (PublishingRESTSupportTransaction* self,
+ gboolean is_executed);
+void publishing_rest_support_transaction_send (PublishingRESTSupportTransaction* self,
+ GError** error);
PublishingRESTSupportHttpMethod publishing_rest_support_transaction_get_method (PublishingRESTSupportTransaction* self);
-void publishing_rest_support_transaction_add_header (PublishingRESTSupportTransaction* self, const gchar* key, const gchar* value);
-void publishing_rest_support_transaction_set_custom_payload (PublishingRESTSupportTransaction* self, const gchar* custom_payload, const gchar* payload_content_type, gulong payload_length);
-void publishing_rest_support_transaction_set_message (PublishingRESTSupportTransaction* self, SoupMessage* message);
+void publishing_rest_support_transaction_add_header (PublishingRESTSupportTransaction* self,
+ const gchar* key,
+ const gchar* value);
+void publishing_rest_support_transaction_set_custom_payload (PublishingRESTSupportTransaction* self,
+ const gchar* custom_payload,
+ const gchar* payload_content_type,
+ gulong payload_length);
+void publishing_rest_support_transaction_set_message (PublishingRESTSupportTransaction* self,
+ SoupMessage* message);
gboolean publishing_rest_support_transaction_get_is_executed (PublishingRESTSupportTransaction* self);
guint publishing_rest_support_transaction_get_status_code (PublishingRESTSupportTransaction* self);
-void publishing_rest_support_transaction_execute (PublishingRESTSupportTransaction* self, GError** error);
+void publishing_rest_support_transaction_execute (PublishingRESTSupportTransaction* self,
+ GError** error);
gchar* publishing_rest_support_transaction_get_response (PublishingRESTSupportTransaction* self);
SoupMessageHeaders* publishing_rest_support_transaction_get_response_headers (PublishingRESTSupportTransaction* self);
SoupMessage* publishing_rest_support_transaction_get_message (PublishingRESTSupportTransaction* self);
-void publishing_rest_support_transaction_add_argument (PublishingRESTSupportTransaction* self, const gchar* name, const gchar* value);
+void publishing_rest_support_transaction_add_argument (PublishingRESTSupportTransaction* self,
+ const gchar* name,
+ const gchar* value);
gchar* publishing_rest_support_transaction_get_endpoint_url (PublishingRESTSupportTransaction* self);
PublishingRESTSupportSession* publishing_rest_support_transaction_get_parent_session (PublishingRESTSupportTransaction* self);
GType publishing_rest_support_upload_transaction_get_type (void) G_GNUC_CONST;
-PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transaction_new (PublishingRESTSupportSession* session, SpitPublishingPublishable* publishable);
-PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transaction_construct (GType object_type, PublishingRESTSupportSession* session, SpitPublishingPublishable* publishable);
-PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transaction_new_with_endpoint_url (PublishingRESTSupportSession* session, SpitPublishingPublishable* publishable, const gchar* endpoint_url);
-PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transaction_construct_with_endpoint_url (GType object_type, PublishingRESTSupportSession* session, SpitPublishingPublishable* publishable, const gchar* endpoint_url);
-void publishing_rest_support_upload_transaction_set_binary_disposition_table (PublishingRESTSupportUploadTransaction* self, GHashTable* new_disp_table);
+PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transaction_new (PublishingRESTSupportSession* session,
+ SpitPublishingPublishable* publishable);
+PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transaction_construct (GType object_type,
+ PublishingRESTSupportSession* session,
+ SpitPublishingPublishable* publishable);
+PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transaction_new_with_endpoint_url (PublishingRESTSupportSession* session,
+ SpitPublishingPublishable* publishable,
+ const gchar* endpoint_url);
+PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transaction_construct_with_endpoint_url (GType object_type,
+ PublishingRESTSupportSession* session,
+ SpitPublishingPublishable* publishable,
+ const gchar* endpoint_url);
+void publishing_rest_support_upload_transaction_set_binary_disposition_table (PublishingRESTSupportUploadTransaction* self,
+ GHashTable* new_disp_table);
gpointer publishing_rest_support_xml_document_ref (gpointer instance);
void publishing_rest_support_xml_document_unref (gpointer instance);
-GParamSpec* publishing_rest_support_param_spec_xml_document (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void publishing_rest_support_value_set_xml_document (GValue* value, gpointer v_object);
-void publishing_rest_support_value_take_xml_document (GValue* value, gpointer v_object);
+GParamSpec* publishing_rest_support_param_spec_xml_document (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void publishing_rest_support_value_set_xml_document (GValue* value,
+ gpointer v_object);
+void publishing_rest_support_value_take_xml_document (GValue* value,
+ gpointer v_object);
gpointer publishing_rest_support_value_get_xml_document (const GValue* value);
GType publishing_rest_support_xml_document_get_type (void) G_GNUC_CONST;
xmlNode* publishing_rest_support_xml_document_get_root_node (PublishingRESTSupportXmlDocument* self);
-xmlNode* publishing_rest_support_xml_document_get_named_child (PublishingRESTSupportXmlDocument* self, xmlNode* parent, const gchar* child_name, GError** error);
-gchar* publishing_rest_support_xml_document_get_property_value (PublishingRESTSupportXmlDocument* self, xmlNode* node, const gchar* property_key, GError** error);
-PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_string (const gchar* input_string, PublishingRESTSupportXmlDocumentCheckForErrorResponse check_for_error_response, void* check_for_error_response_target, GError** error);
+xmlNode* publishing_rest_support_xml_document_get_named_child (PublishingRESTSupportXmlDocument* self,
+ xmlNode* parent,
+ const gchar* child_name,
+ GError** error);
+gchar* publishing_rest_support_xml_document_get_property_value (PublishingRESTSupportXmlDocument* self,
+ xmlNode* node,
+ const gchar* property_key,
+ GError** error);
+PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_string (const gchar* input_string,
+ PublishingRESTSupportXmlDocumentCheckForErrorResponse check_for_error_response,
+ void* check_for_error_response_target,
+ GError** error);
gchar* publishing_rest_support_decimal_entity_encode (const gchar* source);
gpointer publishing_rest_support_batch_uploader_ref (gpointer instance);
void publishing_rest_support_batch_uploader_unref (gpointer instance);
-GParamSpec* publishing_rest_support_param_spec_batch_uploader (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void publishing_rest_support_value_set_batch_uploader (GValue* value, gpointer v_object);
-void publishing_rest_support_value_take_batch_uploader (GValue* value, gpointer v_object);
+GParamSpec* publishing_rest_support_param_spec_batch_uploader (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void publishing_rest_support_value_set_batch_uploader (GValue* value,
+ gpointer v_object);
+void publishing_rest_support_value_take_batch_uploader (GValue* value,
+ gpointer v_object);
gpointer publishing_rest_support_value_get_batch_uploader (const GValue* value);
GType publishing_rest_support_batch_uploader_get_type (void) G_GNUC_CONST;
-PublishingRESTSupportBatchUploader* publishing_rest_support_batch_uploader_construct (GType object_type, PublishingRESTSupportSession* session, SpitPublishingPublishable** publishables, int publishables_length1);
+PublishingRESTSupportBatchUploader* publishing_rest_support_batch_uploader_construct (GType object_type,
+ PublishingRESTSupportSession* session,
+ SpitPublishingPublishable** publishables,
+ int publishables_length1);
PublishingRESTSupportSession* publishing_rest_support_batch_uploader_get_session (PublishingRESTSupportBatchUploader* self);
SpitPublishingPublishable* publishing_rest_support_batch_uploader_get_current_publishable (PublishingRESTSupportBatchUploader* self);
-PublishingRESTSupportTransaction* publishing_rest_support_batch_uploader_create_transaction (PublishingRESTSupportBatchUploader* self, SpitPublishingPublishable* publishable);
-void publishing_rest_support_batch_uploader_upload (PublishingRESTSupportBatchUploader* self, SpitPublishingProgressCallback status_updated, void* status_updated_target);
+PublishingRESTSupportTransaction* publishing_rest_support_batch_uploader_create_transaction (PublishingRESTSupportBatchUploader* self,
+ SpitPublishingPublishable* publishable);
+void publishing_rest_support_batch_uploader_upload (PublishingRESTSupportBatchUploader* self,
+ SpitPublishingProgressCallback status_updated,
+ void* status_updated_target);
gchar* publishing_rest_support_asciify_string (const gchar* s);
GType publishing_rest_support_google_session_get_type (void) G_GNUC_CONST;
gchar* publishing_rest_support_google_session_get_user_name (PublishingRESTSupportGoogleSession* self);
@@ -446,7 +539,10 @@ gchar* publishing_rest_support_google_session_get_access_token (PublishingRESTSu
void publishing_rest_support_google_session_deauthenticate (PublishingRESTSupportGoogleSession* self);
PublishingRESTSupportGoogleSession* publishing_rest_support_google_session_construct (GType object_type);
GType publishing_rest_support_google_publisher_get_type (void) G_GNUC_CONST;
-PublishingRESTSupportGooglePublisher* publishing_rest_support_google_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host, const gchar* scope);
+PublishingRESTSupportGooglePublisher* publishing_rest_support_google_publisher_construct (GType object_type,
+ SpitPublishingService* service,
+ SpitPublishingPluginHost* host,
+ const gchar* scope);
SpitPublishingAuthenticator* publishing_rest_support_google_publisher_get_authenticator (PublishingRESTSupportGooglePublisher* self);
SpitPublishingPluginHost* publishing_rest_support_google_publisher_get_host (PublishingRESTSupportGooglePublisher* self);
PublishingRESTSupportGoogleSession* publishing_rest_support_google_publisher_get_session (PublishingRESTSupportGooglePublisher* self);
@@ -456,17 +552,36 @@ gboolean publishing_rest_support_google_publisher_is_running (PublishingRESTSupp
void publishing_rest_support_google_publisher_start (PublishingRESTSupportGooglePublisher* self);
void publishing_rest_support_google_publisher_stop (PublishingRESTSupportGooglePublisher* self);
GType publishing_rest_support_google_publisher_authenticated_transaction_get_type (void) G_GNUC_CONST;
-PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_support_google_publisher_authenticated_transaction_new (PublishingRESTSupportGoogleSession* session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method);
-PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_support_google_publisher_authenticated_transaction_construct (GType object_type, PublishingRESTSupportGoogleSession* session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method);
+PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_support_google_publisher_authenticated_transaction_new (PublishingRESTSupportGoogleSession* session,
+ const gchar* endpoint_url,
+ PublishingRESTSupportHttpMethod method);
+PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_support_google_publisher_authenticated_transaction_construct (GType object_type,
+ PublishingRESTSupportGoogleSession* session,
+ const gchar* endpoint_url,
+ PublishingRESTSupportHttpMethod method);
GType publishing_rest_support_oauth1_session_get_type (void) G_GNUC_CONST;
PublishingRESTSupportOAuth1Session* publishing_rest_support_oauth1_session_new (const gchar* endpoint_uri);
-PublishingRESTSupportOAuth1Session* publishing_rest_support_oauth1_session_construct (GType object_type, const gchar* endpoint_uri);
-void publishing_rest_support_oauth1_session_authenticate_from_persistent_credentials (PublishingRESTSupportOAuth1Session* self, const gchar* token, const gchar* secret, const gchar* username);
+PublishingRESTSupportOAuth1Session* publishing_rest_support_oauth1_session_construct (GType object_type,
+ const gchar* endpoint_uri);
+void publishing_rest_support_oauth1_session_authenticate_from_persistent_credentials (PublishingRESTSupportOAuth1Session* self,
+ const gchar* token,
+ const gchar* secret,
+ const gchar* username);
void publishing_rest_support_oauth1_session_deauthenticate (PublishingRESTSupportOAuth1Session* self);
-void publishing_rest_support_oauth1_session_set_api_credentials (PublishingRESTSupportOAuth1Session* self, const gchar* consumer_key, const gchar* consumer_secret);
-gchar* publishing_rest_support_oauth1_session_sign_transaction (PublishingRESTSupportOAuth1Session* self, PublishingRESTSupportTransaction* txn, PublishingRESTSupportArgument** extra_arguments, int extra_arguments_length1);
-void publishing_rest_support_oauth1_session_set_request_phase_credentials (PublishingRESTSupportOAuth1Session* self, const gchar* token, const gchar* secret);
-void publishing_rest_support_oauth1_session_set_access_phase_credentials (PublishingRESTSupportOAuth1Session* self, const gchar* token, const gchar* secret, const gchar* username);
+void publishing_rest_support_oauth1_session_set_api_credentials (PublishingRESTSupportOAuth1Session* self,
+ const gchar* consumer_key,
+ const gchar* consumer_secret);
+gchar* publishing_rest_support_oauth1_session_sign_transaction (PublishingRESTSupportOAuth1Session* self,
+ PublishingRESTSupportTransaction* txn,
+ PublishingRESTSupportArgument** extra_arguments,
+ int extra_arguments_length1);
+void publishing_rest_support_oauth1_session_set_request_phase_credentials (PublishingRESTSupportOAuth1Session* self,
+ const gchar* token,
+ const gchar* secret);
+void publishing_rest_support_oauth1_session_set_access_phase_credentials (PublishingRESTSupportOAuth1Session* self,
+ const gchar* token,
+ const gchar* secret,
+ const gchar* username);
gchar* publishing_rest_support_oauth1_session_get_oauth_nonce (PublishingRESTSupportOAuth1Session* self);
gchar* publishing_rest_support_oauth1_session_get_oauth_timestamp (PublishingRESTSupportOAuth1Session* self);
gchar* publishing_rest_support_oauth1_session_get_consumer_key (PublishingRESTSupportOAuth1Session* self);
@@ -476,14 +591,29 @@ gboolean publishing_rest_support_oauth1_session_has_access_phase_token (Publishi
gchar* publishing_rest_support_oauth1_session_get_access_phase_token_secret (PublishingRESTSupportOAuth1Session* self);
gchar* publishing_rest_support_oauth1_session_get_username (PublishingRESTSupportOAuth1Session* self);
GType publishing_rest_support_oauth1_transaction_get_type (void) G_GNUC_CONST;
-PublishingRESTSupportOAuth1Transaction* publishing_rest_support_oauth1_transaction_new (PublishingRESTSupportOAuth1Session* session, PublishingRESTSupportHttpMethod method);
-PublishingRESTSupportOAuth1Transaction* publishing_rest_support_oauth1_transaction_construct (GType object_type, PublishingRESTSupportOAuth1Session* session, PublishingRESTSupportHttpMethod method);
-PublishingRESTSupportOAuth1Transaction* publishing_rest_support_oauth1_transaction_new_with_uri (PublishingRESTSupportOAuth1Session* session, const gchar* uri, PublishingRESTSupportHttpMethod method);
-PublishingRESTSupportOAuth1Transaction* publishing_rest_support_oauth1_transaction_construct_with_uri (GType object_type, PublishingRESTSupportOAuth1Session* session, const gchar* uri, PublishingRESTSupportHttpMethod method);
+PublishingRESTSupportOAuth1Transaction* publishing_rest_support_oauth1_transaction_new (PublishingRESTSupportOAuth1Session* session,
+ PublishingRESTSupportHttpMethod method);
+PublishingRESTSupportOAuth1Transaction* publishing_rest_support_oauth1_transaction_construct (GType object_type,
+ PublishingRESTSupportOAuth1Session* session,
+ PublishingRESTSupportHttpMethod method);
+PublishingRESTSupportOAuth1Transaction* publishing_rest_support_oauth1_transaction_new_with_uri (PublishingRESTSupportOAuth1Session* session,
+ const gchar* uri,
+ PublishingRESTSupportHttpMethod method);
+PublishingRESTSupportOAuth1Transaction* publishing_rest_support_oauth1_transaction_construct_with_uri (GType object_type,
+ PublishingRESTSupportOAuth1Session* session,
+ const gchar* uri,
+ PublishingRESTSupportHttpMethod method);
GType publishing_rest_support_oauth1_upload_transaction_get_type (void) G_GNUC_CONST;
-PublishingRESTSupportOAuth1UploadTransaction* publishing_rest_support_oauth1_upload_transaction_new (PublishingRESTSupportOAuth1Session* session, SpitPublishingPublishable* publishable, const gchar* endpoint_uri);
-PublishingRESTSupportOAuth1UploadTransaction* publishing_rest_support_oauth1_upload_transaction_construct (GType object_type, PublishingRESTSupportOAuth1Session* session, SpitPublishingPublishable* publishable, const gchar* endpoint_uri);
-void publishing_rest_support_oauth1_upload_transaction_add_authorization_header_field (PublishingRESTSupportOAuth1UploadTransaction* self, const gchar* key, const gchar* value);
+PublishingRESTSupportOAuth1UploadTransaction* publishing_rest_support_oauth1_upload_transaction_new (PublishingRESTSupportOAuth1Session* session,
+ SpitPublishingPublishable* publishable,
+ const gchar* endpoint_uri);
+PublishingRESTSupportOAuth1UploadTransaction* publishing_rest_support_oauth1_upload_transaction_construct (GType object_type,
+ PublishingRESTSupportOAuth1Session* session,
+ SpitPublishingPublishable* publishable,
+ const gchar* endpoint_uri);
+void publishing_rest_support_oauth1_upload_transaction_add_authorization_header_field (PublishingRESTSupportOAuth1UploadTransaction* self,
+ const gchar* key,
+ const gchar* value);
gchar* publishing_rest_support_oauth1_upload_transaction_get_authorization_header_string (PublishingRESTSupportOAuth1UploadTransaction* self);
void publishing_rest_support_oauth1_upload_transaction_authorize (PublishingRESTSupportOAuth1UploadTransaction* self);
#define RESOURCES_WEBSITE_NAME _ ("Visit the Shotwell home page")
@@ -511,11 +641,14 @@ void publishing_rest_support_oauth1_upload_transaction_authorize (PublishingREST
"c., \n" \
"51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA\n"
#define RESOURCES_TRANSLATORS _ ("translator-credits")
-GdkPixbuf** resources_load_icon_set (GFile* icon_file, int* result_length1);
-GdkPixbuf** resources_load_from_resource (const gchar* resource_path, int* result_length1);
+GdkPixbuf** resources_load_icon_set (GFile* icon_file,
+ int* result_length1);
+GdkPixbuf** resources_load_from_resource (const gchar* resource_path,
+ int* result_length1);
GType shotwell_plugins_common_web_authentication_pane_get_type (void) G_GNUC_CONST;
void shotwell_plugins_common_web_authentication_pane_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* self);
-void shotwell_plugins_common_web_authentication_pane_set_cursor (ShotwellPluginsCommonWebAuthenticationPane* self, GdkCursorType type);
+void shotwell_plugins_common_web_authentication_pane_set_cursor (ShotwellPluginsCommonWebAuthenticationPane* self,
+ GdkCursorType type);
WebKitWebView* shotwell_plugins_common_web_authentication_pane_get_view (ShotwellPluginsCommonWebAuthenticationPane* self);
ShotwellPluginsCommonWebAuthenticationPane* shotwell_plugins_common_web_authentication_pane_construct (GType object_type);
SpitPublishingDialogPaneGeometryOptions shotwell_plugins_common_web_authentication_pane_get_preferred_geometry (ShotwellPluginsCommonWebAuthenticationPane* self);
diff --git a/plugins/shotwell-plugin-common.vapi b/plugins/shotwell-plugin-common.vapi
index f07c2c7..b8e327f 100644
--- a/plugins/shotwell-plugin-common.vapi
+++ b/plugins/shotwell-plugin-common.vapi
@@ -1,4 +1,4 @@
-/* shotwell-plugin-common.vapi generated by valac 0.36.6, do not modify. */
+/* shotwell-plugin-common.vapi generated by valac 0.40.4, do not modify. */
namespace Publishing {
namespace RESTSupport {
diff --git a/plugins/shotwell-plugin-dev-1.0.h b/plugins/shotwell-plugin-dev-1.0.h
index f9315b3..77913ed 100644
--- a/plugins/shotwell-plugin-dev-1.0.h
+++ b/plugins/shotwell-plugin-dev-1.0.h
@@ -1,4 +1,4 @@
-/* shotwell-plugin-dev-1.0.h generated by valac 0.36.6, the Vala compiler, do not modify */
+/* shotwell-plugin-dev-1.0.h generated by valac 0.40.4, the Vala compiler, do not modify */
#ifndef __PLUGINS_SHOTWELL_PLUGIN_DEV_1_0_H__
@@ -640,16 +640,20 @@ struct _SpitDataImportsDataImporterIface {
#define SPIT_UNSUPPORTED_INTERFACE -1
#define SPIT_CURRENT_INTERFACE 0
-gint spit_negotiate_interfaces (gint min_host_interface, gint max_host_interface, gint plugin_interface);
+gint spit_negotiate_interfaces (gint min_host_interface,
+ gint max_host_interface,
+ gint plugin_interface);
GType spit_entry_point_params_get_type (void) G_GNUC_CONST;
SpitEntryPointParams* spit_entry_point_params_dup (const SpitEntryPointParams* self);
void spit_entry_point_params_free (SpitEntryPointParams* self);
-void spit_entry_point_params_copy (const SpitEntryPointParams* self, SpitEntryPointParams* dest);
+void spit_entry_point_params_copy (const SpitEntryPointParams* self,
+ SpitEntryPointParams* dest);
void spit_entry_point_params_destroy (SpitEntryPointParams* self);
GType spit_pluggable_info_get_type (void) G_GNUC_CONST;
SpitPluggableInfo* spit_pluggable_info_dup (const SpitPluggableInfo* self);
void spit_pluggable_info_free (SpitPluggableInfo* self);
-void spit_pluggable_info_copy (const SpitPluggableInfo* self, SpitPluggableInfo* dest);
+void spit_pluggable_info_copy (const SpitPluggableInfo* self,
+ SpitPluggableInfo* dest);
void spit_pluggable_info_destroy (SpitPluggableInfo* self);
GType spit_pluggable_get_type (void) G_GNUC_CONST;
GType spit_module_get_type (void) G_GNUC_CONST;
@@ -657,7 +661,8 @@ GType spit_module_get_type (void) G_GNUC_CONST;
const gchar* spit_module_get_module_name (SpitModule* self);
const gchar* spit_module_get_version (SpitModule* self);
const gchar* spit_module_get_id (SpitModule* self);
-SpitPluggable** spit_module_get_pluggables (SpitModule* self, int* result_length1);
+SpitPluggable** spit_module_get_pluggables (SpitModule* self,
+ int* result_length1);
void spit_module_reserved0 (SpitModule* self);
void spit_module_reserved1 (SpitModule* self);
void spit_module_reserved2 (SpitModule* self);
@@ -666,11 +671,15 @@ void spit_module_reserved4 (SpitModule* self);
void spit_module_reserved5 (SpitModule* self);
void spit_module_reserved6 (SpitModule* self);
void spit_module_reserved7 (SpitModule* self);
-gint spit_pluggable_get_pluggable_interface (SpitPluggable* self, gint min_host_interface, gint max_host_interface);
+gint spit_pluggable_get_pluggable_interface (SpitPluggable* self,
+ gint min_host_interface,
+ gint max_host_interface);
const gchar* spit_pluggable_get_id (SpitPluggable* self);
const gchar* spit_pluggable_get_pluggable_name (SpitPluggable* self);
-void spit_pluggable_get_info (SpitPluggable* self, SpitPluggableInfo* info);
-void spit_pluggable_activation (SpitPluggable* self, gboolean enabled);
+void spit_pluggable_get_info (SpitPluggable* self,
+ SpitPluggableInfo* info);
+void spit_pluggable_activation (SpitPluggable* self,
+ gboolean enabled);
void spit_pluggable_reserved0 (SpitPluggable* self);
void spit_pluggable_reserved1 (SpitPluggable* self);
void spit_pluggable_reserved2 (SpitPluggable* self);
@@ -681,15 +690,32 @@ void spit_pluggable_reserved6 (SpitPluggable* self);
void spit_pluggable_reserved7 (SpitPluggable* self);
GType spit_host_interface_get_type (void) G_GNUC_CONST;
GFile* spit_host_interface_get_module_file (SpitHostInterface* self);
-gboolean spit_host_interface_get_config_bool (SpitHostInterface* self, const gchar* key, gboolean def);
-void spit_host_interface_set_config_bool (SpitHostInterface* self, const gchar* key, gboolean val);
-gint spit_host_interface_get_config_int (SpitHostInterface* self, const gchar* key, gint def);
-void spit_host_interface_set_config_int (SpitHostInterface* self, const gchar* key, gint val);
-gchar* spit_host_interface_get_config_string (SpitHostInterface* self, const gchar* key, const gchar* def);
-void spit_host_interface_set_config_string (SpitHostInterface* self, const gchar* key, const gchar* val);
-gdouble spit_host_interface_get_config_double (SpitHostInterface* self, const gchar* key, gdouble def);
-void spit_host_interface_set_config_double (SpitHostInterface* self, const gchar* key, gdouble val);
-void spit_host_interface_unset_config_key (SpitHostInterface* self, const gchar* key);
+gboolean spit_host_interface_get_config_bool (SpitHostInterface* self,
+ const gchar* key,
+ gboolean def);
+void spit_host_interface_set_config_bool (SpitHostInterface* self,
+ const gchar* key,
+ gboolean val);
+gint spit_host_interface_get_config_int (SpitHostInterface* self,
+ const gchar* key,
+ gint def);
+void spit_host_interface_set_config_int (SpitHostInterface* self,
+ const gchar* key,
+ gint val);
+gchar* spit_host_interface_get_config_string (SpitHostInterface* self,
+ const gchar* key,
+ const gchar* def);
+void spit_host_interface_set_config_string (SpitHostInterface* self,
+ const gchar* key,
+ const gchar* val);
+gdouble spit_host_interface_get_config_double (SpitHostInterface* self,
+ const gchar* key,
+ gdouble def);
+void spit_host_interface_set_config_double (SpitHostInterface* self,
+ const gchar* key,
+ gdouble val);
+void spit_host_interface_unset_config_key (SpitHostInterface* self,
+ const gchar* key);
void spit_host_interface_reserved0 (SpitHostInterface* self);
void spit_host_interface_reserved1 (SpitHostInterface* self);
void spit_host_interface_reserved2 (SpitHostInterface* self);
@@ -701,8 +727,17 @@ void spit_host_interface_reserved7 (SpitHostInterface* self);
#define SPIT_TRANSITIONS_CURRENT_INTERFACE 0
GType spit_transitions_direction_get_type (void) G_GNUC_CONST;
GType spit_transitions_visuals_get_type (void) G_GNUC_CONST;
-SpitTransitionsVisuals* spit_transitions_visuals_new (GdkPixbuf* from_pixbuf, GdkRectangle* from_pos, GdkPixbuf* to_pixbuf, GdkRectangle* to_pos, GdkRGBA* bg_color);
-SpitTransitionsVisuals* spit_transitions_visuals_construct (GType object_type, GdkPixbuf* from_pixbuf, GdkRectangle* from_pos, GdkPixbuf* to_pixbuf, GdkRectangle* to_pos, GdkRGBA* bg_color);
+SpitTransitionsVisuals* spit_transitions_visuals_new (GdkPixbuf* from_pixbuf,
+ GdkRectangle* from_pos,
+ GdkPixbuf* to_pixbuf,
+ GdkRectangle* to_pos,
+ GdkRGBA* bg_color);
+SpitTransitionsVisuals* spit_transitions_visuals_construct (GType object_type,
+ GdkPixbuf* from_pixbuf,
+ GdkRectangle* from_pos,
+ GdkPixbuf* to_pixbuf,
+ GdkRectangle* to_pos,
+ GdkRGBA* bg_color);
void spit_transitions_visuals_reserved0 (SpitTransitionsVisuals* self);
void spit_transitions_visuals_reserved1 (SpitTransitionsVisuals* self);
void spit_transitions_visuals_reserved2 (SpitTransitionsVisuals* self);
@@ -712,14 +747,23 @@ void spit_transitions_visuals_reserved5 (SpitTransitionsVisuals* self);
void spit_transitions_visuals_reserved6 (SpitTransitionsVisuals* self);
void spit_transitions_visuals_reserved7 (SpitTransitionsVisuals* self);
GdkPixbuf* spit_transitions_visuals_get_from_pixbuf (SpitTransitionsVisuals* self);
-void spit_transitions_visuals_get_from_pos (SpitTransitionsVisuals* self, GdkRectangle * result);
+void spit_transitions_visuals_get_from_pos (SpitTransitionsVisuals* self,
+ GdkRectangle * result);
GdkPixbuf* spit_transitions_visuals_get_to_pixbuf (SpitTransitionsVisuals* self);
-void spit_transitions_visuals_get_to_pos (SpitTransitionsVisuals* self, GdkRectangle * result);
-void spit_transitions_visuals_get_bg_color (SpitTransitionsVisuals* self, GdkRGBA * result);
+void spit_transitions_visuals_get_to_pos (SpitTransitionsVisuals* self,
+ GdkRectangle * result);
+void spit_transitions_visuals_get_bg_color (SpitTransitionsVisuals* self,
+ GdkRGBA * result);
GType spit_transitions_motion_get_type (void) G_GNUC_CONST;
-SpitTransitionsMotion* spit_transitions_motion_new (SpitTransitionsDirection direction, gint fps, gint duration_msec);
-SpitTransitionsMotion* spit_transitions_motion_construct (GType object_type, SpitTransitionsDirection direction, gint fps, gint duration_msec);
-gdouble spit_transitions_motion_get_alpha (SpitTransitionsMotion* self, gint frame_number);
+SpitTransitionsMotion* spit_transitions_motion_new (SpitTransitionsDirection direction,
+ gint fps,
+ gint duration_msec);
+SpitTransitionsMotion* spit_transitions_motion_construct (GType object_type,
+ SpitTransitionsDirection direction,
+ gint fps,
+ gint duration_msec);
+gdouble spit_transitions_motion_get_alpha (SpitTransitionsMotion* self,
+ gint frame_number);
void spit_transitions_motion_reserved0 (SpitTransitionsMotion* self);
void spit_transitions_motion_reserved1 (SpitTransitionsMotion* self);
void spit_transitions_motion_reserved2 (SpitTransitionsMotion* self);
@@ -735,7 +779,8 @@ gint spit_transitions_motion_get_total_frames (SpitTransitionsMotion* self);
gint spit_transitions_motion_get_tick_msec (SpitTransitionsMotion* self);
GType spit_transitions_effect_get_type (void) G_GNUC_CONST;
GType spit_transitions_descriptor_get_type (void) G_GNUC_CONST;
-SpitTransitionsEffect* spit_transitions_descriptor_create (SpitTransitionsDescriptor* self, SpitHostInterface* host);
+SpitTransitionsEffect* spit_transitions_descriptor_create (SpitTransitionsDescriptor* self,
+ SpitHostInterface* host);
void spit_transitions_descriptor_reserved0 (SpitTransitionsDescriptor* self);
void spit_transitions_descriptor_reserved1 (SpitTransitionsDescriptor* self);
void spit_transitions_descriptor_reserved2 (SpitTransitionsDescriptor* self);
@@ -744,11 +789,24 @@ void spit_transitions_descriptor_reserved4 (SpitTransitionsDescriptor* self);
void spit_transitions_descriptor_reserved5 (SpitTransitionsDescriptor* self);
void spit_transitions_descriptor_reserved6 (SpitTransitionsDescriptor* self);
void spit_transitions_descriptor_reserved7 (SpitTransitionsDescriptor* self);
-void spit_transitions_effect_get_fps (SpitTransitionsEffect* self, gint* desired_fps, gint* min_fps);
-void spit_transitions_effect_start (SpitTransitionsEffect* self, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion);
+void spit_transitions_effect_get_fps (SpitTransitionsEffect* self,
+ gint* desired_fps,
+ gint* min_fps);
+void spit_transitions_effect_start (SpitTransitionsEffect* self,
+ SpitTransitionsVisuals* visuals,
+ SpitTransitionsMotion* motion);
gboolean spit_transitions_effect_needs_clear_background (SpitTransitionsEffect* self);
-void spit_transitions_effect_paint (SpitTransitionsEffect* self, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number);
-void spit_transitions_effect_advance (SpitTransitionsEffect* self, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, gint frame_number);
+void spit_transitions_effect_paint (SpitTransitionsEffect* self,
+ SpitTransitionsVisuals* visuals,
+ SpitTransitionsMotion* motion,
+ cairo_t* ctx,
+ gint width,
+ gint height,
+ gint frame_number);
+void spit_transitions_effect_advance (SpitTransitionsEffect* self,
+ SpitTransitionsVisuals* visuals,
+ SpitTransitionsMotion* motion,
+ gint frame_number);
void spit_transitions_effect_cancel (SpitTransitionsEffect* self);
void spit_transitions_effect_reserved0 (SpitTransitionsEffect* self);
void spit_transitions_effect_reserved1 (SpitTransitionsEffect* self);
@@ -792,20 +850,37 @@ void spit_publishing_dialog_pane_reserved4 (SpitPublishingDialogPane* self);
void spit_publishing_dialog_pane_reserved5 (SpitPublishingDialogPane* self);
void spit_publishing_dialog_pane_reserved6 (SpitPublishingDialogPane* self);
void spit_publishing_dialog_pane_reserved7 (SpitPublishingDialogPane* self);
-void spit_publishing_plugin_host_post_error (SpitPublishingPluginHost* self, GError* err);
+void spit_publishing_plugin_host_post_error (SpitPublishingPluginHost* self,
+ GError* err);
void spit_publishing_plugin_host_stop_publishing (SpitPublishingPluginHost* self);
SpitPublishingPublisher* spit_publishing_plugin_host_get_publisher (SpitPublishingPluginHost* self);
-void spit_publishing_plugin_host_install_dialog_pane (SpitPublishingPluginHost* self, SpitPublishingDialogPane* pane, SpitPublishingPluginHostButtonMode mode);
-void spit_publishing_plugin_host_install_static_message_pane (SpitPublishingPluginHost* self, const gchar* message, SpitPublishingPluginHostButtonMode mode);
-void spit_publishing_plugin_host_install_pango_message_pane (SpitPublishingPluginHost* self, const gchar* markup, SpitPublishingPluginHostButtonMode mode);
+void spit_publishing_plugin_host_install_dialog_pane (SpitPublishingPluginHost* self,
+ SpitPublishingDialogPane* pane,
+ SpitPublishingPluginHostButtonMode mode);
+void spit_publishing_plugin_host_install_static_message_pane (SpitPublishingPluginHost* self,
+ const gchar* message,
+ SpitPublishingPluginHostButtonMode mode);
+void spit_publishing_plugin_host_install_pango_message_pane (SpitPublishingPluginHost* self,
+ const gchar* markup,
+ SpitPublishingPluginHostButtonMode mode);
void spit_publishing_plugin_host_install_success_pane (SpitPublishingPluginHost* self);
void spit_publishing_plugin_host_install_account_fetch_wait_pane (SpitPublishingPluginHost* self);
void spit_publishing_plugin_host_install_login_wait_pane (SpitPublishingPluginHost* self);
-void spit_publishing_plugin_host_install_welcome_pane (SpitPublishingPluginHost* self, const gchar* welcome_message, SpitPublishingLoginCallback on_login_clicked, void* on_login_clicked_target);
-void spit_publishing_plugin_host_set_service_locked (SpitPublishingPluginHost* self, gboolean is_locked);
-void spit_publishing_plugin_host_set_dialog_default_widget (SpitPublishingPluginHost* self, GtkWidget* widget);
-SpitPublishingPublishable** spit_publishing_plugin_host_get_publishables (SpitPublishingPluginHost* self, int* result_length1);
-SpitPublishingProgressCallback spit_publishing_plugin_host_serialize_publishables (SpitPublishingPluginHost* self, gint content_major_axis, gboolean strip_metadata, void** result_target, GDestroyNotify* result_target_destroy_notify);
+void spit_publishing_plugin_host_install_welcome_pane (SpitPublishingPluginHost* self,
+ const gchar* welcome_message,
+ SpitPublishingLoginCallback on_login_clicked,
+ void* on_login_clicked_target);
+void spit_publishing_plugin_host_set_service_locked (SpitPublishingPluginHost* self,
+ gboolean is_locked);
+void spit_publishing_plugin_host_set_dialog_default_widget (SpitPublishingPluginHost* self,
+ GtkWidget* widget);
+SpitPublishingPublishable** spit_publishing_plugin_host_get_publishables (SpitPublishingPluginHost* self,
+ int* result_length1);
+SpitPublishingProgressCallback spit_publishing_plugin_host_serialize_publishables (SpitPublishingPluginHost* self,
+ gint content_major_axis,
+ gboolean strip_metadata,
+ void** result_target,
+ GDestroyNotify* result_target_destroy_notify);
SpitPublishingPublisherMediaType spit_publishing_plugin_host_get_publishable_media_type (SpitPublishingPluginHost* self);
void spit_publishing_plugin_host_reserved0 (SpitPublishingPluginHost* self);
void spit_publishing_plugin_host_reserved1 (SpitPublishingPluginHost* self);
@@ -817,8 +892,10 @@ void spit_publishing_plugin_host_reserved6 (SpitPublishingPluginHost* self);
void spit_publishing_plugin_host_reserved7 (SpitPublishingPluginHost* self);
GFile* spit_publishing_publishable_get_serialized_file (SpitPublishingPublishable* self);
gchar* spit_publishing_publishable_get_publishing_name (SpitPublishingPublishable* self);
-gchar* spit_publishing_publishable_get_param_string (SpitPublishingPublishable* self, const gchar* name);
-gchar** spit_publishing_publishable_get_publishing_keywords (SpitPublishingPublishable* self, int* result_length1);
+gchar* spit_publishing_publishable_get_param_string (SpitPublishingPublishable* self,
+ const gchar* name);
+gchar** spit_publishing_publishable_get_publishing_keywords (SpitPublishingPublishable* self,
+ int* result_length1);
SpitPublishingPublisherMediaType spit_publishing_publishable_get_media_type (SpitPublishingPublishable* self);
GDateTime* spit_publishing_publishable_get_exposure_date_time (SpitPublishingPublishable* self);
void spit_publishing_publishable_reserved0 (SpitPublishingPublishable* self);
@@ -833,7 +910,8 @@ void spit_publishing_publishable_reserved7 (SpitPublishingPublishable* self);
#define SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_TITLE "title"
#define SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_COMMENT "comment"
#define SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_EVENTCOMMENT "eventcomment"
-SpitPublishingPublisher* spit_publishing_service_create_publisher (SpitPublishingService* self, SpitPublishingPluginHost* host);
+SpitPublishingPublisher* spit_publishing_service_create_publisher (SpitPublishingService* self,
+ SpitPublishingPluginHost* host);
SpitPublishingPublisherMediaType spit_publishing_service_get_supported_media (SpitPublishingService* self);
void spit_publishing_service_reserved0 (SpitPublishingService* self);
void spit_publishing_service_reserved1 (SpitPublishingService* self);
@@ -851,7 +929,9 @@ void spit_publishing_authenticator_refresh (SpitPublishingAuthenticator* self);
GHashTable* spit_publishing_authenticator_get_authentication_parameter (SpitPublishingAuthenticator* self);
GType spit_publishing_authenticator_factory_get_type (void) G_GNUC_CONST;
GeeList* spit_publishing_authenticator_factory_get_available_authenticators (SpitPublishingAuthenticatorFactory* self);
-SpitPublishingAuthenticator* spit_publishing_authenticator_factory_create (SpitPublishingAuthenticatorFactory* self, const gchar* provider, SpitPublishingPluginHost* host);
+SpitPublishingAuthenticator* spit_publishing_authenticator_factory_create (SpitPublishingAuthenticatorFactory* self,
+ const gchar* provider,
+ SpitPublishingPluginHost* host);
#define SPIT_DATA_IMPORTS_CURRENT_INTERFACE 0
GQuark spit_data_imports_data_import_error_quark (void);
GType spit_data_imports_dialog_pane_geometry_options_get_type (void) G_GNUC_CONST;
@@ -869,8 +949,10 @@ SpitDataImportsService* spit_data_imports_data_importer_get_service (SpitDataImp
void spit_data_imports_data_importer_start (SpitDataImportsDataImporter* self);
gboolean spit_data_imports_data_importer_is_running (SpitDataImportsDataImporter* self);
void spit_data_imports_data_importer_stop (SpitDataImportsDataImporter* self);
-void spit_data_imports_data_importer_on_library_selected (SpitDataImportsDataImporter* self, SpitDataImportsImportableLibrary* library);
-void spit_data_imports_data_importer_on_file_selected (SpitDataImportsDataImporter* self, GFile* file);
+void spit_data_imports_data_importer_on_library_selected (SpitDataImportsDataImporter* self,
+ SpitDataImportsImportableLibrary* library);
+void spit_data_imports_data_importer_on_file_selected (SpitDataImportsDataImporter* self,
+ GFile* file);
void spit_data_imports_data_importer_reserved0 (SpitDataImportsDataImporter* self);
void spit_data_imports_data_importer_reserved1 (SpitDataImportsDataImporter* self);
void spit_data_imports_data_importer_reserved2 (SpitDataImportsDataImporter* self);
@@ -880,7 +962,8 @@ void spit_data_imports_data_importer_reserved5 (SpitDataImportsDataImporter* sel
void spit_data_imports_data_importer_reserved6 (SpitDataImportsDataImporter* self);
void spit_data_imports_data_importer_reserved7 (SpitDataImportsDataImporter* self);
gchar* spit_data_imports_importable_library_get_display_name (SpitDataImportsImportableLibrary* self);
-SpitDataImportsImportableTag** spit_data_imports_importable_media_item_get_tags (SpitDataImportsImportableMediaItem* self, int* result_length1);
+SpitDataImportsImportableTag** spit_data_imports_importable_media_item_get_tags (SpitDataImportsImportableMediaItem* self,
+ int* result_length1);
SpitDataImportsImportableEvent* spit_data_imports_importable_media_item_get_event (SpitDataImportsImportableMediaItem* self);
SpitDataImportsImportableRating* spit_data_imports_importable_media_item_get_rating (SpitDataImportsImportableMediaItem* self);
gchar* spit_data_imports_importable_media_item_get_title (SpitDataImportsImportableMediaItem* self);
@@ -905,18 +988,39 @@ void spit_data_imports_dialog_pane_reserved4 (SpitDataImportsDialogPane* self);
void spit_data_imports_dialog_pane_reserved5 (SpitDataImportsDialogPane* self);
void spit_data_imports_dialog_pane_reserved6 (SpitDataImportsDialogPane* self);
void spit_data_imports_dialog_pane_reserved7 (SpitDataImportsDialogPane* self);
-void spit_data_imports_plugin_host_post_error (SpitDataImportsPluginHost* self, GError* err);
-void spit_data_imports_plugin_host_post_error_message (SpitDataImportsPluginHost* self, const gchar* msg);
+void spit_data_imports_plugin_host_post_error (SpitDataImportsPluginHost* self,
+ GError* err);
+void spit_data_imports_plugin_host_post_error_message (SpitDataImportsPluginHost* self,
+ const gchar* msg);
void spit_data_imports_plugin_host_start_importing (SpitDataImportsPluginHost* self);
void spit_data_imports_plugin_host_stop_importing (SpitDataImportsPluginHost* self);
SpitDataImportsDataImporter* spit_data_imports_plugin_host_get_data_importer (SpitDataImportsPluginHost* self);
-void spit_data_imports_plugin_host_install_dialog_pane (SpitDataImportsPluginHost* self, SpitDataImportsDialogPane* pane, SpitDataImportsPluginHostButtonMode mode);
-void spit_data_imports_plugin_host_install_static_message_pane (SpitDataImportsPluginHost* self, const gchar* message, SpitDataImportsPluginHostButtonMode mode);
-void spit_data_imports_plugin_host_install_library_selection_pane (SpitDataImportsPluginHost* self, const gchar* welcome_message, SpitDataImportsImportableLibrary** discovered_libraries, int discovered_libraries_length1, const gchar* file_select_label);
-void spit_data_imports_plugin_host_install_import_progress_pane (SpitDataImportsPluginHost* self, const gchar* message);
-void spit_data_imports_plugin_host_update_import_progress_pane (SpitDataImportsPluginHost* self, gdouble progress, const gchar* progress_message);
-void spit_data_imports_plugin_host_prepare_media_items_for_import (SpitDataImportsPluginHost* self, SpitDataImportsImportableMediaItem** items, int items_length1, gdouble progress, gdouble host_progress_delta, const gchar* progress_message);
-void spit_data_imports_plugin_host_finalize_import (SpitDataImportsPluginHost* self, SpitDataImportsImportedItemsCountCallback report_imported_items_count, void* report_imported_items_count_target, const gchar* finalize_message);
+void spit_data_imports_plugin_host_install_dialog_pane (SpitDataImportsPluginHost* self,
+ SpitDataImportsDialogPane* pane,
+ SpitDataImportsPluginHostButtonMode mode);
+void spit_data_imports_plugin_host_install_static_message_pane (SpitDataImportsPluginHost* self,
+ const gchar* message,
+ SpitDataImportsPluginHostButtonMode mode);
+void spit_data_imports_plugin_host_install_library_selection_pane (SpitDataImportsPluginHost* self,
+ const gchar* welcome_message,
+ SpitDataImportsImportableLibrary** discovered_libraries,
+ int discovered_libraries_length1,
+ const gchar* file_select_label);
+void spit_data_imports_plugin_host_install_import_progress_pane (SpitDataImportsPluginHost* self,
+ const gchar* message);
+void spit_data_imports_plugin_host_update_import_progress_pane (SpitDataImportsPluginHost* self,
+ gdouble progress,
+ const gchar* progress_message);
+void spit_data_imports_plugin_host_prepare_media_items_for_import (SpitDataImportsPluginHost* self,
+ SpitDataImportsImportableMediaItem** items,
+ int items_length1,
+ gdouble progress,
+ gdouble host_progress_delta,
+ const gchar* progress_message);
+void spit_data_imports_plugin_host_finalize_import (SpitDataImportsPluginHost* self,
+ SpitDataImportsImportedItemsCountCallback report_imported_items_count,
+ void* report_imported_items_count_target,
+ const gchar* finalize_message);
void spit_data_imports_plugin_host_reserved0 (SpitDataImportsPluginHost* self);
void spit_data_imports_plugin_host_reserved1 (SpitDataImportsPluginHost* self);
void spit_data_imports_plugin_host_reserved2 (SpitDataImportsPluginHost* self);
@@ -925,7 +1029,8 @@ void spit_data_imports_plugin_host_reserved4 (SpitDataImportsPluginHost* self);
void spit_data_imports_plugin_host_reserved5 (SpitDataImportsPluginHost* self);
void spit_data_imports_plugin_host_reserved6 (SpitDataImportsPluginHost* self);
void spit_data_imports_plugin_host_reserved7 (SpitDataImportsPluginHost* self);
-SpitDataImportsDataImporter* spit_data_imports_service_create_data_importer (SpitDataImportsService* self, SpitDataImportsPluginHost* host);
+SpitDataImportsDataImporter* spit_data_imports_service_create_data_importer (SpitDataImportsService* self,
+ SpitDataImportsPluginHost* host);
void spit_data_imports_service_reserved0 (SpitDataImportsService* self);
void spit_data_imports_service_reserved1 (SpitDataImportsService* self);
void spit_data_imports_service_reserved2 (SpitDataImportsService* self);
diff --git a/plugins/shotwell-plugin-dev-1.0.vapi b/plugins/shotwell-plugin-dev-1.0.vapi
index ab248a4..e297926 100644
--- a/plugins/shotwell-plugin-dev-1.0.vapi
+++ b/plugins/shotwell-plugin-dev-1.0.vapi
@@ -1,4 +1,4 @@
-/* shotwell-plugin-dev-1.0.vapi generated by valac 0.36.6, do not modify. */
+/* shotwell-plugin-dev-1.0.vapi generated by valac 0.40.4, do not modify. */
namespace Spit {
namespace DataImports {
diff --git a/plugins/shotwell-publishing-extras/GalleryConnector.c b/plugins/shotwell-publishing-extras/GalleryConnector.c
index 17f2ef2..bd25726 100644
--- a/plugins/shotwell-publishing-extras/GalleryConnector.c
+++ b/plugins/shotwell-publishing-extras/GalleryConnector.c
@@ -1,4 +1,4 @@
-/* GalleryConnector.c generated by valac 0.36.6, the Vala compiler
+/* GalleryConnector.c generated by valac 0.40.4, the Vala compiler
* generated from GalleryConnector.vala, do not modify */
/* Copyright 2012-2013 Joe Sapp nixphoeni@gentoo.org
@@ -7,6 +7,7 @@
* See the COPYING file in this distribution.
*/
+
#include <glib.h>
#include <glib-object.h>
#include <stdlib.h>
@@ -33,6 +34,11 @@
typedef struct _ShotwellPublishingGallery3 ShotwellPublishingGallery3;
typedef struct _ShotwellPublishingGallery3Class ShotwellPublishingGallery3Class;
typedef struct _ShotwellPublishingGallery3Private ShotwellPublishingGallery3Private;
+enum {
+ SHOTWELL_PUBLISHING_GALLERY3_0_PROPERTY,
+ SHOTWELL_PUBLISHING_GALLERY3_NUM_PROPERTIES
+};
+static GParamSpec* shotwell_publishing_gallery3_properties[SHOTWELL_PUBLISHING_GALLERY3_NUM_PROPERTIES];
#define TYPE_GALLERY3_SERVICE (gallery3_service_get_type ())
#define GALLERY3_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_GALLERY3_SERVICE, Gallery3Service))
@@ -45,6 +51,11 @@ typedef struct _Gallery3Service Gallery3Service;
typedef struct _Gallery3ServiceClass Gallery3ServiceClass;
#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
typedef struct _Gallery3ServicePrivate Gallery3ServicePrivate;
+enum {
+ GALLERY3_SERVICE_0_PROPERTY,
+ GALLERY3_SERVICE_NUM_PROPERTIES
+};
+static GParamSpec* gallery3_service_properties[GALLERY3_SERVICE_NUM_PROPERTIES];
#define _g_free0(var) (var = (g_free (var), NULL))
#define PUBLISHING_GALLERY3_TYPE_GALLERY_PUBLISHER (publishing_gallery3_gallery_publisher_get_type ())
@@ -217,6 +228,11 @@ typedef struct _PublishingGallery3GalleryPublisherPrivate PublishingGallery3Gall
typedef struct _PublishingGallery3PublishingOptionsPane PublishingGallery3PublishingOptionsPane;
typedef struct _PublishingGallery3PublishingOptionsPaneClass PublishingGallery3PublishingOptionsPaneClass;
+enum {
+ PUBLISHING_GALLERY3_GALLERY_PUBLISHER_0_PROPERTY,
+ PUBLISHING_GALLERY3_GALLERY_PUBLISHER_NUM_PROPERTIES
+};
+static GParamSpec* publishing_gallery3_gallery_publisher_properties[PUBLISHING_GALLERY3_GALLERY_PUBLISHER_NUM_PROPERTIES];
#define PUBLISHING_GALLERY3_CREDENTIALS_PANE_TYPE_MODE (publishing_gallery3_credentials_pane_mode_get_type ())
@@ -241,13 +257,18 @@ typedef struct _PublishingGallery3Uploader PublishingGallery3Uploader;
typedef struct _PublishingGallery3UploaderClass PublishingGallery3UploaderClass;
#define _publishing_rest_support_batch_uploader_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rest_support_batch_uploader_unref (var), NULL)))
typedef struct _PublishingGallery3PublishingOptionsPanePrivate PublishingGallery3PublishingOptionsPanePrivate;
+enum {
+ PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_0_PROPERTY,
+ PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_NUM_PROPERTIES
+};
+static GParamSpec* publishing_gallery3_publishing_options_pane_properties[PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_NUM_PROPERTIES];
#define _g_slist_free0(var) ((var == NULL) ? NULL : (var = (g_slist_free (var), NULL)))
enum {
PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL,
PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL,
- PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL
+ PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_NUM_SIGNALS
};
-static guint publishing_gallery3_publishing_options_pane_signals[PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL] = {0};
+static guint publishing_gallery3_publishing_options_pane_signals[PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_NUM_SIGNALS] = {0};
typedef struct _PublishingGallery3PublishingParametersPrivate PublishingGallery3PublishingParametersPrivate;
typedef struct _PublishingGallery3ParamSpecPublishingParameters PublishingGallery3ParamSpecPublishingParameters;
typedef struct _PublishingGallery3CredentialsPanePrivate PublishingGallery3CredentialsPanePrivate;
@@ -262,18 +283,29 @@ typedef struct _PublishingGallery3CredentialsPanePrivate PublishingGallery3Crede
typedef struct _PublishingGallery3CredentialsGrid PublishingGallery3CredentialsGrid;
typedef struct _PublishingGallery3CredentialsGridClass PublishingGallery3CredentialsGridClass;
enum {
+ PUBLISHING_GALLERY3_CREDENTIALS_PANE_0_PROPERTY,
+ PUBLISHING_GALLERY3_CREDENTIALS_PANE_NUM_PROPERTIES
+};
+static GParamSpec* publishing_gallery3_credentials_pane_properties[PUBLISHING_GALLERY3_CREDENTIALS_PANE_NUM_PROPERTIES];
+enum {
PUBLISHING_GALLERY3_CREDENTIALS_PANE_GO_BACK_SIGNAL,
PUBLISHING_GALLERY3_CREDENTIALS_PANE_LOGIN_SIGNAL,
- PUBLISHING_GALLERY3_CREDENTIALS_PANE_LAST_SIGNAL
+ PUBLISHING_GALLERY3_CREDENTIALS_PANE_NUM_SIGNALS
};
-static guint publishing_gallery3_credentials_pane_signals[PUBLISHING_GALLERY3_CREDENTIALS_PANE_LAST_SIGNAL] = {0};
+static guint publishing_gallery3_credentials_pane_signals[PUBLISHING_GALLERY3_CREDENTIALS_PANE_NUM_SIGNALS] = {0};
typedef struct _PublishingGallery3CredentialsGridPrivate PublishingGallery3CredentialsGridPrivate;
enum {
+ PUBLISHING_GALLERY3_CREDENTIALS_GRID_0_PROPERTY,
+ PUBLISHING_GALLERY3_CREDENTIALS_GRID_PANE_WIDGET_PROPERTY,
+ PUBLISHING_GALLERY3_CREDENTIALS_GRID_NUM_PROPERTIES
+};
+static GParamSpec* publishing_gallery3_credentials_grid_properties[PUBLISHING_GALLERY3_CREDENTIALS_GRID_NUM_PROPERTIES];
+enum {
PUBLISHING_GALLERY3_CREDENTIALS_GRID_GO_BACK_SIGNAL,
PUBLISHING_GALLERY3_CREDENTIALS_GRID_LOGIN_SIGNAL,
- PUBLISHING_GALLERY3_CREDENTIALS_GRID_LAST_SIGNAL
+ PUBLISHING_GALLERY3_CREDENTIALS_GRID_NUM_SIGNALS
};
-static guint publishing_gallery3_credentials_grid_signals[PUBLISHING_GALLERY3_CREDENTIALS_GRID_LAST_SIGNAL] = {0};
+static guint publishing_gallery3_credentials_grid_signals[PUBLISHING_GALLERY3_CREDENTIALS_GRID_NUM_SIGNALS] = {0};
typedef struct _PublishingGallery3SessionPrivate PublishingGallery3SessionPrivate;
typedef struct _PublishingGallery3UploaderPrivate PublishingGallery3UploaderPrivate;
#define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
@@ -661,33 +693,42 @@ static gpointer publishing_gallery3_uploader_parent_class = NULL;
#define WEBSITE_URL "https://github.com/sappjw/shotwell-gallery3"
GType shotwell_publishing_gallery3_get_type (void) G_GNUC_CONST;
#define SHOTWELL_PUBLISHING_GALLERY3_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SHOTWELL_PUBLISHING_GALLERY3, ShotwellPublishingGallery3Private))
-enum {
- SHOTWELL_PUBLISHING_GALLERY3_DUMMY_PROPERTY
-};
ShotwellPublishingGallery3* shotwell_publishing_gallery3_new (GFile* module_file);
-ShotwellPublishingGallery3* shotwell_publishing_gallery3_construct (GType object_type, GFile* module_file);
+ShotwellPublishingGallery3* shotwell_publishing_gallery3_construct (GType object_type,
+ GFile* module_file);
Gallery3Service* gallery3_service_new (GFile* resource_directory);
-Gallery3Service* gallery3_service_construct (GType object_type, GFile* resource_directory);
+Gallery3Service* gallery3_service_construct (GType object_type,
+ GFile* resource_directory);
GType gallery3_service_get_type (void) G_GNUC_CONST;
-static void _vala_array_add1 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value);
+static void _vala_array_add1 (SpitPluggable** * array,
+ int* length,
+ int* size,
+ SpitPluggable* value);
static const gchar* shotwell_publishing_gallery3_real_get_module_name (SpitModule* base);
static const gchar* shotwell_publishing_gallery3_real_get_version (SpitModule* base);
static const gchar* shotwell_publishing_gallery3_real_get_id (SpitModule* base);
-static SpitPluggable** shotwell_publishing_gallery3_real_get_pluggables (SpitModule* base, int* result_length1);
+static SpitPluggable** shotwell_publishing_gallery3_real_get_pluggables (SpitModule* base,
+ int* result_length1);
static void shotwell_publishing_gallery3_finalize (GObject * obj);
-enum {
- GALLERY3_SERVICE_DUMMY_PROPERTY
-};
#define GALLERY3_SERVICE_ICON_FILENAME "gallery3.png"
-static gint gallery3_service_real_get_pluggable_interface (SpitPluggable* base, gint min_host_interface, gint max_host_interface);
+static gint gallery3_service_real_get_pluggable_interface (SpitPluggable* base,
+ gint min_host_interface,
+ gint max_host_interface);
static const gchar* gallery3_service_real_get_id (SpitPluggable* base);
static const gchar* gallery3_service_real_get_pluggable_name (SpitPluggable* base);
-static void gallery3_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info);
-static GdkPixbuf** _vala_array_dup1 (GdkPixbuf** self, int length);
-static void gallery3_service_real_activation (SpitPluggable* base, gboolean enabled);
-static SpitPublishingPublisher* gallery3_service_real_create_publisher (SpitPublishingService* base, SpitPublishingPluginHost* host);
-PublishingGallery3GalleryPublisher* publishing_gallery3_gallery_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host);
-PublishingGallery3GalleryPublisher* publishing_gallery3_gallery_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host);
+static void gallery3_service_real_get_info (SpitPluggable* base,
+ SpitPluggableInfo* info);
+static GdkPixbuf** _vala_array_dup1 (GdkPixbuf** self,
+ int length);
+static void gallery3_service_real_activation (SpitPluggable* base,
+ gboolean enabled);
+static SpitPublishingPublisher* gallery3_service_real_create_publisher (SpitPublishingService* base,
+ SpitPublishingPluginHost* host);
+PublishingGallery3GalleryPublisher* publishing_gallery3_gallery_publisher_new (SpitPublishingService* service,
+ SpitPublishingPluginHost* host);
+PublishingGallery3GalleryPublisher* publishing_gallery3_gallery_publisher_construct (GType object_type,
+ SpitPublishingService* service,
+ SpitPublishingPluginHost* host);
GType publishing_gallery3_gallery_publisher_get_type (void) G_GNUC_CONST;
static SpitPublishingPublisherMediaType gallery3_service_real_get_supported_media (SpitPublishingService* base);
static void gallery3_service_finalize (GObject * obj);
@@ -701,123 +742,176 @@ static void gallery3_service_finalize (GObject * obj);
#define PUBLISHING_GALLERY3_REST_PATH "/index.php/rest"
gpointer publishing_gallery3_album_ref (gpointer instance);
void publishing_gallery3_album_unref (gpointer instance);
-GParamSpec* publishing_gallery3_param_spec_album (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void publishing_gallery3_value_set_album (GValue* value, gpointer v_object);
-void publishing_gallery3_value_take_album (GValue* value, gpointer v_object);
+GParamSpec* publishing_gallery3_param_spec_album (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void publishing_gallery3_value_set_album (GValue* value,
+ gpointer v_object);
+void publishing_gallery3_value_take_album (GValue* value,
+ gpointer v_object);
gpointer publishing_gallery3_value_get_album (const GValue* value);
GType publishing_gallery3_album_get_type (void) G_GNUC_CONST;
#define PUBLISHING_GALLERY3_ALBUM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_GALLERY3_TYPE_ALBUM, PublishingGallery3AlbumPrivate))
-enum {
- PUBLISHING_GALLERY3_ALBUM_DUMMY_PROPERTY
-};
PublishingGallery3Album* publishing_gallery3_album_new (JsonObject* collection);
-PublishingGallery3Album* publishing_gallery3_album_construct (GType object_type, JsonObject* collection);
-static void publishing_gallery3_album_set_title (PublishingGallery3Album* self, const gchar* value);
-static void publishing_gallery3_album_set_name (PublishingGallery3Album* self, const gchar* value);
-static void publishing_gallery3_album_set_parentname (PublishingGallery3Album* self, const gchar* value);
-static void publishing_gallery3_album_set_url (PublishingGallery3Album* self, const gchar* value);
-static void publishing_gallery3_album_set_editable (PublishingGallery3Album* self, gboolean value);
+PublishingGallery3Album* publishing_gallery3_album_construct (GType object_type,
+ JsonObject* collection);
+static void publishing_gallery3_album_set_title (PublishingGallery3Album* self,
+ const gchar* value);
+static void publishing_gallery3_album_set_name (PublishingGallery3Album* self,
+ const gchar* value);
+static void publishing_gallery3_album_set_parentname (PublishingGallery3Album* self,
+ const gchar* value);
+static void publishing_gallery3_album_set_url (PublishingGallery3Album* self,
+ const gchar* value);
+static void publishing_gallery3_album_set_editable (PublishingGallery3Album* self,
+ gboolean value);
gchar* publishing_gallery3_strip_session_url (const gchar* url);
const gchar* publishing_gallery3_album_get_url (PublishingGallery3Album* self);
-static void publishing_gallery3_album_set_path (PublishingGallery3Album* self, const gchar* value);
+static void publishing_gallery3_album_set_path (PublishingGallery3Album* self,
+ const gchar* value);
const gchar* publishing_gallery3_album_get_name (PublishingGallery3Album* self);
const gchar* publishing_gallery3_album_get_title (PublishingGallery3Album* self);
const gchar* publishing_gallery3_album_get_summary (PublishingGallery3Album* self);
-static void publishing_gallery3_album_set_summary (PublishingGallery3Album* self, const gchar* value);
+static void publishing_gallery3_album_set_summary (PublishingGallery3Album* self,
+ const gchar* value);
const gchar* publishing_gallery3_album_get_parentname (PublishingGallery3Album* self);
const gchar* publishing_gallery3_album_get_path (PublishingGallery3Album* self);
gboolean publishing_gallery3_album_get_editable (PublishingGallery3Album* self);
static void publishing_gallery3_album_finalize (PublishingGallery3Album * obj);
GType publishing_gallery3_base_gallery_transaction_get_type (void) G_GNUC_CONST;
-enum {
- PUBLISHING_GALLERY3_BASE_GALLERY_TRANSACTION_DUMMY_PROPERTY
-};
GType publishing_gallery3_session_get_type (void) G_GNUC_CONST;
-PublishingGallery3BaseGalleryTransaction* publishing_gallery3_base_gallery_transaction_new (PublishingGallery3Session* session, const gchar* endpoint_url, const gchar* item_path, PublishingRESTSupportHttpMethod method);
-PublishingGallery3BaseGalleryTransaction* publishing_gallery3_base_gallery_transaction_construct (GType object_type, PublishingGallery3Session* session, const gchar* endpoint_url, const gchar* item_path, PublishingRESTSupportHttpMethod method);
-JsonNode* publishing_gallery3_base_gallery_transaction_get_root_node (PublishingGallery3BaseGalleryTransaction* self, GError** error);
+PublishingGallery3BaseGalleryTransaction* publishing_gallery3_base_gallery_transaction_new (PublishingGallery3Session* session,
+ const gchar* endpoint_url,
+ const gchar* item_path,
+ PublishingRESTSupportHttpMethod method);
+PublishingGallery3BaseGalleryTransaction* publishing_gallery3_base_gallery_transaction_construct (GType object_type,
+ PublishingGallery3Session* session,
+ const gchar* endpoint_url,
+ const gchar* item_path,
+ PublishingRESTSupportHttpMethod method);
+JsonNode* publishing_gallery3_base_gallery_transaction_get_root_node (PublishingGallery3BaseGalleryTransaction* self,
+ GError** error);
static void publishing_gallery3_base_gallery_transaction_finalize (PublishingRESTSupportTransaction * obj);
GType publishing_gallery3_key_fetch_transaction_get_type (void) G_GNUC_CONST;
#define PUBLISHING_GALLERY3_KEY_FETCH_TRANSACTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_GALLERY3_TYPE_KEY_FETCH_TRANSACTION, PublishingGallery3KeyFetchTransactionPrivate))
-enum {
- PUBLISHING_GALLERY3_KEY_FETCH_TRANSACTION_DUMMY_PROPERTY
-};
-PublishingGallery3KeyFetchTransaction* publishing_gallery3_key_fetch_transaction_new (PublishingGallery3Session* session, const gchar* url, const gchar* username, const gchar* password);
-PublishingGallery3KeyFetchTransaction* publishing_gallery3_key_fetch_transaction_construct (GType object_type, PublishingGallery3Session* session, const gchar* url, const gchar* username, const gchar* password);
+PublishingGallery3KeyFetchTransaction* publishing_gallery3_key_fetch_transaction_new (PublishingGallery3Session* session,
+ const gchar* url,
+ const gchar* username,
+ const gchar* password);
+PublishingGallery3KeyFetchTransaction* publishing_gallery3_key_fetch_transaction_construct (GType object_type,
+ PublishingGallery3Session* session,
+ const gchar* url,
+ const gchar* username,
+ const gchar* password);
gchar* publishing_gallery3_key_fetch_transaction_get_key (PublishingGallery3KeyFetchTransaction* self);
static void publishing_gallery3_key_fetch_transaction_finalize (PublishingRESTSupportTransaction * obj);
GType publishing_gallery3_gallery_request_transaction_get_type (void) G_GNUC_CONST;
-enum {
- PUBLISHING_GALLERY3_GALLERY_REQUEST_TRANSACTION_DUMMY_PROPERTY
-};
-PublishingGallery3GalleryRequestTransaction* publishing_gallery3_gallery_request_transaction_new (PublishingGallery3Session* session, const gchar* item, PublishingRESTSupportHttpMethod method);
-PublishingGallery3GalleryRequestTransaction* publishing_gallery3_gallery_request_transaction_construct (GType object_type, PublishingGallery3Session* session, const gchar* item, PublishingRESTSupportHttpMethod method);
+PublishingGallery3GalleryRequestTransaction* publishing_gallery3_gallery_request_transaction_new (PublishingGallery3Session* session,
+ const gchar* item,
+ PublishingRESTSupportHttpMethod method);
+PublishingGallery3GalleryRequestTransaction* publishing_gallery3_gallery_request_transaction_construct (GType object_type,
+ PublishingGallery3Session* session,
+ const gchar* item,
+ PublishingRESTSupportHttpMethod method);
const gchar* publishing_gallery3_session_get_url (PublishingGallery3Session* self);
const gchar* publishing_gallery3_session_get_key (PublishingGallery3Session* self);
GType publishing_gallery3_get_album_ur_ls_transaction_get_type (void) G_GNUC_CONST;
-enum {
- PUBLISHING_GALLERY3_GET_ALBUM_UR_LS_TRANSACTION_DUMMY_PROPERTY
-};
PublishingGallery3GetAlbumURLsTransaction* publishing_gallery3_get_album_ur_ls_transaction_new (PublishingGallery3Session* session);
-PublishingGallery3GetAlbumURLsTransaction* publishing_gallery3_get_album_ur_ls_transaction_construct (GType object_type, PublishingGallery3Session* session);
-gchar** publishing_gallery3_get_album_ur_ls_transaction_get_album_urls (PublishingGallery3GetAlbumURLsTransaction* self, int* result_length1);
-static void _vala_array_add2 (gchar** * array, int* length, int* size, gchar* value);
+PublishingGallery3GetAlbumURLsTransaction* publishing_gallery3_get_album_ur_ls_transaction_construct (GType object_type,
+ PublishingGallery3Session* session);
+gchar** publishing_gallery3_get_album_ur_ls_transaction_get_album_urls (PublishingGallery3GetAlbumURLsTransaction* self,
+ int* result_length1);
+static void _vala_array_add2 (gchar** * array,
+ int* length,
+ int* size,
+ gchar* value);
GType publishing_gallery3_get_albums_transaction_get_type (void) G_GNUC_CONST;
#define PUBLISHING_GALLERY3_GET_ALBUMS_TRANSACTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_GALLERY3_TYPE_GET_ALBUMS_TRANSACTION, PublishingGallery3GetAlbumsTransactionPrivate))
-enum {
- PUBLISHING_GALLERY3_GET_ALBUMS_TRANSACTION_DUMMY_PROPERTY
-};
-PublishingGallery3GetAlbumsTransaction* publishing_gallery3_get_albums_transaction_new (PublishingGallery3Session* session, gchar** _album_urls, int _album_urls_length1, guint start);
-PublishingGallery3GetAlbumsTransaction* publishing_gallery3_get_albums_transaction_construct (GType object_type, PublishingGallery3Session* session, gchar** _album_urls, int _album_urls_length1, guint start);
-static void publishing_gallery3_get_albums_transaction_set_album_urls (PublishingGallery3GetAlbumsTransaction* self, gchar** value, int value_length1);
-gchar** publishing_gallery3_get_albums_transaction_get_album_urls (PublishingGallery3GetAlbumsTransaction* self, int* result_length1);
-static void publishing_gallery3_get_albums_transaction_set_urls_sent (PublishingGallery3GetAlbumsTransaction* self, guint value);
+PublishingGallery3GetAlbumsTransaction* publishing_gallery3_get_albums_transaction_new (PublishingGallery3Session* session,
+ gchar** _album_urls,
+ int _album_urls_length1,
+ guint start);
+PublishingGallery3GetAlbumsTransaction* publishing_gallery3_get_albums_transaction_construct (GType object_type,
+ PublishingGallery3Session* session,
+ gchar** _album_urls,
+ int _album_urls_length1,
+ guint start);
+static void publishing_gallery3_get_albums_transaction_set_album_urls (PublishingGallery3GetAlbumsTransaction* self,
+ gchar** value,
+ int value_length1);
+gchar** publishing_gallery3_get_albums_transaction_get_album_urls (PublishingGallery3GetAlbumsTransaction* self,
+ int* result_length1);
+static void publishing_gallery3_get_albums_transaction_set_urls_sent (PublishingGallery3GetAlbumsTransaction* self,
+ guint value);
guint publishing_gallery3_get_albums_transaction_get_urls_sent (PublishingGallery3GetAlbumsTransaction* self);
-static void _vala_array_add3 (gchar** * array, int* length, int* size, gchar* value);
-static void publishing_gallery3_get_albums_transaction_set_more_urls (PublishingGallery3GetAlbumsTransaction* self, gboolean value);
-PublishingGallery3Album** publishing_gallery3_get_albums_transaction_get_albums (PublishingGallery3GetAlbumsTransaction* self, int* result_length1, GError** error);
-static void _vala_array_add4 (PublishingGallery3Album** * array, int* length, int* size, PublishingGallery3Album* value);
-static gchar** _vala_array_dup2 (gchar** self, int length);
+static void _vala_array_add3 (gchar** * array,
+ int* length,
+ int* size,
+ gchar* value);
+static void publishing_gallery3_get_albums_transaction_set_more_urls (PublishingGallery3GetAlbumsTransaction* self,
+ gboolean value);
+PublishingGallery3Album** publishing_gallery3_get_albums_transaction_get_albums (PublishingGallery3GetAlbumsTransaction* self,
+ int* result_length1,
+ GError** error);
+static void _vala_array_add4 (PublishingGallery3Album** * array,
+ int* length,
+ int* size,
+ PublishingGallery3Album* value);
+static gchar** _vala_array_dup2 (gchar** self,
+ int length);
gboolean publishing_gallery3_get_albums_transaction_get_more_urls (PublishingGallery3GetAlbumsTransaction* self);
static void publishing_gallery3_get_albums_transaction_finalize (PublishingRESTSupportTransaction * obj);
GType publishing_gallery3_gallery_get_tag_transaction_get_type (void) G_GNUC_CONST;
-enum {
- PUBLISHING_GALLERY3_GALLERY_GET_TAG_TRANSACTION_DUMMY_PROPERTY
-};
-PublishingGallery3GalleryGetTagTransaction* publishing_gallery3_gallery_get_tag_transaction_new (PublishingGallery3Session* session, const gchar* tag_name);
-PublishingGallery3GalleryGetTagTransaction* publishing_gallery3_gallery_get_tag_transaction_construct (GType object_type, PublishingGallery3Session* session, const gchar* tag_name);
+PublishingGallery3GalleryGetTagTransaction* publishing_gallery3_gallery_get_tag_transaction_new (PublishingGallery3Session* session,
+ const gchar* tag_name);
+PublishingGallery3GalleryGetTagTransaction* publishing_gallery3_gallery_get_tag_transaction_construct (GType object_type,
+ PublishingGallery3Session* session,
+ const gchar* tag_name);
static void _vala_JsonNode_free (JsonNode* self);
gchar* publishing_gallery3_gallery_get_tag_transaction_tag_url (PublishingGallery3GalleryGetTagTransaction* self);
GType publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_get_type (void) G_GNUC_CONST;
#define PUBLISHING_GALLERY3_GALLERY_GET_ITEM_TAGS_UR_LS_TRANSACTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_GALLERY3_TYPE_GALLERY_GET_ITEM_TAGS_UR_LS_TRANSACTION, PublishingGallery3GalleryGetItemTagsURLsTransactionPrivate))
-enum {
- PUBLISHING_GALLERY3_GALLERY_GET_ITEM_TAGS_UR_LS_TRANSACTION_DUMMY_PROPERTY
-};
-PublishingGallery3GalleryGetItemTagsURLsTransaction* publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_new (PublishingGallery3Session* session, const gchar* item_url);
-PublishingGallery3GalleryGetItemTagsURLsTransaction* publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_construct (GType object_type, PublishingGallery3Session* session, const gchar* item_url);
+PublishingGallery3GalleryGetItemTagsURLsTransaction* publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_new (PublishingGallery3Session* session,
+ const gchar* item_url);
+PublishingGallery3GalleryGetItemTagsURLsTransaction* publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_construct (GType object_type,
+ PublishingGallery3Session* session,
+ const gchar* item_url);
gchar* publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_get_item_tags_path (PublishingGallery3GalleryGetItemTagsURLsTransaction* self);
static void publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_finalize (PublishingRESTSupportTransaction * obj);
GType publishing_gallery3_gallery_set_tag_relationship_transaction_get_type (void) G_GNUC_CONST;
-enum {
- PUBLISHING_GALLERY3_GALLERY_SET_TAG_RELATIONSHIP_TRANSACTION_DUMMY_PROPERTY
-};
-PublishingGallery3GallerySetTagRelationshipTransaction* publishing_gallery3_gallery_set_tag_relationship_transaction_new (PublishingGallery3Session* session, const gchar* item_tags_path, const gchar* tag_url, const gchar* item_url);
-PublishingGallery3GallerySetTagRelationshipTransaction* publishing_gallery3_gallery_set_tag_relationship_transaction_construct (GType object_type, PublishingGallery3Session* session, const gchar* item_tags_path, const gchar* tag_url, const gchar* item_url);
+PublishingGallery3GallerySetTagRelationshipTransaction* publishing_gallery3_gallery_set_tag_relationship_transaction_new (PublishingGallery3Session* session,
+ const gchar* item_tags_path,
+ const gchar* tag_url,
+ const gchar* item_url);
+PublishingGallery3GallerySetTagRelationshipTransaction* publishing_gallery3_gallery_set_tag_relationship_transaction_construct (GType object_type,
+ PublishingGallery3Session* session,
+ const gchar* item_tags_path,
+ const gchar* tag_url,
+ const gchar* item_url);
GType publishing_gallery3_gallery_album_create_transaction_get_type (void) G_GNUC_CONST;
gpointer publishing_gallery3_publishing_parameters_ref (gpointer instance);
void publishing_gallery3_publishing_parameters_unref (gpointer instance);
-GParamSpec* publishing_gallery3_param_spec_publishing_parameters (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void publishing_gallery3_value_set_publishing_parameters (GValue* value, gpointer v_object);
-void publishing_gallery3_value_take_publishing_parameters (GValue* value, gpointer v_object);
+GParamSpec* publishing_gallery3_param_spec_publishing_parameters (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void publishing_gallery3_value_set_publishing_parameters (GValue* value,
+ gpointer v_object);
+void publishing_gallery3_value_take_publishing_parameters (GValue* value,
+ gpointer v_object);
gpointer publishing_gallery3_value_get_publishing_parameters (const GValue* value);
GType publishing_gallery3_publishing_parameters_get_type (void) G_GNUC_CONST;
#define PUBLISHING_GALLERY3_GALLERY_ALBUM_CREATE_TRANSACTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_GALLERY3_TYPE_GALLERY_ALBUM_CREATE_TRANSACTION, PublishingGallery3GalleryAlbumCreateTransactionPrivate))
-enum {
- PUBLISHING_GALLERY3_GALLERY_ALBUM_CREATE_TRANSACTION_DUMMY_PROPERTY
-};
-PublishingGallery3GalleryAlbumCreateTransaction* publishing_gallery3_gallery_album_create_transaction_new (PublishingGallery3Session* session, PublishingGallery3PublishingParameters* parameters);
-PublishingGallery3GalleryAlbumCreateTransaction* publishing_gallery3_gallery_album_create_transaction_construct (GType object_type, PublishingGallery3Session* session, PublishingGallery3PublishingParameters* parameters);
-static void publishing_gallery3_gallery_album_create_transaction_set_parameters (PublishingGallery3GalleryAlbumCreateTransaction* self, PublishingGallery3PublishingParameters* value);
+PublishingGallery3GalleryAlbumCreateTransaction* publishing_gallery3_gallery_album_create_transaction_new (PublishingGallery3Session* session,
+ PublishingGallery3PublishingParameters* parameters);
+PublishingGallery3GalleryAlbumCreateTransaction* publishing_gallery3_gallery_album_create_transaction_construct (GType object_type,
+ PublishingGallery3Session* session,
+ PublishingGallery3PublishingParameters* parameters);
+static void publishing_gallery3_gallery_album_create_transaction_set_parameters (PublishingGallery3GalleryAlbumCreateTransaction* self,
+ PublishingGallery3PublishingParameters* value);
const gchar* publishing_gallery3_publishing_parameters_get_album_name (PublishingGallery3PublishingParameters* self);
const gchar* publishing_gallery3_publishing_parameters_get_album_title (PublishingGallery3PublishingParameters* self);
gchar* publishing_gallery3_gallery_album_create_transaction_get_new_album_path (PublishingGallery3GalleryAlbumCreateTransaction* self);
@@ -825,26 +919,30 @@ PublishingGallery3PublishingParameters* publishing_gallery3_gallery_album_create
static void publishing_gallery3_gallery_album_create_transaction_finalize (PublishingRESTSupportTransaction * obj);
GType publishing_gallery3_gallery_upload_transaction_get_type (void) G_GNUC_CONST;
#define PUBLISHING_GALLERY3_GALLERY_UPLOAD_TRANSACTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_GALLERY3_TYPE_GALLERY_UPLOAD_TRANSACTION, PublishingGallery3GalleryUploadTransactionPrivate))
-enum {
- PUBLISHING_GALLERY3_GALLERY_UPLOAD_TRANSACTION_DUMMY_PROPERTY
-};
-PublishingGallery3GalleryUploadTransaction* publishing_gallery3_gallery_upload_transaction_new (PublishingGallery3Session* session, PublishingGallery3PublishingParameters* parameters, SpitPublishingPublishable* publishable);
-PublishingGallery3GalleryUploadTransaction* publishing_gallery3_gallery_upload_transaction_construct (GType object_type, PublishingGallery3Session* session, PublishingGallery3PublishingParameters* parameters, SpitPublishingPublishable* publishable);
+PublishingGallery3GalleryUploadTransaction* publishing_gallery3_gallery_upload_transaction_new (PublishingGallery3Session* session,
+ PublishingGallery3PublishingParameters* parameters,
+ SpitPublishingPublishable* publishable);
+PublishingGallery3GalleryUploadTransaction* publishing_gallery3_gallery_upload_transaction_construct (GType object_type,
+ PublishingGallery3Session* session,
+ PublishingGallery3PublishingParameters* parameters,
+ SpitPublishingPublishable* publishable);
const gchar* publishing_gallery3_publishing_parameters_get_album_path (PublishingGallery3PublishingParameters* self);
static void _g_free0_ (gpointer var);
static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_url (PublishingGallery3GalleryUploadTransaction* self);
-static void publishing_gallery3_gallery_upload_transaction_do_set_tag_relationship (PublishingGallery3GalleryUploadTransaction* self, const gchar* tag_url, GError** error);
+static void publishing_gallery3_gallery_upload_transaction_do_set_tag_relationship (PublishingGallery3GalleryUploadTransaction* self,
+ const gchar* tag_url,
+ GError** error);
static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_tags_path (PublishingGallery3GalleryUploadTransaction* self);
-static gchar* publishing_gallery3_gallery_upload_transaction_get_tag_url (PublishingGallery3GalleryUploadTransaction* self, const gchar* tag);
-static void publishing_gallery3_gallery_upload_transaction_on_upload_completed (PublishingGallery3GalleryUploadTransaction* self, GError** error);
+static gchar* publishing_gallery3_gallery_upload_transaction_get_tag_url (PublishingGallery3GalleryUploadTransaction* self,
+ const gchar* tag);
+static void publishing_gallery3_gallery_upload_transaction_on_upload_completed (PublishingGallery3GalleryUploadTransaction* self,
+ GError** error);
gboolean publishing_gallery3_publishing_parameters_get_strip_metadata (PublishingGallery3PublishingParameters* self);
-static void publishing_gallery3_gallery_upload_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error);
+static void publishing_gallery3_gallery_upload_transaction_real_execute (PublishingRESTSupportTransaction* base,
+ GError** error);
static void publishing_gallery3_gallery_upload_transaction_finalize (PublishingRESTSupportTransaction * obj);
GType publishing_gallery3_publishing_options_pane_get_type (void) G_GNUC_CONST;
#define PUBLISHING_GALLERY3_GALLERY_PUBLISHER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_GALLERY3_TYPE_GALLERY_PUBLISHER, PublishingGallery3GalleryPublisherPrivate))
-enum {
- PUBLISHING_GALLERY3_GALLERY_PUBLISHER_DUMMY_PROPERTY
-};
#define PUBLISHING_GALLERY3_GALLERY_PUBLISHER_BAD_FILE_MSG _ ("\n" \
"\n" \
"The file “%s” may not be supported by or may be too large for this ins" \
@@ -860,106 +958,221 @@ gchar* publishing_gallery3_gallery_publisher_get_api_key (PublishingGallery3Gall
static void publishing_gallery3_gallery_publisher_do_show_service_welcome_pane (PublishingGallery3GalleryPublisher* self);
gchar* publishing_gallery3_gallery_publisher_get_gallery_url (PublishingGallery3GalleryPublisher* self);
gchar* publishing_gallery3_gallery_publisher_get_gallery_username (PublishingGallery3GalleryPublisher* self);
-void publishing_gallery3_session_authenticate (PublishingGallery3Session* self, const gchar* gallery_url, const gchar* username, const gchar* key);
+void publishing_gallery3_session_authenticate (PublishingGallery3Session* self,
+ const gchar* gallery_url,
+ const gchar* username,
+ const gchar* key);
static void publishing_gallery3_gallery_publisher_do_fetch_album_urls (PublishingGallery3GalleryPublisher* self);
static void publishing_gallery3_gallery_publisher_real_stop (SpitPublishingPublisher* base);
-void publishing_gallery3_gallery_publisher_set_api_key (PublishingGallery3GalleryPublisher* self, const gchar* key);
-void publishing_gallery3_gallery_publisher_set_gallery_url (PublishingGallery3GalleryPublisher* self, const gchar* url);
-void publishing_gallery3_gallery_publisher_set_gallery_username (PublishingGallery3GalleryPublisher* self, const gchar* username);
+void publishing_gallery3_gallery_publisher_set_api_key (PublishingGallery3GalleryPublisher* self,
+ const gchar* key);
+void publishing_gallery3_gallery_publisher_set_gallery_url (PublishingGallery3GalleryPublisher* self,
+ const gchar* url);
+void publishing_gallery3_gallery_publisher_set_gallery_username (PublishingGallery3GalleryPublisher* self,
+ const gchar* username);
gboolean* publishing_gallery3_gallery_publisher_get_persistent_strip_metadata (PublishingGallery3GalleryPublisher* self);
static gboolean* _bool_dup (gboolean* self);
-void publishing_gallery3_gallery_publisher_set_persistent_strip_metadata (PublishingGallery3GalleryPublisher* self, gboolean strip_metadata);
+void publishing_gallery3_gallery_publisher_set_persistent_strip_metadata (PublishingGallery3GalleryPublisher* self,
+ gboolean strip_metadata);
gint* publishing_gallery3_gallery_publisher_get_scaling_constraint_id (PublishingGallery3GalleryPublisher* self);
static gint* _int_dup (gint* self);
-void publishing_gallery3_gallery_publisher_set_scaling_constraint_id (PublishingGallery3GalleryPublisher* self, gint constraint);
+void publishing_gallery3_gallery_publisher_set_scaling_constraint_id (PublishingGallery3GalleryPublisher* self,
+ gint constraint);
gint* publishing_gallery3_gallery_publisher_get_scaling_pixels (PublishingGallery3GalleryPublisher* self);
-void publishing_gallery3_gallery_publisher_set_scaling_pixels (PublishingGallery3GalleryPublisher* self, gint pixels);
+void publishing_gallery3_gallery_publisher_set_scaling_pixels (PublishingGallery3GalleryPublisher* self,
+ gint pixels);
static void publishing_gallery3_gallery_publisher_on_service_welcome_login (PublishingGallery3GalleryPublisher* self);
static void _publishing_gallery3_gallery_publisher_on_service_welcome_login_spit_publishing_login_callback (gpointer self);
GType publishing_gallery3_credentials_pane_mode_get_type (void) G_GNUC_CONST;
-static void publishing_gallery3_gallery_publisher_do_show_credentials_pane (PublishingGallery3GalleryPublisher* self, PublishingGallery3CredentialsPaneMode mode);
+static void publishing_gallery3_gallery_publisher_do_show_credentials_pane (PublishingGallery3GalleryPublisher* self,
+ PublishingGallery3CredentialsPaneMode mode);
gchar* publishing_gallery3_credentials_pane_mode_to_string (PublishingGallery3CredentialsPaneMode self);
void publishing_gallery3_session_deauthenticate (PublishingGallery3Session* self);
GType publishing_gallery3_credentials_pane_get_type (void) G_GNUC_CONST;
-PublishingGallery3CredentialsPane* publishing_gallery3_credentials_pane_new (SpitPublishingPluginHost* host, PublishingGallery3CredentialsPaneMode mode, const gchar* url, const gchar* username, const gchar* key);
-PublishingGallery3CredentialsPane* publishing_gallery3_credentials_pane_construct (GType object_type, SpitPublishingPluginHost* host, PublishingGallery3CredentialsPaneMode mode, const gchar* url, const gchar* username, const gchar* key);
+PublishingGallery3CredentialsPane* publishing_gallery3_credentials_pane_new (SpitPublishingPluginHost* host,
+ PublishingGallery3CredentialsPaneMode mode,
+ const gchar* url,
+ const gchar* username,
+ const gchar* key);
+PublishingGallery3CredentialsPane* publishing_gallery3_credentials_pane_construct (GType object_type,
+ SpitPublishingPluginHost* host,
+ PublishingGallery3CredentialsPaneMode mode,
+ const gchar* url,
+ const gchar* username,
+ const gchar* key);
static void publishing_gallery3_gallery_publisher_on_credentials_go_back (PublishingGallery3GalleryPublisher* self);
-static void _publishing_gallery3_gallery_publisher_on_credentials_go_back_publishing_gallery3_credentials_pane_go_back (PublishingGallery3CredentialsPane* _sender, gpointer self);
-static void publishing_gallery3_gallery_publisher_on_credentials_login (PublishingGallery3GalleryPublisher* self, const gchar* url, const gchar* username, const gchar* password);
-static void _publishing_gallery3_gallery_publisher_on_credentials_login_publishing_gallery3_credentials_pane_login (PublishingGallery3CredentialsPane* _sender, const gchar* url, const gchar* uname, const gchar* password, const gchar* key, gpointer self);
-static void publishing_gallery3_gallery_publisher_do_network_login (PublishingGallery3GalleryPublisher* self, const gchar* url, const gchar* username, const gchar* password);
-static void publishing_gallery3_gallery_publisher_on_key_fetch_error (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err);
-static void _publishing_gallery3_gallery_publisher_on_key_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self);
-static void publishing_gallery3_gallery_publisher_on_key_fetch_complete (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportTransaction* txn);
-static void _publishing_gallery3_gallery_publisher_on_key_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
-static void publishing_gallery3_gallery_publisher_on_album_urls_fetch_error (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err);
-static void _publishing_gallery3_gallery_publisher_on_album_urls_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self);
-static void publishing_gallery3_gallery_publisher_on_album_urls_fetch_complete (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportTransaction* txn);
-static void _publishing_gallery3_gallery_publisher_on_album_urls_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
-static void publishing_gallery3_gallery_publisher_do_fetch_albums (PublishingGallery3GalleryPublisher* self, gchar** album_urls, int album_urls_length1, guint start);
-static void publishing_gallery3_gallery_publisher_on_album_fetch_error (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err);
-static void _publishing_gallery3_gallery_publisher_on_album_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self);
-static void publishing_gallery3_gallery_publisher_on_album_fetch_complete (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportTransaction* txn);
-static void _publishing_gallery3_gallery_publisher_on_album_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
-static void publishing_gallery3_gallery_publisher_do_show_publishing_options_pane (PublishingGallery3GalleryPublisher* self, const gchar* url, const gchar* username);
-PublishingGallery3PublishingOptionsPane* publishing_gallery3_publishing_options_pane_new (SpitPublishingPluginHost* host, const gchar* url, const gchar* username, PublishingGallery3Album** albums, int albums_length1, GtkBuilder* builder, gboolean strip_metadata, gint scaling_id, gint scaling_pixels);
-PublishingGallery3PublishingOptionsPane* publishing_gallery3_publishing_options_pane_construct (GType object_type, SpitPublishingPluginHost* host, const gchar* url, const gchar* username, PublishingGallery3Album** albums, int albums_length1, GtkBuilder* builder, gboolean strip_metadata, gint scaling_id, gint scaling_pixels);
-static void publishing_gallery3_gallery_publisher_on_publishing_options_pane_publish (PublishingGallery3GalleryPublisher* self, PublishingGallery3PublishingParameters* parameters);
-static void _publishing_gallery3_gallery_publisher_on_publishing_options_pane_publish_publishing_gallery3_publishing_options_pane_publish (PublishingGallery3PublishingOptionsPane* _sender, PublishingGallery3PublishingParameters* parameters, gpointer self);
+static void _publishing_gallery3_gallery_publisher_on_credentials_go_back_publishing_gallery3_credentials_pane_go_back (PublishingGallery3CredentialsPane* _sender,
+ gpointer self);
+static void publishing_gallery3_gallery_publisher_on_credentials_login (PublishingGallery3GalleryPublisher* self,
+ const gchar* url,
+ const gchar* username,
+ const gchar* password);
+static void _publishing_gallery3_gallery_publisher_on_credentials_login_publishing_gallery3_credentials_pane_login (PublishingGallery3CredentialsPane* _sender,
+ const gchar* url,
+ const gchar* uname,
+ const gchar* password,
+ const gchar* key,
+ gpointer self);
+static void publishing_gallery3_gallery_publisher_do_network_login (PublishingGallery3GalleryPublisher* self,
+ const gchar* url,
+ const gchar* username,
+ const gchar* password);
+static void publishing_gallery3_gallery_publisher_on_key_fetch_error (PublishingGallery3GalleryPublisher* self,
+ PublishingRESTSupportTransaction* bad_txn,
+ GError* err);
+static void _publishing_gallery3_gallery_publisher_on_key_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+ GError* err,
+ gpointer self);
+static void publishing_gallery3_gallery_publisher_on_key_fetch_complete (PublishingGallery3GalleryPublisher* self,
+ PublishingRESTSupportTransaction* txn);
+static void _publishing_gallery3_gallery_publisher_on_key_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+ gpointer self);
+static void publishing_gallery3_gallery_publisher_on_album_urls_fetch_error (PublishingGallery3GalleryPublisher* self,
+ PublishingRESTSupportTransaction* bad_txn,
+ GError* err);
+static void _publishing_gallery3_gallery_publisher_on_album_urls_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+ GError* err,
+ gpointer self);
+static void publishing_gallery3_gallery_publisher_on_album_urls_fetch_complete (PublishingGallery3GalleryPublisher* self,
+ PublishingRESTSupportTransaction* txn);
+static void _publishing_gallery3_gallery_publisher_on_album_urls_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+ gpointer self);
+static void publishing_gallery3_gallery_publisher_do_fetch_albums (PublishingGallery3GalleryPublisher* self,
+ gchar** album_urls,
+ int album_urls_length1,
+ guint start);
+static void publishing_gallery3_gallery_publisher_on_album_fetch_error (PublishingGallery3GalleryPublisher* self,
+ PublishingRESTSupportTransaction* bad_txn,
+ GError* err);
+static void _publishing_gallery3_gallery_publisher_on_album_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+ GError* err,
+ gpointer self);
+static void publishing_gallery3_gallery_publisher_on_album_fetch_complete (PublishingGallery3GalleryPublisher* self,
+ PublishingRESTSupportTransaction* txn);
+static void _publishing_gallery3_gallery_publisher_on_album_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+ gpointer self);
+static void publishing_gallery3_gallery_publisher_do_show_publishing_options_pane (PublishingGallery3GalleryPublisher* self,
+ const gchar* url,
+ const gchar* username);
+PublishingGallery3PublishingOptionsPane* publishing_gallery3_publishing_options_pane_new (SpitPublishingPluginHost* host,
+ const gchar* url,
+ const gchar* username,
+ PublishingGallery3Album** albums,
+ int albums_length1,
+ GtkBuilder* builder,
+ gboolean strip_metadata,
+ gint scaling_id,
+ gint scaling_pixels);
+PublishingGallery3PublishingOptionsPane* publishing_gallery3_publishing_options_pane_construct (GType object_type,
+ SpitPublishingPluginHost* host,
+ const gchar* url,
+ const gchar* username,
+ PublishingGallery3Album** albums,
+ int albums_length1,
+ GtkBuilder* builder,
+ gboolean strip_metadata,
+ gint scaling_id,
+ gint scaling_pixels);
+static void publishing_gallery3_gallery_publisher_on_publishing_options_pane_publish (PublishingGallery3GalleryPublisher* self,
+ PublishingGallery3PublishingParameters* parameters);
+static void _publishing_gallery3_gallery_publisher_on_publishing_options_pane_publish_publishing_gallery3_publishing_options_pane_publish (PublishingGallery3PublishingOptionsPane* _sender,
+ PublishingGallery3PublishingParameters* parameters,
+ gpointer self);
static void publishing_gallery3_gallery_publisher_on_publishing_options_pane_logout (PublishingGallery3GalleryPublisher* self);
-static void _publishing_gallery3_gallery_publisher_on_publishing_options_pane_logout_publishing_gallery3_publishing_options_pane_logout (PublishingGallery3PublishingOptionsPane* _sender, gpointer self);
-static void publishing_gallery3_gallery_publisher_do_create_album (PublishingGallery3GalleryPublisher* self, PublishingGallery3PublishingParameters* parameters);
-static void publishing_gallery3_gallery_publisher_on_album_create_error (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err);
-static void _publishing_gallery3_gallery_publisher_on_album_create_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self);
-static void publishing_gallery3_gallery_publisher_on_album_create_complete (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportTransaction* txn);
-static void _publishing_gallery3_gallery_publisher_on_album_create_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
-static void publishing_gallery3_gallery_publisher_do_publish (PublishingGallery3GalleryPublisher* self, PublishingGallery3PublishingParameters* parameters);
+static void _publishing_gallery3_gallery_publisher_on_publishing_options_pane_logout_publishing_gallery3_publishing_options_pane_logout (PublishingGallery3PublishingOptionsPane* _sender,
+ gpointer self);
+static void publishing_gallery3_gallery_publisher_do_create_album (PublishingGallery3GalleryPublisher* self,
+ PublishingGallery3PublishingParameters* parameters);
+static void publishing_gallery3_gallery_publisher_on_album_create_error (PublishingGallery3GalleryPublisher* self,
+ PublishingRESTSupportTransaction* bad_txn,
+ GError* err);
+static void _publishing_gallery3_gallery_publisher_on_album_create_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+ GError* err,
+ gpointer self);
+static void publishing_gallery3_gallery_publisher_on_album_create_complete (PublishingGallery3GalleryPublisher* self,
+ PublishingRESTSupportTransaction* txn);
+static void _publishing_gallery3_gallery_publisher_on_album_create_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+ gpointer self);
+static void publishing_gallery3_gallery_publisher_do_publish (PublishingGallery3GalleryPublisher* self,
+ PublishingGallery3PublishingParameters* parameters);
gint publishing_gallery3_publishing_parameters_get_photo_major_axis_size (PublishingGallery3PublishingParameters* self);
GType publishing_gallery3_uploader_get_type (void) G_GNUC_CONST;
-PublishingGallery3Uploader* publishing_gallery3_uploader_new (PublishingGallery3Session* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingGallery3PublishingParameters* parameters);
-PublishingGallery3Uploader* publishing_gallery3_uploader_construct (GType object_type, PublishingGallery3Session* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingGallery3PublishingParameters* parameters);
-static void publishing_gallery3_gallery_publisher_on_publish_complete (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportBatchUploader* uploader, gint num_published);
-static void _publishing_gallery3_gallery_publisher_on_publish_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender, gint num_photos_published, gpointer self);
-static void publishing_gallery3_gallery_publisher_on_publish_error (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportBatchUploader* _uploader, GError* err);
-static void _publishing_gallery3_gallery_publisher_on_publish_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender, GError* err, gpointer self);
-static void publishing_gallery3_gallery_publisher_on_upload_status_updated (PublishingGallery3GalleryPublisher* self, gint file_number, gdouble completed_fraction);
-static void _publishing_gallery3_gallery_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self);
+PublishingGallery3Uploader* publishing_gallery3_uploader_new (PublishingGallery3Session* session,
+ SpitPublishingPublishable** publishables,
+ int publishables_length1,
+ PublishingGallery3PublishingParameters* parameters);
+PublishingGallery3Uploader* publishing_gallery3_uploader_construct (GType object_type,
+ PublishingGallery3Session* session,
+ SpitPublishingPublishable** publishables,
+ int publishables_length1,
+ PublishingGallery3PublishingParameters* parameters);
+static void publishing_gallery3_gallery_publisher_on_publish_complete (PublishingGallery3GalleryPublisher* self,
+ PublishingRESTSupportBatchUploader* uploader,
+ gint num_published);
+static void _publishing_gallery3_gallery_publisher_on_publish_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender,
+ gint num_photos_published,
+ gpointer self);
+static void publishing_gallery3_gallery_publisher_on_publish_error (PublishingGallery3GalleryPublisher* self,
+ PublishingRESTSupportBatchUploader* _uploader,
+ GError* err);
+static void _publishing_gallery3_gallery_publisher_on_publish_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender,
+ GError* err,
+ gpointer self);
+static void publishing_gallery3_gallery_publisher_on_upload_status_updated (PublishingGallery3GalleryPublisher* self,
+ gint file_number,
+ gdouble completed_fraction);
+static void _publishing_gallery3_gallery_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number,
+ gdouble fraction_complete,
+ gpointer self);
static void publishing_gallery3_gallery_publisher_do_show_success_pane (PublishingGallery3GalleryPublisher* self);
const gchar* publishing_gallery3_session_get_username (PublishingGallery3Session* self);
-static void _vala_array_add5 (PublishingGallery3Album** * array, int* length, int* size, PublishingGallery3Album* value);
-void publishing_gallery3_publishing_parameters_set_album_path (PublishingGallery3PublishingParameters* self, const gchar* value);
+static void _vala_array_add5 (PublishingGallery3Album** * array,
+ int* length,
+ int* size,
+ PublishingGallery3Album* value);
+void publishing_gallery3_publishing_parameters_set_album_path (PublishingGallery3PublishingParameters* self,
+ const gchar* value);
const gchar* publishing_gallery3_uploader_get_current_publishable_name (PublishingGallery3Uploader* self);
guint publishing_gallery3_uploader_get_status_code (PublishingGallery3Uploader* self);
SpitPublishingPublisherMediaType publishing_gallery3_uploader_get_current_publishable_type (PublishingGallery3Uploader* self);
gboolean publishing_gallery3_publishing_parameters_is_to_new_album (PublishingGallery3PublishingParameters* self);
static void publishing_gallery3_gallery_publisher_finalize (GObject * obj);
#define PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_GALLERY3_TYPE_PUBLISHING_OPTIONS_PANE, PublishingGallery3PublishingOptionsPanePrivate))
-enum {
- PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_DUMMY_PROPERTY
-};
#define PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_DEFAULT_ALBUM_NAME ""
#define PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_LAST_ALBUM_CONFIG_KEY "last-album"
-static PublishingGallery3Album** _vala_array_dup3 (PublishingGallery3Album** self, int length);
+static PublishingGallery3Album** _vala_array_dup3 (PublishingGallery3Album** self,
+ int length);
static void publishing_gallery3_publishing_options_pane_on_use_existing_radio_clicked (PublishingGallery3PublishingOptionsPane* self);
-static void _publishing_gallery3_publishing_options_pane_on_use_existing_radio_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void _publishing_gallery3_publishing_options_pane_on_use_existing_radio_clicked_gtk_button_clicked (GtkButton* _sender,
+ gpointer self);
static void publishing_gallery3_publishing_options_pane_on_create_new_radio_clicked (PublishingGallery3PublishingOptionsPane* self);
-static void _publishing_gallery3_publishing_options_pane_on_create_new_radio_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void _publishing_gallery3_publishing_options_pane_on_create_new_radio_clicked_gtk_button_clicked (GtkButton* _sender,
+ gpointer self);
static void publishing_gallery3_publishing_options_pane_on_new_album_entry_changed (PublishingGallery3PublishingOptionsPane* self);
-static void _publishing_gallery3_publishing_options_pane_on_new_album_entry_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self);
+static void _publishing_gallery3_publishing_options_pane_on_new_album_entry_changed_gtk_editable_changed (GtkEditable* _sender,
+ gpointer self);
static void publishing_gallery3_publishing_options_pane_on_scaling_constraint_changed (PublishingGallery3PublishingOptionsPane* self);
-static void _publishing_gallery3_publishing_options_pane_on_scaling_constraint_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
+static void _publishing_gallery3_publishing_options_pane_on_scaling_constraint_changed_gtk_combo_box_changed (GtkComboBox* _sender,
+ gpointer self);
static void publishing_gallery3_publishing_options_pane_on_pixels_changed (PublishingGallery3PublishingOptionsPane* self);
-static void _publishing_gallery3_publishing_options_pane_on_pixels_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self);
+static void _publishing_gallery3_publishing_options_pane_on_pixels_changed_gtk_editable_changed (GtkEditable* _sender,
+ gpointer self);
static void publishing_gallery3_publishing_options_pane_on_logout_clicked (PublishingGallery3PublishingOptionsPane* self);
-static void _publishing_gallery3_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void _publishing_gallery3_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender,
+ gpointer self);
static void publishing_gallery3_publishing_options_pane_on_publish_clicked (PublishingGallery3PublishingOptionsPane* self);
-static void _publishing_gallery3_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void _publishing_gallery3_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender,
+ gpointer self);
PublishingGallery3PublishingParameters* publishing_gallery3_publishing_parameters_new_to_new_album (const gchar* album_title);
-PublishingGallery3PublishingParameters* publishing_gallery3_publishing_parameters_construct_to_new_album (GType object_type, const gchar* album_title);
+PublishingGallery3PublishingParameters* publishing_gallery3_publishing_parameters_construct_to_new_album (GType object_type,
+ const gchar* album_title);
PublishingGallery3PublishingParameters* publishing_gallery3_publishing_parameters_new_to_existing_album (const gchar* album_path);
-PublishingGallery3PublishingParameters* publishing_gallery3_publishing_parameters_construct_to_existing_album (GType object_type, const gchar* album_path);
-void publishing_gallery3_publishing_parameters_set_photo_major_axis_size (PublishingGallery3PublishingParameters* self, gint value);
-void publishing_gallery3_publishing_parameters_set_strip_metadata (PublishingGallery3PublishingParameters* self, gboolean value);
+PublishingGallery3PublishingParameters* publishing_gallery3_publishing_parameters_construct_to_existing_album (GType object_type,
+ const gchar* album_path);
+void publishing_gallery3_publishing_parameters_set_photo_major_axis_size (PublishingGallery3PublishingParameters* self,
+ gint value);
+void publishing_gallery3_publishing_parameters_set_strip_metadata (PublishingGallery3PublishingParameters* self,
+ gboolean value);
static void publishing_gallery3_publishing_options_pane_update_publish_button_sensitivity (PublishingGallery3PublishingOptionsPane* self);
static void publishing_gallery3_publishing_options_pane_update_pixel_entry_sensitivity (PublishingGallery3PublishingOptionsPane* self);
void publishing_gallery3_publishing_options_pane_installed (PublishingGallery3PublishingOptionsPane* self);
@@ -967,43 +1180,67 @@ static GtkWidget* publishing_gallery3_publishing_options_pane_real_get_widget (S
static SpitPublishingDialogPaneGeometryOptions publishing_gallery3_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base);
static void publishing_gallery3_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base);
static void publishing_gallery3_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base);
-static void g_cclosure_user_marshal_VOID__PUBLISHING_GALLERY3_PUBLISHING_PARAMETERS (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
+static void g_cclosure_user_marshal_VOID__PUBLISHING_GALLERY3_PUBLISHING_PARAMETERS (GClosure * closure,
+ GValue * return_value,
+ guint n_param_values,
+ const GValue * param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data);
static void publishing_gallery3_publishing_options_pane_finalize (GObject * obj);
#define PUBLISHING_GALLERY3_PUBLISHING_PARAMETERS_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_GALLERY3_TYPE_PUBLISHING_PARAMETERS, PublishingGallery3PublishingParametersPrivate))
-enum {
- PUBLISHING_GALLERY3_PUBLISHING_PARAMETERS_DUMMY_PROPERTY
-};
static PublishingGallery3PublishingParameters* publishing_gallery3_publishing_parameters_new (void);
static PublishingGallery3PublishingParameters* publishing_gallery3_publishing_parameters_construct (GType object_type);
-static void publishing_gallery3_publishing_parameters_set_album_name (PublishingGallery3PublishingParameters* self, const gchar* value);
-static void publishing_gallery3_publishing_parameters_set_album_title (PublishingGallery3PublishingParameters* self, const gchar* value);
+static void publishing_gallery3_publishing_parameters_set_album_name (PublishingGallery3PublishingParameters* self,
+ const gchar* value);
+static void publishing_gallery3_publishing_parameters_set_album_title (PublishingGallery3PublishingParameters* self,
+ const gchar* value);
const gchar* publishing_gallery3_publishing_parameters_get_entity_title (PublishingGallery3PublishingParameters* self);
-static void publishing_gallery3_publishing_parameters_set_entity_title (PublishingGallery3PublishingParameters* self, const gchar* value);
+static void publishing_gallery3_publishing_parameters_set_entity_title (PublishingGallery3PublishingParameters* self,
+ const gchar* value);
static void publishing_gallery3_publishing_parameters_finalize (PublishingGallery3PublishingParameters * obj);
GType publishing_gallery3_credentials_grid_get_type (void) G_GNUC_CONST;
#define PUBLISHING_GALLERY3_CREDENTIALS_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_GALLERY3_TYPE_CREDENTIALS_PANE, PublishingGallery3CredentialsPanePrivate))
-enum {
- PUBLISHING_GALLERY3_CREDENTIALS_PANE_DUMMY_PROPERTY
-};
-PublishingGallery3CredentialsGrid* publishing_gallery3_credentials_grid_new (SpitPublishingPluginHost* host, PublishingGallery3CredentialsPaneMode mode, const gchar* url, const gchar* username, const gchar* key, GtkBuilder* builder);
-PublishingGallery3CredentialsGrid* publishing_gallery3_credentials_grid_construct (GType object_type, SpitPublishingPluginHost* host, PublishingGallery3CredentialsPaneMode mode, const gchar* url, const gchar* username, const gchar* key, GtkBuilder* builder);
+PublishingGallery3CredentialsGrid* publishing_gallery3_credentials_grid_new (SpitPublishingPluginHost* host,
+ PublishingGallery3CredentialsPaneMode mode,
+ const gchar* url,
+ const gchar* username,
+ const gchar* key,
+ GtkBuilder* builder);
+PublishingGallery3CredentialsGrid* publishing_gallery3_credentials_grid_construct (GType object_type,
+ SpitPublishingPluginHost* host,
+ PublishingGallery3CredentialsPaneMode mode,
+ const gchar* url,
+ const gchar* username,
+ const gchar* key,
+ GtkBuilder* builder);
GtkGrid* publishing_gallery3_credentials_grid_get_pane_widget (PublishingGallery3CredentialsGrid* self);
void publishing_gallery3_credentials_pane_notify_go_back (PublishingGallery3CredentialsPane* self);
-void publishing_gallery3_credentials_pane_notify_login (PublishingGallery3CredentialsPane* self, const gchar* url, const gchar* uname, const gchar* password, const gchar* key);
+void publishing_gallery3_credentials_pane_notify_login (PublishingGallery3CredentialsPane* self,
+ const gchar* url,
+ const gchar* uname,
+ const gchar* password,
+ const gchar* key);
static GtkWidget* publishing_gallery3_credentials_pane_real_get_widget (SpitPublishingDialogPane* base);
static SpitPublishingDialogPaneGeometryOptions publishing_gallery3_credentials_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base);
static void publishing_gallery3_credentials_pane_real_on_pane_installed (SpitPublishingDialogPane* base);
-static void _publishing_gallery3_credentials_pane_notify_go_back_publishing_gallery3_credentials_grid_go_back (PublishingGallery3CredentialsGrid* _sender, gpointer self);
-static void _publishing_gallery3_credentials_pane_notify_login_publishing_gallery3_credentials_grid_login (PublishingGallery3CredentialsGrid* _sender, const gchar* url, const gchar* username, const gchar* password, const gchar* key, gpointer self);
+static void _publishing_gallery3_credentials_pane_notify_go_back_publishing_gallery3_credentials_grid_go_back (PublishingGallery3CredentialsGrid* _sender,
+ gpointer self);
+static void _publishing_gallery3_credentials_pane_notify_login_publishing_gallery3_credentials_grid_login (PublishingGallery3CredentialsGrid* _sender,
+ const gchar* url,
+ const gchar* username,
+ const gchar* password,
+ const gchar* key,
+ gpointer self);
void publishing_gallery3_credentials_grid_installed (PublishingGallery3CredentialsGrid* self);
static void publishing_gallery3_credentials_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base);
-static void g_cclosure_user_marshal_VOID__STRING_STRING_STRING_STRING (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
+static void g_cclosure_user_marshal_VOID__STRING_STRING_STRING_STRING (GClosure * closure,
+ GValue * return_value,
+ guint n_param_values,
+ const GValue * param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data);
static void publishing_gallery3_credentials_pane_finalize (GObject * obj);
#define PUBLISHING_GALLERY3_CREDENTIALS_GRID_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_GALLERY3_TYPE_CREDENTIALS_GRID, PublishingGallery3CredentialsGridPrivate))
-enum {
- PUBLISHING_GALLERY3_CREDENTIALS_GRID_DUMMY_PROPERTY,
- PUBLISHING_GALLERY3_CREDENTIALS_GRID_PANE_WIDGET_PROPERTY
-};
#define PUBLISHING_GALLERY3_CREDENTIALS_GRID_INTRO_MESSAGE _ ("Enter the URL for your Gallery3 site and the username and password (or" \
" API key) for your Gallery3 account.")
#define PUBLISHING_GALLERY3_CREDENTIALS_GRID_FAILED_RETRY_MESSAGE _ ("The username and password or API key were incorrect. To try again, re-" \
@@ -1011,94 +1248,115 @@ enum {
#define PUBLISHING_GALLERY3_CREDENTIALS_GRID_NOT_GALLERY_URL_MESSAGE _ ("The URL entered does not appear to be the main directory of a Gallery3" \
" instance. Please make sure you typed it correctly and it does not hav" \
"e any trailing components (e.g., index.php).")
-static void publishing_gallery3_credentials_grid_set_pane_widget (PublishingGallery3CredentialsGrid* self, GtkGrid* value);
+static void publishing_gallery3_credentials_grid_set_pane_widget (PublishingGallery3CredentialsGrid* self,
+ GtkGrid* value);
static void publishing_gallery3_credentials_grid_on_url_or_username_changed (PublishingGallery3CredentialsGrid* self);
-static void _publishing_gallery3_credentials_grid_on_url_or_username_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self);
+static void _publishing_gallery3_credentials_grid_on_url_or_username_changed_gtk_editable_changed (GtkEditable* _sender,
+ gpointer self);
static void publishing_gallery3_credentials_grid_on_go_back_button_clicked (PublishingGallery3CredentialsGrid* self);
-static void _publishing_gallery3_credentials_grid_on_go_back_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void _publishing_gallery3_credentials_grid_on_go_back_button_clicked_gtk_button_clicked (GtkButton* _sender,
+ gpointer self);
static void publishing_gallery3_credentials_grid_on_login_button_clicked (PublishingGallery3CredentialsGrid* self);
-static void _publishing_gallery3_credentials_grid_on_login_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void _publishing_gallery3_credentials_grid_on_login_button_clicked_gtk_button_clicked (GtkButton* _sender,
+ gpointer self);
static void publishing_gallery3_credentials_grid_finalize (GObject * obj);
-static void _vala_publishing_gallery3_credentials_grid_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
-static void _vala_publishing_gallery3_credentials_grid_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec);
+static void _vala_publishing_gallery3_credentials_grid_get_property (GObject * object,
+ guint property_id,
+ GValue * value,
+ GParamSpec * pspec);
+static void _vala_publishing_gallery3_credentials_grid_set_property (GObject * object,
+ guint property_id,
+ const GValue * value,
+ GParamSpec * pspec);
#define PUBLISHING_GALLERY3_SESSION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_GALLERY3_TYPE_SESSION, PublishingGallery3SessionPrivate))
-enum {
- PUBLISHING_GALLERY3_SESSION_DUMMY_PROPERTY
-};
static gboolean publishing_gallery3_session_real_is_authenticated (PublishingRESTSupportSession* base);
-static void publishing_gallery3_session_set_url (PublishingGallery3Session* self, const gchar* value);
-static void publishing_gallery3_session_set_username (PublishingGallery3Session* self, const gchar* value);
-static void publishing_gallery3_session_set_key (PublishingGallery3Session* self, const gchar* value);
+static void publishing_gallery3_session_set_url (PublishingGallery3Session* self,
+ const gchar* value);
+static void publishing_gallery3_session_set_username (PublishingGallery3Session* self,
+ const gchar* value);
+static void publishing_gallery3_session_set_key (PublishingGallery3Session* self,
+ const gchar* value);
static void publishing_gallery3_session_finalize (PublishingRESTSupportSession * obj);
#define PUBLISHING_GALLERY3_UPLOADER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_GALLERY3_TYPE_UPLOADER, PublishingGallery3UploaderPrivate))
-enum {
- PUBLISHING_GALLERY3_UPLOADER_DUMMY_PROPERTY
-};
-static PublishingRESTSupportTransaction* publishing_gallery3_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base, SpitPublishingPublishable* publishable);
+static PublishingRESTSupportTransaction* publishing_gallery3_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base,
+ SpitPublishingPublishable* publishable);
static void publishing_gallery3_uploader_finalize (PublishingRESTSupportBatchUploader * 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_add1 (SpitPluggable** * array, int* length, int* size, SpitPluggable* 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_add1 (SpitPluggable** * array,
+ int* length,
+ int* size,
+ SpitPluggable* value)
+{
#line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
if ((*length) == (*size)) {
#line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
*array = g_renew (SpitPluggable*, *array, (*size) + 1);
-#line 1020 "GalleryConnector.c"
+#line 1274 "GalleryConnector.c"
}
#line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
(*array)[(*length)++] = value;
#line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
(*array)[*length] = NULL;
-#line 1026 "GalleryConnector.c"
+#line 1280 "GalleryConnector.c"
}
-ShotwellPublishingGallery3* shotwell_publishing_gallery3_construct (GType object_type, GFile* module_file) {
+ShotwellPublishingGallery3*
+shotwell_publishing_gallery3_construct (GType object_type,
+ GFile* module_file)
+{
ShotwellPublishingGallery3 * self = NULL;
GFile* resource_directory = NULL;
GFile* _tmp0_;
- GFile* _tmp1_;
- SpitPluggable** _tmp2_;
- gint _tmp2__length1;
- Gallery3Service* _tmp3_;
+ SpitPluggable** _tmp1_;
+ gint _tmp1__length1;
+ Gallery3Service* _tmp2_;
#line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_val_if_fail (G_IS_FILE (module_file), NULL);
#line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
self = (ShotwellPublishingGallery3*) g_object_new (object_type, NULL);
#line 35 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp0_ = module_file;
-#line 35 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp1_ = g_file_get_parent (_tmp0_);
+ _tmp0_ = g_file_get_parent (module_file);
#line 35 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- resource_directory = _tmp1_;
+ resource_directory = _tmp0_;
#line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp2_ = self->priv->pluggables;
+ _tmp1_ = self->priv->pluggables;
#line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp2__length1 = self->priv->pluggables_length1;
+ _tmp1__length1 = self->priv->pluggables_length1;
#line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp3_ = gallery3_service_new (resource_directory);
+ _tmp2_ = gallery3_service_new (resource_directory);
#line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _vala_array_add1 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+ _vala_array_add1 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
#line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_object_unref0 (resource_directory);
#line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return self;
-#line 1060 "GalleryConnector.c"
+#line 1314 "GalleryConnector.c"
}
-ShotwellPublishingGallery3* shotwell_publishing_gallery3_new (GFile* module_file) {
+ShotwellPublishingGallery3*
+shotwell_publishing_gallery3_new (GFile* module_file)
+{
#line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return shotwell_publishing_gallery3_construct (TYPE_SHOTWELL_PUBLISHING_GALLERY3, module_file);
-#line 1067 "GalleryConnector.c"
+#line 1323 "GalleryConnector.c"
}
-static const gchar* shotwell_publishing_gallery3_real_get_module_name (SpitModule* base) {
+static const gchar*
+shotwell_publishing_gallery3_real_get_module_name (SpitModule* base)
+{
ShotwellPublishingGallery3 * self;
const gchar* result = NULL;
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -1107,11 +1365,13 @@ static const gchar* shotwell_publishing_gallery3_real_get_module_name (SpitModul
result = _ ("Gallery3 publishing module");
#line 41 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return result;
-#line 1080 "GalleryConnector.c"
+#line 1338 "GalleryConnector.c"
}
-static const gchar* shotwell_publishing_gallery3_real_get_version (SpitModule* base) {
+static const gchar*
+shotwell_publishing_gallery3_real_get_version (SpitModule* base)
+{
ShotwellPublishingGallery3 * self;
const gchar* result = NULL;
#line 44 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -1120,11 +1380,13 @@ static const gchar* shotwell_publishing_gallery3_real_get_version (SpitModule* b
result = G3_VERSION;
#line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return result;
-#line 1093 "GalleryConnector.c"
+#line 1353 "GalleryConnector.c"
}
-static const gchar* shotwell_publishing_gallery3_real_get_id (SpitModule* base) {
+static const gchar*
+shotwell_publishing_gallery3_real_get_id (SpitModule* base)
+{
ShotwellPublishingGallery3 * self;
const gchar* result = NULL;
#line 48 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -1133,11 +1395,14 @@ static const gchar* shotwell_publishing_gallery3_real_get_id (SpitModule* base)
result = "org.yorba.shotwell.sharing.gallery3";
#line 49 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return result;
-#line 1106 "GalleryConnector.c"
+#line 1368 "GalleryConnector.c"
}
-static SpitPluggable** shotwell_publishing_gallery3_real_get_pluggables (SpitModule* base, int* result_length1) {
+static SpitPluggable**
+shotwell_publishing_gallery3_real_get_pluggables (SpitModule* base,
+ int* result_length1)
+{
ShotwellPublishingGallery3 * self;
SpitPluggable** result = NULL;
SpitPluggable** _tmp0_;
@@ -1158,28 +1423,32 @@ static SpitPluggable** shotwell_publishing_gallery3_real_get_pluggables (SpitMod
if (result_length1) {
#line 53 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
*result_length1 = _tmp1__length1;
-#line 1131 "GalleryConnector.c"
+#line 1396 "GalleryConnector.c"
}
#line 53 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
result = _tmp1_;
#line 53 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return result;
-#line 1137 "GalleryConnector.c"
+#line 1402 "GalleryConnector.c"
}
-static void shotwell_publishing_gallery3_class_init (ShotwellPublishingGallery3Class * klass) {
+static void
+shotwell_publishing_gallery3_class_init (ShotwellPublishingGallery3Class * klass)
+{
#line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
shotwell_publishing_gallery3_parent_class = g_type_class_peek_parent (klass);
#line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_type_class_add_private (klass, sizeof (ShotwellPublishingGallery3Private));
#line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
G_OBJECT_CLASS (klass)->finalize = shotwell_publishing_gallery3_finalize;
-#line 1148 "GalleryConnector.c"
+#line 1415 "GalleryConnector.c"
}
-static void shotwell_publishing_gallery3_spit_module_interface_init (SpitModuleIface * iface) {
+static void
+shotwell_publishing_gallery3_spit_module_interface_init (SpitModuleIface * iface)
+{
#line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
shotwell_publishing_gallery3_spit_module_parent_iface = g_type_interface_peek_parent (iface);
#line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -1190,11 +1459,13 @@ static void shotwell_publishing_gallery3_spit_module_interface_init (SpitModuleI
iface->get_id = (const gchar* (*) (SpitModule *)) shotwell_publishing_gallery3_real_get_id;
#line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
iface->get_pluggables = (SpitPluggable** (*) (SpitModule *, int*)) shotwell_publishing_gallery3_real_get_pluggables;
-#line 1163 "GalleryConnector.c"
+#line 1432 "GalleryConnector.c"
}
-static void shotwell_publishing_gallery3_instance_init (ShotwellPublishingGallery3 * self) {
+static void
+shotwell_publishing_gallery3_instance_init (ShotwellPublishingGallery3 * self)
+{
SpitPluggable** _tmp0_;
#line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
self->priv = SHOTWELL_PUBLISHING_GALLERY3_GET_PRIVATE (self);
@@ -1206,11 +1477,13 @@ static void shotwell_publishing_gallery3_instance_init (ShotwellPublishingGaller
self->priv->pluggables_length1 = 0;
#line 32 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
self->priv->_pluggables_size_ = self->priv->pluggables_length1;
-#line 1179 "GalleryConnector.c"
+#line 1450 "GalleryConnector.c"
}
-static void shotwell_publishing_gallery3_finalize (GObject * obj) {
+static void
+shotwell_publishing_gallery3_finalize (GObject * obj)
+{
ShotwellPublishingGallery3 * self;
#line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SHOTWELL_PUBLISHING_GALLERY3, ShotwellPublishingGallery3);
@@ -1218,11 +1491,13 @@ static void shotwell_publishing_gallery3_finalize (GObject * obj) {
self->priv->pluggables = (_vala_array_free (self->priv->pluggables, self->priv->pluggables_length1, (GDestroyNotify) g_object_unref), NULL);
#line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
G_OBJECT_CLASS (shotwell_publishing_gallery3_parent_class)->finalize (obj);
-#line 1191 "GalleryConnector.c"
+#line 1464 "GalleryConnector.c"
}
-GType shotwell_publishing_gallery3_get_type (void) {
+GType
+shotwell_publishing_gallery3_get_type (void)
+{
static volatile gsize shotwell_publishing_gallery3_type_id__volatile = 0;
if (g_once_init_enter (&shotwell_publishing_gallery3_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (ShotwellPublishingGallery3Class), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) shotwell_publishing_gallery3_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ShotwellPublishingGallery3), 0, (GInstanceInitFunc) shotwell_publishing_gallery3_instance_init, NULL };
@@ -1236,7 +1511,10 @@ GType shotwell_publishing_gallery3_get_type (void) {
}
-Gallery3Service* gallery3_service_construct (GType object_type, GFile* resource_directory) {
+Gallery3Service*
+gallery3_service_construct (GType object_type,
+ GFile* resource_directory)
+{
Gallery3Service * self = NULL;
GdkPixbuf** _tmp0_;
gint _tmp0__length1;
@@ -1250,7 +1528,7 @@ Gallery3Service* gallery3_service_construct (GType object_type, GFile* resource_
_tmp0__length1 = gallery3_service_icon_pixbuf_set_length1;
#line 65 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
if (_tmp0_ == NULL) {
-#line 1223 "GalleryConnector.c"
+#line 1501 "GalleryConnector.c"
gint _tmp1_;
GdkPixbuf** _tmp2_;
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -1263,44 +1541,43 @@ Gallery3Service* gallery3_service_construct (GType object_type, GFile* resource_
gallery3_service_icon_pixbuf_set_length1 = _tmp1_;
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_gallery3_service_icon_pixbuf_set_size_ = gallery3_service_icon_pixbuf_set_length1;
-#line 1236 "GalleryConnector.c"
+#line 1514 "GalleryConnector.c"
}
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return self;
-#line 1240 "GalleryConnector.c"
+#line 1518 "GalleryConnector.c"
}
-Gallery3Service* gallery3_service_new (GFile* resource_directory) {
+Gallery3Service*
+gallery3_service_new (GFile* resource_directory)
+{
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return gallery3_service_construct (TYPE_GALLERY3_SERVICE, resource_directory);
-#line 1247 "GalleryConnector.c"
+#line 1527 "GalleryConnector.c"
}
-static gint gallery3_service_real_get_pluggable_interface (SpitPluggable* base, gint min_host_interface, gint max_host_interface) {
+static gint
+gallery3_service_real_get_pluggable_interface (SpitPluggable* base,
+ gint min_host_interface,
+ gint max_host_interface)
+{
Gallery3Service * self;
gint result = 0;
- gint _tmp0_;
- gint _tmp1_;
- gint _tmp2_;
#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GALLERY3_SERVICE, Gallery3Service);
#line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp0_ = min_host_interface;
-#line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp1_ = max_host_interface;
-#line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp2_ = spit_negotiate_interfaces (_tmp0_, _tmp1_, SPIT_PUBLISHING_CURRENT_INTERFACE);
-#line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- result = _tmp2_;
+ result = spit_negotiate_interfaces (min_host_interface, max_host_interface, SPIT_PUBLISHING_CURRENT_INTERFACE);
#line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return result;
-#line 1269 "GalleryConnector.c"
+#line 1544 "GalleryConnector.c"
}
-static const gchar* gallery3_service_real_get_id (SpitPluggable* base) {
+static const gchar*
+gallery3_service_real_get_id (SpitPluggable* base)
+{
Gallery3Service * self;
const gchar* result = NULL;
#line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -1309,11 +1586,13 @@ static const gchar* gallery3_service_real_get_id (SpitPluggable* base) {
result = "publishing-gallery3";
#line 78 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return result;
-#line 1282 "GalleryConnector.c"
+#line 1559 "GalleryConnector.c"
}
-static const gchar* gallery3_service_real_get_pluggable_name (SpitPluggable* base) {
+static const gchar*
+gallery3_service_real_get_pluggable_name (SpitPluggable* base)
+{
Gallery3Service * self;
const gchar* result = NULL;
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -1322,39 +1601,47 @@ static const gchar* gallery3_service_real_get_pluggable_name (SpitPluggable* bas
result = "Gallery3";
#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return result;
-#line 1295 "GalleryConnector.c"
+#line 1574 "GalleryConnector.c"
}
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
#line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return self ? g_object_ref (self) : NULL;
-#line 1302 "GalleryConnector.c"
+#line 1583 "GalleryConnector.c"
}
-static GdkPixbuf** _vala_array_dup1 (GdkPixbuf** self, int length) {
+static GdkPixbuf**
+_vala_array_dup1 (GdkPixbuf** self,
+ int length)
+{
GdkPixbuf** result;
int i;
#line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
result = g_new0 (GdkPixbuf*, length + 1);
#line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
for (i = 0; i < length; i++) {
-#line 1313 "GalleryConnector.c"
+#line 1597 "GalleryConnector.c"
GdkPixbuf* _tmp0_;
#line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp0_ = _g_object_ref0 (self[i]);
#line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
result[i] = _tmp0_;
-#line 1319 "GalleryConnector.c"
+#line 1603 "GalleryConnector.c"
}
#line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return result;
-#line 1323 "GalleryConnector.c"
+#line 1607 "GalleryConnector.c"
}
-static void gallery3_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info) {
+static void
+gallery3_service_real_get_info (SpitPluggable* base,
+ SpitPluggableInfo* info)
+{
Gallery3Service * self;
gchar* _tmp0_;
gchar* _tmp1_;
@@ -1422,40 +1709,45 @@ static void gallery3_service_real_get_info (SpitPluggable* base, SpitPluggableIn
(*info).icons = _tmp7_;
#line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
(*info).icons_length1 = _tmp7__length1;
-#line 1395 "GalleryConnector.c"
+#line 1682 "GalleryConnector.c"
}
-static void gallery3_service_real_activation (SpitPluggable* base, gboolean enabled) {
+static void
+gallery3_service_real_activation (SpitPluggable* base,
+ gboolean enabled)
+{
Gallery3Service * self;
#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GALLERY3_SERVICE, Gallery3Service);
-#line 1403 "GalleryConnector.c"
+#line 1693 "GalleryConnector.c"
}
-static SpitPublishingPublisher* gallery3_service_real_create_publisher (SpitPublishingService* base, SpitPublishingPluginHost* host) {
+static SpitPublishingPublisher*
+gallery3_service_real_create_publisher (SpitPublishingService* base,
+ SpitPublishingPluginHost* host)
+{
Gallery3Service * self;
SpitPublishingPublisher* result = NULL;
- SpitPublishingPluginHost* _tmp0_;
- PublishingGallery3GalleryPublisher* _tmp1_;
+ PublishingGallery3GalleryPublisher* _tmp0_;
#line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GALLERY3_SERVICE, Gallery3Service);
#line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL);
#line 101 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp0_ = host;
-#line 101 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp1_ = publishing_gallery3_gallery_publisher_new (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_SERVICE, SpitPublishingService), _tmp0_);
+ _tmp0_ = publishing_gallery3_gallery_publisher_new (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_SERVICE, SpitPublishingService), host);
#line 101 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher);
+ result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher);
#line 101 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return result;
-#line 1424 "GalleryConnector.c"
+#line 1714 "GalleryConnector.c"
}
-static SpitPublishingPublisherMediaType gallery3_service_real_get_supported_media (SpitPublishingService* base) {
+static SpitPublishingPublisherMediaType
+gallery3_service_real_get_supported_media (SpitPublishingService* base)
+{
Gallery3Service * self;
SpitPublishingPublisherMediaType result = 0;
#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -1464,20 +1756,24 @@ static SpitPublishingPublisherMediaType gallery3_service_real_get_supported_medi
result = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO | SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO;
#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return result;
-#line 1437 "GalleryConnector.c"
+#line 1729 "GalleryConnector.c"
}
-static void gallery3_service_class_init (Gallery3ServiceClass * klass) {
+static void
+gallery3_service_class_init (Gallery3ServiceClass * klass)
+{
#line 58 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
gallery3_service_parent_class = g_type_class_peek_parent (klass);
#line 58 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
G_OBJECT_CLASS (klass)->finalize = gallery3_service_finalize;
-#line 1446 "GalleryConnector.c"
+#line 1740 "GalleryConnector.c"
}
-static void gallery3_service_spit_pluggable_interface_init (SpitPluggableIface * iface) {
+static void
+gallery3_service_spit_pluggable_interface_init (SpitPluggableIface * iface)
+{
#line 58 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
gallery3_service_spit_pluggable_parent_iface = g_type_interface_peek_parent (iface);
#line 58 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -1490,36 +1786,44 @@ static void gallery3_service_spit_pluggable_interface_init (SpitPluggableIface *
iface->get_info = (void (*) (SpitPluggable *, SpitPluggableInfo*)) gallery3_service_real_get_info;
#line 58 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
iface->activation = (void (*) (SpitPluggable *, gboolean)) gallery3_service_real_activation;
-#line 1463 "GalleryConnector.c"
+#line 1759 "GalleryConnector.c"
}
-static void gallery3_service_spit_publishing_service_interface_init (SpitPublishingServiceIface * iface) {
+static void
+gallery3_service_spit_publishing_service_interface_init (SpitPublishingServiceIface * iface)
+{
#line 58 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
gallery3_service_spit_publishing_service_parent_iface = g_type_interface_peek_parent (iface);
#line 58 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
iface->create_publisher = (SpitPublishingPublisher* (*) (SpitPublishingService *, SpitPublishingPluginHost*)) gallery3_service_real_create_publisher;
#line 58 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
iface->get_supported_media = (SpitPublishingPublisherMediaType (*) (SpitPublishingService *)) gallery3_service_real_get_supported_media;
-#line 1474 "GalleryConnector.c"
+#line 1772 "GalleryConnector.c"
}
-static void gallery3_service_instance_init (Gallery3Service * self) {
+static void
+gallery3_service_instance_init (Gallery3Service * self)
+{
}
-static void gallery3_service_finalize (GObject * obj) {
+static void
+gallery3_service_finalize (GObject * obj)
+{
Gallery3Service * self;
#line 58 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_GALLERY3_SERVICE, Gallery3Service);
#line 58 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
G_OBJECT_CLASS (gallery3_service_parent_class)->finalize (obj);
-#line 1488 "GalleryConnector.c"
+#line 1790 "GalleryConnector.c"
}
-GType gallery3_service_get_type (void) {
+GType
+gallery3_service_get_type (void)
+{
static volatile gsize gallery3_service_type_id__volatile = 0;
if (g_once_init_enter (&gallery3_service_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (Gallery3ServiceClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) gallery3_service_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (Gallery3Service), 0, (GInstanceInitFunc) gallery3_service_instance_init, NULL };
@@ -1535,76 +1839,74 @@ GType gallery3_service_get_type (void) {
}
-PublishingGallery3Album* publishing_gallery3_album_construct (GType object_type, JsonObject* collection) {
+PublishingGallery3Album*
+publishing_gallery3_album_construct (GType object_type,
+ JsonObject* collection)
+{
PublishingGallery3Album* self = NULL;
JsonObject* entity = NULL;
JsonObject* _tmp0_;
- JsonObject* _tmp1_;
+ const gchar* _tmp1_;
const gchar* _tmp2_;
const gchar* _tmp3_;
const gchar* _tmp4_;
- JsonObject* _tmp5_;
- const gchar* _tmp6_;
- gboolean _tmp7_;
- const gchar* _tmp8_;
- gchar* _tmp9_;
- gchar* _tmp10_;
+ const gchar* _tmp5_;
+ gchar* _tmp6_;
+ gchar* _tmp7_;
#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_val_if_fail (collection != NULL, NULL);
#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
self = (PublishingGallery3Album*) g_type_create_instance (object_type);
#line 134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp0_ = collection;
-#line 134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp1_ = json_object_get_object_member (_tmp0_, "entity");
+ _tmp0_ = json_object_get_object_member (collection, "entity");
#line 134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- entity = _tmp1_;
+ entity = _tmp0_;
#line 137 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp2_ = json_object_get_string_member (entity, "title");
+ _tmp1_ = json_object_get_string_member (entity, "title");
#line 137 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- publishing_gallery3_album_set_title (self, _tmp2_);
+ publishing_gallery3_album_set_title (self, _tmp1_);
#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp3_ = json_object_get_string_member (entity, "name");
+ _tmp2_ = json_object_get_string_member (entity, "name");
#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- publishing_gallery3_album_set_name (self, _tmp3_);
+ publishing_gallery3_album_set_name (self, _tmp2_);
#line 139 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp4_ = json_object_get_string_member (entity, "parent");
+ _tmp3_ = json_object_get_string_member (entity, "parent");
#line 139 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- publishing_gallery3_album_set_parentname (self, _tmp4_);
+ publishing_gallery3_album_set_parentname (self, _tmp3_);
#line 140 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp5_ = collection;
+ _tmp4_ = json_object_get_string_member (collection, "url");
#line 140 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp6_ = json_object_get_string_member (_tmp5_, "url");
-#line 140 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- publishing_gallery3_album_set_url (self, _tmp6_);
-#line 141 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp7_ = json_object_get_boolean_member (entity, "can_edit");
+ publishing_gallery3_album_set_url (self, _tmp4_);
#line 141 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- publishing_gallery3_album_set_editable (self, _tmp7_);
+ publishing_gallery3_album_set_editable (self, json_object_get_boolean_member (entity, "can_edit"));
#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp8_ = self->priv->_url;
+ _tmp5_ = self->priv->_url;
#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp9_ = publishing_gallery3_strip_session_url (_tmp8_);
+ _tmp6_ = publishing_gallery3_strip_session_url (_tmp5_);
#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp10_ = _tmp9_;
+ _tmp7_ = _tmp6_;
#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- publishing_gallery3_album_set_path (self, _tmp10_);
+ publishing_gallery3_album_set_path (self, _tmp7_);
#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _g_free0 (_tmp10_);
+ _g_free0 (_tmp7_);
#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return self;
-#line 1566 "GalleryConnector.c"
+#line 1864 "GalleryConnector.c"
}
-PublishingGallery3Album* publishing_gallery3_album_new (JsonObject* collection) {
+PublishingGallery3Album*
+publishing_gallery3_album_new (JsonObject* collection)
+{
#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return publishing_gallery3_album_construct (PUBLISHING_GALLERY3_TYPE_ALBUM, collection);
-#line 1573 "GalleryConnector.c"
+#line 1873 "GalleryConnector.c"
}
-const gchar* publishing_gallery3_album_get_name (PublishingGallery3Album* self) {
+const gchar*
+publishing_gallery3_album_get_name (PublishingGallery3Album* self)
+{
const gchar* result;
const gchar* _tmp0_;
#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -1615,28 +1917,30 @@ const gchar* publishing_gallery3_album_get_name (PublishingGallery3Album* self)
result = _tmp0_;
#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return result;
-#line 1588 "GalleryConnector.c"
+#line 1890 "GalleryConnector.c"
}
-static void publishing_gallery3_album_set_name (PublishingGallery3Album* self, const gchar* value) {
- const gchar* _tmp0_;
- gchar* _tmp1_;
+static void
+publishing_gallery3_album_set_name (PublishingGallery3Album* self,
+ const gchar* value)
+{
+ gchar* _tmp0_;
#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (PUBLISHING_GALLERY3_IS_ALBUM (self));
#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp0_ = value;
-#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp1_ = g_strdup (_tmp0_);
+ _tmp0_ = g_strdup (value);
#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_free0 (self->priv->_name);
#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self->priv->_name = _tmp1_;
-#line 1605 "GalleryConnector.c"
+ self->priv->_name = _tmp0_;
+#line 1907 "GalleryConnector.c"
}
-const gchar* publishing_gallery3_album_get_title (PublishingGallery3Album* self) {
+const gchar*
+publishing_gallery3_album_get_title (PublishingGallery3Album* self)
+{
const gchar* result;
const gchar* _tmp0_;
#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -1647,28 +1951,30 @@ const gchar* publishing_gallery3_album_get_title (PublishingGallery3Album* self)
result = _tmp0_;
#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return result;
-#line 1620 "GalleryConnector.c"
+#line 1924 "GalleryConnector.c"
}
-static void publishing_gallery3_album_set_title (PublishingGallery3Album* self, const gchar* value) {
- const gchar* _tmp0_;
- gchar* _tmp1_;
+static void
+publishing_gallery3_album_set_title (PublishingGallery3Album* self,
+ const gchar* value)
+{
+ gchar* _tmp0_;
#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (PUBLISHING_GALLERY3_IS_ALBUM (self));
#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp0_ = value;
-#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp1_ = g_strdup (_tmp0_);
+ _tmp0_ = g_strdup (value);
#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_free0 (self->priv->_title);
#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self->priv->_title = _tmp1_;
-#line 1637 "GalleryConnector.c"
+ self->priv->_title = _tmp0_;
+#line 1941 "GalleryConnector.c"
}
-const gchar* publishing_gallery3_album_get_summary (PublishingGallery3Album* self) {
+const gchar*
+publishing_gallery3_album_get_summary (PublishingGallery3Album* self)
+{
const gchar* result;
const gchar* _tmp0_;
#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -1679,28 +1985,30 @@ const gchar* publishing_gallery3_album_get_summary (PublishingGallery3Album* sel
result = _tmp0_;
#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return result;
-#line 1652 "GalleryConnector.c"
+#line 1958 "GalleryConnector.c"
}
-static void publishing_gallery3_album_set_summary (PublishingGallery3Album* self, const gchar* value) {
- const gchar* _tmp0_;
- gchar* _tmp1_;
+static void
+publishing_gallery3_album_set_summary (PublishingGallery3Album* self,
+ const gchar* value)
+{
+ gchar* _tmp0_;
#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (PUBLISHING_GALLERY3_IS_ALBUM (self));
#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp0_ = value;
-#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp1_ = g_strdup (_tmp0_);
+ _tmp0_ = g_strdup (value);
#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_free0 (self->priv->_summary);
#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self->priv->_summary = _tmp1_;
-#line 1669 "GalleryConnector.c"
+ self->priv->_summary = _tmp0_;
+#line 1975 "GalleryConnector.c"
}
-const gchar* publishing_gallery3_album_get_parentname (PublishingGallery3Album* self) {
+const gchar*
+publishing_gallery3_album_get_parentname (PublishingGallery3Album* self)
+{
const gchar* result;
const gchar* _tmp0_;
#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -1711,28 +2019,30 @@ const gchar* publishing_gallery3_album_get_parentname (PublishingGallery3Album*
result = _tmp0_;
#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return result;
-#line 1684 "GalleryConnector.c"
+#line 1992 "GalleryConnector.c"
}
-static void publishing_gallery3_album_set_parentname (PublishingGallery3Album* self, const gchar* value) {
- const gchar* _tmp0_;
- gchar* _tmp1_;
+static void
+publishing_gallery3_album_set_parentname (PublishingGallery3Album* self,
+ const gchar* value)
+{
+ gchar* _tmp0_;
#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (PUBLISHING_GALLERY3_IS_ALBUM (self));
#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp0_ = value;
-#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp1_ = g_strdup (_tmp0_);
+ _tmp0_ = g_strdup (value);
#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_free0 (self->priv->_parentname);
#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self->priv->_parentname = _tmp1_;
-#line 1701 "GalleryConnector.c"
+ self->priv->_parentname = _tmp0_;
+#line 2009 "GalleryConnector.c"
}
-const gchar* publishing_gallery3_album_get_url (PublishingGallery3Album* self) {
+const gchar*
+publishing_gallery3_album_get_url (PublishingGallery3Album* self)
+{
const gchar* result;
const gchar* _tmp0_;
#line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -1743,28 +2053,30 @@ const gchar* publishing_gallery3_album_get_url (PublishingGallery3Album* self) {
result = _tmp0_;
#line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return result;
-#line 1716 "GalleryConnector.c"
+#line 2026 "GalleryConnector.c"
}
-static void publishing_gallery3_album_set_url (PublishingGallery3Album* self, const gchar* value) {
- const gchar* _tmp0_;
- gchar* _tmp1_;
+static void
+publishing_gallery3_album_set_url (PublishingGallery3Album* self,
+ const gchar* value)
+{
+ gchar* _tmp0_;
#line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (PUBLISHING_GALLERY3_IS_ALBUM (self));
#line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp0_ = value;
-#line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp1_ = g_strdup (_tmp0_);
+ _tmp0_ = g_strdup (value);
#line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_free0 (self->priv->_url);
#line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self->priv->_url = _tmp1_;
-#line 1733 "GalleryConnector.c"
+ self->priv->_url = _tmp0_;
+#line 2043 "GalleryConnector.c"
}
-const gchar* publishing_gallery3_album_get_path (PublishingGallery3Album* self) {
+const gchar*
+publishing_gallery3_album_get_path (PublishingGallery3Album* self)
+{
const gchar* result;
const gchar* _tmp0_;
#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -1775,28 +2087,30 @@ const gchar* publishing_gallery3_album_get_path (PublishingGallery3Album* self)
result = _tmp0_;
#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return result;
-#line 1748 "GalleryConnector.c"
+#line 2060 "GalleryConnector.c"
}
-static void publishing_gallery3_album_set_path (PublishingGallery3Album* self, const gchar* value) {
- const gchar* _tmp0_;
- gchar* _tmp1_;
+static void
+publishing_gallery3_album_set_path (PublishingGallery3Album* self,
+ const gchar* value)
+{
+ gchar* _tmp0_;
#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (PUBLISHING_GALLERY3_IS_ALBUM (self));
#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp0_ = value;
-#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp1_ = g_strdup (_tmp0_);
+ _tmp0_ = g_strdup (value);
#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_free0 (self->priv->_path);
#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self->priv->_path = _tmp1_;
-#line 1765 "GalleryConnector.c"
+ self->priv->_path = _tmp0_;
+#line 2077 "GalleryConnector.c"
}
-gboolean publishing_gallery3_album_get_editable (PublishingGallery3Album* self) {
+gboolean
+publishing_gallery3_album_get_editable (PublishingGallery3Album* self)
+{
gboolean result;
gboolean _tmp0_;
#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -1807,120 +2121,145 @@ gboolean publishing_gallery3_album_get_editable (PublishingGallery3Album* self)
result = _tmp0_;
#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return result;
-#line 1780 "GalleryConnector.c"
+#line 2094 "GalleryConnector.c"
}
-static void publishing_gallery3_album_set_editable (PublishingGallery3Album* self, gboolean value) {
- gboolean _tmp0_;
+static void
+publishing_gallery3_album_set_editable (PublishingGallery3Album* self,
+ gboolean value)
+{
#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (PUBLISHING_GALLERY3_IS_ALBUM (self));
#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp0_ = value;
-#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self->priv->_editable = _tmp0_;
-#line 1792 "GalleryConnector.c"
+ self->priv->_editable = value;
+#line 2106 "GalleryConnector.c"
}
-static void publishing_gallery3_value_album_init (GValue* value) {
+static void
+publishing_gallery3_value_album_init (GValue* value)
+{
#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
value->data[0].v_pointer = NULL;
-#line 1799 "GalleryConnector.c"
+#line 2115 "GalleryConnector.c"
}
-static void publishing_gallery3_value_album_free_value (GValue* value) {
+static void
+publishing_gallery3_value_album_free_value (GValue* value)
+{
#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
if (value->data[0].v_pointer) {
#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_album_unref (value->data[0].v_pointer);
-#line 1808 "GalleryConnector.c"
+#line 2126 "GalleryConnector.c"
}
}
-static void publishing_gallery3_value_album_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+publishing_gallery3_value_album_copy_value (const GValue* src_value,
+ GValue* dest_value)
+{
#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
if (src_value->data[0].v_pointer) {
#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
dest_value->data[0].v_pointer = publishing_gallery3_album_ref (src_value->data[0].v_pointer);
-#line 1818 "GalleryConnector.c"
+#line 2139 "GalleryConnector.c"
} else {
#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
dest_value->data[0].v_pointer = NULL;
-#line 1822 "GalleryConnector.c"
+#line 2143 "GalleryConnector.c"
}
}
-static gpointer publishing_gallery3_value_album_peek_pointer (const GValue* value) {
+static gpointer
+publishing_gallery3_value_album_peek_pointer (const GValue* value)
+{
#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return value->data[0].v_pointer;
-#line 1830 "GalleryConnector.c"
+#line 2153 "GalleryConnector.c"
}
-static gchar* publishing_gallery3_value_album_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_gallery3_value_album_collect_value (GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
if (collect_values[0].v_pointer) {
-#line 1837 "GalleryConnector.c"
+#line 2165 "GalleryConnector.c"
PublishingGallery3Album * object;
object = collect_values[0].v_pointer;
#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
if (object->parent_instance.g_class == NULL) {
#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1844 "GalleryConnector.c"
+#line 2172 "GalleryConnector.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1848 "GalleryConnector.c"
+#line 2176 "GalleryConnector.c"
}
#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
value->data[0].v_pointer = publishing_gallery3_album_ref (object);
-#line 1852 "GalleryConnector.c"
+#line 2180 "GalleryConnector.c"
} else {
#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
value->data[0].v_pointer = NULL;
-#line 1856 "GalleryConnector.c"
+#line 2184 "GalleryConnector.c"
}
#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return NULL;
-#line 1860 "GalleryConnector.c"
+#line 2188 "GalleryConnector.c"
}
-static gchar* publishing_gallery3_value_album_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_gallery3_value_album_lcopy_value (const GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
PublishingGallery3Album ** object_p;
object_p = collect_values[0].v_pointer;
#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
if (!object_p) {
#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1871 "GalleryConnector.c"
+#line 2204 "GalleryConnector.c"
}
#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
if (!value->data[0].v_pointer) {
#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
*object_p = NULL;
-#line 1877 "GalleryConnector.c"
+#line 2210 "GalleryConnector.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
*object_p = value->data[0].v_pointer;
-#line 1881 "GalleryConnector.c"
+#line 2214 "GalleryConnector.c"
} else {
#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
*object_p = publishing_gallery3_album_ref (value->data[0].v_pointer);
-#line 1885 "GalleryConnector.c"
+#line 2218 "GalleryConnector.c"
}
#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return NULL;
-#line 1889 "GalleryConnector.c"
+#line 2222 "GalleryConnector.c"
}
-GParamSpec* publishing_gallery3_param_spec_album (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+publishing_gallery3_param_spec_album (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags)
+{
PublishingGallery3ParamSpecAlbum* spec;
#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_GALLERY3_TYPE_ALBUM), NULL);
@@ -1930,20 +2269,25 @@ GParamSpec* publishing_gallery3_param_spec_album (const gchar* name, const gchar
G_PARAM_SPEC (spec)->value_type = object_type;
#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return G_PARAM_SPEC (spec);
-#line 1903 "GalleryConnector.c"
+#line 2242 "GalleryConnector.c"
}
-gpointer publishing_gallery3_value_get_album (const GValue* value) {
+gpointer
+publishing_gallery3_value_get_album (const GValue* value)
+{
#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_GALLERY3_TYPE_ALBUM), NULL);
#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return value->data[0].v_pointer;
-#line 1912 "GalleryConnector.c"
+#line 2253 "GalleryConnector.c"
}
-void publishing_gallery3_value_set_album (GValue* value, gpointer v_object) {
+void
+publishing_gallery3_value_set_album (GValue* value,
+ gpointer v_object)
+{
PublishingGallery3Album * old;
#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_GALLERY3_TYPE_ALBUM));
@@ -1959,22 +2303,25 @@ void publishing_gallery3_value_set_album (GValue* value, gpointer v_object) {
value->data[0].v_pointer = v_object;
#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_album_ref (value->data[0].v_pointer);
-#line 1932 "GalleryConnector.c"
+#line 2276 "GalleryConnector.c"
} else {
#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
value->data[0].v_pointer = NULL;
-#line 1936 "GalleryConnector.c"
+#line 2280 "GalleryConnector.c"
}
#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
if (old) {
#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_album_unref (old);
-#line 1942 "GalleryConnector.c"
+#line 2286 "GalleryConnector.c"
}
}
-void publishing_gallery3_value_take_album (GValue* value, gpointer v_object) {
+void
+publishing_gallery3_value_take_album (GValue* value,
+ gpointer v_object)
+{
PublishingGallery3Album * old;
#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_GALLERY3_TYPE_ALBUM));
@@ -1988,33 +2335,37 @@ void publishing_gallery3_value_take_album (GValue* value, gpointer v_object) {
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
value->data[0].v_pointer = v_object;
-#line 1961 "GalleryConnector.c"
+#line 2308 "GalleryConnector.c"
} else {
#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
value->data[0].v_pointer = NULL;
-#line 1965 "GalleryConnector.c"
+#line 2312 "GalleryConnector.c"
}
#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
if (old) {
#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_album_unref (old);
-#line 1971 "GalleryConnector.c"
+#line 2318 "GalleryConnector.c"
}
}
-static void publishing_gallery3_album_class_init (PublishingGallery3AlbumClass * klass) {
+static void
+publishing_gallery3_album_class_init (PublishingGallery3AlbumClass * klass)
+{
#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_album_parent_class = g_type_class_peek_parent (klass);
#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
((PublishingGallery3AlbumClass *) klass)->finalize = publishing_gallery3_album_finalize;
#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_type_class_add_private (klass, sizeof (PublishingGallery3AlbumPrivate));
-#line 1983 "GalleryConnector.c"
+#line 2332 "GalleryConnector.c"
}
-static void publishing_gallery3_album_instance_init (PublishingGallery3Album * self) {
+static void
+publishing_gallery3_album_instance_init (PublishingGallery3Album * self)
+{
gchar* _tmp0_;
gchar* _tmp1_;
gchar* _tmp2_;
@@ -2051,11 +2402,13 @@ static void publishing_gallery3_album_instance_init (PublishingGallery3Album * s
self->priv->_editable = FALSE;
#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
self->ref_count = 1;
-#line 2024 "GalleryConnector.c"
+#line 2375 "GalleryConnector.c"
}
-static void publishing_gallery3_album_finalize (PublishingGallery3Album * obj) {
+static void
+publishing_gallery3_album_finalize (PublishingGallery3Album * obj)
+{
PublishingGallery3Album * self;
#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_GALLERY3_TYPE_ALBUM, PublishingGallery3Album);
@@ -2073,11 +2426,13 @@ static void publishing_gallery3_album_finalize (PublishingGallery3Album * obj) {
_g_free0 (self->priv->_url);
#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_free0 (self->priv->_path);
-#line 2046 "GalleryConnector.c"
+#line 2399 "GalleryConnector.c"
}
-GType publishing_gallery3_album_get_type (void) {
+GType
+publishing_gallery3_album_get_type (void)
+{
static volatile gsize publishing_gallery3_album_type_id__volatile = 0;
if (g_once_init_enter (&publishing_gallery3_album_type_id__volatile)) {
static const GTypeValueTable g_define_type_value_table = { publishing_gallery3_value_album_init, publishing_gallery3_value_album_free_value, publishing_gallery3_value_album_copy_value, publishing_gallery3_value_album_peek_pointer, "p", publishing_gallery3_value_album_collect_value, "p", publishing_gallery3_value_album_lcopy_value };
@@ -2091,18 +2446,22 @@ GType publishing_gallery3_album_get_type (void) {
}
-gpointer publishing_gallery3_album_ref (gpointer instance) {
+gpointer
+publishing_gallery3_album_ref (gpointer instance)
+{
PublishingGallery3Album * self;
self = instance;
#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_atomic_int_inc (&self->ref_count);
#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return instance;
-#line 2071 "GalleryConnector.c"
+#line 2428 "GalleryConnector.c"
}
-void publishing_gallery3_album_unref (gpointer instance) {
+void
+publishing_gallery3_album_unref (gpointer instance)
+{
PublishingGallery3Album * self;
self = instance;
#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -2111,42 +2470,43 @@ void publishing_gallery3_album_unref (gpointer instance) {
PUBLISHING_GALLERY3_ALBUM_GET_CLASS (self)->finalize (self);
#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 2084 "GalleryConnector.c"
+#line 2443 "GalleryConnector.c"
}
}
-static gchar string_get (const gchar* self, glong index) {
+static gchar
+string_get (const gchar* self,
+ glong index)
+{
gchar result = '\0';
- glong _tmp0_;
- gchar _tmp1_;
-#line 1110 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ gchar _tmp0_;
+#line 1124 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, '\0');
-#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp0_ = index;
-#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp1_ = ((gchar*) self)[_tmp0_];
-#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- result = _tmp1_;
-#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1125 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp0_ = ((gchar*) self)[index];
+#line 1125 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = _tmp0_;
+#line 1125 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 2103 "GalleryConnector.c"
+#line 2462 "GalleryConnector.c"
}
-PublishingGallery3BaseGalleryTransaction* publishing_gallery3_base_gallery_transaction_construct (GType object_type, PublishingGallery3Session* session, const gchar* endpoint_url, const gchar* item_path, PublishingRESTSupportHttpMethod method) {
+PublishingGallery3BaseGalleryTransaction*
+publishing_gallery3_base_gallery_transaction_construct (GType object_type,
+ PublishingGallery3Session* session,
+ const gchar* endpoint_url,
+ const gchar* item_path,
+ PublishingRESTSupportHttpMethod method)
+{
PublishingGallery3BaseGalleryTransaction* self = NULL;
gboolean _tmp0_ = FALSE;
- const gchar* _tmp1_;
- PublishingGallery3Session* _tmp5_;
- const gchar* _tmp6_;
- gchar* _tmp7_;
- gchar* _tmp8_;
- const gchar* _tmp9_;
- gchar* _tmp10_;
- gchar* _tmp11_;
- PublishingRESTSupportHttpMethod _tmp12_;
- JsonParser* _tmp13_;
+ gchar* _tmp1_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
+ gchar* _tmp4_;
+ JsonParser* _tmp5_;
#line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_val_if_fail (PUBLISHING_GALLERY3_IS_SESSION (session), NULL);
#line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -2154,78 +2514,65 @@ PublishingGallery3BaseGalleryTransaction* publishing_gallery3_base_gallery_trans
#line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_val_if_fail (item_path != NULL, NULL);
#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp1_ = item_path;
+ if (g_strcmp0 (item_path, "") != 0) {
#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (g_strcmp0 (_tmp1_, "") != 0) {
-#line 2130 "GalleryConnector.c"
- const gchar* _tmp2_;
- gchar _tmp3_;
-#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp2_ = item_path;
-#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp3_ = string_get (_tmp2_, (glong) 0);
-#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp0_ = _tmp3_ != '/';
-#line 2139 "GalleryConnector.c"
+ _tmp0_ = string_get (item_path, (glong) 0) != '/';
+#line 2490 "GalleryConnector.c"
} else {
#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp0_ = FALSE;
-#line 2143 "GalleryConnector.c"
+#line 2494 "GalleryConnector.c"
}
#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
if (_tmp0_) {
-#line 2147 "GalleryConnector.c"
- const gchar* _tmp4_;
#line 164 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_warning ("GalleryConnector.vala:164: Bad item path, this is a bug!");
#line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp4_ = item_path;
-#line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_error ("GalleryConnector.vala:165: %s", _tmp4_);
-#line 2155 "GalleryConnector.c"
+ g_error ("GalleryConnector.vala:165: %s", item_path);
+#line 2502 "GalleryConnector.c"
}
#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp5_ = session;
-#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp6_ = endpoint_url;
-#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp7_ = g_strconcat (_tmp6_, PUBLISHING_GALLERY3_REST_PATH, NULL);
-#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp8_ = _tmp7_;
+ _tmp1_ = g_strconcat (endpoint_url, PUBLISHING_GALLERY3_REST_PATH, NULL);
#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp9_ = item_path;
+ _tmp2_ = _tmp1_;
#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp10_ = g_strconcat (_tmp8_, _tmp9_, NULL);
+ _tmp3_ = g_strconcat (_tmp2_, item_path, NULL);
#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp11_ = _tmp10_;
+ _tmp4_ = _tmp3_;
#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp12_ = method;
+ self = (PublishingGallery3BaseGalleryTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp4_, method);
#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self = (PublishingGallery3BaseGalleryTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp11_, _tmp12_);
+ _g_free0 (_tmp4_);
#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _g_free0 (_tmp11_);
-#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _g_free0 (_tmp8_);
+ _g_free0 (_tmp2_);
#line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp13_ = json_parser_new ();
+ _tmp5_ = json_parser_new ();
#line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_object_unref0 (self->parser);
#line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self->parser = _tmp13_;
+ self->parser = _tmp5_;
#line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return self;
-#line 2187 "GalleryConnector.c"
+#line 2526 "GalleryConnector.c"
}
-PublishingGallery3BaseGalleryTransaction* publishing_gallery3_base_gallery_transaction_new (PublishingGallery3Session* session, const gchar* endpoint_url, const gchar* item_path, PublishingRESTSupportHttpMethod method) {
+PublishingGallery3BaseGalleryTransaction*
+publishing_gallery3_base_gallery_transaction_new (PublishingGallery3Session* session,
+ const gchar* endpoint_url,
+ const gchar* item_path,
+ PublishingRESTSupportHttpMethod method)
+{
#line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return publishing_gallery3_base_gallery_transaction_construct (PUBLISHING_GALLERY3_TYPE_BASE_GALLERY_TRANSACTION, session, endpoint_url, item_path, method);
-#line 2194 "GalleryConnector.c"
+#line 2538 "GalleryConnector.c"
}
-JsonNode* publishing_gallery3_base_gallery_transaction_get_root_node (PublishingGallery3BaseGalleryTransaction* self, GError** error) {
+JsonNode*
+publishing_gallery3_base_gallery_transaction_get_root_node (PublishingGallery3BaseGalleryTransaction* self,
+ GError** error)
+{
JsonNode* result = NULL;
gchar* json_object = NULL;
JsonNode* root_node = NULL;
@@ -2234,7 +2581,6 @@ JsonNode* publishing_gallery3_base_gallery_transaction_get_root_node (Publishing
const gchar* _tmp2_;
JsonParser* _tmp15_;
JsonNode* _tmp16_;
- gboolean _tmp17_;
GError * _inner_error_ = NULL;
#line 176 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_val_if_fail (PUBLISHING_GALLERY3_IS_BASE_GALLERY_TRANSACTION (self), NULL);
@@ -2250,7 +2596,7 @@ JsonNode* publishing_gallery3_base_gallery_transaction_get_root_node (Publishing
if (NULL == _tmp2_) {
#line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp1_ = TRUE;
-#line 2223 "GalleryConnector.c"
+#line 2569 "GalleryConnector.c"
} else {
const gchar* _tmp3_;
gint _tmp4_;
@@ -2263,11 +2609,11 @@ JsonNode* publishing_gallery3_base_gallery_transaction_get_root_node (Publishing
_tmp5_ = _tmp4_;
#line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp1_ = 0 == _tmp5_;
-#line 2236 "GalleryConnector.c"
+#line 2582 "GalleryConnector.c"
}
#line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
if (_tmp1_) {
-#line 2240 "GalleryConnector.c"
+#line 2586 "GalleryConnector.c"
gchar* _tmp6_;
gchar* _tmp7_;
GError* _tmp8_;
@@ -2292,7 +2638,7 @@ JsonNode* publishing_gallery3_base_gallery_transaction_get_root_node (Publishing
_g_free0 (json_object);
#line 185 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return NULL;
-#line 2265 "GalleryConnector.c"
+#line 2611 "GalleryConnector.c"
} else {
#line 185 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_free0 (json_object);
@@ -2302,7 +2648,7 @@ JsonNode* publishing_gallery3_base_gallery_transaction_get_root_node (Publishing
g_clear_error (&_inner_error_);
#line 185 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return NULL;
-#line 2275 "GalleryConnector.c"
+#line 2621 "GalleryConnector.c"
}
}
{
@@ -2316,7 +2662,7 @@ JsonNode* publishing_gallery3_base_gallery_transaction_get_root_node (Publishing
json_parser_load_from_data (_tmp10_, _tmp11_, (gssize) -1, &_inner_error_);
#line 189 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2289 "GalleryConnector.c"
+#line 2635 "GalleryConnector.c"
goto __catch0_g_error;
}
}
@@ -2345,7 +2691,7 @@ JsonNode* publishing_gallery3_base_gallery_transaction_get_root_node (Publishing
_inner_error_ = _tmp14_;
#line 195 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_error_free0 (e);
-#line 2318 "GalleryConnector.c"
+#line 2664 "GalleryConnector.c"
goto __finally0;
}
__finally0:
@@ -2359,7 +2705,7 @@ JsonNode* publishing_gallery3_base_gallery_transaction_get_root_node (Publishing
_g_free0 (json_object);
#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return NULL;
-#line 2332 "GalleryConnector.c"
+#line 2678 "GalleryConnector.c"
} else {
#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_free0 (json_object);
@@ -2369,7 +2715,7 @@ JsonNode* publishing_gallery3_base_gallery_transaction_get_root_node (Publishing
g_clear_error (&_inner_error_);
#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return NULL;
-#line 2342 "GalleryConnector.c"
+#line 2688 "GalleryConnector.c"
}
}
#line 198 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -2379,15 +2725,13 @@ JsonNode* publishing_gallery3_base_gallery_transaction_get_root_node (Publishing
#line 198 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
root_node = _tmp16_;
#line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp17_ = json_node_is_null (root_node);
-#line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (_tmp17_) {
-#line 2355 "GalleryConnector.c"
- GError* _tmp18_;
+ if (json_node_is_null (root_node)) {
+#line 2699 "GalleryConnector.c"
+ GError* _tmp17_;
#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp18_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Root node is null, doesn't appear to be JSON data");
+ _tmp17_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Root node is null, doesn't appear to be JSON data");
#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _inner_error_ = _tmp18_;
+ _inner_error_ = _tmp17_;
#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -2396,7 +2740,7 @@ JsonNode* publishing_gallery3_base_gallery_transaction_get_root_node (Publishing
_g_free0 (json_object);
#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return NULL;
-#line 2369 "GalleryConnector.c"
+#line 2713 "GalleryConnector.c"
} else {
#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_free0 (json_object);
@@ -2406,7 +2750,7 @@ JsonNode* publishing_gallery3_base_gallery_transaction_get_root_node (Publishing
g_clear_error (&_inner_error_);
#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return NULL;
-#line 2379 "GalleryConnector.c"
+#line 2723 "GalleryConnector.c"
}
}
#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -2415,24 +2759,30 @@ JsonNode* publishing_gallery3_base_gallery_transaction_get_root_node (Publishing
_g_free0 (json_object);
#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return result;
-#line 2388 "GalleryConnector.c"
+#line 2732 "GalleryConnector.c"
}
-static void publishing_gallery3_base_gallery_transaction_class_init (PublishingGallery3BaseGalleryTransactionClass * klass) {
+static void
+publishing_gallery3_base_gallery_transaction_class_init (PublishingGallery3BaseGalleryTransactionClass * klass)
+{
#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_base_gallery_transaction_parent_class = g_type_class_peek_parent (klass);
#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
((PublishingRESTSupportTransactionClass *) klass)->finalize = publishing_gallery3_base_gallery_transaction_finalize;
-#line 2397 "GalleryConnector.c"
+#line 2743 "GalleryConnector.c"
}
-static void publishing_gallery3_base_gallery_transaction_instance_init (PublishingGallery3BaseGalleryTransaction * self) {
+static void
+publishing_gallery3_base_gallery_transaction_instance_init (PublishingGallery3BaseGalleryTransaction * self)
+{
}
-static void publishing_gallery3_base_gallery_transaction_finalize (PublishingRESTSupportTransaction * obj) {
+static void
+publishing_gallery3_base_gallery_transaction_finalize (PublishingRESTSupportTransaction * obj)
+{
PublishingGallery3BaseGalleryTransaction * self;
#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_GALLERY3_TYPE_BASE_GALLERY_TRANSACTION, PublishingGallery3BaseGalleryTransaction);
@@ -2440,11 +2790,13 @@ static void publishing_gallery3_base_gallery_transaction_finalize (PublishingRES
_g_object_unref0 (self->parser);
#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_gallery3_base_gallery_transaction_parent_class)->finalize (obj);
-#line 2413 "GalleryConnector.c"
+#line 2763 "GalleryConnector.c"
}
-GType publishing_gallery3_base_gallery_transaction_get_type (void) {
+GType
+publishing_gallery3_base_gallery_transaction_get_type (void)
+{
static volatile gsize publishing_gallery3_base_gallery_transaction_type_id__volatile = 0;
if (g_once_init_enter (&publishing_gallery3_base_gallery_transaction_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingGallery3BaseGalleryTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_gallery3_base_gallery_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingGallery3BaseGalleryTransaction), 0, (GInstanceInitFunc) publishing_gallery3_base_gallery_transaction_instance_init, NULL };
@@ -2456,12 +2808,14 @@ GType publishing_gallery3_base_gallery_transaction_get_type (void) {
}
-PublishingGallery3KeyFetchTransaction* publishing_gallery3_key_fetch_transaction_construct (GType object_type, PublishingGallery3Session* session, const gchar* url, const gchar* username, const gchar* password) {
+PublishingGallery3KeyFetchTransaction*
+publishing_gallery3_key_fetch_transaction_construct (GType object_type,
+ PublishingGallery3Session* session,
+ const gchar* url,
+ const gchar* username,
+ const gchar* password)
+{
PublishingGallery3KeyFetchTransaction* self = NULL;
- PublishingGallery3Session* _tmp0_;
- const gchar* _tmp1_;
- const gchar* _tmp2_;
- const gchar* _tmp3_;
#line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_val_if_fail (PUBLISHING_GALLERY3_IS_SESSION (session), NULL);
#line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -2471,152 +2825,116 @@ PublishingGallery3KeyFetchTransaction* publishing_gallery3_key_fetch_transaction
#line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_val_if_fail (password != NULL, NULL);
#line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp0_ = session;
-#line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp1_ = url;
-#line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self = (PublishingGallery3KeyFetchTransaction*) publishing_gallery3_base_gallery_transaction_construct (object_type, _tmp0_, _tmp1_, "", PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
+ self = (PublishingGallery3KeyFetchTransaction*) publishing_gallery3_base_gallery_transaction_construct (object_type, session, url, "", PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
#line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp2_ = username;
-#line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "user", _tmp2_);
-#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp3_ = password;
+ publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "user", username);
#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "password", _tmp3_);
+ publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "password", password);
#line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return self;
-#line 2459 "GalleryConnector.c"
+#line 2805 "GalleryConnector.c"
}
-PublishingGallery3KeyFetchTransaction* publishing_gallery3_key_fetch_transaction_new (PublishingGallery3Session* session, const gchar* url, const gchar* username, const gchar* password) {
+PublishingGallery3KeyFetchTransaction*
+publishing_gallery3_key_fetch_transaction_new (PublishingGallery3Session* session,
+ const gchar* url,
+ const gchar* username,
+ const gchar* password)
+{
#line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return publishing_gallery3_key_fetch_transaction_construct (PUBLISHING_GALLERY3_TYPE_KEY_FETCH_TRANSACTION, session, url, username, password);
-#line 2466 "GalleryConnector.c"
+#line 2817 "GalleryConnector.c"
}
-static gchar* string_slice (const gchar* self, glong start, glong end) {
+static gchar*
+string_slice (const gchar* self,
+ glong start,
+ glong end)
+{
gchar* result = NULL;
glong string_length = 0L;
gint _tmp0_;
gint _tmp1_;
- glong _tmp2_;
- glong _tmp5_;
- gboolean _tmp8_ = FALSE;
- glong _tmp9_;
- gboolean _tmp12_ = FALSE;
- glong _tmp13_;
- glong _tmp16_;
- glong _tmp17_;
- glong _tmp18_;
- glong _tmp19_;
- glong _tmp20_;
- gchar* _tmp21_;
-#line 1355 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ gboolean _tmp4_ = FALSE;
+ gboolean _tmp6_ = FALSE;
+ gchar* _tmp8_;
+#line 1369 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1370 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp0_ = strlen (self);
-#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1370 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp1_ = _tmp0_;
-#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1370 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
string_length = (glong) _tmp1_;
-#line 1357 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp2_ = start;
-#line 1357 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp2_ < ((glong) 0)) {
-#line 2499 "GalleryConnector.c"
+#line 1371 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (start < ((glong) 0)) {
+#line 2843 "GalleryConnector.c"
+ glong _tmp2_;
+#line 1372 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp2_ = string_length;
+#line 1372 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ start = _tmp2_ + start;
+#line 2849 "GalleryConnector.c"
+ }
+#line 1374 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (end < ((glong) 0)) {
+#line 2853 "GalleryConnector.c"
glong _tmp3_;
- glong _tmp4_;
-#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1375 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp3_ = string_length;
-#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp4_ = start;
-#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- start = _tmp3_ + _tmp4_;
-#line 2508 "GalleryConnector.c"
- }
-#line 1360 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp5_ = end;
-#line 1360 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp5_ < ((glong) 0)) {
-#line 2514 "GalleryConnector.c"
- glong _tmp6_;
- glong _tmp7_;
-#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp6_ = string_length;
-#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp7_ = end;
-#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- end = _tmp6_ + _tmp7_;
-#line 2523 "GalleryConnector.c"
- }
-#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp9_ = start;
-#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp9_ >= ((glong) 0)) {
-#line 2529 "GalleryConnector.c"
- glong _tmp10_;
- glong _tmp11_;
-#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp10_ = start;
-#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp11_ = string_length;
-#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp8_ = _tmp10_ <= _tmp11_;
-#line 2538 "GalleryConnector.c"
+#line 1375 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ end = _tmp3_ + end;
+#line 2859 "GalleryConnector.c"
+ }
+#line 1377 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (start >= ((glong) 0)) {
+#line 2863 "GalleryConnector.c"
+ glong _tmp5_;
+#line 1377 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp5_ = string_length;
+#line 1377 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp4_ = start <= _tmp5_;
+#line 2869 "GalleryConnector.c"
} else {
-#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp8_ = FALSE;
-#line 2542 "GalleryConnector.c"
- }
-#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- g_return_val_if_fail (_tmp8_, NULL);
-#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp13_ = end;
-#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp13_ >= ((glong) 0)) {
-#line 2550 "GalleryConnector.c"
- glong _tmp14_;
- glong _tmp15_;
-#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp14_ = end;
-#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp15_ = string_length;
-#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp12_ = _tmp14_ <= _tmp15_;
-#line 2559 "GalleryConnector.c"
+#line 1377 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp4_ = FALSE;
+#line 2873 "GalleryConnector.c"
+ }
+#line 1377 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ g_return_val_if_fail (_tmp4_, NULL);
+#line 1378 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (end >= ((glong) 0)) {
+#line 2879 "GalleryConnector.c"
+ glong _tmp7_;
+#line 1378 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp7_ = string_length;
+#line 1378 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp6_ = end <= _tmp7_;
+#line 2885 "GalleryConnector.c"
} else {
-#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp12_ = FALSE;
-#line 2563 "GalleryConnector.c"
- }
-#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- g_return_val_if_fail (_tmp12_, NULL);
-#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp16_ = start;
-#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp17_ = end;
-#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL);
-#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp18_ = start;
-#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp19_ = end;
-#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp20_ = start;
-#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_));
-#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- result = _tmp21_;
-#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1378 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp6_ = FALSE;
+#line 2889 "GalleryConnector.c"
+ }
+#line 1378 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ g_return_val_if_fail (_tmp6_, NULL);
+#line 1379 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ g_return_val_if_fail (start <= end, NULL);
+#line 1380 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp8_ = g_strndup (((gchar*) self) + start, (gsize) (end - start));
+#line 1380 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = _tmp8_;
+#line 1380 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 2585 "GalleryConnector.c"
+#line 2901 "GalleryConnector.c"
}
-gchar* publishing_gallery3_key_fetch_transaction_get_key (PublishingGallery3KeyFetchTransaction* self) {
+gchar*
+publishing_gallery3_key_fetch_transaction_get_key (PublishingGallery3KeyFetchTransaction* self)
+{
gchar* result = NULL;
const gchar* _tmp0_;
gchar* _tmp3_;
@@ -2633,7 +2951,7 @@ gchar* publishing_gallery3_key_fetch_transaction_get_key (PublishingGallery3KeyF
_tmp0_ = self->priv->key;
#line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
if (g_strcmp0 (_tmp0_, "") != 0) {
-#line 2606 "GalleryConnector.c"
+#line 2924 "GalleryConnector.c"
const gchar* _tmp1_;
gchar* _tmp2_;
#line 226 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -2644,7 +2962,7 @@ gchar* publishing_gallery3_key_fetch_transaction_get_key (PublishingGallery3KeyF
result = _tmp2_;
#line 226 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return result;
-#line 2617 "GalleryConnector.c"
+#line 2935 "GalleryConnector.c"
}
#line 228 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp3_ = publishing_rest_support_transaction_get_response (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
@@ -2658,20 +2976,20 @@ gchar* publishing_gallery3_key_fetch_transaction_get_key (PublishingGallery3KeyF
if (NULL == _tmp6_) {
#line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp5_ = TRUE;
-#line 2631 "GalleryConnector.c"
+#line 2949 "GalleryConnector.c"
} else {
const gchar* _tmp7_;
#line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp7_ = self->priv->key;
#line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp5_ = g_strcmp0 ("", _tmp7_) == 0;
-#line 2638 "GalleryConnector.c"
+#line 2956 "GalleryConnector.c"
}
#line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
if (_tmp5_) {
#line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp4_ = TRUE;
-#line 2644 "GalleryConnector.c"
+#line 2962 "GalleryConnector.c"
} else {
const gchar* _tmp8_;
gint _tmp9_;
@@ -2684,11 +3002,11 @@ gchar* publishing_gallery3_key_fetch_transaction_get_key (PublishingGallery3KeyF
_tmp10_ = _tmp9_;
#line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp4_ = 0 == _tmp10_;
-#line 2657 "GalleryConnector.c"
+#line 2975 "GalleryConnector.c"
}
#line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
if (_tmp4_) {
-#line 2661 "GalleryConnector.c"
+#line 2979 "GalleryConnector.c"
gchar* _tmp11_;
gchar* _tmp12_;
gchar* _tmp13_;
@@ -2706,7 +3024,7 @@ gchar* publishing_gallery3_key_fetch_transaction_get_key (PublishingGallery3KeyF
result = _tmp13_;
#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return result;
-#line 2679 "GalleryConnector.c"
+#line 2997 "GalleryConnector.c"
}
#line 237 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp14_ = self->priv->key;
@@ -2724,22 +3042,26 @@ gchar* publishing_gallery3_key_fetch_transaction_get_key (PublishingGallery3KeyF
result = _tmp17_;
#line 239 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return result;
-#line 2697 "GalleryConnector.c"
+#line 3015 "GalleryConnector.c"
}
-static void publishing_gallery3_key_fetch_transaction_class_init (PublishingGallery3KeyFetchTransactionClass * klass) {
+static void
+publishing_gallery3_key_fetch_transaction_class_init (PublishingGallery3KeyFetchTransactionClass * klass)
+{
#line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_key_fetch_transaction_parent_class = g_type_class_peek_parent (klass);
#line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
((PublishingRESTSupportTransactionClass *) klass)->finalize = publishing_gallery3_key_fetch_transaction_finalize;
#line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_type_class_add_private (klass, sizeof (PublishingGallery3KeyFetchTransactionPrivate));
-#line 2708 "GalleryConnector.c"
+#line 3028 "GalleryConnector.c"
}
-static void publishing_gallery3_key_fetch_transaction_instance_init (PublishingGallery3KeyFetchTransaction * self) {
+static void
+publishing_gallery3_key_fetch_transaction_instance_init (PublishingGallery3KeyFetchTransaction * self)
+{
gchar* _tmp0_;
#line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
self->priv = PUBLISHING_GALLERY3_KEY_FETCH_TRANSACTION_GET_PRIVATE (self);
@@ -2747,11 +3069,13 @@ static void publishing_gallery3_key_fetch_transaction_instance_init (PublishingG
_tmp0_ = g_strdup ("");
#line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
self->priv->key = _tmp0_;
-#line 2720 "GalleryConnector.c"
+#line 3042 "GalleryConnector.c"
}
-static void publishing_gallery3_key_fetch_transaction_finalize (PublishingRESTSupportTransaction * obj) {
+static void
+publishing_gallery3_key_fetch_transaction_finalize (PublishingRESTSupportTransaction * obj)
+{
PublishingGallery3KeyFetchTransaction * self;
#line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_GALLERY3_TYPE_KEY_FETCH_TRANSACTION, PublishingGallery3KeyFetchTransaction);
@@ -2759,11 +3083,13 @@ static void publishing_gallery3_key_fetch_transaction_finalize (PublishingRESTSu
_g_free0 (self->priv->key);
#line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_gallery3_key_fetch_transaction_parent_class)->finalize (obj);
-#line 2732 "GalleryConnector.c"
+#line 3056 "GalleryConnector.c"
}
-GType publishing_gallery3_key_fetch_transaction_get_type (void) {
+GType
+publishing_gallery3_key_fetch_transaction_get_type (void)
+{
static volatile gsize publishing_gallery3_key_fetch_transaction_type_id__volatile = 0;
if (g_once_init_enter (&publishing_gallery3_key_fetch_transaction_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingGallery3KeyFetchTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_gallery3_key_fetch_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingGallery3KeyFetchTransaction), 0, (GInstanceInitFunc) publishing_gallery3_key_fetch_transaction_instance_init, NULL };
@@ -2775,84 +3101,78 @@ GType publishing_gallery3_key_fetch_transaction_get_type (void) {
}
-PublishingGallery3GalleryRequestTransaction* publishing_gallery3_gallery_request_transaction_construct (GType object_type, PublishingGallery3Session* session, const gchar* item, PublishingRESTSupportHttpMethod method) {
+PublishingGallery3GalleryRequestTransaction*
+publishing_gallery3_gallery_request_transaction_construct (GType object_type,
+ PublishingGallery3Session* session,
+ const gchar* item,
+ PublishingRESTSupportHttpMethod method)
+{
PublishingGallery3GalleryRequestTransaction* self = NULL;
- PublishingGallery3Session* _tmp0_;
- gboolean _tmp1_;
#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_val_if_fail (PUBLISHING_GALLERY3_IS_SESSION (session), NULL);
#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_val_if_fail (item != NULL, NULL);
#line 253 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp0_ = session;
-#line 253 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp1_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 253 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (!_tmp1_) {
+ if (!publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession))) {
#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_error ("GalleryConnector.vala:254: Not authenticated");
-#line 2764 "GalleryConnector.c"
+#line 3089 "GalleryConnector.c"
} else {
- PublishingGallery3Session* _tmp2_;
- PublishingGallery3Session* _tmp3_;
- const gchar* _tmp4_;
- const gchar* _tmp5_;
- const gchar* _tmp6_;
- PublishingRESTSupportHttpMethod _tmp7_;
- PublishingGallery3Session* _tmp8_;
- const gchar* _tmp9_;
- const gchar* _tmp10_;
-#line 257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp2_ = session;
-#line 257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp3_ = session;
-#line 257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp4_ = publishing_gallery3_session_get_url (_tmp3_);
-#line 257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp5_ = _tmp4_;
+ const gchar* _tmp0_;
+ const gchar* _tmp1_;
+ const gchar* _tmp2_;
+ const gchar* _tmp3_;
#line 257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp6_ = item;
+ _tmp0_ = publishing_gallery3_session_get_url (session);
#line 257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp7_ = method;
+ _tmp1_ = _tmp0_;
#line 257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self = (PublishingGallery3GalleryRequestTransaction*) publishing_gallery3_base_gallery_transaction_construct (object_type, _tmp2_, _tmp5_, _tmp6_, _tmp7_);
+ self = (PublishingGallery3GalleryRequestTransaction*) publishing_gallery3_base_gallery_transaction_construct (object_type, session, _tmp1_, item, method);
#line 258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp8_ = session;
+ _tmp2_ = publishing_gallery3_session_get_key (session);
#line 258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp9_ = publishing_gallery3_session_get_key (_tmp8_);
+ _tmp3_ = _tmp2_;
#line 258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp10_ = _tmp9_;
-#line 258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "X-Gallery-Request-Key", _tmp10_);
+ publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "X-Gallery-Request-Key", _tmp3_);
#line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "X-Gallery-Request-Method", "GET");
-#line 2799 "GalleryConnector.c"
+#line 3109 "GalleryConnector.c"
}
#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return self;
-#line 2803 "GalleryConnector.c"
+#line 3113 "GalleryConnector.c"
}
-PublishingGallery3GalleryRequestTransaction* publishing_gallery3_gallery_request_transaction_new (PublishingGallery3Session* session, const gchar* item, PublishingRESTSupportHttpMethod method) {
+PublishingGallery3GalleryRequestTransaction*
+publishing_gallery3_gallery_request_transaction_new (PublishingGallery3Session* session,
+ const gchar* item,
+ PublishingRESTSupportHttpMethod method)
+{
#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return publishing_gallery3_gallery_request_transaction_construct (PUBLISHING_GALLERY3_TYPE_GALLERY_REQUEST_TRANSACTION, session, item, method);
-#line 2810 "GalleryConnector.c"
+#line 3124 "GalleryConnector.c"
}
-static void publishing_gallery3_gallery_request_transaction_class_init (PublishingGallery3GalleryRequestTransactionClass * klass) {
+static void
+publishing_gallery3_gallery_request_transaction_class_init (PublishingGallery3GalleryRequestTransactionClass * klass)
+{
#line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_gallery_request_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 2817 "GalleryConnector.c"
+#line 3133 "GalleryConnector.c"
}
-static void publishing_gallery3_gallery_request_transaction_instance_init (PublishingGallery3GalleryRequestTransaction * self) {
+static void
+publishing_gallery3_gallery_request_transaction_instance_init (PublishingGallery3GalleryRequestTransaction * self)
+{
}
-GType publishing_gallery3_gallery_request_transaction_get_type (void) {
+GType
+publishing_gallery3_gallery_request_transaction_get_type (void)
+{
static volatile gsize publishing_gallery3_gallery_request_transaction_type_id__volatile = 0;
if (g_once_init_enter (&publishing_gallery3_gallery_request_transaction_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingGallery3GalleryRequestTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_gallery3_gallery_request_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingGallery3GalleryRequestTransaction), 0, (GInstanceInitFunc) publishing_gallery3_gallery_request_transaction_instance_init, NULL };
@@ -2864,50 +3184,60 @@ GType publishing_gallery3_gallery_request_transaction_get_type (void) {
}
-PublishingGallery3GetAlbumURLsTransaction* publishing_gallery3_get_album_ur_ls_transaction_construct (GType object_type, PublishingGallery3Session* session) {
+PublishingGallery3GetAlbumURLsTransaction*
+publishing_gallery3_get_album_ur_ls_transaction_construct (GType object_type,
+ PublishingGallery3Session* session)
+{
PublishingGallery3GetAlbumURLsTransaction* self = NULL;
- PublishingGallery3Session* _tmp0_;
#line 268 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_val_if_fail (PUBLISHING_GALLERY3_IS_SESSION (session), NULL);
#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp0_ = session;
-#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self = (PublishingGallery3GetAlbumURLsTransaction*) publishing_gallery3_gallery_request_transaction_construct (object_type, _tmp0_, "/item/1", PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET);
+ self = (PublishingGallery3GetAlbumURLsTransaction*) publishing_gallery3_gallery_request_transaction_construct (object_type, session, "/item/1", PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET);
#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "type", "album");
#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "scope", "all");
#line 268 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return self;
-#line 2852 "GalleryConnector.c"
+#line 3172 "GalleryConnector.c"
}
-PublishingGallery3GetAlbumURLsTransaction* publishing_gallery3_get_album_ur_ls_transaction_new (PublishingGallery3Session* session) {
+PublishingGallery3GetAlbumURLsTransaction*
+publishing_gallery3_get_album_ur_ls_transaction_new (PublishingGallery3Session* session)
+{
#line 268 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return publishing_gallery3_get_album_ur_ls_transaction_construct (PUBLISHING_GALLERY3_TYPE_GET_ALBUM_UR_LS_TRANSACTION, session);
-#line 2859 "GalleryConnector.c"
+#line 3181 "GalleryConnector.c"
}
-static void _vala_array_add2 (gchar** * array, int* length, int* size, gchar* value) {
+static void
+_vala_array_add2 (gchar** * array,
+ int* length,
+ int* size,
+ gchar* value)
+{
#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
if ((*length) == (*size)) {
#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
*array = g_renew (gchar*, *array, (*size) + 1);
-#line 2870 "GalleryConnector.c"
+#line 3197 "GalleryConnector.c"
}
#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
(*array)[(*length)++] = value;
#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
(*array)[*length] = NULL;
-#line 2876 "GalleryConnector.c"
+#line 3203 "GalleryConnector.c"
}
-gchar** publishing_gallery3_get_album_ur_ls_transaction_get_album_urls (PublishingGallery3GetAlbumURLsTransaction* self, int* result_length1) {
+gchar**
+publishing_gallery3_get_album_ur_ls_transaction_get_album_urls (PublishingGallery3GetAlbumURLsTransaction* self,
+ int* result_length1)
+{
gchar** result = NULL;
JsonNode* root_node = NULL;
JsonArray* all_members = NULL;
@@ -2916,12 +3246,12 @@ gchar** publishing_gallery3_get_album_ur_ls_transaction_get_album_urls (Publishi
gchar** member_urls = NULL;
gint member_urls_length1;
gint _member_urls_size_;
- gchar** _tmp14_;
- gint _tmp14__length1;
+ gchar** _tmp13_;
+ gint _tmp13__length1;
GError * _inner_error_ = NULL;
#line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_val_if_fail (PUBLISHING_GALLERY3_IS_GET_ALBUM_UR_LS_TRANSACTION (self), NULL);
-#line 2894 "GalleryConnector.c"
+#line 3224 "GalleryConnector.c"
{
JsonNode* _tmp0_ = NULL;
JsonNode* _tmp1_;
@@ -2933,7 +3263,7 @@ gchar** publishing_gallery3_get_album_ur_ls_transaction_get_album_urls (Publishi
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 282 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2906 "GalleryConnector.c"
+#line 3236 "GalleryConnector.c"
goto __catch1_spit_publishing_publishing_error;
}
#line 282 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -2942,11 +3272,11 @@ gchar** publishing_gallery3_get_album_ur_ls_transaction_get_album_urls (Publishi
g_clear_error (&_inner_error_);
#line 282 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return NULL;
-#line 2915 "GalleryConnector.c"
+#line 3245 "GalleryConnector.c"
}
#line 282 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
root_node = _tmp0_;
-#line 2919 "GalleryConnector.c"
+#line 3249 "GalleryConnector.c"
}
goto __finally1;
__catch1_spit_publishing_publishing_error:
@@ -2960,7 +3290,7 @@ gchar** publishing_gallery3_get_album_ur_ls_transaction_get_album_urls (Publishi
g_error ("GalleryConnector.vala:285: Could not get root node");
#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_error_free0 (e);
-#line 2933 "GalleryConnector.c"
+#line 3263 "GalleryConnector.c"
}
__finally1:
#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -2971,7 +3301,7 @@ gchar** publishing_gallery3_get_album_ur_ls_transaction_get_album_urls (Publishi
g_clear_error (&_inner_error_);
#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return NULL;
-#line 2944 "GalleryConnector.c"
+#line 3274 "GalleryConnector.c"
}
#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp2_ = json_node_get_object (root_node);
@@ -2985,37 +3315,36 @@ gchar** publishing_gallery3_get_album_ur_ls_transaction_get_album_urls (Publishi
member_urls_length1 = 0;
#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_member_urls_size_ = member_urls_length1;
-#line 2958 "GalleryConnector.c"
+#line 3288 "GalleryConnector.c"
{
guint i = 0U;
#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
i = (guint) 0;
-#line 2963 "GalleryConnector.c"
+#line 3293 "GalleryConnector.c"
{
gboolean _tmp4_ = FALSE;
#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp4_ = TRUE;
#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
while (TRUE) {
-#line 2970 "GalleryConnector.c"
+#line 3300 "GalleryConnector.c"
guint _tmp6_;
JsonArray* _tmp7_;
- guint _tmp8_;
- gchar** _tmp9_;
- gint _tmp9__length1;
- JsonArray* _tmp10_;
- guint _tmp11_;
- const gchar* _tmp12_;
- gchar* _tmp13_;
+ gchar** _tmp8_;
+ gint _tmp8__length1;
+ JsonArray* _tmp9_;
+ guint _tmp10_;
+ const gchar* _tmp11_;
+ gchar* _tmp12_;
#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
if (!_tmp4_) {
-#line 2982 "GalleryConnector.c"
+#line 3311 "GalleryConnector.c"
guint _tmp5_;
#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp5_ = i;
#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
i = _tmp5_ + 1;
-#line 2988 "GalleryConnector.c"
+#line 3317 "GalleryConnector.c"
}
#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp4_ = FALSE;
@@ -3024,61 +3353,65 @@ gchar** publishing_gallery3_get_album_ur_ls_transaction_get_album_urls (Publishi
#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp7_ = all_members;
#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp8_ = json_array_get_length (_tmp7_);
-#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (!(_tmp6_ <= (_tmp8_ - 1))) {
+ if (!(_tmp6_ <= (json_array_get_length (_tmp7_) - 1))) {
#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
break;
-#line 3002 "GalleryConnector.c"
+#line 3329 "GalleryConnector.c"
}
#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp9_ = member_urls;
+ _tmp8_ = member_urls;
#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp9__length1 = member_urls_length1;
+ _tmp8__length1 = member_urls_length1;
#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp10_ = all_members;
+ _tmp9_ = all_members;
#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp11_ = i;
+ _tmp10_ = i;
#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp12_ = json_array_get_string_element (_tmp10_, _tmp11_);
+ _tmp11_ = json_array_get_string_element (_tmp9_, _tmp10_);
#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp13_ = g_strdup (_tmp12_);
+ _tmp12_ = g_strdup (_tmp11_);
#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _vala_array_add2 (&member_urls, &member_urls_length1, &_member_urls_size_, _tmp13_);
-#line 3018 "GalleryConnector.c"
+ _vala_array_add2 (&member_urls, &member_urls_length1, &_member_urls_size_, _tmp12_);
+#line 3345 "GalleryConnector.c"
}
}
}
#line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp14_ = member_urls;
+ _tmp13_ = member_urls;
#line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp14__length1 = member_urls_length1;
+ _tmp13__length1 = member_urls_length1;
#line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
if (result_length1) {
#line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- *result_length1 = _tmp14__length1;
-#line 3030 "GalleryConnector.c"
+ *result_length1 = _tmp13__length1;
+#line 3357 "GalleryConnector.c"
}
#line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- result = _tmp14_;
+ result = _tmp13_;
#line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return result;
-#line 3036 "GalleryConnector.c"
+#line 3363 "GalleryConnector.c"
}
-static void publishing_gallery3_get_album_ur_ls_transaction_class_init (PublishingGallery3GetAlbumURLsTransactionClass * klass) {
+static void
+publishing_gallery3_get_album_ur_ls_transaction_class_init (PublishingGallery3GetAlbumURLsTransactionClass * klass)
+{
#line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_get_album_ur_ls_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 3043 "GalleryConnector.c"
+#line 3372 "GalleryConnector.c"
}
-static void publishing_gallery3_get_album_ur_ls_transaction_instance_init (PublishingGallery3GetAlbumURLsTransaction * self) {
+static void
+publishing_gallery3_get_album_ur_ls_transaction_instance_init (PublishingGallery3GetAlbumURLsTransaction * self)
+{
}
-GType publishing_gallery3_get_album_ur_ls_transaction_get_type (void) {
+GType
+publishing_gallery3_get_album_ur_ls_transaction_get_type (void)
+{
static volatile gsize publishing_gallery3_get_album_ur_ls_transaction_type_id__volatile = 0;
if (g_once_init_enter (&publishing_gallery3_get_album_ur_ls_transaction_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingGallery3GetAlbumURLsTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_gallery3_get_album_ur_ls_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingGallery3GetAlbumURLsTransaction), 0, (GInstanceInitFunc) publishing_gallery3_get_album_ur_ls_transaction_instance_init, NULL };
@@ -3090,476 +3423,388 @@ GType publishing_gallery3_get_album_ur_ls_transaction_get_type (void) {
}
-static void _vala_array_add3 (gchar** * array, int* length, int* size, gchar* value) {
+static void
+_vala_array_add3 (gchar** * array,
+ int* length,
+ int* size,
+ gchar* value)
+{
#line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
if ((*length) == (*size)) {
#line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
*array = g_renew (gchar*, *array, (*size) + 1);
-#line 3070 "GalleryConnector.c"
+#line 3408 "GalleryConnector.c"
}
#line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
(*array)[(*length)++] = value;
#line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
(*array)[*length] = NULL;
-#line 3076 "GalleryConnector.c"
+#line 3414 "GalleryConnector.c"
}
-static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int str_array_length1) {
+static gchar*
+_vala_g_strjoinv (const gchar* separator,
+ gchar** str_array,
+ int str_array_length1)
+{
gchar* result = NULL;
- const gchar* _tmp0_;
- gboolean _tmp1_ = FALSE;
- gboolean _tmp2_ = FALSE;
- gchar** _tmp3_;
- gint _tmp3__length1;
-#line 1078 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp0_ = separator;
-#line 1078 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp0_ == NULL) {
-#line 1079 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ gboolean _tmp0_ = FALSE;
+#line 1092 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (separator == NULL) {
+#line 1093 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
separator = "";
-#line 3093 "GalleryConnector.c"
- }
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp3_ = str_array;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp3__length1 = str_array_length1;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp3_ != NULL) {
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp2_ = TRUE;
-#line 3103 "GalleryConnector.c"
- } else {
- gchar** _tmp4_;
- gint _tmp4__length1;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp4_ = str_array;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp4__length1 = str_array_length1;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp2_ = _tmp4__length1 > 0;
-#line 3113 "GalleryConnector.c"
- }
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp2_) {
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp1_ = TRUE;
-#line 3119 "GalleryConnector.c"
- } else {
- gboolean _tmp5_ = FALSE;
- gchar** _tmp6_;
- gint _tmp6__length1;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp6_ = str_array;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp6__length1 = str_array_length1;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp6__length1 == -1) {
-#line 3130 "GalleryConnector.c"
- gchar** _tmp7_;
- gint _tmp7__length1;
- const gchar* _tmp8_;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp7_ = str_array;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp7__length1 = str_array_length1;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp8_ = _tmp7_[0];
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp5_ = _tmp8_ != NULL;
-#line 3142 "GalleryConnector.c"
+#line 3429 "GalleryConnector.c"
+ }
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (str_array != NULL) {
+#line 3433 "GalleryConnector.c"
+ gboolean _tmp1_ = FALSE;
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (str_array_length1 > 0) {
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp1_ = TRUE;
+#line 3439 "GalleryConnector.c"
} else {
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp5_ = FALSE;
-#line 3146 "GalleryConnector.c"
+ gboolean _tmp2_ = FALSE;
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (str_array_length1 == -1) {
+#line 3444 "GalleryConnector.c"
+ const gchar* _tmp3_;
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp3_ = str_array[0];
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp2_ = _tmp3_ != NULL;
+#line 3450 "GalleryConnector.c"
+ } else {
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp2_ = FALSE;
+#line 3454 "GalleryConnector.c"
+ }
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp1_ = _tmp2_;
+#line 3458 "GalleryConnector.c"
}
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp1_ = _tmp5_;
-#line 3150 "GalleryConnector.c"
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp0_ = _tmp1_;
+#line 3462 "GalleryConnector.c"
+ } else {
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp0_ = FALSE;
+#line 3466 "GalleryConnector.c"
}
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp1_) {
-#line 3154 "GalleryConnector.c"
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (_tmp0_) {
+#line 3470 "GalleryConnector.c"
gint i = 0;
gsize len = 0UL;
- gint _tmp31_;
- gint _tmp33_;
- gint _tmp34_;
- gsize _tmp35_;
- const gchar* _tmp36_;
- gint _tmp37_;
- gint _tmp38_;
- gint _tmp39_;
+ gint _tmp20_;
+ gint _tmp22_;
+ gint _tmp23_;
+ gsize _tmp24_;
+ gint _tmp25_;
+ gint _tmp26_;
+ gint _tmp27_;
const gchar* res = NULL;
- gsize _tmp40_;
- void* _tmp41_;
+ gsize _tmp28_;
+ void* _tmp29_;
void* ptr = NULL;
- const gchar* _tmp42_;
- gchar** _tmp43_;
- gint _tmp43__length1;
- const gchar* _tmp44_;
- void* _tmp45_;
- const gchar* _tmp62_;
-#line 1083 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ const gchar* _tmp30_;
+ const gchar* _tmp31_;
+ void* _tmp32_;
+ const gchar* _tmp45_;
+#line 1097 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
len = (gsize) 1;
-#line 3177 "GalleryConnector.c"
+#line 3490 "GalleryConnector.c"
{
- gboolean _tmp9_ = FALSE;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ gboolean _tmp4_ = FALSE;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
i = 0;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp9_ = TRUE;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp4_ = TRUE;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
while (TRUE) {
-#line 3186 "GalleryConnector.c"
- gboolean _tmp11_ = FALSE;
- gboolean _tmp12_ = FALSE;
- gchar** _tmp13_;
- gint _tmp13__length1;
- gint _tmp21_ = 0;
- gchar** _tmp22_;
- gint _tmp22__length1;
- gint _tmp23_;
- const gchar* _tmp24_;
- gsize _tmp30_;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (!_tmp9_) {
-#line 3199 "GalleryConnector.c"
- gint _tmp10_;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp10_ = i;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- i = _tmp10_ + 1;
-#line 3205 "GalleryConnector.c"
+#line 3499 "GalleryConnector.c"
+ gboolean _tmp6_ = FALSE;
+ gboolean _tmp7_ = FALSE;
+ gint _tmp12_ = 0;
+ gint _tmp13_;
+ const gchar* _tmp14_;
+ gsize _tmp19_;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (!_tmp4_) {
+#line 3508 "GalleryConnector.c"
+ gint _tmp5_;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp5_ = i;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ i = _tmp5_ + 1;
+#line 3514 "GalleryConnector.c"
}
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp9_ = FALSE;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp13_ = str_array;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp13__length1 = str_array_length1;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp13__length1 != -1) {
-#line 3215 "GalleryConnector.c"
- gint _tmp14_;
- gchar** _tmp15_;
- gint _tmp15__length1;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp14_ = i;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp15_ = str_array;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp15__length1 = str_array_length1;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp12_ = _tmp14_ < _tmp15__length1;
-#line 3227 "GalleryConnector.c"
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp4_ = FALSE;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (str_array_length1 != -1) {
+#line 3520 "GalleryConnector.c"
+ gint _tmp8_;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp8_ = i;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp7_ = _tmp8_ < str_array_length1;
+#line 3526 "GalleryConnector.c"
} else {
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp12_ = FALSE;
-#line 3231 "GalleryConnector.c"
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp7_ = FALSE;
+#line 3530 "GalleryConnector.c"
}
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp12_) {
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp11_ = TRUE;
-#line 3237 "GalleryConnector.c"
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (_tmp7_) {
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp6_ = TRUE;
+#line 3536 "GalleryConnector.c"
} else {
- gboolean _tmp16_ = FALSE;
- gchar** _tmp17_;
- gint _tmp17__length1;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp17_ = str_array;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp17__length1 = str_array_length1;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp17__length1 == -1) {
-#line 3248 "GalleryConnector.c"
- gchar** _tmp18_;
- gint _tmp18__length1;
- gint _tmp19_;
- const gchar* _tmp20_;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp18_ = str_array;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp18__length1 = str_array_length1;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp19_ = i;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp20_ = _tmp18_[_tmp19_];
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp16_ = _tmp20_ != NULL;
-#line 3263 "GalleryConnector.c"
+ gboolean _tmp9_ = FALSE;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (str_array_length1 == -1) {
+#line 3541 "GalleryConnector.c"
+ gint _tmp10_;
+ const gchar* _tmp11_;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp10_ = i;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp11_ = str_array[_tmp10_];
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp9_ = _tmp11_ != NULL;
+#line 3550 "GalleryConnector.c"
} else {
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp16_ = FALSE;
-#line 3267 "GalleryConnector.c"
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp9_ = FALSE;
+#line 3554 "GalleryConnector.c"
}
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp11_ = _tmp16_;
-#line 3271 "GalleryConnector.c"
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp6_ = _tmp9_;
+#line 3558 "GalleryConnector.c"
}
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (!_tmp11_) {
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (!_tmp6_) {
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
break;
-#line 3277 "GalleryConnector.c"
+#line 3564 "GalleryConnector.c"
}
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp22_ = str_array;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp22__length1 = str_array_length1;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp23_ = i;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp24_ = _tmp22_[_tmp23_];
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp24_ != NULL) {
-#line 3289 "GalleryConnector.c"
- gchar** _tmp25_;
- gint _tmp25__length1;
- gint _tmp26_;
- const gchar* _tmp27_;
- gint _tmp28_;
- gint _tmp29_;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp25_ = str_array;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp25__length1 = str_array_length1;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp26_ = i;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp27_ = _tmp25_[_tmp26_];
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp28_ = strlen ((const gchar*) _tmp27_);
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp29_ = _tmp28_;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp21_ = _tmp29_;
-#line 3310 "GalleryConnector.c"
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp13_ = i;
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp14_ = str_array[_tmp13_];
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (_tmp14_ != NULL) {
+#line 3572 "GalleryConnector.c"
+ gint _tmp15_;
+ const gchar* _tmp16_;
+ gint _tmp17_;
+ gint _tmp18_;
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp15_ = i;
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp16_ = str_array[_tmp15_];
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp17_ = strlen ((const gchar*) _tmp16_);
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp18_ = _tmp17_;
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp12_ = _tmp18_;
+#line 3587 "GalleryConnector.c"
} else {
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp21_ = 0;
-#line 3314 "GalleryConnector.c"
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp12_ = 0;
+#line 3591 "GalleryConnector.c"
}
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp30_ = len;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- len = _tmp30_ + _tmp21_;
-#line 3320 "GalleryConnector.c"
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp19_ = len;
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ len = _tmp19_ + _tmp12_;
+#line 3597 "GalleryConnector.c"
}
}
-#line 1087 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp31_ = i;
-#line 1087 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp31_ == 0) {
-#line 3327 "GalleryConnector.c"
- gchar* _tmp32_;
-#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp32_ = g_strdup ("");
-#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- result = _tmp32_;
-#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1101 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp20_ = i;
+#line 1101 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (_tmp20_ == 0) {
+#line 3604 "GalleryConnector.c"
+ gchar* _tmp21_;
+#line 1102 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp21_ = g_strdup ("");
+#line 1102 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = _tmp21_;
+#line 1102 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 3335 "GalleryConnector.c"
+#line 3612 "GalleryConnector.c"
}
-#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp33_ = i;
-#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- str_array_length1 = _tmp33_;
-#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp34_ = str_array_length1;
-#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp35_ = len;
-#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp36_ = separator;
-#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp37_ = strlen ((const gchar*) _tmp36_);
-#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp38_ = _tmp37_;
-#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp39_ = i;
-#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- len = _tmp35_ + (_tmp38_ * (_tmp39_ - 1));
-#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp40_ = len;
-#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp41_ = g_malloc (_tmp40_);
-#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- res = _tmp41_;
-#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp42_ = res;
-#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp43_ = str_array;
-#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp43__length1 = str_array_length1;
-#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp44_ = _tmp43_[0];
-#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_);
-#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- ptr = _tmp45_;
-#line 3373 "GalleryConnector.c"
+#line 1104 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp22_ = i;
+#line 1104 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ str_array_length1 = _tmp22_;
+#line 1104 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp23_ = str_array_length1;
+#line 1105 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp24_ = len;
+#line 1105 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp25_ = strlen ((const gchar*) separator);
+#line 1105 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp26_ = _tmp25_;
+#line 1105 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp27_ = i;
+#line 1105 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ len = _tmp24_ + (_tmp26_ * (_tmp27_ - 1));
+#line 1107 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp28_ = len;
+#line 1107 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp29_ = g_malloc (_tmp28_);
+#line 1107 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ res = _tmp29_;
+#line 1108 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp30_ = res;
+#line 1108 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp31_ = str_array[0];
+#line 1108 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp32_ = g_stpcpy ((void*) _tmp30_, (const gchar*) _tmp31_);
+#line 1108 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ ptr = _tmp32_;
+#line 3644 "GalleryConnector.c"
{
- gboolean _tmp46_ = FALSE;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ gboolean _tmp33_ = FALSE;
+#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
i = 1;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp46_ = TRUE;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp33_ = TRUE;
+#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
while (TRUE) {
-#line 3382 "GalleryConnector.c"
- gint _tmp48_;
- gchar** _tmp49_;
- gint _tmp49__length1;
- void* _tmp50_;
- const gchar* _tmp51_;
- void* _tmp52_;
- const gchar* _tmp53_ = NULL;
- gchar** _tmp54_;
- gint _tmp54__length1;
- gint _tmp55_;
- const gchar* _tmp56_;
- void* _tmp60_;
- void* _tmp61_;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (!_tmp46_) {
-#line 3398 "GalleryConnector.c"
- gint _tmp47_;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp47_ = i;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- i = _tmp47_ + 1;
-#line 3404 "GalleryConnector.c"
+#line 3653 "GalleryConnector.c"
+ gint _tmp35_;
+ void* _tmp36_;
+ void* _tmp37_;
+ const gchar* _tmp38_ = NULL;
+ gint _tmp39_;
+ const gchar* _tmp40_;
+ void* _tmp43_;
+ void* _tmp44_;
+#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (!_tmp33_) {
+#line 3664 "GalleryConnector.c"
+ gint _tmp34_;
+#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp34_ = i;
+#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ i = _tmp34_ + 1;
+#line 3670 "GalleryConnector.c"
}
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp46_ = FALSE;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp48_ = i;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp49_ = str_array;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp49__length1 = str_array_length1;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (!(_tmp48_ < _tmp49__length1)) {
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp33_ = FALSE;
+#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp35_ = i;
+#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (!(_tmp35_ < str_array_length1)) {
+#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
break;
-#line 3418 "GalleryConnector.c"
+#line 3680 "GalleryConnector.c"
}
-#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp50_ = ptr;
-#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp51_ = separator;
-#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp52_ = g_stpcpy (_tmp50_, (const gchar*) _tmp51_);
-#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- ptr = _tmp52_;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp54_ = str_array;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp54__length1 = str_array_length1;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp55_ = i;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp56_ = _tmp54_[_tmp55_];
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp56_ != NULL) {
-#line 3438 "GalleryConnector.c"
- gchar** _tmp57_;
- gint _tmp57__length1;
- gint _tmp58_;
- const gchar* _tmp59_;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp57_ = str_array;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp57__length1 = str_array_length1;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp58_ = i;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp59_ = _tmp57_[_tmp58_];
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp53_ = (const gchar*) _tmp59_;
-#line 3453 "GalleryConnector.c"
+#line 1110 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp36_ = ptr;
+#line 1110 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp37_ = g_stpcpy (_tmp36_, (const gchar*) separator);
+#line 1110 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ ptr = _tmp37_;
+#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp39_ = i;
+#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp40_ = str_array[_tmp39_];
+#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (_tmp40_ != NULL) {
+#line 3694 "GalleryConnector.c"
+ gint _tmp41_;
+ const gchar* _tmp42_;
+#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp41_ = i;
+#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp42_ = str_array[_tmp41_];
+#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp38_ = (const gchar*) _tmp42_;
+#line 3703 "GalleryConnector.c"
} else {
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp53_ = "";
-#line 3457 "GalleryConnector.c"
+#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp38_ = "";
+#line 3707 "GalleryConnector.c"
}
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp60_ = ptr;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp61_ = g_stpcpy (_tmp60_, _tmp53_);
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- ptr = _tmp61_;
-#line 3465 "GalleryConnector.c"
+#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp43_ = ptr;
+#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp44_ = g_stpcpy (_tmp43_, _tmp38_);
+#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ ptr = _tmp44_;
+#line 3715 "GalleryConnector.c"
}
}
-#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp62_ = res;
-#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1114 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp45_ = res;
+#line 1114 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
res = NULL;
-#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- result = (gchar*) _tmp62_;
-#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1114 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = (gchar*) _tmp45_;
+#line 1114 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 3476 "GalleryConnector.c"
+#line 3726 "GalleryConnector.c"
} else {
- gchar* _tmp63_;
-#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp63_ = g_strdup ("");
-#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- result = _tmp63_;
-#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ gchar* _tmp46_;
+#line 1116 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp46_ = g_strdup ("");
+#line 1116 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = _tmp46_;
+#line 1116 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 3485 "GalleryConnector.c"
+#line 3735 "GalleryConnector.c"
}
}
-PublishingGallery3GetAlbumsTransaction* publishing_gallery3_get_albums_transaction_construct (GType object_type, PublishingGallery3Session* session, gchar** _album_urls, int _album_urls_length1, guint start) {
+PublishingGallery3GetAlbumsTransaction*
+publishing_gallery3_get_albums_transaction_construct (GType object_type,
+ PublishingGallery3Session* session,
+ gchar** _album_urls,
+ int _album_urls_length1,
+ guint start)
+{
PublishingGallery3GetAlbumsTransaction* self = NULL;
- PublishingGallery3Session* _tmp0_;
- gchar** _tmp1_;
- gint _tmp1__length1;
gchar* url_list = NULL;
- gchar* _tmp2_;
+ gchar* _tmp0_;
gchar** my_album_urls = NULL;
gint my_album_urls_length1;
gint _my_album_urls_size_;
gchar* endpoint_url = NULL;
- PublishingGallery3Session* _tmp3_;
- gchar* _tmp4_;
- gint _tmp5_ = 0;
- const gchar* _tmp6_;
+ gchar* _tmp1_;
+ gint _tmp2_ = 0;
+ const gchar* _tmp3_;
gint url_length = 0;
- gint _tmp10_;
- guint _tmp11_;
- gchar** _tmp12_;
- gint _tmp12__length1;
- gchar** _tmp13_;
- gint _tmp13__length1;
- const gchar* _tmp51_;
- gchar* _tmp52_;
- const gchar* _tmp53_;
+ gint _tmp7_;
+ gchar** _tmp8_;
+ gint _tmp8__length1;
+ gchar** _tmp9_;
+ gint _tmp9__length1;
+ const gchar* _tmp46_;
+ gchar* _tmp47_;
+ const gchar* _tmp48_;
#line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_val_if_fail (PUBLISHING_GALLERY3_IS_SESSION (session), NULL);
#line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp0_ = session;
-#line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self = (PublishingGallery3GetAlbumsTransaction*) publishing_gallery3_gallery_request_transaction_construct (object_type, _tmp0_, "/items", PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET);
+ self = (PublishingGallery3GetAlbumsTransaction*) publishing_gallery3_gallery_request_transaction_construct (object_type, session, "/items", PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET);
#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "scope", "all");
#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp1_ = _album_urls;
-#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp1__length1 = _album_urls_length1;
-#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- publishing_gallery3_get_albums_transaction_set_album_urls (self, _tmp1_, _tmp1__length1);
+ publishing_gallery3_get_albums_transaction_set_album_urls (self, _album_urls, _album_urls_length1);
#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp2_ = g_strdup ("[");
+ _tmp0_ = g_strdup ("[");
#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- url_list = _tmp2_;
+ url_list = _tmp0_;
#line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
my_album_urls = NULL;
#line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -3567,248 +3812,241 @@ PublishingGallery3GetAlbumsTransaction* publishing_gallery3_get_albums_transacti
#line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_my_album_urls_size_ = my_album_urls_length1;
#line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp3_ = session;
+ _tmp1_ = publishing_rest_support_session_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
#line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp4_ = publishing_rest_support_session_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- endpoint_url = _tmp4_;
+ endpoint_url = _tmp1_;
#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp6_ = endpoint_url;
+ _tmp3_ = endpoint_url;
#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (NULL != _tmp6_) {
-#line 3549 "GalleryConnector.c"
- const gchar* _tmp7_;
- gint _tmp8_;
- gint _tmp9_;
+ if (NULL != _tmp3_) {
+#line 3792 "GalleryConnector.c"
+ const gchar* _tmp4_;
+ gint _tmp5_;
+ gint _tmp6_;
#line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp7_ = endpoint_url;
+ _tmp4_ = endpoint_url;
#line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp8_ = strlen (_tmp7_);
+ _tmp5_ = strlen (_tmp4_);
#line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp9_ = _tmp8_;
+ _tmp6_ = _tmp5_;
#line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp5_ = _tmp9_;
-#line 3561 "GalleryConnector.c"
+ _tmp2_ = _tmp6_;
+#line 3804 "GalleryConnector.c"
} else {
#line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp5_ = 0;
-#line 3565 "GalleryConnector.c"
+ _tmp2_ = 0;
+#line 3808 "GalleryConnector.c"
}
#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- url_length = _tmp5_;
+ url_length = _tmp2_;
#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp10_ = url_length;
+ _tmp7_ = url_length;
#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- url_length = _tmp10_ + 18;
+ url_length = _tmp7_ + 18;
#line 336 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp11_ = start;
+ _tmp8_ = publishing_gallery3_get_albums_transaction_get_album_urls (self, &_tmp8__length1);
#line 336 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp12_ = publishing_gallery3_get_albums_transaction_get_album_urls (self, &_tmp12__length1);
-#line 336 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp13_ = _tmp12_;
+ _tmp9_ = _tmp8_;
#line 336 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp13__length1 = _tmp12__length1;
+ _tmp9__length1 = _tmp8__length1;
#line 336 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (_tmp11_ <= ((guint) (_tmp13__length1 - 1))) {
-#line 3583 "GalleryConnector.c"
- guint _tmp14_;
- const gchar* _tmp43_;
+ if (start <= ((guint) (_tmp9__length1 - 1))) {
+#line 3824 "GalleryConnector.c"
+ const gchar* _tmp38_;
+ gchar** _tmp39_;
+ gint _tmp39__length1;
+ gchar* _tmp40_;
+ gchar* _tmp41_;
+ gchar* _tmp42_;
+ guint _tmp43_;
gchar** _tmp44_;
gint _tmp44__length1;
- gchar* _tmp45_;
- gchar* _tmp46_;
- gchar* _tmp47_;
- guint _tmp48_;
- gchar** _tmp49_;
- gint _tmp49__length1;
- gchar** _tmp50_;
- gint _tmp50__length1;
+ gchar** _tmp45_;
+ gint _tmp45__length1;
#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp14_ = start;
-#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- publishing_gallery3_get_albums_transaction_set_urls_sent (self, _tmp14_);
-#line 3600 "GalleryConnector.c"
+ publishing_gallery3_get_albums_transaction_set_urls_sent (self, start);
+#line 3838 "GalleryConnector.c"
{
- gboolean _tmp15_ = FALSE;
+ gboolean _tmp10_ = FALSE;
#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp15_ = TRUE;
+ _tmp10_ = TRUE;
#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
while (TRUE) {
-#line 3607 "GalleryConnector.c"
- gchar** _tmp27_;
- gint _tmp27__length1;
- gchar** _tmp28_;
- gint _tmp28__length1;
- gchar** _tmp29_;
- gint _tmp29__length1;
- guint _tmp30_;
- const gchar* _tmp31_;
- gchar* _tmp32_;
- gchar* _tmp33_;
- gchar* _tmp34_;
+#line 3845 "GalleryConnector.c"
+ gchar** _tmp22_;
+ gint _tmp22__length1;
+ gchar** _tmp23_;
+ gint _tmp23__length1;
+ gchar** _tmp24_;
+ gint _tmp24__length1;
+ guint _tmp25_;
+ const gchar* _tmp26_;
+ gchar* _tmp27_;
+ gchar* _tmp28_;
+ gchar* _tmp29_;
+ gint _tmp30_;
+ gchar** _tmp31_;
+ gint _tmp31__length1;
+ gchar** _tmp32_;
+ gint _tmp32__length1;
+ guint _tmp33_;
+ const gchar* _tmp34_;
gint _tmp35_;
- gchar** _tmp36_;
- gint _tmp36__length1;
- gchar** _tmp37_;
- gint _tmp37__length1;
- guint _tmp38_;
- const gchar* _tmp39_;
- gint _tmp40_;
- gint _tmp41_;
- guint _tmp42_;
+ gint _tmp36_;
+ guint _tmp37_;
#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (!_tmp15_) {
-#line 3631 "GalleryConnector.c"
- gboolean _tmp16_ = FALSE;
- guint _tmp17_;
- gchar** _tmp18_;
- gint _tmp18__length1;
- gchar** _tmp19_;
- gint _tmp19__length1;
+ if (!_tmp10_) {
+#line 3869 "GalleryConnector.c"
+ gboolean _tmp11_ = FALSE;
+ guint _tmp12_;
+ gchar** _tmp13_;
+ gint _tmp13__length1;
+ gchar** _tmp14_;
+ gint _tmp14__length1;
#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp17_ = self->priv->_urls_sent;
+ _tmp12_ = self->priv->_urls_sent;
#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp18_ = publishing_gallery3_get_albums_transaction_get_album_urls (self, &_tmp18__length1);
+ _tmp13_ = publishing_gallery3_get_albums_transaction_get_album_urls (self, &_tmp13__length1);
#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp19_ = _tmp18_;
+ _tmp14_ = _tmp13_;
#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp19__length1 = _tmp18__length1;
+ _tmp14__length1 = _tmp13__length1;
#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (_tmp17_ <= ((guint) (_tmp19__length1 - 1))) {
-#line 3648 "GalleryConnector.c"
+ if (_tmp12_ <= ((guint) (_tmp14__length1 - 1))) {
+#line 3886 "GalleryConnector.c"
+ gint _tmp15_;
+ gchar** _tmp16_;
+ gint _tmp16__length1;
+ gchar** _tmp17_;
+ gint _tmp17__length1;
+ guint _tmp18_;
+ const gchar* _tmp19_;
gint _tmp20_;
- gchar** _tmp21_;
- gint _tmp21__length1;
- gchar** _tmp22_;
- gint _tmp22__length1;
- guint _tmp23_;
- const gchar* _tmp24_;
- gint _tmp25_;
- gint _tmp26_;
+ gint _tmp21_;
#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp20_ = url_length;
+ _tmp15_ = url_length;
#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp21_ = publishing_gallery3_get_albums_transaction_get_album_urls (self, &_tmp21__length1);
+ _tmp16_ = publishing_gallery3_get_albums_transaction_get_album_urls (self, &_tmp16__length1);
#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp22_ = _tmp21_;
+ _tmp17_ = _tmp16_;
#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp22__length1 = _tmp21__length1;
+ _tmp17__length1 = _tmp16__length1;
#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp23_ = self->priv->_urls_sent;
+ _tmp18_ = self->priv->_urls_sent;
#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp24_ = _tmp22_[_tmp23_];
+ _tmp19_ = _tmp17_[_tmp18_];
#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp25_ = strlen (_tmp24_);
+ _tmp20_ = strlen (_tmp19_);
#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp26_ = _tmp25_;
+ _tmp21_ = _tmp20_;
#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp16_ = ((_tmp20_ + _tmp26_) + 3) <= 255;
-#line 3676 "GalleryConnector.c"
+ _tmp11_ = ((_tmp15_ + _tmp21_) + 3) <= 255;
+#line 3914 "GalleryConnector.c"
} else {
#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp16_ = FALSE;
-#line 3680 "GalleryConnector.c"
+ _tmp11_ = FALSE;
+#line 3918 "GalleryConnector.c"
}
#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (!_tmp16_) {
+ if (!_tmp11_) {
#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
break;
-#line 3686 "GalleryConnector.c"
+#line 3924 "GalleryConnector.c"
}
}
#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp15_ = FALSE;
+ _tmp10_ = FALSE;
#line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp27_ = my_album_urls;
+ _tmp22_ = my_album_urls;
#line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp27__length1 = my_album_urls_length1;
+ _tmp22__length1 = my_album_urls_length1;
#line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp28_ = publishing_gallery3_get_albums_transaction_get_album_urls (self, &_tmp28__length1);
+ _tmp23_ = publishing_gallery3_get_albums_transaction_get_album_urls (self, &_tmp23__length1);
#line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp29_ = _tmp28_;
+ _tmp24_ = _tmp23_;
#line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp29__length1 = _tmp28__length1;
+ _tmp24__length1 = _tmp23__length1;
#line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp30_ = self->priv->_urls_sent;
+ _tmp25_ = self->priv->_urls_sent;
#line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp31_ = _tmp29_[_tmp30_];
+ _tmp26_ = _tmp24_[_tmp25_];
#line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp32_ = g_strconcat ("\"", _tmp31_, NULL);
+ _tmp27_ = g_strconcat ("\"", _tmp26_, NULL);
#line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp33_ = _tmp32_;
+ _tmp28_ = _tmp27_;
#line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp34_ = g_strconcat (_tmp33_, "\"", NULL);
+ _tmp29_ = g_strconcat (_tmp28_, "\"", NULL);
#line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _vala_array_add3 (&my_album_urls, &my_album_urls_length1, &_my_album_urls_size_, _tmp34_);
+ _vala_array_add3 (&my_album_urls, &my_album_urls_length1, &_my_album_urls_size_, _tmp29_);
#line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _g_free0 (_tmp33_);
+ _g_free0 (_tmp28_);
#line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp35_ = url_length;
+ _tmp30_ = url_length;
#line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp36_ = publishing_gallery3_get_albums_transaction_get_album_urls (self, &_tmp36__length1);
+ _tmp31_ = publishing_gallery3_get_albums_transaction_get_album_urls (self, &_tmp31__length1);
#line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp37_ = _tmp36_;
+ _tmp32_ = _tmp31_;
#line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp37__length1 = _tmp36__length1;
+ _tmp32__length1 = _tmp31__length1;
#line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp38_ = self->priv->_urls_sent;
+ _tmp33_ = self->priv->_urls_sent;
#line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp39_ = _tmp37_[_tmp38_];
+ _tmp34_ = _tmp32_[_tmp33_];
#line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp40_ = strlen (_tmp39_);
+ _tmp35_ = strlen (_tmp34_);
#line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp41_ = _tmp40_;
+ _tmp36_ = _tmp35_;
#line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- url_length = _tmp35_ + (_tmp41_ + 3);
+ url_length = _tmp30_ + (_tmp36_ + 3);
#line 343 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp42_ = self->priv->_urls_sent;
+ _tmp37_ = self->priv->_urls_sent;
#line 343 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- publishing_gallery3_get_albums_transaction_set_urls_sent (self, _tmp42_ + 1);
-#line 3737 "GalleryConnector.c"
+ publishing_gallery3_get_albums_transaction_set_urls_sent (self, _tmp37_ + 1);
+#line 3975 "GalleryConnector.c"
}
}
#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp43_ = url_list;
+ _tmp38_ = url_list;
#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp44_ = my_album_urls;
+ _tmp39_ = my_album_urls;
#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp44__length1 = my_album_urls_length1;
+ _tmp39__length1 = my_album_urls_length1;
#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp45_ = _vala_g_strjoinv (",", _tmp44_, _tmp44__length1);
+ _tmp40_ = _vala_g_strjoinv (",", _tmp39_, _tmp39__length1);
#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp46_ = _tmp45_;
+ _tmp41_ = _tmp40_;
#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp47_ = g_strconcat (_tmp43_, _tmp46_, NULL);
+ _tmp42_ = g_strconcat (_tmp38_, _tmp41_, NULL);
#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_free0 (url_list);
#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- url_list = _tmp47_;
+ url_list = _tmp42_;
#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _g_free0 (_tmp46_);
+ _g_free0 (_tmp41_);
#line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp48_ = self->priv->_urls_sent;
+ _tmp43_ = self->priv->_urls_sent;
#line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp49_ = publishing_gallery3_get_albums_transaction_get_album_urls (self, &_tmp49__length1);
+ _tmp44_ = publishing_gallery3_get_albums_transaction_get_album_urls (self, &_tmp44__length1);
#line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp50_ = _tmp49_;
+ _tmp45_ = _tmp44_;
#line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp50__length1 = _tmp49__length1;
+ _tmp45__length1 = _tmp44__length1;
#line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- publishing_gallery3_get_albums_transaction_set_more_urls (self, _tmp48_ <= ((guint) (_tmp50__length1 - 1)));
-#line 3768 "GalleryConnector.c"
+ publishing_gallery3_get_albums_transaction_set_more_urls (self, _tmp43_ <= ((guint) (_tmp45__length1 - 1)));
+#line 4006 "GalleryConnector.c"
}
#line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp51_ = url_list;
+ _tmp46_ = url_list;
#line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp52_ = g_strconcat (_tmp51_, "]", NULL);
+ _tmp47_ = g_strconcat (_tmp46_, "]", NULL);
#line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_free0 (url_list);
#line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- url_list = _tmp52_;
+ url_list = _tmp47_;
#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp53_ = url_list;
+ _tmp48_ = url_list;
#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "urls", _tmp53_);
+ publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "urls", _tmp48_);
#line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_free0 (endpoint_url);
#line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -3817,54 +4055,72 @@ PublishingGallery3GetAlbumsTransaction* publishing_gallery3_get_albums_transacti
_g_free0 (url_list);
#line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return self;
-#line 3790 "GalleryConnector.c"
+#line 4028 "GalleryConnector.c"
}
-PublishingGallery3GetAlbumsTransaction* publishing_gallery3_get_albums_transaction_new (PublishingGallery3Session* session, gchar** _album_urls, int _album_urls_length1, guint start) {
+PublishingGallery3GetAlbumsTransaction*
+publishing_gallery3_get_albums_transaction_new (PublishingGallery3Session* session,
+ gchar** _album_urls,
+ int _album_urls_length1,
+ guint start)
+{
#line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return publishing_gallery3_get_albums_transaction_construct (PUBLISHING_GALLERY3_TYPE_GET_ALBUMS_TRANSACTION, session, _album_urls, _album_urls_length1, start);
-#line 3797 "GalleryConnector.c"
+#line 4040 "GalleryConnector.c"
}
-static gpointer _publishing_gallery3_album_ref0 (gpointer self) {
+static gpointer
+_publishing_gallery3_album_ref0 (gpointer self)
+{
#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return self ? publishing_gallery3_album_ref (self) : NULL;
-#line 3804 "GalleryConnector.c"
+#line 4049 "GalleryConnector.c"
}
-static void _vala_array_add4 (PublishingGallery3Album** * array, int* length, int* size, PublishingGallery3Album* value) {
+static void
+_vala_array_add4 (PublishingGallery3Album** * array,
+ int* length,
+ int* size,
+ PublishingGallery3Album* value)
+{
#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
if ((*length) == (*size)) {
#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
*array = g_renew (PublishingGallery3Album*, *array, (*size) + 1);
-#line 3815 "GalleryConnector.c"
+#line 4065 "GalleryConnector.c"
}
#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
(*array)[(*length)++] = value;
#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
(*array)[*length] = NULL;
-#line 3821 "GalleryConnector.c"
+#line 4071 "GalleryConnector.c"
}
-static const gchar* string_to_string (const gchar* self) {
+static const gchar*
+string_to_string (const gchar* self)
+{
const gchar* result = NULL;
-#line 1442 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1456 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1443 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1457 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
result = self;
-#line 1443 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1457 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 3833 "GalleryConnector.c"
+#line 4085 "GalleryConnector.c"
}
-PublishingGallery3Album** publishing_gallery3_get_albums_transaction_get_albums (PublishingGallery3GetAlbumsTransaction* self, int* result_length1, GError** error) {
+PublishingGallery3Album**
+publishing_gallery3_get_albums_transaction_get_albums (PublishingGallery3GetAlbumsTransaction* self,
+ int* result_length1,
+ GError** error)
+{
PublishingGallery3Album** result = NULL;
PublishingGallery3Album** albums = NULL;
gint albums_length1;
@@ -3874,8 +4130,8 @@ PublishingGallery3Album** publishing_gallery3_get_albums_transaction_get_albums
JsonNode* _tmp0_;
JsonArray* members = NULL;
JsonArray* _tmp1_;
- PublishingGallery3Album** _tmp23_;
- gint _tmp23__length1;
+ PublishingGallery3Album** _tmp22_;
+ gint _tmp22__length1;
GError * _inner_error_ = NULL;
#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_val_if_fail (PUBLISHING_GALLERY3_IS_GET_ALBUMS_TRANSACTION (self), NULL);
@@ -3901,7 +4157,7 @@ PublishingGallery3Album** publishing_gallery3_get_albums_transaction_get_albums
albums = (_vala_array_free (albums, albums_length1, (GDestroyNotify) publishing_gallery3_album_unref), NULL);
#line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return NULL;
-#line 3874 "GalleryConnector.c"
+#line 4130 "GalleryConnector.c"
} else {
#line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_publishing_gallery3_album_unref0 (tmp_album);
@@ -3913,45 +4169,44 @@ PublishingGallery3Album** publishing_gallery3_get_albums_transaction_get_albums
g_clear_error (&_inner_error_);
#line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return NULL;
-#line 3886 "GalleryConnector.c"
+#line 4142 "GalleryConnector.c"
}
}
#line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp1_ = json_node_get_array (root_node);
#line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
members = _tmp1_;
-#line 3893 "GalleryConnector.c"
+#line 4149 "GalleryConnector.c"
{
guint i = 0U;
#line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
i = (guint) 0;
-#line 3898 "GalleryConnector.c"
+#line 4154 "GalleryConnector.c"
{
gboolean _tmp2_ = FALSE;
#line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp2_ = TRUE;
#line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
while (TRUE) {
-#line 3905 "GalleryConnector.c"
+#line 4161 "GalleryConnector.c"
guint _tmp4_;
JsonArray* _tmp5_;
- guint _tmp6_;
- JsonArray* _tmp7_;
- guint _tmp8_;
- JsonObject* _tmp9_;
+ JsonArray* _tmp6_;
+ guint _tmp7_;
+ JsonObject* _tmp8_;
+ PublishingGallery3Album* _tmp9_;
PublishingGallery3Album* _tmp10_;
- PublishingGallery3Album* _tmp11_;
+ gboolean _tmp11_;
gboolean _tmp12_;
- gboolean _tmp13_;
#line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
if (!_tmp2_) {
-#line 3918 "GalleryConnector.c"
+#line 4173 "GalleryConnector.c"
guint _tmp3_;
#line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp3_ = i;
#line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
i = _tmp3_ + 1;
-#line 3924 "GalleryConnector.c"
+#line 4179 "GalleryConnector.c"
}
#line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp2_ = FALSE;
@@ -3960,98 +4215,99 @@ PublishingGallery3Album** publishing_gallery3_get_albums_transaction_get_albums
#line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp5_ = members;
#line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp6_ = json_array_get_length (_tmp5_);
-#line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (!(_tmp4_ <= (_tmp6_ - 1))) {
+ if (!(_tmp4_ <= (json_array_get_length (_tmp5_) - 1))) {
#line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
break;
-#line 3938 "GalleryConnector.c"
+#line 4191 "GalleryConnector.c"
}
#line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp7_ = members;
+ _tmp6_ = members;
#line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp8_ = i;
+ _tmp7_ = i;
#line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp9_ = json_array_get_object_element (_tmp7_, _tmp8_);
+ _tmp8_ = json_array_get_object_element (_tmp6_, _tmp7_);
#line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp10_ = publishing_gallery3_album_new (_tmp9_);
+ _tmp9_ = publishing_gallery3_album_new (_tmp8_);
#line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_publishing_gallery3_album_unref0 (tmp_album);
#line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- tmp_album = _tmp10_;
+ tmp_album = _tmp9_;
#line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp11_ = tmp_album;
+ _tmp10_ = tmp_album;
#line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp12_ = publishing_gallery3_album_get_editable (_tmp11_);
+ _tmp11_ = publishing_gallery3_album_get_editable (_tmp10_);
#line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp13_ = _tmp12_;
+ _tmp12_ = _tmp11_;
#line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (_tmp13_) {
-#line 3960 "GalleryConnector.c"
- PublishingGallery3Album** _tmp14_;
- gint _tmp14__length1;
+ if (_tmp12_) {
+#line 4213 "GalleryConnector.c"
+ PublishingGallery3Album** _tmp13_;
+ gint _tmp13__length1;
+ PublishingGallery3Album* _tmp14_;
PublishingGallery3Album* _tmp15_;
- PublishingGallery3Album* _tmp16_;
#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp14_ = albums;
+ _tmp13_ = albums;
#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp14__length1 = albums_length1;
+ _tmp13__length1 = albums_length1;
#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp15_ = tmp_album;
+ _tmp14_ = tmp_album;
#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp16_ = _publishing_gallery3_album_ref0 (_tmp15_);
+ _tmp15_ = _publishing_gallery3_album_ref0 (_tmp14_);
#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _vala_array_add4 (&albums, &albums_length1, &_albums_size_, _tmp16_);
-#line 3975 "GalleryConnector.c"
+ _vala_array_add4 (&albums, &albums_length1, &_albums_size_, _tmp15_);
+#line 4228 "GalleryConnector.c"
} else {
- PublishingGallery3Album* _tmp17_;
+ PublishingGallery3Album* _tmp16_;
+ const gchar* _tmp17_;
const gchar* _tmp18_;
const gchar* _tmp19_;
- const gchar* _tmp20_;
+ gchar* _tmp20_;
gchar* _tmp21_;
- gchar* _tmp22_;
#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp17_ = tmp_album;
+ _tmp16_ = tmp_album;
#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp18_ = publishing_gallery3_album_get_title (_tmp17_);
+ _tmp17_ = publishing_gallery3_album_get_title (_tmp16_);
#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp19_ = _tmp18_;
+ _tmp18_ = _tmp17_;
#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp20_ = string_to_string (_tmp19_);
+ _tmp19_ = string_to_string (_tmp18_);
#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp21_ = g_strconcat ("Album \"", _tmp20_, "\" is not editable", NULL);
+ _tmp20_ = g_strconcat ("Album \"", _tmp19_, "\" is not editable", NULL);
#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp22_ = _tmp21_;
+ _tmp21_ = _tmp20_;
#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_warning ("GalleryConnector.vala:373: %s", _tmp22_);
+ g_warning ("GalleryConnector.vala:373: %s", _tmp21_);
#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _g_free0 (_tmp22_);
-#line 3999 "GalleryConnector.c"
+ _g_free0 (_tmp21_);
+#line 4252 "GalleryConnector.c"
}
}
}
}
#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp23_ = albums;
+ _tmp22_ = albums;
#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp23__length1 = albums_length1;
+ _tmp22__length1 = albums_length1;
#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
if (result_length1) {
#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- *result_length1 = _tmp23__length1;
-#line 4012 "GalleryConnector.c"
+ *result_length1 = _tmp22__length1;
+#line 4265 "GalleryConnector.c"
}
#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- result = _tmp23_;
+ result = _tmp22_;
#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_publishing_gallery3_album_unref0 (tmp_album);
#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return result;
-#line 4020 "GalleryConnector.c"
+#line 4273 "GalleryConnector.c"
}
-gchar** publishing_gallery3_get_albums_transaction_get_album_urls (PublishingGallery3GetAlbumsTransaction* self, int* result_length1) {
+gchar**
+publishing_gallery3_get_albums_transaction_get_album_urls (PublishingGallery3GetAlbumsTransaction* self,
+ int* result_length1)
+{
gchar** result;
gchar** _tmp0_;
gint _tmp0__length1;
@@ -4071,65 +4327,68 @@ gchar** publishing_gallery3_get_albums_transaction_get_album_urls (PublishingGal
if (result_length1) {
#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
*result_length1 = _tmp1__length1;
-#line 4044 "GalleryConnector.c"
+#line 4300 "GalleryConnector.c"
}
#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
result = _tmp1_;
#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return result;
-#line 4050 "GalleryConnector.c"
+#line 4306 "GalleryConnector.c"
}
-static gchar** _vala_array_dup2 (gchar** self, int length) {
+static gchar**
+_vala_array_dup2 (gchar** self,
+ int length)
+{
gchar** result;
int i;
#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
result = g_new0 (gchar*, length + 1);
#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
for (i = 0; i < length; i++) {
-#line 4061 "GalleryConnector.c"
+#line 4320 "GalleryConnector.c"
gchar* _tmp0_;
#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp0_ = g_strdup (self[i]);
#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
result[i] = _tmp0_;
-#line 4067 "GalleryConnector.c"
+#line 4326 "GalleryConnector.c"
}
#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return result;
-#line 4071 "GalleryConnector.c"
+#line 4330 "GalleryConnector.c"
}
-static void publishing_gallery3_get_albums_transaction_set_album_urls (PublishingGallery3GetAlbumsTransaction* self, gchar** value, int value_length1) {
+static void
+publishing_gallery3_get_albums_transaction_set_album_urls (PublishingGallery3GetAlbumsTransaction* self,
+ gchar** value,
+ int value_length1)
+{
gchar** _tmp0_;
gint _tmp0__length1;
- gchar** _tmp1_;
- gint _tmp1__length1;
#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (PUBLISHING_GALLERY3_IS_GET_ALBUMS_TRANSACTION (self));
#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp0_ = value;
+ _tmp0_ = (value != NULL) ? _vala_array_dup2 (value, value_length1) : ((gpointer) value);
#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp0__length1 = value_length1;
#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup2 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
-#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp1__length1 = _tmp0__length1;
-#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
self->priv->_album_urls = (_vala_array_free (self->priv->_album_urls, self->priv->_album_urls_length1, (GDestroyNotify) g_free), NULL);
#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self->priv->_album_urls = _tmp1_;
+ self->priv->_album_urls = _tmp0_;
#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self->priv->_album_urls_length1 = _tmp1__length1;
+ self->priv->_album_urls_length1 = _tmp0__length1;
#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
self->priv->__album_urls_size_ = self->priv->_album_urls_length1;
-#line 4098 "GalleryConnector.c"
+#line 4355 "GalleryConnector.c"
}
-guint publishing_gallery3_get_albums_transaction_get_urls_sent (PublishingGallery3GetAlbumsTransaction* self) {
+guint
+publishing_gallery3_get_albums_transaction_get_urls_sent (PublishingGallery3GetAlbumsTransaction* self)
+{
guint result;
guint _tmp0_;
#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -4140,23 +4399,25 @@ guint publishing_gallery3_get_albums_transaction_get_urls_sent (PublishingGaller
result = _tmp0_;
#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return result;
-#line 4113 "GalleryConnector.c"
+#line 4372 "GalleryConnector.c"
}
-static void publishing_gallery3_get_albums_transaction_set_urls_sent (PublishingGallery3GetAlbumsTransaction* self, guint value) {
- guint _tmp0_;
+static void
+publishing_gallery3_get_albums_transaction_set_urls_sent (PublishingGallery3GetAlbumsTransaction* self,
+ guint value)
+{
#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (PUBLISHING_GALLERY3_IS_GET_ALBUMS_TRANSACTION (self));
#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp0_ = value;
-#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self->priv->_urls_sent = _tmp0_;
-#line 4125 "GalleryConnector.c"
+ self->priv->_urls_sent = value;
+#line 4384 "GalleryConnector.c"
}
-gboolean publishing_gallery3_get_albums_transaction_get_more_urls (PublishingGallery3GetAlbumsTransaction* self) {
+gboolean
+publishing_gallery3_get_albums_transaction_get_more_urls (PublishingGallery3GetAlbumsTransaction* self)
+{
gboolean result;
gboolean _tmp0_;
#line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -4167,34 +4428,38 @@ gboolean publishing_gallery3_get_albums_transaction_get_more_urls (PublishingGal
result = _tmp0_;
#line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return result;
-#line 4140 "GalleryConnector.c"
+#line 4401 "GalleryConnector.c"
}
-static void publishing_gallery3_get_albums_transaction_set_more_urls (PublishingGallery3GetAlbumsTransaction* self, gboolean value) {
- gboolean _tmp0_;
+static void
+publishing_gallery3_get_albums_transaction_set_more_urls (PublishingGallery3GetAlbumsTransaction* self,
+ gboolean value)
+{
#line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (PUBLISHING_GALLERY3_IS_GET_ALBUMS_TRANSACTION (self));
#line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp0_ = value;
-#line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self->priv->_more_urls = _tmp0_;
-#line 4152 "GalleryConnector.c"
+ self->priv->_more_urls = value;
+#line 4413 "GalleryConnector.c"
}
-static void publishing_gallery3_get_albums_transaction_class_init (PublishingGallery3GetAlbumsTransactionClass * klass) {
+static void
+publishing_gallery3_get_albums_transaction_class_init (PublishingGallery3GetAlbumsTransactionClass * klass)
+{
#line 302 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_get_albums_transaction_parent_class = g_type_class_peek_parent (klass);
#line 302 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
((PublishingRESTSupportTransactionClass *) klass)->finalize = publishing_gallery3_get_albums_transaction_finalize;
#line 302 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_type_class_add_private (klass, sizeof (PublishingGallery3GetAlbumsTransactionPrivate));
-#line 4163 "GalleryConnector.c"
+#line 4426 "GalleryConnector.c"
}
-static void publishing_gallery3_get_albums_transaction_instance_init (PublishingGallery3GetAlbumsTransaction * self) {
+static void
+publishing_gallery3_get_albums_transaction_instance_init (PublishingGallery3GetAlbumsTransaction * self)
+{
#line 302 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
self->priv = PUBLISHING_GALLERY3_GET_ALBUMS_TRANSACTION_GET_PRIVATE (self);
#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -4207,11 +4472,13 @@ static void publishing_gallery3_get_albums_transaction_instance_init (Publishing
self->priv->_urls_sent = (guint) 0;
#line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
self->priv->_more_urls = FALSE;
-#line 4180 "GalleryConnector.c"
+#line 4445 "GalleryConnector.c"
}
-static void publishing_gallery3_get_albums_transaction_finalize (PublishingRESTSupportTransaction * obj) {
+static void
+publishing_gallery3_get_albums_transaction_finalize (PublishingRESTSupportTransaction * obj)
+{
PublishingGallery3GetAlbumsTransaction * self;
#line 302 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_GALLERY3_TYPE_GET_ALBUMS_TRANSACTION, PublishingGallery3GetAlbumsTransaction);
@@ -4219,11 +4486,13 @@ static void publishing_gallery3_get_albums_transaction_finalize (PublishingRESTS
self->priv->_album_urls = (_vala_array_free (self->priv->_album_urls, self->priv->_album_urls_length1, (GDestroyNotify) g_free), NULL);
#line 302 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_gallery3_get_albums_transaction_parent_class)->finalize (obj);
-#line 4192 "GalleryConnector.c"
+#line 4459 "GalleryConnector.c"
}
-GType publishing_gallery3_get_albums_transaction_get_type (void) {
+GType
+publishing_gallery3_get_albums_transaction_get_type (void)
+{
static volatile gsize publishing_gallery3_get_albums_transaction_type_id__volatile = 0;
if (g_once_init_enter (&publishing_gallery3_get_albums_transaction_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingGallery3GetAlbumsTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_gallery3_get_albums_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingGallery3GetAlbumsTransaction), 0, (GInstanceInitFunc) publishing_gallery3_get_albums_transaction_instance_init, NULL };
@@ -4235,95 +4504,83 @@ GType publishing_gallery3_get_albums_transaction_get_type (void) {
}
-static void _vala_JsonNode_free (JsonNode* self) {
+static void
+_vala_JsonNode_free (JsonNode* self)
+{
#line 388 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_boxed_free (json_node_get_type (), self);
-#line 4211 "GalleryConnector.c"
+#line 4482 "GalleryConnector.c"
}
-PublishingGallery3GalleryGetTagTransaction* publishing_gallery3_gallery_get_tag_transaction_construct (GType object_type, PublishingGallery3Session* session, const gchar* tag_name) {
+PublishingGallery3GalleryGetTagTransaction*
+publishing_gallery3_gallery_get_tag_transaction_construct (GType object_type,
+ PublishingGallery3Session* session,
+ const gchar* tag_name)
+{
PublishingGallery3GalleryGetTagTransaction* self = NULL;
- PublishingGallery3Session* _tmp0_;
- gboolean _tmp1_;
#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_val_if_fail (PUBLISHING_GALLERY3_IS_SESSION (session), NULL);
#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_val_if_fail (tag_name != NULL, NULL);
#line 388 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp0_ = session;
-#line 388 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp1_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 388 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (!_tmp1_) {
+ if (!publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession))) {
#line 389 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_error ("GalleryConnector.vala:389: Not authenticated");
-#line 4231 "GalleryConnector.c"
+#line 4500 "GalleryConnector.c"
} else {
JsonGenerator* entity = NULL;
- JsonGenerator* _tmp2_;
+ JsonGenerator* _tmp0_;
JsonNode* root_node = NULL;
- JsonNode* _tmp3_;
+ JsonNode* _tmp1_;
JsonObject* obj = NULL;
- JsonObject* _tmp4_;
- PublishingGallery3Session* _tmp5_;
- PublishingGallery3Session* _tmp6_;
- const gchar* _tmp7_;
- const gchar* _tmp8_;
- PublishingGallery3Session* _tmp9_;
- const gchar* _tmp10_;
- const gchar* _tmp11_;
- const gchar* _tmp12_;
+ JsonObject* _tmp2_;
+ const gchar* _tmp3_;
+ const gchar* _tmp4_;
+ const gchar* _tmp5_;
+ const gchar* _tmp6_;
gsize entity_length = 0UL;
gchar* entity_value = NULL;
- gsize _tmp13_ = 0UL;
- gchar* _tmp14_;
+ gsize _tmp7_ = 0UL;
+ gchar* _tmp8_;
#line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp2_ = json_generator_new ();
+ _tmp0_ = json_generator_new ();
#line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- entity = _tmp2_;
+ entity = _tmp0_;
#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp3_ = json_node_new (JSON_NODE_OBJECT);
+ _tmp1_ = json_node_new (JSON_NODE_OBJECT);
#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- root_node = _tmp3_;
+ root_node = _tmp1_;
#line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp4_ = json_object_new ();
+ _tmp2_ = json_object_new ();
#line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- obj = _tmp4_;
-#line 396 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp5_ = session;
+ obj = _tmp2_;
#line 396 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp6_ = session;
-#line 396 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp7_ = publishing_gallery3_session_get_url (_tmp6_);
+ _tmp3_ = publishing_gallery3_session_get_url (session);
#line 396 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp8_ = _tmp7_;
+ _tmp4_ = _tmp3_;
#line 396 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self = (PublishingGallery3GalleryGetTagTransaction*) publishing_gallery3_base_gallery_transaction_construct (object_type, _tmp5_, _tmp8_, "/tags", PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
-#line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp9_ = session;
+ self = (PublishingGallery3GalleryGetTagTransaction*) publishing_gallery3_base_gallery_transaction_construct (object_type, session, _tmp4_, "/tags", PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
#line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp10_ = publishing_gallery3_session_get_key (_tmp9_);
+ _tmp5_ = publishing_gallery3_session_get_key (session);
#line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp11_ = _tmp10_;
+ _tmp6_ = _tmp5_;
#line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "X-Gallery-Request-Key", _tmp11_);
+ publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "X-Gallery-Request-Key", _tmp6_);
#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "X-Gallery-Request-Method", "POST");
#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp12_ = tag_name;
-#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- json_object_set_string_member (obj, "name", _tmp12_);
+ json_object_set_string_member (obj, "name", tag_name);
#line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
json_node_set_object (root_node, obj);
#line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
json_generator_set_root (entity, root_node);
#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp14_ = json_generator_to_data (entity, &_tmp13_);
+ _tmp8_ = json_generator_to_data (entity, &_tmp7_);
#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- entity_length = _tmp13_;
+ entity_length = _tmp7_;
#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- entity_value = _tmp14_;
+ entity_value = _tmp8_;
#line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_debug ("GalleryConnector.vala:409: created entity: %s", entity_value);
#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -4336,22 +4593,27 @@ PublishingGallery3GalleryGetTagTransaction* publishing_gallery3_gallery_get_tag_
__vala_JsonNode_free0 (root_node);
#line 388 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_object_unref0 (entity);
-#line 4309 "GalleryConnector.c"
+#line 4566 "GalleryConnector.c"
}
#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return self;
-#line 4313 "GalleryConnector.c"
+#line 4570 "GalleryConnector.c"
}
-PublishingGallery3GalleryGetTagTransaction* publishing_gallery3_gallery_get_tag_transaction_new (PublishingGallery3Session* session, const gchar* tag_name) {
+PublishingGallery3GalleryGetTagTransaction*
+publishing_gallery3_gallery_get_tag_transaction_new (PublishingGallery3Session* session,
+ const gchar* tag_name)
+{
#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return publishing_gallery3_gallery_get_tag_transaction_construct (PUBLISHING_GALLERY3_TYPE_GALLERY_GET_TAG_TRANSACTION, session, tag_name);
-#line 4320 "GalleryConnector.c"
+#line 4580 "GalleryConnector.c"
}
-gchar* publishing_gallery3_gallery_get_tag_transaction_tag_url (PublishingGallery3GalleryGetTagTransaction* self) {
+gchar*
+publishing_gallery3_gallery_get_tag_transaction_tag_url (PublishingGallery3GalleryGetTagTransaction* self)
+{
gchar* result = NULL;
JsonNode* root_node = NULL;
gchar* url = NULL;
@@ -4361,7 +4623,7 @@ gchar* publishing_gallery3_gallery_get_tag_transaction_tag_url (PublishingGaller
GError * _inner_error_ = NULL;
#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_val_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_GET_TAG_TRANSACTION (self), NULL);
-#line 4334 "GalleryConnector.c"
+#line 4596 "GalleryConnector.c"
{
JsonNode* _tmp0_ = NULL;
JsonNode* _tmp1_;
@@ -4373,7 +4635,7 @@ gchar* publishing_gallery3_gallery_get_tag_transaction_tag_url (PublishingGaller
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4346 "GalleryConnector.c"
+#line 4608 "GalleryConnector.c"
goto __catch2_spit_publishing_publishing_error;
}
#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -4384,11 +4646,11 @@ gchar* publishing_gallery3_gallery_get_tag_transaction_tag_url (PublishingGaller
g_clear_error (&_inner_error_);
#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return NULL;
-#line 4357 "GalleryConnector.c"
+#line 4619 "GalleryConnector.c"
}
#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
root_node = _tmp0_;
-#line 4361 "GalleryConnector.c"
+#line 4623 "GalleryConnector.c"
}
goto __finally2;
__catch2_spit_publishing_publishing_error:
@@ -4402,7 +4664,7 @@ gchar* publishing_gallery3_gallery_get_tag_transaction_tag_url (PublishingGaller
g_error ("GalleryConnector.vala:425: Could not get root node");
#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_error_free0 (e);
-#line 4375 "GalleryConnector.c"
+#line 4637 "GalleryConnector.c"
}
__finally2:
#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -4415,7 +4677,7 @@ gchar* publishing_gallery3_gallery_get_tag_transaction_tag_url (PublishingGaller
g_clear_error (&_inner_error_);
#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return NULL;
-#line 4388 "GalleryConnector.c"
+#line 4650 "GalleryConnector.c"
}
#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp2_ = json_node_get_object (root_node);
@@ -4431,22 +4693,28 @@ gchar* publishing_gallery3_gallery_get_tag_transaction_tag_url (PublishingGaller
result = url;
#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return result;
-#line 4404 "GalleryConnector.c"
+#line 4666 "GalleryConnector.c"
}
-static void publishing_gallery3_gallery_get_tag_transaction_class_init (PublishingGallery3GalleryGetTagTransactionClass * klass) {
+static void
+publishing_gallery3_gallery_get_tag_transaction_class_init (PublishingGallery3GalleryGetTagTransactionClass * klass)
+{
#line 384 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_gallery_get_tag_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 4411 "GalleryConnector.c"
+#line 4675 "GalleryConnector.c"
}
-static void publishing_gallery3_gallery_get_tag_transaction_instance_init (PublishingGallery3GalleryGetTagTransaction * self) {
+static void
+publishing_gallery3_gallery_get_tag_transaction_instance_init (PublishingGallery3GalleryGetTagTransaction * self)
+{
}
-GType publishing_gallery3_gallery_get_tag_transaction_get_type (void) {
+GType
+publishing_gallery3_gallery_get_tag_transaction_get_type (void)
+{
static volatile gsize publishing_gallery3_gallery_get_tag_transaction_type_id__volatile = 0;
if (g_once_init_enter (&publishing_gallery3_gallery_get_tag_transaction_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingGallery3GalleryGetTagTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_gallery3_gallery_get_tag_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingGallery3GalleryGetTagTransaction), 0, (GInstanceInitFunc) publishing_gallery3_gallery_get_tag_transaction_instance_init, NULL };
@@ -4458,34 +4726,37 @@ GType publishing_gallery3_gallery_get_tag_transaction_get_type (void) {
}
-PublishingGallery3GalleryGetItemTagsURLsTransaction* publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_construct (GType object_type, PublishingGallery3Session* session, const gchar* item_url) {
+PublishingGallery3GalleryGetItemTagsURLsTransaction*
+publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_construct (GType object_type,
+ PublishingGallery3Session* session,
+ const gchar* item_url)
+{
PublishingGallery3GalleryGetItemTagsURLsTransaction* self = NULL;
- PublishingGallery3Session* _tmp0_;
- const gchar* _tmp1_;
#line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_val_if_fail (PUBLISHING_GALLERY3_IS_SESSION (session), NULL);
#line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_val_if_fail (item_url != NULL, NULL);
#line 446 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp0_ = session;
-#line 446 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp1_ = item_url;
-#line 446 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self = (PublishingGallery3GalleryGetItemTagsURLsTransaction*) publishing_gallery3_gallery_request_transaction_construct (object_type, _tmp0_, _tmp1_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET);
+ self = (PublishingGallery3GalleryGetItemTagsURLsTransaction*) publishing_gallery3_gallery_request_transaction_construct (object_type, session, item_url, PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET);
#line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return self;
-#line 4447 "GalleryConnector.c"
+#line 4713 "GalleryConnector.c"
}
-PublishingGallery3GalleryGetItemTagsURLsTransaction* publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_new (PublishingGallery3Session* session, const gchar* item_url) {
+PublishingGallery3GalleryGetItemTagsURLsTransaction*
+publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_new (PublishingGallery3Session* session,
+ const gchar* item_url)
+{
#line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_construct (PUBLISHING_GALLERY3_TYPE_GALLERY_GET_ITEM_TAGS_UR_LS_TRANSACTION, session, item_url);
-#line 4454 "GalleryConnector.c"
+#line 4723 "GalleryConnector.c"
}
-gchar* publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_get_item_tags_path (PublishingGallery3GalleryGetItemTagsURLsTransaction* self) {
+gchar*
+publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_get_item_tags_path (PublishingGallery3GalleryGetItemTagsURLsTransaction* self)
+{
gchar* result = NULL;
JsonNode* root_node = NULL;
JsonObject* relationships = NULL;
@@ -4500,7 +4771,7 @@ gchar* publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_get_item_tags
_tmp0_ = self->priv->item_tags_path;
#line 455 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
if (g_strcmp0 ("", _tmp0_) == 0) {
-#line 4473 "GalleryConnector.c"
+#line 4744 "GalleryConnector.c"
JsonNode* _tmp3_;
JsonObject* _tmp4_;
JsonObject* _tmp5_;
@@ -4522,7 +4793,7 @@ gchar* publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_get_item_tags
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4495 "GalleryConnector.c"
+#line 4766 "GalleryConnector.c"
goto __catch3_spit_publishing_publishing_error;
}
#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -4531,11 +4802,11 @@ gchar* publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_get_item_tags
g_clear_error (&_inner_error_);
#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return NULL;
-#line 4504 "GalleryConnector.c"
+#line 4775 "GalleryConnector.c"
}
#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
root_node = _tmp1_;
-#line 4508 "GalleryConnector.c"
+#line 4779 "GalleryConnector.c"
}
goto __finally3;
__catch3_spit_publishing_publishing_error:
@@ -4549,7 +4820,7 @@ gchar* publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_get_item_tags
g_error ("GalleryConnector.vala:461: Could not get root node");
#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_error_free0 (e);
-#line 4522 "GalleryConnector.c"
+#line 4793 "GalleryConnector.c"
}
__finally3:
#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -4560,7 +4831,7 @@ gchar* publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_get_item_tags
g_clear_error (&_inner_error_);
#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return NULL;
-#line 4533 "GalleryConnector.c"
+#line 4804 "GalleryConnector.c"
}
#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp3_ = root_node;
@@ -4594,7 +4865,7 @@ gchar* publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_get_item_tags
_g_free0 (self->priv->item_tags_path);
#line 471 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
self->priv->item_tags_path = _tmp12_;
-#line 4567 "GalleryConnector.c"
+#line 4838 "GalleryConnector.c"
}
#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp13_ = self->priv->item_tags_path;
@@ -4604,22 +4875,26 @@ gchar* publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_get_item_tags
result = _tmp14_;
#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return result;
-#line 4577 "GalleryConnector.c"
+#line 4848 "GalleryConnector.c"
}
-static void publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_class_init (PublishingGallery3GalleryGetItemTagsURLsTransactionClass * klass) {
+static void
+publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_class_init (PublishingGallery3GalleryGetItemTagsURLsTransactionClass * klass)
+{
#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_parent_class = g_type_class_peek_parent (klass);
#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
((PublishingRESTSupportTransactionClass *) klass)->finalize = publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_finalize;
#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_type_class_add_private (klass, sizeof (PublishingGallery3GalleryGetItemTagsURLsTransactionPrivate));
-#line 4588 "GalleryConnector.c"
+#line 4861 "GalleryConnector.c"
}
-static void publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_instance_init (PublishingGallery3GalleryGetItemTagsURLsTransaction * self) {
+static void
+publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_instance_init (PublishingGallery3GalleryGetItemTagsURLsTransaction * self)
+{
gchar* _tmp0_;
#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
self->priv = PUBLISHING_GALLERY3_GALLERY_GET_ITEM_TAGS_UR_LS_TRANSACTION_GET_PRIVATE (self);
@@ -4627,11 +4902,13 @@ static void publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_instance
_tmp0_ = g_strdup ("");
#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
self->priv->item_tags_path = _tmp0_;
-#line 4600 "GalleryConnector.c"
+#line 4875 "GalleryConnector.c"
}
-static void publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_finalize (PublishingRESTSupportTransaction * obj) {
+static void
+publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_finalize (PublishingRESTSupportTransaction * obj)
+{
PublishingGallery3GalleryGetItemTagsURLsTransaction * self;
#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_GALLERY3_TYPE_GALLERY_GET_ITEM_TAGS_UR_LS_TRANSACTION, PublishingGallery3GalleryGetItemTagsURLsTransaction);
@@ -4639,11 +4916,13 @@ static void publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_finalize
_g_free0 (self->priv->item_tags_path);
#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_parent_class)->finalize (obj);
-#line 4612 "GalleryConnector.c"
+#line 4889 "GalleryConnector.c"
}
-GType publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_get_type (void) {
+GType
+publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_get_type (void)
+{
static volatile gsize publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_type_id__volatile = 0;
if (g_once_init_enter (&publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingGallery3GalleryGetItemTagsURLsTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingGallery3GalleryGetItemTagsURLsTransaction), 0, (GInstanceInitFunc) publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_instance_init, NULL };
@@ -4655,10 +4934,14 @@ GType publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_get_type (void
}
-PublishingGallery3GallerySetTagRelationshipTransaction* publishing_gallery3_gallery_set_tag_relationship_transaction_construct (GType object_type, PublishingGallery3Session* session, const gchar* item_tags_path, const gchar* tag_url, const gchar* item_url) {
+PublishingGallery3GallerySetTagRelationshipTransaction*
+publishing_gallery3_gallery_set_tag_relationship_transaction_construct (GType object_type,
+ PublishingGallery3Session* session,
+ const gchar* item_tags_path,
+ const gchar* tag_url,
+ const gchar* item_url)
+{
PublishingGallery3GallerySetTagRelationshipTransaction* self = NULL;
- PublishingGallery3Session* _tmp0_;
- gboolean _tmp1_;
#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_val_if_fail (PUBLISHING_GALLERY3_IS_SESSION (session), NULL);
#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -4668,87 +4951,65 @@ PublishingGallery3GallerySetTagRelationshipTransaction* publishing_gallery3_gall
#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_val_if_fail (item_url != NULL, NULL);
#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp0_ = session;
-#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp1_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (!_tmp1_) {
+ if (!publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession))) {
#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_error ("GalleryConnector.vala:489: Not authenticated");
-#line 4648 "GalleryConnector.c"
+#line 4927 "GalleryConnector.c"
} else {
JsonGenerator* entity = NULL;
- JsonGenerator* _tmp2_;
+ JsonGenerator* _tmp0_;
JsonNode* root_node = NULL;
- JsonNode* _tmp3_;
+ JsonNode* _tmp1_;
JsonObject* obj = NULL;
- JsonObject* _tmp4_;
- PublishingGallery3Session* _tmp5_;
- PublishingGallery3Session* _tmp6_;
- const gchar* _tmp7_;
- const gchar* _tmp8_;
- const gchar* _tmp9_;
- PublishingGallery3Session* _tmp10_;
- const gchar* _tmp11_;
- const gchar* _tmp12_;
- const gchar* _tmp13_;
- const gchar* _tmp14_;
+ JsonObject* _tmp2_;
+ const gchar* _tmp3_;
+ const gchar* _tmp4_;
+ const gchar* _tmp5_;
+ const gchar* _tmp6_;
gsize entity_length = 0UL;
gchar* entity_value = NULL;
- gsize _tmp15_ = 0UL;
- gchar* _tmp16_;
+ gsize _tmp7_ = 0UL;
+ gchar* _tmp8_;
#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp2_ = json_generator_new ();
+ _tmp0_ = json_generator_new ();
#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- entity = _tmp2_;
+ entity = _tmp0_;
#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp3_ = json_node_new (JSON_NODE_OBJECT);
+ _tmp1_ = json_node_new (JSON_NODE_OBJECT);
#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- root_node = _tmp3_;
+ root_node = _tmp1_;
#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp4_ = json_object_new ();
+ _tmp2_ = json_object_new ();
#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- obj = _tmp4_;
+ obj = _tmp2_;
#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp5_ = session;
+ _tmp3_ = publishing_gallery3_session_get_url (session);
#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp6_ = session;
+ _tmp4_ = _tmp3_;
#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp7_ = publishing_gallery3_session_get_url (_tmp6_);
-#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp8_ = _tmp7_;
-#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp9_ = item_tags_path;
-#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self = (PublishingGallery3GallerySetTagRelationshipTransaction*) publishing_gallery3_base_gallery_transaction_construct (object_type, _tmp5_, _tmp8_, _tmp9_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
+ self = (PublishingGallery3GallerySetTagRelationshipTransaction*) publishing_gallery3_base_gallery_transaction_construct (object_type, session, _tmp4_, item_tags_path, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
#line 499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp10_ = session;
+ _tmp5_ = publishing_gallery3_session_get_key (session);
#line 499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp11_ = publishing_gallery3_session_get_key (_tmp10_);
-#line 499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp12_ = _tmp11_;
+ _tmp6_ = _tmp5_;
#line 499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "X-Gallery-Request-Key", _tmp12_);
+ publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "X-Gallery-Request-Key", _tmp6_);
#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "X-Gallery-Request-Method", "POST");
#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp13_ = tag_url;
-#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- json_object_set_string_member (obj, "tag", _tmp13_);
-#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp14_ = item_url;
+ json_object_set_string_member (obj, "tag", tag_url);
#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- json_object_set_string_member (obj, "item", _tmp14_);
+ json_object_set_string_member (obj, "item", item_url);
#line 504 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
json_node_set_object (root_node, obj);
#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
json_generator_set_root (entity, root_node);
#line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp16_ = json_generator_to_data (entity, &_tmp15_);
+ _tmp8_ = json_generator_to_data (entity, &_tmp7_);
#line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- entity_length = _tmp15_;
+ entity_length = _tmp7_;
#line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- entity_value = _tmp16_;
+ entity_value = _tmp8_;
#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_debug ("GalleryConnector.vala:510: created entity: %s", entity_value);
#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -4761,33 +5022,44 @@ PublishingGallery3GallerySetTagRelationshipTransaction* publishing_gallery3_gall
__vala_JsonNode_free0 (root_node);
#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_object_unref0 (entity);
-#line 4734 "GalleryConnector.c"
+#line 4995 "GalleryConnector.c"
}
#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return self;
-#line 4738 "GalleryConnector.c"
+#line 4999 "GalleryConnector.c"
}
-PublishingGallery3GallerySetTagRelationshipTransaction* publishing_gallery3_gallery_set_tag_relationship_transaction_new (PublishingGallery3Session* session, const gchar* item_tags_path, const gchar* tag_url, const gchar* item_url) {
+PublishingGallery3GallerySetTagRelationshipTransaction*
+publishing_gallery3_gallery_set_tag_relationship_transaction_new (PublishingGallery3Session* session,
+ const gchar* item_tags_path,
+ const gchar* tag_url,
+ const gchar* item_url)
+{
#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return publishing_gallery3_gallery_set_tag_relationship_transaction_construct (PUBLISHING_GALLERY3_TYPE_GALLERY_SET_TAG_RELATIONSHIP_TRANSACTION, session, item_tags_path, tag_url, item_url);
-#line 4745 "GalleryConnector.c"
+#line 5011 "GalleryConnector.c"
}
-static void publishing_gallery3_gallery_set_tag_relationship_transaction_class_init (PublishingGallery3GallerySetTagRelationshipTransactionClass * klass) {
+static void
+publishing_gallery3_gallery_set_tag_relationship_transaction_class_init (PublishingGallery3GallerySetTagRelationshipTransactionClass * klass)
+{
#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_gallery_set_tag_relationship_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 4752 "GalleryConnector.c"
+#line 5020 "GalleryConnector.c"
}
-static void publishing_gallery3_gallery_set_tag_relationship_transaction_instance_init (PublishingGallery3GallerySetTagRelationshipTransaction * self) {
+static void
+publishing_gallery3_gallery_set_tag_relationship_transaction_instance_init (PublishingGallery3GallerySetTagRelationshipTransaction * self)
+{
}
-GType publishing_gallery3_gallery_set_tag_relationship_transaction_get_type (void) {
+GType
+publishing_gallery3_gallery_set_tag_relationship_transaction_get_type (void)
+{
static volatile gsize publishing_gallery3_gallery_set_tag_relationship_transaction_type_id__volatile = 0;
if (g_once_init_enter (&publishing_gallery3_gallery_set_tag_relationship_transaction_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingGallery3GallerySetTagRelationshipTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_gallery3_gallery_set_tag_relationship_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingGallery3GallerySetTagRelationshipTransaction), 0, (GInstanceInitFunc) publishing_gallery3_gallery_set_tag_relationship_transaction_instance_init, NULL };
@@ -4799,124 +5071,101 @@ GType publishing_gallery3_gallery_set_tag_relationship_transaction_get_type (voi
}
-PublishingGallery3GalleryAlbumCreateTransaction* publishing_gallery3_gallery_album_create_transaction_construct (GType object_type, PublishingGallery3Session* session, PublishingGallery3PublishingParameters* parameters) {
+PublishingGallery3GalleryAlbumCreateTransaction*
+publishing_gallery3_gallery_album_create_transaction_construct (GType object_type,
+ PublishingGallery3Session* session,
+ PublishingGallery3PublishingParameters* parameters)
+{
PublishingGallery3GalleryAlbumCreateTransaction* self = NULL;
- PublishingGallery3Session* _tmp0_;
- gboolean _tmp1_;
#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_val_if_fail (PUBLISHING_GALLERY3_IS_SESSION (session), NULL);
#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_val_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_PARAMETERS (parameters), NULL);
#line 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp0_ = session;
-#line 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp1_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (!_tmp1_) {
+ if (!publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession))) {
#line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_error ("GalleryConnector.vala:533: Not authenticated");
-#line 4788 "GalleryConnector.c"
+#line 5058 "GalleryConnector.c"
} else {
JsonGenerator* entity = NULL;
- JsonGenerator* _tmp2_;
+ JsonGenerator* _tmp0_;
JsonNode* root_node = NULL;
- JsonNode* _tmp3_;
+ JsonNode* _tmp1_;
JsonObject* obj = NULL;
- JsonObject* _tmp4_;
- PublishingGallery3Session* _tmp5_;
- PublishingGallery3Session* _tmp6_;
+ JsonObject* _tmp2_;
+ const gchar* _tmp3_;
+ const gchar* _tmp4_;
+ const gchar* _tmp5_;
+ const gchar* _tmp6_;
const gchar* _tmp7_;
const gchar* _tmp8_;
- PublishingGallery3Session* _tmp9_;
+ gchar* _tmp9_;
const gchar* _tmp10_;
const gchar* _tmp11_;
- PublishingGallery3Session* _tmp12_;
+ const gchar* _tmp12_;
const gchar* _tmp13_;
- const gchar* _tmp14_;
- gchar* _tmp15_;
- PublishingGallery3PublishingParameters* _tmp16_;
- PublishingGallery3PublishingParameters* _tmp17_;
- const gchar* _tmp18_;
- const gchar* _tmp19_;
- PublishingGallery3PublishingParameters* _tmp20_;
- const gchar* _tmp21_;
- const gchar* _tmp22_;
gchar* entity_value = NULL;
- gchar* _tmp23_;
+ gchar* _tmp14_;
#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp2_ = json_generator_new ();
+ _tmp0_ = json_generator_new ();
#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- entity = _tmp2_;
+ entity = _tmp0_;
#line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp3_ = json_node_new (JSON_NODE_OBJECT);
+ _tmp1_ = json_node_new (JSON_NODE_OBJECT);
#line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- root_node = _tmp3_;
+ root_node = _tmp1_;
#line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp4_ = json_object_new ();
+ _tmp2_ = json_object_new ();
#line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- obj = _tmp4_;
+ obj = _tmp2_;
#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp5_ = session;
+ _tmp3_ = publishing_gallery3_session_get_url (session);
#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp6_ = session;
+ _tmp4_ = _tmp3_;
#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp7_ = publishing_gallery3_session_get_url (_tmp6_);
-#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp8_ = _tmp7_;
-#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self = (PublishingGallery3GalleryAlbumCreateTransaction*) publishing_gallery3_base_gallery_transaction_construct (object_type, _tmp5_, _tmp8_, "/item/1", PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
+ self = (PublishingGallery3GalleryAlbumCreateTransaction*) publishing_gallery3_base_gallery_transaction_construct (object_type, session, _tmp4_, "/item/1", PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
#line 542 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp9_ = session;
+ _tmp5_ = publishing_gallery3_session_get_key (session);
#line 542 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp10_ = publishing_gallery3_session_get_key (_tmp9_);
-#line 542 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp11_ = _tmp10_;
+ _tmp6_ = _tmp5_;
#line 542 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "X-Gallery-Request-Key", _tmp11_);
+ publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "X-Gallery-Request-Key", _tmp6_);
#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "X-Gallery-Request-Method", "POST");
#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp12_ = session;
+ _tmp7_ = publishing_gallery3_session_get_url (session);
#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp13_ = publishing_gallery3_session_get_url (_tmp12_);
-#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp14_ = _tmp13_;
+ _tmp8_ = _tmp7_;
#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp15_ = g_strdup (_tmp14_);
+ _tmp9_ = g_strdup (_tmp8_);
#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_free0 (self->priv->session_url);
#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self->priv->session_url = _tmp15_;
-#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp16_ = parameters;
+ self->priv->session_url = _tmp9_;
#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- publishing_gallery3_gallery_album_create_transaction_set_parameters (self, _tmp16_);
+ publishing_gallery3_gallery_album_create_transaction_set_parameters (self, parameters);
#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp17_ = parameters;
+ _tmp10_ = publishing_gallery3_publishing_parameters_get_album_name (parameters);
#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp18_ = publishing_gallery3_publishing_parameters_get_album_name (_tmp17_);
-#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp19_ = _tmp18_;
+ _tmp11_ = _tmp10_;
#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- json_object_set_string_member (obj, "name", _tmp19_);
+ json_object_set_string_member (obj, "name", _tmp11_);
#line 549 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
json_object_set_string_member (obj, "type", "album");
#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp20_ = parameters;
+ _tmp12_ = publishing_gallery3_publishing_parameters_get_album_title (parameters);
#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp21_ = publishing_gallery3_publishing_parameters_get_album_title (_tmp20_);
-#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp22_ = _tmp21_;
+ _tmp13_ = _tmp12_;
#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- json_object_set_string_member (obj, "title", _tmp22_);
+ json_object_set_string_member (obj, "title", _tmp13_);
#line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
json_node_set_object (root_node, obj);
#line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
json_generator_set_root (entity, root_node);
#line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp23_ = json_generator_to_data (entity, NULL);
+ _tmp14_ = json_generator_to_data (entity, NULL);
#line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- entity_value = _tmp23_;
+ entity_value = _tmp14_;
#line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_debug ("GalleryConnector.vala:556: created entity: %s", entity_value);
#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -4929,22 +5178,27 @@ PublishingGallery3GalleryAlbumCreateTransaction* publishing_gallery3_gallery_alb
__vala_JsonNode_free0 (root_node);
#line 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_object_unref0 (entity);
-#line 4902 "GalleryConnector.c"
+#line 5151 "GalleryConnector.c"
}
#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return self;
-#line 4906 "GalleryConnector.c"
+#line 5155 "GalleryConnector.c"
}
-PublishingGallery3GalleryAlbumCreateTransaction* publishing_gallery3_gallery_album_create_transaction_new (PublishingGallery3Session* session, PublishingGallery3PublishingParameters* parameters) {
+PublishingGallery3GalleryAlbumCreateTransaction*
+publishing_gallery3_gallery_album_create_transaction_new (PublishingGallery3Session* session,
+ PublishingGallery3PublishingParameters* parameters)
+{
#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return publishing_gallery3_gallery_album_create_transaction_construct (PUBLISHING_GALLERY3_TYPE_GALLERY_ALBUM_CREATE_TRANSACTION, session, parameters);
-#line 4913 "GalleryConnector.c"
+#line 5165 "GalleryConnector.c"
}
-gchar* publishing_gallery3_gallery_album_create_transaction_get_new_album_path (PublishingGallery3GalleryAlbumCreateTransaction* self) {
+gchar*
+publishing_gallery3_gallery_album_create_transaction_get_new_album_path (PublishingGallery3GalleryAlbumCreateTransaction* self)
+{
gchar* result = NULL;
JsonNode* root_node = NULL;
gchar* new_path = NULL;
@@ -4956,7 +5210,7 @@ gchar* publishing_gallery3_gallery_album_create_transaction_get_new_album_path (
GError * _inner_error_ = NULL;
#line 563 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_val_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_ALBUM_CREATE_TRANSACTION (self), NULL);
-#line 4929 "GalleryConnector.c"
+#line 5183 "GalleryConnector.c"
{
JsonNode* _tmp0_ = NULL;
JsonNode* _tmp1_;
@@ -4968,7 +5222,7 @@ gchar* publishing_gallery3_gallery_album_create_transaction_get_new_album_path (
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4941 "GalleryConnector.c"
+#line 5195 "GalleryConnector.c"
goto __catch4_spit_publishing_publishing_error;
}
#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -4979,11 +5233,11 @@ gchar* publishing_gallery3_gallery_album_create_transaction_get_new_album_path (
g_clear_error (&_inner_error_);
#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return NULL;
-#line 4952 "GalleryConnector.c"
+#line 5206 "GalleryConnector.c"
}
#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
root_node = _tmp0_;
-#line 4956 "GalleryConnector.c"
+#line 5210 "GalleryConnector.c"
}
goto __finally4;
__catch4_spit_publishing_publishing_error:
@@ -4997,7 +5251,7 @@ gchar* publishing_gallery3_gallery_album_create_transaction_get_new_album_path (
g_error ("GalleryConnector.vala:572: Could not get root node");
#line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_error_free0 (e);
-#line 4970 "GalleryConnector.c"
+#line 5224 "GalleryConnector.c"
}
__finally4:
#line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -5010,7 +5264,7 @@ gchar* publishing_gallery3_gallery_album_create_transaction_get_new_album_path (
g_clear_error (&_inner_error_);
#line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return NULL;
-#line 4983 "GalleryConnector.c"
+#line 5237 "GalleryConnector.c"
}
#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp2_ = json_node_get_object (root_node);
@@ -5034,11 +5288,13 @@ gchar* publishing_gallery3_gallery_album_create_transaction_get_new_album_path (
result = new_path;
#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return result;
-#line 5007 "GalleryConnector.c"
+#line 5261 "GalleryConnector.c"
}
-PublishingGallery3PublishingParameters* publishing_gallery3_gallery_album_create_transaction_get_parameters (PublishingGallery3GalleryAlbumCreateTransaction* self) {
+PublishingGallery3PublishingParameters*
+publishing_gallery3_gallery_album_create_transaction_get_parameters (PublishingGallery3GalleryAlbumCreateTransaction* self)
+{
PublishingGallery3PublishingParameters* result;
PublishingGallery3PublishingParameters* _tmp0_;
#line 522 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -5049,53 +5305,61 @@ PublishingGallery3PublishingParameters* publishing_gallery3_gallery_album_create
result = _tmp0_;
#line 522 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return result;
-#line 5022 "GalleryConnector.c"
+#line 5278 "GalleryConnector.c"
}
-static gpointer _publishing_gallery3_publishing_parameters_ref0 (gpointer self) {
+static gpointer
+_publishing_gallery3_publishing_parameters_ref0 (gpointer self)
+{
#line 522 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return self ? publishing_gallery3_publishing_parameters_ref (self) : NULL;
-#line 5029 "GalleryConnector.c"
+#line 5287 "GalleryConnector.c"
}
-static void publishing_gallery3_gallery_album_create_transaction_set_parameters (PublishingGallery3GalleryAlbumCreateTransaction* self, PublishingGallery3PublishingParameters* value) {
+static void
+publishing_gallery3_gallery_album_create_transaction_set_parameters (PublishingGallery3GalleryAlbumCreateTransaction* self,
+ PublishingGallery3PublishingParameters* value)
+{
PublishingGallery3PublishingParameters* _tmp0_;
- PublishingGallery3PublishingParameters* _tmp1_;
#line 522 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_ALBUM_CREATE_TRANSACTION (self));
#line 522 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp0_ = value;
-#line 522 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp1_ = _publishing_gallery3_publishing_parameters_ref0 (_tmp0_);
+ _tmp0_ = _publishing_gallery3_publishing_parameters_ref0 (value);
#line 522 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_publishing_gallery3_publishing_parameters_unref0 (self->priv->_parameters);
#line 522 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self->priv->_parameters = _tmp1_;
-#line 5046 "GalleryConnector.c"
+ self->priv->_parameters = _tmp0_;
+#line 5304 "GalleryConnector.c"
}
-static void publishing_gallery3_gallery_album_create_transaction_class_init (PublishingGallery3GalleryAlbumCreateTransactionClass * klass) {
+static void
+publishing_gallery3_gallery_album_create_transaction_class_init (PublishingGallery3GalleryAlbumCreateTransactionClass * klass)
+{
#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_gallery_album_create_transaction_parent_class = g_type_class_peek_parent (klass);
#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
((PublishingRESTSupportTransactionClass *) klass)->finalize = publishing_gallery3_gallery_album_create_transaction_finalize;
#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_type_class_add_private (klass, sizeof (PublishingGallery3GalleryAlbumCreateTransactionPrivate));
-#line 5057 "GalleryConnector.c"
+#line 5317 "GalleryConnector.c"
}
-static void publishing_gallery3_gallery_album_create_transaction_instance_init (PublishingGallery3GalleryAlbumCreateTransaction * self) {
+static void
+publishing_gallery3_gallery_album_create_transaction_instance_init (PublishingGallery3GalleryAlbumCreateTransaction * self)
+{
#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
self->priv = PUBLISHING_GALLERY3_GALLERY_ALBUM_CREATE_TRANSACTION_GET_PRIVATE (self);
-#line 5064 "GalleryConnector.c"
+#line 5326 "GalleryConnector.c"
}
-static void publishing_gallery3_gallery_album_create_transaction_finalize (PublishingRESTSupportTransaction * obj) {
+static void
+publishing_gallery3_gallery_album_create_transaction_finalize (PublishingRESTSupportTransaction * obj)
+{
PublishingGallery3GalleryAlbumCreateTransaction * self;
#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_GALLERY3_TYPE_GALLERY_ALBUM_CREATE_TRANSACTION, PublishingGallery3GalleryAlbumCreateTransaction);
@@ -5105,11 +5369,13 @@ static void publishing_gallery3_gallery_album_create_transaction_finalize (Publi
_g_free0 (self->priv->session_url);
#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_gallery3_gallery_album_create_transaction_parent_class)->finalize (obj);
-#line 5078 "GalleryConnector.c"
+#line 5342 "GalleryConnector.c"
}
-GType publishing_gallery3_gallery_album_create_transaction_get_type (void) {
+GType
+publishing_gallery3_gallery_album_create_transaction_get_type (void)
+{
static volatile gsize publishing_gallery3_gallery_album_create_transaction_type_id__volatile = 0;
if (g_once_init_enter (&publishing_gallery3_gallery_album_create_transaction_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingGallery3GalleryAlbumCreateTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_gallery3_gallery_album_create_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingGallery3GalleryAlbumCreateTransaction), 0, (GInstanceInitFunc) publishing_gallery3_gallery_album_create_transaction_instance_init, NULL };
@@ -5121,86 +5387,81 @@ GType publishing_gallery3_gallery_album_create_transaction_get_type (void) {
}
-static gpointer _publishing_rest_support_session_ref0 (gpointer self) {
+static gpointer
+_publishing_rest_support_session_ref0 (gpointer self)
+{
#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return self ? publishing_rest_support_session_ref (self) : NULL;
-#line 5097 "GalleryConnector.c"
+#line 5365 "GalleryConnector.c"
}
-static void _g_free0_ (gpointer var) {
+static void
+_g_free0_ (gpointer var)
+{
#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
var = (g_free (var), NULL);
-#line 5104 "GalleryConnector.c"
+#line 5374 "GalleryConnector.c"
}
-PublishingGallery3GalleryUploadTransaction* publishing_gallery3_gallery_upload_transaction_construct (GType object_type, PublishingGallery3Session* session, PublishingGallery3PublishingParameters* parameters, SpitPublishingPublishable* publishable) {
+PublishingGallery3GalleryUploadTransaction*
+publishing_gallery3_gallery_upload_transaction_construct (GType object_type,
+ PublishingGallery3Session* session,
+ PublishingGallery3PublishingParameters* parameters,
+ SpitPublishingPublishable* publishable)
+{
PublishingGallery3GalleryUploadTransaction* self = NULL;
- PublishingGallery3PublishingParameters* _tmp0_;
+ const gchar* _tmp0_;
const gchar* _tmp1_;
- const gchar* _tmp2_;
- gchar _tmp3_;
- PublishingGallery3Session* _tmp7_;
- SpitPublishingPublishable* _tmp8_;
- PublishingGallery3Session* _tmp9_;
- const gchar* _tmp10_;
- const gchar* _tmp11_;
- gchar* _tmp12_;
- gchar* _tmp13_;
- PublishingGallery3PublishingParameters* _tmp14_;
+ const gchar* _tmp4_;
+ const gchar* _tmp5_;
+ gchar* _tmp6_;
+ gchar* _tmp7_;
+ const gchar* _tmp8_;
+ const gchar* _tmp9_;
+ gchar* _tmp10_;
+ gchar* _tmp11_;
+ PublishingGallery3PublishingParameters* _tmp12_;
+ PublishingGallery3Session* _tmp13_;
+ const gchar* _tmp14_;
const gchar* _tmp15_;
- const gchar* _tmp16_;
- gchar* _tmp17_;
- gchar* _tmp18_;
- PublishingGallery3PublishingParameters* _tmp19_;
- PublishingGallery3PublishingParameters* _tmp20_;
- PublishingGallery3Session* _tmp21_;
- PublishingGallery3Session* _tmp22_;
- PublishingGallery3Session* _tmp23_;
- const gchar* _tmp24_;
- const gchar* _tmp25_;
GHashTable* disposition_table = NULL;
- GHashFunc _tmp26_;
- GEqualFunc _tmp27_;
- GHashTable* _tmp28_;
+ GHashFunc _tmp16_;
+ GEqualFunc _tmp17_;
+ GHashTable* _tmp18_;
gchar* title = NULL;
- SpitPublishingPublishable* _tmp29_;
- gchar* _tmp30_;
+ gchar* _tmp19_;
gchar* filename = NULL;
- SpitPublishingPublishable* _tmp31_;
+ gchar* _tmp20_;
+ gboolean _tmp21_ = FALSE;
+ const gchar* _tmp22_;
+ GHashTable* _tmp26_;
+ gchar* _tmp27_;
+ const gchar* _tmp28_;
+ const gchar* _tmp29_;
+ gchar* _tmp30_;
+ GHashTable* _tmp31_;
gchar* _tmp32_;
- gboolean _tmp33_ = FALSE;
- const gchar* _tmp34_;
- GHashTable* _tmp38_;
- gchar* _tmp39_;
- const gchar* _tmp40_;
- const gchar* _tmp41_;
- gchar* _tmp42_;
- GHashTable* _tmp43_;
- gchar* _tmp44_;
- gchar* _tmp45_;
- GHashTable* _tmp46_;
- JsonGenerator* _tmp47_;
+ gchar* _tmp33_;
+ GHashTable* _tmp34_;
+ JsonGenerator* _tmp35_;
gchar* desc = NULL;
- SpitPublishingPublishable* _tmp48_;
- gchar* _tmp49_;
- const gchar* _tmp50_ = NULL;
- SpitPublishingPublishable* _tmp51_;
- SpitPublishingPublisherMediaType _tmp52_;
+ gchar* _tmp36_;
+ const gchar* _tmp37_ = NULL;
gchar* type = NULL;
- gchar* _tmp53_;
+ gchar* _tmp38_;
JsonNode* root_node = NULL;
- JsonNode* _tmp54_;
+ JsonNode* _tmp39_;
JsonObject* obj = NULL;
- JsonObject* _tmp55_;
- const gchar* _tmp56_;
- const gchar* _tmp57_;
- const gchar* _tmp58_;
- JsonGenerator* _tmp59_;
- JsonGenerator* _tmp60_;
- gchar* _tmp61_;
- gchar* _tmp62_;
+ JsonObject* _tmp40_;
+ const gchar* _tmp41_;
+ const gchar* _tmp42_;
+ const gchar* _tmp43_;
+ JsonGenerator* _tmp44_;
+ JsonGenerator* _tmp45_;
+ gchar* _tmp46_;
+ gchar* _tmp47_;
#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_val_if_fail (PUBLISHING_GALLERY3_IS_SESSION (session), NULL);
#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -5208,229 +5469,198 @@ PublishingGallery3GalleryUploadTransaction* publishing_gallery3_gallery_upload_t
#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL);
#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp0_ = parameters;
-#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp1_ = publishing_gallery3_publishing_parameters_get_album_path (_tmp0_);
-#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp2_ = _tmp1_;
+ _tmp0_ = publishing_gallery3_publishing_parameters_get_album_path (parameters);
#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp3_ = string_get (_tmp2_, (glong) 0);
+ _tmp1_ = _tmp0_;
#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (_tmp3_ != '/') {
-#line 5190 "GalleryConnector.c"
- PublishingGallery3PublishingParameters* _tmp4_;
- const gchar* _tmp5_;
- const gchar* _tmp6_;
+ if (string_get (_tmp1_, (glong) 0) != '/') {
+#line 5447 "GalleryConnector.c"
+ const gchar* _tmp2_;
+ const gchar* _tmp3_;
#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_warning ("GalleryConnector.vala:601: Bad upload item path, this is a bug!");
#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp4_ = parameters;
+ _tmp2_ = publishing_gallery3_publishing_parameters_get_album_path (parameters);
#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp5_ = publishing_gallery3_publishing_parameters_get_album_path (_tmp4_);
+ _tmp3_ = _tmp2_;
#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp6_ = _tmp5_;
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_error ("GalleryConnector.vala:602: %s", _tmp6_);
-#line 5204 "GalleryConnector.c"
+ g_error ("GalleryConnector.vala:602: %s", _tmp3_);
+#line 5458 "GalleryConnector.c"
}
#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp7_ = session;
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp8_ = publishable;
+ _tmp4_ = publishing_gallery3_session_get_url (session);
#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp9_ = session;
+ _tmp5_ = _tmp4_;
#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp10_ = publishing_gallery3_session_get_url (_tmp9_);
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp11_ = _tmp10_;
+ _tmp6_ = g_strconcat (_tmp5_, PUBLISHING_GALLERY3_REST_PATH, NULL);
#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp12_ = g_strconcat (_tmp11_, PUBLISHING_GALLERY3_REST_PATH, NULL);
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp13_ = _tmp12_;
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp14_ = parameters;
+ _tmp7_ = _tmp6_;
#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp15_ = publishing_gallery3_publishing_parameters_get_album_path (_tmp14_);
+ _tmp8_ = publishing_gallery3_publishing_parameters_get_album_path (parameters);
#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp16_ = _tmp15_;
+ _tmp9_ = _tmp8_;
#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp17_ = g_strconcat (_tmp13_, _tmp16_, NULL);
+ _tmp10_ = g_strconcat (_tmp7_, _tmp9_, NULL);
#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp18_ = _tmp17_;
+ _tmp11_ = _tmp10_;
#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self = (PublishingGallery3GalleryUploadTransaction*) publishing_rest_support_upload_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp8_, _tmp18_);
+ self = (PublishingGallery3GalleryUploadTransaction*) publishing_rest_support_upload_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), publishable, _tmp11_);
#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _g_free0 (_tmp18_);
+ _g_free0 (_tmp11_);
#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _g_free0 (_tmp13_);
-#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp19_ = parameters;
+ _g_free0 (_tmp7_);
#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp20_ = _publishing_gallery3_publishing_parameters_ref0 (_tmp19_);
+ _tmp12_ = _publishing_gallery3_publishing_parameters_ref0 (parameters);
#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_publishing_gallery3_publishing_parameters_unref0 (self->priv->parameters);
#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self->priv->parameters = _tmp20_;
-#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp21_ = session;
+ self->priv->parameters = _tmp12_;
#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp22_ = _publishing_rest_support_session_ref0 (_tmp21_);
+ _tmp13_ = _publishing_rest_support_session_ref0 (session);
#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_publishing_rest_support_session_unref0 (self->priv->session);
#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self->priv->session = _tmp22_;
-#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp23_ = session;
+ self->priv->session = _tmp13_;
#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp24_ = publishing_gallery3_session_get_key (_tmp23_);
+ _tmp14_ = publishing_gallery3_session_get_key (session);
#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp25_ = _tmp24_;
+ _tmp15_ = _tmp14_;
#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "X-Gallery-Request-Key", _tmp25_);
+ publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "X-Gallery-Request-Key", _tmp15_);
#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "X-Gallery-Request-Method", "POST");
#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp26_ = g_str_hash;
+ _tmp16_ = g_str_hash;
#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp27_ = g_str_equal;
+ _tmp17_ = g_str_equal;
#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp28_ = g_hash_table_new_full (_tmp26_, _tmp27_, _g_free0_, _g_free0_);
+ _tmp18_ = g_hash_table_new_full (_tmp16_, _tmp17_, _g_free0_, _g_free0_);
#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- disposition_table = _tmp28_;
-#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp29_ = publishable;
+ disposition_table = _tmp18_;
#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp30_ = spit_publishing_publishable_get_publishing_name (_tmp29_);
+ _tmp19_ = spit_publishing_publishable_get_publishing_name (publishable);
#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- title = _tmp30_;
+ title = _tmp19_;
#line 618 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp31_ = publishable;
+ _tmp20_ = spit_publishing_publishable_get_param_string (publishable, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME);
#line 618 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp32_ = spit_publishing_publishable_get_param_string (_tmp31_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME);
-#line 618 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- filename = _tmp32_;
+ filename = _tmp20_;
#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp34_ = title;
+ _tmp22_ = title;
#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (_tmp34_ == NULL) {
+ if (_tmp22_ == NULL) {
#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp33_ = TRUE;
-#line 5288 "GalleryConnector.c"
+ _tmp21_ = TRUE;
+#line 5524 "GalleryConnector.c"
} else {
- const gchar* _tmp35_;
+ const gchar* _tmp23_;
#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp35_ = title;
+ _tmp23_ = title;
#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp33_ = g_strcmp0 (_tmp35_, "") == 0;
-#line 5295 "GalleryConnector.c"
+ _tmp21_ = g_strcmp0 (_tmp23_, "") == 0;
+#line 5531 "GalleryConnector.c"
}
#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (_tmp33_) {
-#line 5299 "GalleryConnector.c"
- const gchar* _tmp36_;
- gchar* _tmp37_;
+ if (_tmp21_) {
+#line 5535 "GalleryConnector.c"
+ const gchar* _tmp24_;
+ gchar* _tmp25_;
#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp36_ = filename;
+ _tmp24_ = filename;
#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp37_ = g_strdup (_tmp36_);
+ _tmp25_ = g_strdup (_tmp24_);
#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_free0 (title);
#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- title = _tmp37_;
-#line 5310 "GalleryConnector.c"
+ title = _tmp25_;
+#line 5546 "GalleryConnector.c"
}
#line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp38_ = disposition_table;
+ _tmp26_ = disposition_table;
#line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp39_ = g_strdup ("filename");
+ _tmp27_ = g_strdup ("filename");
#line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp40_ = filename;
+ _tmp28_ = filename;
#line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp41_ = string_to_string (_tmp40_);
+ _tmp29_ = string_to_string (_tmp28_);
#line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp42_ = g_strdup (_tmp41_);
+ _tmp30_ = g_strdup (_tmp29_);
#line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_hash_table_insert (_tmp38_, _tmp39_, _tmp42_);
+ g_hash_table_insert (_tmp26_, _tmp27_, _tmp30_);
#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp43_ = disposition_table;
+ _tmp31_ = disposition_table;
#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp44_ = g_strdup ("name");
+ _tmp32_ = g_strdup ("name");
#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp45_ = g_strdup ("file");
+ _tmp33_ = g_strdup ("file");
#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_hash_table_insert (_tmp43_, _tmp44_, _tmp45_);
+ g_hash_table_insert (_tmp31_, _tmp32_, _tmp33_);
#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp46_ = disposition_table;
+ _tmp34_ = disposition_table;
#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- publishing_rest_support_upload_transaction_set_binary_disposition_table (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction), _tmp46_);
+ publishing_rest_support_upload_transaction_set_binary_disposition_table (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction), _tmp34_);
#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp47_ = json_generator_new ();
+ _tmp35_ = json_generator_new ();
#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_object_unref0 (self->priv->generator);
#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self->priv->generator = _tmp47_;
-#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp48_ = publishable;
+ self->priv->generator = _tmp35_;
#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp49_ = spit_publishing_publishable_get_param_string (_tmp48_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_COMMENT);
+ _tmp36_ = spit_publishing_publishable_get_param_string (publishable, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_COMMENT);
#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- desc = _tmp49_;
-#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp51_ = publishable;
-#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp52_ = spit_publishing_publishable_get_media_type (_tmp51_);
+ desc = _tmp36_;
#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (_tmp52_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
+ if (spit_publishing_publishable_get_media_type (publishable) == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp50_ = "movie";
-#line 5356 "GalleryConnector.c"
+ _tmp37_ = "movie";
+#line 5586 "GalleryConnector.c"
} else {
#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp50_ = "photo";
-#line 5360 "GalleryConnector.c"
+ _tmp37_ = "photo";
+#line 5590 "GalleryConnector.c"
}
#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp53_ = g_strdup (_tmp50_);
+ _tmp38_ = g_strdup (_tmp37_);
#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- type = _tmp53_;
+ type = _tmp38_;
#line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp54_ = json_node_new (JSON_NODE_OBJECT);
+ _tmp39_ = json_node_new (JSON_NODE_OBJECT);
#line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- root_node = _tmp54_;
+ root_node = _tmp39_;
#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp55_ = json_object_new ();
+ _tmp40_ = json_object_new ();
#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- obj = _tmp55_;
+ obj = _tmp40_;
#line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp56_ = filename;
+ _tmp41_ = filename;
#line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- json_object_set_string_member (obj, "name", _tmp56_);
+ json_object_set_string_member (obj, "name", _tmp41_);
#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
json_object_set_string_member (obj, "type", type);
#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp57_ = title;
+ _tmp42_ = title;
#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- json_object_set_string_member (obj, "title", _tmp57_);
+ json_object_set_string_member (obj, "title", _tmp42_);
#line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp58_ = desc;
+ _tmp43_ = desc;
#line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- json_object_set_string_member (obj, "description", _tmp58_);
+ json_object_set_string_member (obj, "description", _tmp43_);
#line 644 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
json_node_set_object (root_node, obj);
#line 645 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp59_ = self->priv->generator;
+ _tmp44_ = self->priv->generator;
#line 645 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- json_generator_set_root (_tmp59_, root_node);
+ json_generator_set_root (_tmp44_, root_node);
#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp60_ = self->priv->generator;
+ _tmp45_ = self->priv->generator;
#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp61_ = json_generator_to_data (_tmp60_, NULL);
+ _tmp46_ = json_generator_to_data (_tmp45_, NULL);
#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp62_ = _tmp61_;
+ _tmp47_ = _tmp46_;
#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "entity", _tmp62_);
+ publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "entity", _tmp47_);
#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _g_free0 (_tmp62_);
+ _g_free0 (_tmp47_);
#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_json_object_unref0 (obj);
#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -5447,18 +5677,24 @@ PublishingGallery3GalleryUploadTransaction* publishing_gallery3_gallery_upload_t
_g_hash_table_unref0 (disposition_table);
#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return self;
-#line 5420 "GalleryConnector.c"
+#line 5650 "GalleryConnector.c"
}
-PublishingGallery3GalleryUploadTransaction* publishing_gallery3_gallery_upload_transaction_new (PublishingGallery3Session* session, PublishingGallery3PublishingParameters* parameters, SpitPublishingPublishable* publishable) {
+PublishingGallery3GalleryUploadTransaction*
+publishing_gallery3_gallery_upload_transaction_new (PublishingGallery3Session* session,
+ PublishingGallery3PublishingParameters* parameters,
+ SpitPublishingPublishable* publishable)
+{
#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return publishing_gallery3_gallery_upload_transaction_construct (PUBLISHING_GALLERY3_TYPE_GALLERY_UPLOAD_TRANSACTION, session, parameters, publishable);
-#line 5427 "GalleryConnector.c"
+#line 5661 "GalleryConnector.c"
}
-static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_url (PublishingGallery3GalleryUploadTransaction* self) {
+static gchar*
+publishing_gallery3_gallery_upload_transaction_get_new_item_url (PublishingGallery3GalleryUploadTransaction* self)
+{
gchar* result = NULL;
gchar* json_object = NULL;
gchar* new_url = NULL;
@@ -5472,11 +5708,10 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_url (P
JsonParser* _tmp14_;
JsonNode* _tmp15_;
JsonNode* _tmp16_;
- gboolean _tmp17_;
- JsonNode* _tmp19_;
- JsonObject* _tmp20_;
- const gchar* _tmp21_;
- gchar* _tmp22_;
+ JsonNode* _tmp18_;
+ JsonObject* _tmp19_;
+ const gchar* _tmp20_;
+ gchar* _tmp21_;
GError * _inner_error_ = NULL;
#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_val_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_UPLOAD_TRANSACTION (self), NULL);
@@ -5496,7 +5731,7 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_url (P
if (NULL == _tmp3_) {
#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp2_ = TRUE;
-#line 5469 "GalleryConnector.c"
+#line 5704 "GalleryConnector.c"
} else {
const gchar* _tmp4_;
gint _tmp5_;
@@ -5509,11 +5744,11 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_url (P
_tmp6_ = _tmp5_;
#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp2_ = 0 == _tmp6_;
-#line 5482 "GalleryConnector.c"
+#line 5717 "GalleryConnector.c"
}
#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
if (_tmp2_) {
-#line 5486 "GalleryConnector.c"
+#line 5721 "GalleryConnector.c"
gchar* _tmp7_;
gchar* _tmp8_;
gchar* _tmp9_;
@@ -5537,13 +5772,13 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_url (P
_g_free0 (json_object);
#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return result;
-#line 5510 "GalleryConnector.c"
+#line 5745 "GalleryConnector.c"
}
#line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp10_ = json_object;
#line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_debug ("GalleryConnector.vala:664: json_object: %s", _tmp10_);
-#line 5516 "GalleryConnector.c"
+#line 5751 "GalleryConnector.c"
{
JsonParser* _tmp11_;
const gchar* _tmp12_;
@@ -5555,7 +5790,7 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_url (P
json_parser_load_from_data (_tmp11_, _tmp12_, (gssize) -1, &_inner_error_);
#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5528 "GalleryConnector.c"
+#line 5763 "GalleryConnector.c"
goto __catch5_g_error;
}
}
@@ -5578,7 +5813,7 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_url (P
g_error ("GalleryConnector.vala:674: %s", _tmp13_);
#line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_error_free0 (e);
-#line 5551 "GalleryConnector.c"
+#line 5786 "GalleryConnector.c"
}
__finally5:
#line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -5595,7 +5830,7 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_url (P
g_clear_error (&_inner_error_);
#line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return NULL;
-#line 5568 "GalleryConnector.c"
+#line 5803 "GalleryConnector.c"
}
#line 677 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp14_ = parser;
@@ -5606,18 +5841,16 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_url (P
#line 678 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp16_ = root_node;
#line 678 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp17_ = json_node_is_null (_tmp16_);
-#line 678 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (_tmp17_) {
-#line 5582 "GalleryConnector.c"
- gchar* _tmp18_;
+ if (json_node_is_null (_tmp16_)) {
+#line 5815 "GalleryConnector.c"
+ gchar* _tmp17_;
#line 679 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_warning ("GalleryConnector.vala:679: Root node is null, doesn't appear to be JSO" \
"N data");
#line 680 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp18_ = g_strdup ("");
+ _tmp17_ = g_strdup ("");
#line 680 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- result = _tmp18_;
+ result = _tmp17_;
#line 680 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_object_unref0 (parser);
#line 680 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -5626,20 +5859,20 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_url (P
_g_free0 (json_object);
#line 680 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return result;
-#line 5598 "GalleryConnector.c"
+#line 5831 "GalleryConnector.c"
}
#line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp19_ = root_node;
+ _tmp18_ = root_node;
#line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp20_ = json_node_get_object (_tmp19_);
+ _tmp19_ = json_node_get_object (_tmp18_);
#line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp21_ = json_object_get_string_member (_tmp20_, "url");
+ _tmp20_ = json_object_get_string_member (_tmp19_, "url");
#line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp22_ = g_strdup (_tmp21_);
+ _tmp21_ = g_strdup (_tmp20_);
#line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_free0 (new_url);
#line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- new_url = _tmp22_;
+ new_url = _tmp21_;
#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
result = new_url;
#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -5648,21 +5881,24 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_url (P
_g_free0 (json_object);
#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return result;
-#line 5620 "GalleryConnector.c"
+#line 5853 "GalleryConnector.c"
}
-static void publishing_gallery3_gallery_upload_transaction_do_set_tag_relationship (PublishingGallery3GalleryUploadTransaction* self, const gchar* tag_url, GError** error) {
+static void
+publishing_gallery3_gallery_upload_transaction_do_set_tag_relationship (PublishingGallery3GalleryUploadTransaction* self,
+ const gchar* tag_url,
+ GError** error)
+{
PublishingGallery3GallerySetTagRelationshipTransaction* tag_txn = NULL;
PublishingRESTSupportSession* _tmp0_;
PublishingGallery3Session* _tmp1_;
const gchar* _tmp2_;
const gchar* _tmp3_;
- const gchar* _tmp4_;
+ PublishingGallery3GallerySetTagRelationshipTransaction* _tmp4_;
PublishingGallery3GallerySetTagRelationshipTransaction* _tmp5_;
- PublishingGallery3GallerySetTagRelationshipTransaction* _tmp6_;
+ gchar* _tmp6_;
gchar* _tmp7_;
- gchar* _tmp8_;
GError * _inner_error_ = NULL;
#line 690 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_UPLOAD_TRANSACTION (self));
@@ -5675,17 +5911,15 @@ static void publishing_gallery3_gallery_upload_transaction_do_set_tag_relationsh
#line 692 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp2_ = self->priv->item_tags_path;
#line 692 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp3_ = tag_url;
+ _tmp3_ = self->priv->item_url;
#line 692 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp4_ = self->priv->item_url;
+ _tmp4_ = publishing_gallery3_gallery_set_tag_relationship_transaction_new (_tmp1_, _tmp2_, tag_url, _tmp3_);
#line 692 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp5_ = publishing_gallery3_gallery_set_tag_relationship_transaction_new (_tmp1_, _tmp2_, _tmp3_, _tmp4_);
-#line 692 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp6_ = _tmp5_;
+ _tmp5_ = _tmp4_;
#line 692 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_publishing_rest_support_session_unref0 (_tmp1_);
#line 692 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- tag_txn = _tmp6_;
+ tag_txn = _tmp5_;
#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (tag_txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -5698,7 +5932,7 @@ static void publishing_gallery3_gallery_upload_transaction_do_set_tag_relationsh
_publishing_rest_support_transaction_unref0 (tag_txn);
#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return;
-#line 5670 "GalleryConnector.c"
+#line 5904 "GalleryConnector.c"
} else {
#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_publishing_rest_support_transaction_unref0 (tag_txn);
@@ -5708,24 +5942,26 @@ static void publishing_gallery3_gallery_upload_transaction_do_set_tag_relationsh
g_clear_error (&_inner_error_);
#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return;
-#line 5680 "GalleryConnector.c"
+#line 5914 "GalleryConnector.c"
}
}
#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp7_ = publishing_rest_support_transaction_get_response (G_TYPE_CHECK_INSTANCE_CAST (tag_txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
+ _tmp6_ = publishing_rest_support_transaction_get_response (G_TYPE_CHECK_INSTANCE_CAST (tag_txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp8_ = _tmp7_;
+ _tmp7_ = _tmp6_;
#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_debug ("GalleryConnector.vala:699: Response from setting tag relationship: %s", _tmp8_);
+ g_debug ("GalleryConnector.vala:699: Response from setting tag relationship: %s", _tmp7_);
#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _g_free0 (_tmp8_);
+ _g_free0 (_tmp7_);
#line 690 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_publishing_rest_support_transaction_unref0 (tag_txn);
-#line 5693 "GalleryConnector.c"
+#line 5927 "GalleryConnector.c"
}
-static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_tags_path (PublishingGallery3GalleryUploadTransaction* self) {
+static gchar*
+publishing_gallery3_gallery_upload_transaction_get_new_item_tags_path (PublishingGallery3GalleryUploadTransaction* self)
+{
gchar* result = NULL;
PublishingGallery3GalleryGetItemTagsURLsTransaction* tag_urls_txn = NULL;
PublishingRESTSupportSession* _tmp0_;
@@ -5752,7 +5988,7 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_tags_p
_publishing_rest_support_session_unref0 (_tmp1_);
#line 704 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
tag_urls_txn = _tmp4_;
-#line 5724 "GalleryConnector.c"
+#line 5960 "GalleryConnector.c"
{
PublishingGallery3GalleryGetItemTagsURLsTransaction* _tmp5_;
#line 709 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -5763,7 +5999,7 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_tags_p
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 709 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 5735 "GalleryConnector.c"
+#line 5971 "GalleryConnector.c"
goto __catch6_spit_publishing_publishing_error;
}
#line 709 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -5774,7 +6010,7 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_tags_p
g_clear_error (&_inner_error_);
#line 709 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return NULL;
-#line 5746 "GalleryConnector.c"
+#line 5982 "GalleryConnector.c"
}
}
goto __finally6;
@@ -5804,7 +6040,7 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_tags_p
_publishing_rest_support_transaction_unref0 (tag_urls_txn);
#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return result;
-#line 5776 "GalleryConnector.c"
+#line 6012 "GalleryConnector.c"
}
__finally6:
#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -5817,7 +6053,7 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_tags_p
g_clear_error (&_inner_error_);
#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return NULL;
-#line 5789 "GalleryConnector.c"
+#line 6025 "GalleryConnector.c"
}
#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp9_ = tag_urls_txn;
@@ -5829,20 +6065,22 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_tags_p
_publishing_rest_support_transaction_unref0 (tag_urls_txn);
#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return result;
-#line 5801 "GalleryConnector.c"
+#line 6037 "GalleryConnector.c"
}
-static gchar* publishing_gallery3_gallery_upload_transaction_get_tag_url (PublishingGallery3GalleryUploadTransaction* self, const gchar* tag) {
+static gchar*
+publishing_gallery3_gallery_upload_transaction_get_tag_url (PublishingGallery3GalleryUploadTransaction* self,
+ const gchar* tag)
+{
gchar* result = NULL;
PublishingGallery3GalleryGetTagTransaction* tag_txn = NULL;
PublishingRESTSupportSession* _tmp0_;
PublishingGallery3Session* _tmp1_;
- const gchar* _tmp2_;
+ PublishingGallery3GalleryGetTagTransaction* _tmp2_;
PublishingGallery3GalleryGetTagTransaction* _tmp3_;
- PublishingGallery3GalleryGetTagTransaction* _tmp4_;
- PublishingGallery3GalleryGetTagTransaction* _tmp9_;
- gchar* _tmp10_;
+ PublishingGallery3GalleryGetTagTransaction* _tmp8_;
+ gchar* _tmp9_;
GError * _inner_error_ = NULL;
#line 719 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_val_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_UPLOAD_TRANSACTION (self), NULL);
@@ -5853,27 +6091,25 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_tag_url (Publis
#line 721 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_GALLERY3_TYPE_SESSION, PublishingGallery3Session);
#line 721 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp2_ = tag;
+ _tmp2_ = publishing_gallery3_gallery_get_tag_transaction_new (_tmp1_, tag);
#line 721 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp3_ = publishing_gallery3_gallery_get_tag_transaction_new (_tmp1_, _tmp2_);
-#line 721 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp4_ = _tmp3_;
+ _tmp3_ = _tmp2_;
#line 721 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_publishing_rest_support_session_unref0 (_tmp1_);
#line 721 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- tag_txn = _tmp4_;
-#line 5834 "GalleryConnector.c"
+ tag_txn = _tmp3_;
+#line 6070 "GalleryConnector.c"
{
- PublishingGallery3GalleryGetTagTransaction* _tmp5_;
+ PublishingGallery3GalleryGetTagTransaction* _tmp4_;
#line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp5_ = tag_txn;
+ _tmp4_ = tag_txn;
#line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
+ publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
#line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 5845 "GalleryConnector.c"
+#line 6081 "GalleryConnector.c"
goto __catch7_spit_publishing_publishing_error;
}
#line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -5884,37 +6120,37 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_tag_url (Publis
g_clear_error (&_inner_error_);
#line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return NULL;
-#line 5856 "GalleryConnector.c"
+#line 6092 "GalleryConnector.c"
}
}
goto __finally7;
__catch7_spit_publishing_publishing_error:
{
GError* err = NULL;
- GError* _tmp6_;
- const gchar* _tmp7_;
- gchar* _tmp8_;
+ GError* _tmp5_;
+ const gchar* _tmp6_;
+ gchar* _tmp7_;
#line 725 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
err = _inner_error_;
#line 725 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_inner_error_ = NULL;
#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp6_ = err;
+ _tmp5_ = err;
#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp7_ = _tmp6_->message;
+ _tmp6_ = _tmp5_->message;
#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_debug ("GalleryConnector.vala:728: Problem getting the tags URL: %s", _tmp7_);
+ g_debug ("GalleryConnector.vala:728: Problem getting the tags URL: %s", _tmp6_);
#line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp8_ = g_strdup ("");
+ _tmp7_ = g_strdup ("");
#line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- result = _tmp8_;
+ result = _tmp7_;
#line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_error_free0 (err);
#line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_publishing_rest_support_transaction_unref0 (tag_txn);
#line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return result;
-#line 5886 "GalleryConnector.c"
+#line 6122 "GalleryConnector.c"
}
__finally7:
#line 725 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -5927,30 +6163,35 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_tag_url (Publis
g_clear_error (&_inner_error_);
#line 725 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return NULL;
-#line 5899 "GalleryConnector.c"
+#line 6135 "GalleryConnector.c"
}
#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp9_ = tag_txn;
+ _tmp8_ = tag_txn;
#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp10_ = publishing_gallery3_gallery_get_tag_transaction_tag_url (_tmp9_);
+ _tmp9_ = publishing_gallery3_gallery_get_tag_transaction_tag_url (_tmp8_);
#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- result = _tmp10_;
+ result = _tmp9_;
#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_publishing_rest_support_transaction_unref0 (tag_txn);
#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return result;
-#line 5911 "GalleryConnector.c"
+#line 6147 "GalleryConnector.c"
}
-static gpointer _g_error_copy0 (gpointer self) {
+static gpointer
+_g_error_copy0 (gpointer self)
+{
#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return self ? g_error_copy (self) : NULL;
-#line 5918 "GalleryConnector.c"
+#line 6156 "GalleryConnector.c"
}
-static void publishing_gallery3_gallery_upload_transaction_on_upload_completed (PublishingGallery3GalleryUploadTransaction* self, GError** error) {
+static void
+publishing_gallery3_gallery_upload_transaction_on_upload_completed (PublishingGallery3GalleryUploadTransaction* self,
+ GError** error)
+{
PublishingGallery3PublishingParameters* _tmp0_;
gboolean _tmp1_;
gboolean _tmp2_;
@@ -5967,7 +6208,7 @@ static void publishing_gallery3_gallery_upload_transaction_on_upload_completed (
_tmp2_ = _tmp1_;
#line 742 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
if (!_tmp2_) {
-#line 5939 "GalleryConnector.c"
+#line 6180 "GalleryConnector.c"
gchar** keywords = NULL;
gint keywords_length1 = 0;
gint _keywords_size_ = 0;
@@ -6012,7 +6253,7 @@ static void publishing_gallery3_gallery_upload_transaction_on_upload_completed (
keywords = (_vala_array_free (keywords, keywords_length1, (GDestroyNotify) g_free), NULL);
#line 753 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return;
-#line 5984 "GalleryConnector.c"
+#line 6225 "GalleryConnector.c"
}
#line 757 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp7_ = publishing_gallery3_gallery_upload_transaction_get_new_item_url (self);
@@ -6048,18 +6289,18 @@ static void publishing_gallery3_gallery_upload_transaction_on_upload_completed (
if (g_strcmp0 ("", _tmp14_) == 0) {
#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp13_ = TRUE;
-#line 6020 "GalleryConnector.c"
+#line 6261 "GalleryConnector.c"
} else {
const gchar* _tmp15_;
#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp15_ = self->priv->item_tags_path;
#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp13_ = g_strcmp0 ("", _tmp15_) == 0;
-#line 6027 "GalleryConnector.c"
+#line 6268 "GalleryConnector.c"
}
#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
if (_tmp13_) {
-#line 6031 "GalleryConnector.c"
+#line 6272 "GalleryConnector.c"
GError* _tmp16_;
#line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp16_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_COMMUNICATION_FAILED, "Could not obtain URL of uploaded item or its " "\"item_tags\" relationship URL");
@@ -6073,7 +6314,7 @@ static void publishing_gallery3_gallery_upload_transaction_on_upload_completed (
keywords = (_vala_array_free (keywords, keywords_length1, (GDestroyNotify) g_free), NULL);
#line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return;
-#line 6045 "GalleryConnector.c"
+#line 6286 "GalleryConnector.c"
} else {
#line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
keywords = (_vala_array_free (keywords, keywords_length1, (GDestroyNotify) g_free), NULL);
@@ -6083,14 +6324,14 @@ static void publishing_gallery3_gallery_upload_transaction_on_upload_completed (
g_clear_error (&_inner_error_);
#line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return;
-#line 6055 "GalleryConnector.c"
+#line 6296 "GalleryConnector.c"
}
}
#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp17_ = keywords;
#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp17__length1 = keywords_length1;
-#line 6062 "GalleryConnector.c"
+#line 6303 "GalleryConnector.c"
{
gchar** tag_collection = NULL;
gint tag_collection_length1 = 0;
@@ -6102,14 +6343,14 @@ static void publishing_gallery3_gallery_upload_transaction_on_upload_completed (
tag_collection_length1 = _tmp17__length1;
#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
for (tag_it = 0; tag_it < _tmp17__length1; tag_it = tag_it + 1) {
-#line 6074 "GalleryConnector.c"
+#line 6315 "GalleryConnector.c"
gchar* _tmp18_;
gchar* tag = NULL;
#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp18_ = g_strdup (tag_collection[tag_it]);
#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
tag = _tmp18_;
-#line 6081 "GalleryConnector.c"
+#line 6322 "GalleryConnector.c"
{
const gchar* _tmp19_;
const gchar* _tmp20_;
@@ -6136,7 +6377,7 @@ static void publishing_gallery3_gallery_upload_transaction_on_upload_completed (
_tmp24_ = publishing_gallery3_gallery_upload_transaction_get_tag_url (self, _tmp23_);
#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
new_tag_url = _tmp24_;
-#line 6108 "GalleryConnector.c"
+#line 6349 "GalleryConnector.c"
{
const gchar* _tmp25_;
#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -6147,7 +6388,7 @@ static void publishing_gallery3_gallery_upload_transaction_on_upload_completed (
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 6119 "GalleryConnector.c"
+#line 6360 "GalleryConnector.c"
goto __catch8_spit_publishing_publishing_error;
}
#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -6162,7 +6403,7 @@ static void publishing_gallery3_gallery_upload_transaction_on_upload_completed (
g_clear_error (&_inner_error_);
#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return;
-#line 6134 "GalleryConnector.c"
+#line 6375 "GalleryConnector.c"
}
}
goto __finally8;
@@ -6191,7 +6432,7 @@ static void publishing_gallery3_gallery_upload_transaction_on_upload_completed (
_inner_error_ = _tmp29_;
#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_error_free0 (err);
-#line 6163 "GalleryConnector.c"
+#line 6404 "GalleryConnector.c"
goto __finally8;
}
__finally8:
@@ -6209,7 +6450,7 @@ static void publishing_gallery3_gallery_upload_transaction_on_upload_completed (
keywords = (_vala_array_free (keywords, keywords_length1, (GDestroyNotify) g_free), NULL);
#line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return;
-#line 6181 "GalleryConnector.c"
+#line 6422 "GalleryConnector.c"
} else {
#line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_free0 (new_tag_url);
@@ -6223,25 +6464,28 @@ static void publishing_gallery3_gallery_upload_transaction_on_upload_completed (
g_clear_error (&_inner_error_);
#line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return;
-#line 6195 "GalleryConnector.c"
+#line 6436 "GalleryConnector.c"
}
}
#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_free0 (new_tag_url);
#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_free0 (tag);
-#line 6202 "GalleryConnector.c"
+#line 6443 "GalleryConnector.c"
}
}
}
#line 742 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
keywords = (_vala_array_free (keywords, keywords_length1, (GDestroyNotify) g_free), NULL);
-#line 6208 "GalleryConnector.c"
+#line 6449 "GalleryConnector.c"
}
}
-static void publishing_gallery3_gallery_upload_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error) {
+static void
+publishing_gallery3_gallery_upload_transaction_real_execute (PublishingRESTSupportTransaction* base,
+ GError** error)
+{
PublishingGallery3GalleryUploadTransaction * self;
GError * _inner_error_ = NULL;
#line 789 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -6256,7 +6500,7 @@ static void publishing_gallery3_gallery_upload_transaction_real_execute (Publish
g_propagate_error (error, _inner_error_);
#line 791 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return;
-#line 6228 "GalleryConnector.c"
+#line 6472 "GalleryConnector.c"
} else {
#line 791 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6264,7 +6508,7 @@ static void publishing_gallery3_gallery_upload_transaction_real_execute (Publish
g_clear_error (&_inner_error_);
#line 791 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return;
-#line 6236 "GalleryConnector.c"
+#line 6480 "GalleryConnector.c"
}
}
#line 794 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -6277,7 +6521,7 @@ static void publishing_gallery3_gallery_upload_transaction_real_execute (Publish
g_propagate_error (error, _inner_error_);
#line 794 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return;
-#line 6249 "GalleryConnector.c"
+#line 6493 "GalleryConnector.c"
} else {
#line 794 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6285,13 +6529,15 @@ static void publishing_gallery3_gallery_upload_transaction_real_execute (Publish
g_clear_error (&_inner_error_);
#line 794 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return;
-#line 6257 "GalleryConnector.c"
+#line 6501 "GalleryConnector.c"
}
}
}
-static void publishing_gallery3_gallery_upload_transaction_class_init (PublishingGallery3GalleryUploadTransactionClass * klass) {
+static void
+publishing_gallery3_gallery_upload_transaction_class_init (PublishingGallery3GalleryUploadTransactionClass * klass)
+{
#line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_gallery_upload_transaction_parent_class = g_type_class_peek_parent (klass);
#line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -6300,18 +6546,22 @@ static void publishing_gallery3_gallery_upload_transaction_class_init (Publishin
g_type_class_add_private (klass, sizeof (PublishingGallery3GalleryUploadTransactionPrivate));
#line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*) (PublishingRESTSupportTransaction *, GError**)) publishing_gallery3_gallery_upload_transaction_real_execute;
-#line 6272 "GalleryConnector.c"
+#line 6518 "GalleryConnector.c"
}
-static void publishing_gallery3_gallery_upload_transaction_instance_init (PublishingGallery3GalleryUploadTransaction * self) {
+static void
+publishing_gallery3_gallery_upload_transaction_instance_init (PublishingGallery3GalleryUploadTransaction * self)
+{
#line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
self->priv = PUBLISHING_GALLERY3_GALLERY_UPLOAD_TRANSACTION_GET_PRIVATE (self);
-#line 6279 "GalleryConnector.c"
+#line 6527 "GalleryConnector.c"
}
-static void publishing_gallery3_gallery_upload_transaction_finalize (PublishingRESTSupportTransaction * obj) {
+static void
+publishing_gallery3_gallery_upload_transaction_finalize (PublishingRESTSupportTransaction * obj)
+{
PublishingGallery3GalleryUploadTransaction * self;
#line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_GALLERY3_TYPE_GALLERY_UPLOAD_TRANSACTION, PublishingGallery3GalleryUploadTransaction);
@@ -6329,11 +6579,13 @@ static void publishing_gallery3_gallery_upload_transaction_finalize (PublishingR
_g_free0 (self->priv->item_tags_path);
#line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_gallery3_gallery_upload_transaction_parent_class)->finalize (obj);
-#line 6301 "GalleryConnector.c"
+#line 6551 "GalleryConnector.c"
}
-GType publishing_gallery3_gallery_upload_transaction_get_type (void) {
+GType
+publishing_gallery3_gallery_upload_transaction_get_type (void)
+{
static volatile gsize publishing_gallery3_gallery_upload_transaction_type_id__volatile = 0;
if (g_once_init_enter (&publishing_gallery3_gallery_upload_transaction_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingGallery3GalleryUploadTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_gallery3_gallery_upload_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingGallery3GalleryUploadTransaction), 0, (GInstanceInitFunc) publishing_gallery3_gallery_upload_transaction_instance_init, NULL };
@@ -6345,11 +6597,13 @@ GType publishing_gallery3_gallery_upload_transaction_get_type (void) {
}
-PublishingGallery3GalleryPublisher* publishing_gallery3_gallery_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host) {
+PublishingGallery3GalleryPublisher*
+publishing_gallery3_gallery_publisher_construct (GType object_type,
+ SpitPublishingService* service,
+ SpitPublishingPluginHost* host)
+{
PublishingGallery3GalleryPublisher * self = NULL;
- SpitPublishingService* _tmp0_;
- SpitPublishingPluginHost* _tmp1_;
- PublishingGallery3Session* _tmp2_;
+ PublishingGallery3Session* _tmp0_;
#line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_val_if_fail (SPIT_PUBLISHING_IS_SERVICE (service), NULL);
#line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -6357,33 +6611,34 @@ PublishingGallery3GalleryPublisher* publishing_gallery3_gallery_publisher_constr
#line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
self = (PublishingGallery3GalleryPublisher*) g_object_new (object_type, NULL);
#line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp0_ = service;
-#line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self->priv->service = _tmp0_;
-#line 817 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp1_ = host;
+ self->priv->service = service;
#line 817 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self->priv->host = _tmp1_;
+ self->priv->host = host;
#line 818 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp2_ = publishing_gallery3_session_new ();
+ _tmp0_ = publishing_gallery3_session_new ();
#line 818 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_publishing_rest_support_session_unref0 (self->priv->session);
#line 818 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self->priv->session = _tmp2_;
+ self->priv->session = _tmp0_;
#line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return self;
-#line 6344 "GalleryConnector.c"
+#line 6594 "GalleryConnector.c"
}
-PublishingGallery3GalleryPublisher* publishing_gallery3_gallery_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host) {
+PublishingGallery3GalleryPublisher*
+publishing_gallery3_gallery_publisher_new (SpitPublishingService* service,
+ SpitPublishingPluginHost* host)
+{
#line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return publishing_gallery3_gallery_publisher_construct (PUBLISHING_GALLERY3_TYPE_GALLERY_PUBLISHER, service, host);
-#line 6351 "GalleryConnector.c"
+#line 6604 "GalleryConnector.c"
}
-static gboolean publishing_gallery3_gallery_publisher_real_is_running (SpitPublishingPublisher* base) {
+static gboolean
+publishing_gallery3_gallery_publisher_real_is_running (SpitPublishingPublisher* base)
+{
PublishingGallery3GalleryPublisher * self;
gboolean result = FALSE;
gboolean _tmp0_;
@@ -6395,11 +6650,13 @@ static gboolean publishing_gallery3_gallery_publisher_real_is_running (SpitPubli
result = _tmp0_;
#line 822 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return result;
-#line 6367 "GalleryConnector.c"
+#line 6622 "GalleryConnector.c"
}
-static SpitPublishingService* publishing_gallery3_gallery_publisher_real_get_service (SpitPublishingPublisher* base) {
+static SpitPublishingService*
+publishing_gallery3_gallery_publisher_real_get_service (SpitPublishingPublisher* base)
+{
PublishingGallery3GalleryPublisher * self;
SpitPublishingService* result = NULL;
SpitPublishingService* _tmp0_;
@@ -6414,156 +6671,157 @@ static SpitPublishingService* publishing_gallery3_gallery_publisher_real_get_ser
result = _tmp1_;
#line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return result;
-#line 6386 "GalleryConnector.c"
+#line 6643 "GalleryConnector.c"
}
-static void publishing_gallery3_gallery_publisher_real_start (SpitPublishingPublisher* base) {
+static void
+publishing_gallery3_gallery_publisher_real_start (SpitPublishingPublisher* base)
+{
PublishingGallery3GalleryPublisher * self;
- gboolean _tmp0_;
- SpitPublishingPluginHost* _tmp1_;
- gchar* _tmp2_;
- gboolean _tmp3_ = FALSE;
- const gchar* _tmp4_;
+ SpitPublishingPluginHost* _tmp0_;
+ gchar* _tmp1_;
+ gboolean _tmp2_ = FALSE;
+ const gchar* _tmp3_;
#line 829 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_GALLERY3_TYPE_GALLERY_PUBLISHER, PublishingGallery3GalleryPublisher);
#line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (_tmp0_) {
+ if (spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
#line 831 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return;
-#line 6405 "GalleryConnector.c"
+#line 6661 "GalleryConnector.c"
}
#line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp1_ = self->priv->host;
+ _tmp0_ = self->priv->host;
#line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (_tmp1_ == NULL) {
+ if (_tmp0_ == NULL) {
#line 834 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_error ("GalleryConnector.vala:834: %s", "GalleryPublisher: start( ): can't start; this " "publisher is not restartable.");
-#line 6413 "GalleryConnector.c"
+#line 6669 "GalleryConnector.c"
}
#line 837 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_debug ("GalleryConnector.vala:837: GalleryPublisher: starting interaction.");
#line 839 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
self->priv->running = TRUE;
#line 841 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp2_ = publishing_gallery3_gallery_publisher_get_api_key (self);
+ _tmp1_ = publishing_gallery3_gallery_publisher_get_api_key (self);
#line 841 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_free0 (self->priv->key);
#line 841 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self->priv->key = _tmp2_;
+ self->priv->key = _tmp1_;
#line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp4_ = self->priv->key;
+ _tmp3_ = self->priv->key;
#line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (NULL == _tmp4_) {
+ if (NULL == _tmp3_) {
#line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp3_ = TRUE;
-#line 6431 "GalleryConnector.c"
+ _tmp2_ = TRUE;
+#line 6687 "GalleryConnector.c"
} else {
- const gchar* _tmp5_;
+ const gchar* _tmp4_;
#line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp5_ = self->priv->key;
+ _tmp4_ = self->priv->key;
#line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp3_ = g_strcmp0 ("", _tmp5_) == 0;
-#line 6438 "GalleryConnector.c"
+ _tmp2_ = g_strcmp0 ("", _tmp4_) == 0;
+#line 6694 "GalleryConnector.c"
}
#line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (_tmp3_) {
+ if (_tmp2_) {
#line 844 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_gallery_publisher_do_show_service_welcome_pane (self);
-#line 6444 "GalleryConnector.c"
+#line 6700 "GalleryConnector.c"
} else {
gchar* url = NULL;
- gchar* _tmp6_;
+ gchar* _tmp5_;
gchar* username = NULL;
- gchar* _tmp7_;
+ gchar* _tmp6_;
+ gboolean _tmp7_ = FALSE;
gboolean _tmp8_ = FALSE;
- gboolean _tmp9_ = FALSE;
- const gchar* _tmp10_;
+ const gchar* _tmp9_;
#line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp6_ = publishing_gallery3_gallery_publisher_get_gallery_url (self);
+ _tmp5_ = publishing_gallery3_gallery_publisher_get_gallery_url (self);
#line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- url = _tmp6_;
+ url = _tmp5_;
#line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp7_ = publishing_gallery3_gallery_publisher_get_gallery_username (self);
+ _tmp6_ = publishing_gallery3_gallery_publisher_get_gallery_username (self);
#line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- username = _tmp7_;
+ username = _tmp6_;
#line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp10_ = username;
+ _tmp9_ = username;
#line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (NULL == _tmp10_) {
+ if (NULL == _tmp9_) {
#line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp9_ = TRUE;
-#line 6467 "GalleryConnector.c"
+ _tmp8_ = TRUE;
+#line 6723 "GalleryConnector.c"
} else {
- const gchar* _tmp11_;
+ const gchar* _tmp10_;
#line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp11_ = self->priv->key;
+ _tmp10_ = self->priv->key;
#line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp9_ = NULL == _tmp11_;
-#line 6474 "GalleryConnector.c"
+ _tmp8_ = NULL == _tmp10_;
+#line 6730 "GalleryConnector.c"
}
#line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (_tmp9_) {
+ if (_tmp8_) {
#line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp8_ = TRUE;
-#line 6480 "GalleryConnector.c"
+ _tmp7_ = TRUE;
+#line 6736 "GalleryConnector.c"
} else {
- const gchar* _tmp12_;
+ const gchar* _tmp11_;
#line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp12_ = url;
+ _tmp11_ = url;
#line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp8_ = NULL == _tmp12_;
-#line 6487 "GalleryConnector.c"
+ _tmp7_ = NULL == _tmp11_;
+#line 6743 "GalleryConnector.c"
}
#line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (_tmp8_) {
+ if (_tmp7_) {
#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_gallery_publisher_do_show_service_welcome_pane (self);
-#line 6493 "GalleryConnector.c"
+#line 6749 "GalleryConnector.c"
} else {
+ const gchar* _tmp12_;
const gchar* _tmp13_;
- const gchar* _tmp14_;
- SpitPublishingPluginHost* _tmp15_;
- PublishingGallery3Session* _tmp16_;
+ SpitPublishingPluginHost* _tmp14_;
+ PublishingGallery3Session* _tmp15_;
+ const gchar* _tmp16_;
const gchar* _tmp17_;
const gchar* _tmp18_;
- const gchar* _tmp19_;
#line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp13_ = username;
+ _tmp12_ = username;
#line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp14_ = url;
+ _tmp13_ = url;
#line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_debug ("ACTION: attempting network login for user " "'%s' at URL '%s' from saved credentials.", _tmp13_, _tmp14_);
+ g_debug ("ACTION: attempting network login for user " "'%s' at URL '%s' from saved credentials.", _tmp12_, _tmp13_);
#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp15_ = self->priv->host;
+ _tmp14_ = self->priv->host;
#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- spit_publishing_plugin_host_install_account_fetch_wait_pane (_tmp15_);
+ spit_publishing_plugin_host_install_account_fetch_wait_pane (_tmp14_);
#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp16_ = self->priv->session;
+ _tmp15_ = self->priv->session;
#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp17_ = url;
+ _tmp16_ = url;
#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp18_ = username;
+ _tmp17_ = username;
#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp19_ = self->priv->key;
+ _tmp18_ = self->priv->key;
#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- publishing_gallery3_session_authenticate (_tmp16_, _tmp17_, _tmp18_, _tmp19_);
+ publishing_gallery3_session_authenticate (_tmp15_, _tmp16_, _tmp17_, _tmp18_);
#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_gallery_publisher_do_fetch_album_urls (self);
-#line 6524 "GalleryConnector.c"
+#line 6780 "GalleryConnector.c"
}
#line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_free0 (username);
#line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_free0 (url);
-#line 6530 "GalleryConnector.c"
+#line 6786 "GalleryConnector.c"
}
}
-static void publishing_gallery3_gallery_publisher_real_stop (SpitPublishingPublisher* base) {
+static void
+publishing_gallery3_gallery_publisher_real_stop (SpitPublishingPublisher* base)
+{
PublishingGallery3GalleryPublisher * self;
#line 866 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_GALLERY3_TYPE_GALLERY_PUBLISHER, PublishingGallery3GalleryPublisher);
@@ -6571,11 +6829,13 @@ static void publishing_gallery3_gallery_publisher_real_stop (SpitPublishingPubli
g_debug ("GalleryConnector.vala:867: GalleryPublisher: stop( ) invoked.");
#line 869 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
self->priv->running = FALSE;
-#line 6543 "GalleryConnector.c"
+#line 6801 "GalleryConnector.c"
}
-gchar* publishing_gallery3_gallery_publisher_get_api_key (PublishingGallery3GalleryPublisher* self) {
+gchar*
+publishing_gallery3_gallery_publisher_get_api_key (PublishingGallery3GalleryPublisher* self)
+{
gchar* result = NULL;
SpitPublishingPluginHost* _tmp0_;
gchar* _tmp1_;
@@ -6589,13 +6849,15 @@ gchar* publishing_gallery3_gallery_publisher_get_api_key (PublishingGallery3Gall
result = _tmp1_;
#line 875 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return result;
-#line 6561 "GalleryConnector.c"
+#line 6821 "GalleryConnector.c"
}
-void publishing_gallery3_gallery_publisher_set_api_key (PublishingGallery3GalleryPublisher* self, const gchar* key) {
+void
+publishing_gallery3_gallery_publisher_set_api_key (PublishingGallery3GalleryPublisher* self,
+ const gchar* key)
+{
SpitPublishingPluginHost* _tmp0_;
- const gchar* _tmp1_;
#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self));
#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -6603,14 +6865,14 @@ void publishing_gallery3_gallery_publisher_set_api_key (PublishingGallery3Galler
#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp0_ = self->priv->host;
#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp1_ = key;
-#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "api-key", _tmp1_);
-#line 6578 "GalleryConnector.c"
+ spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "api-key", key);
+#line 6838 "GalleryConnector.c"
}
-gchar* publishing_gallery3_gallery_publisher_get_gallery_url (PublishingGallery3GalleryPublisher* self) {
+gchar*
+publishing_gallery3_gallery_publisher_get_gallery_url (PublishingGallery3GalleryPublisher* self)
+{
gchar* result = NULL;
SpitPublishingPluginHost* _tmp0_;
gchar* _tmp1_;
@@ -6624,13 +6886,15 @@ gchar* publishing_gallery3_gallery_publisher_get_gallery_url (PublishingGallery3
result = _tmp1_;
#line 884 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return result;
-#line 6596 "GalleryConnector.c"
+#line 6858 "GalleryConnector.c"
}
-void publishing_gallery3_gallery_publisher_set_gallery_url (PublishingGallery3GalleryPublisher* self, const gchar* url) {
+void
+publishing_gallery3_gallery_publisher_set_gallery_url (PublishingGallery3GalleryPublisher* self,
+ const gchar* url)
+{
SpitPublishingPluginHost* _tmp0_;
- const gchar* _tmp1_;
#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self));
#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -6638,14 +6902,14 @@ void publishing_gallery3_gallery_publisher_set_gallery_url (PublishingGallery3Ga
#line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp0_ = self->priv->host;
#line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp1_ = url;
-#line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "url", _tmp1_);
-#line 6613 "GalleryConnector.c"
+ spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "url", url);
+#line 6875 "GalleryConnector.c"
}
-gchar* publishing_gallery3_gallery_publisher_get_gallery_username (PublishingGallery3GalleryPublisher* self) {
+gchar*
+publishing_gallery3_gallery_publisher_get_gallery_username (PublishingGallery3GalleryPublisher* self)
+{
gchar* result = NULL;
SpitPublishingPluginHost* _tmp0_;
gchar* _tmp1_;
@@ -6659,13 +6923,15 @@ gchar* publishing_gallery3_gallery_publisher_get_gallery_username (PublishingGal
result = _tmp1_;
#line 893 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return result;
-#line 6631 "GalleryConnector.c"
+#line 6895 "GalleryConnector.c"
}
-void publishing_gallery3_gallery_publisher_set_gallery_username (PublishingGallery3GalleryPublisher* self, const gchar* username) {
+void
+publishing_gallery3_gallery_publisher_set_gallery_username (PublishingGallery3GalleryPublisher* self,
+ const gchar* username)
+{
SpitPublishingPluginHost* _tmp0_;
- const gchar* _tmp1_;
#line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self));
#line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -6673,14 +6939,14 @@ void publishing_gallery3_gallery_publisher_set_gallery_username (PublishingGalle
#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp0_ = self->priv->host;
#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp1_ = username;
-#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "username", _tmp1_);
-#line 6648 "GalleryConnector.c"
+ spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "username", username);
+#line 6912 "GalleryConnector.c"
}
-static gboolean* _bool_dup (gboolean* self) {
+static gboolean*
+_bool_dup (gboolean* self)
+{
gboolean* dup;
#line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
dup = g_new0 (gboolean, 1);
@@ -6688,18 +6954,22 @@ static gboolean* _bool_dup (gboolean* self) {
memcpy (dup, self, sizeof (gboolean));
#line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return dup;
-#line 6660 "GalleryConnector.c"
+#line 6926 "GalleryConnector.c"
}
-static gpointer __bool_dup0 (gpointer self) {
+static gpointer
+__bool_dup0 (gpointer self)
+{
#line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return self ? _bool_dup (self) : NULL;
-#line 6667 "GalleryConnector.c"
+#line 6935 "GalleryConnector.c"
}
-gboolean* publishing_gallery3_gallery_publisher_get_persistent_strip_metadata (PublishingGallery3GalleryPublisher* self) {
+gboolean*
+publishing_gallery3_gallery_publisher_get_persistent_strip_metadata (PublishingGallery3GalleryPublisher* self)
+{
gboolean* result = NULL;
SpitPublishingPluginHost* _tmp0_;
gboolean _tmp1_;
@@ -6716,26 +6986,28 @@ gboolean* publishing_gallery3_gallery_publisher_get_persistent_strip_metadata (P
result = _tmp2_;
#line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return result;
-#line 6688 "GalleryConnector.c"
+#line 6958 "GalleryConnector.c"
}
-void publishing_gallery3_gallery_publisher_set_persistent_strip_metadata (PublishingGallery3GalleryPublisher* self, gboolean strip_metadata) {
+void
+publishing_gallery3_gallery_publisher_set_persistent_strip_metadata (PublishingGallery3GalleryPublisher* self,
+ gboolean strip_metadata)
+{
SpitPublishingPluginHost* _tmp0_;
- gboolean _tmp1_;
#line 904 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self));
#line 905 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp0_ = self->priv->host;
#line 905 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp1_ = strip_metadata;
-#line 905 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "strip-metadata", _tmp1_);
-#line 6703 "GalleryConnector.c"
+ spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "strip-metadata", strip_metadata);
+#line 6973 "GalleryConnector.c"
}
-static gint* _int_dup (gint* self) {
+static gint*
+_int_dup (gint* self)
+{
gint* dup;
#line 909 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
dup = g_new0 (gint, 1);
@@ -6743,18 +7015,22 @@ static gint* _int_dup (gint* self) {
memcpy (dup, self, sizeof (gint));
#line 909 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return dup;
-#line 6715 "GalleryConnector.c"
+#line 6987 "GalleryConnector.c"
}
-static gpointer __int_dup0 (gpointer self) {
+static gpointer
+__int_dup0 (gpointer self)
+{
#line 909 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return self ? _int_dup (self) : NULL;
-#line 6722 "GalleryConnector.c"
+#line 6996 "GalleryConnector.c"
}
-gint* publishing_gallery3_gallery_publisher_get_scaling_constraint_id (PublishingGallery3GalleryPublisher* self) {
+gint*
+publishing_gallery3_gallery_publisher_get_scaling_constraint_id (PublishingGallery3GalleryPublisher* self)
+{
gint* result = NULL;
SpitPublishingPluginHost* _tmp0_;
gint _tmp1_;
@@ -6771,26 +7047,28 @@ gint* publishing_gallery3_gallery_publisher_get_scaling_constraint_id (Publishin
result = _tmp2_;
#line 909 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return result;
-#line 6743 "GalleryConnector.c"
+#line 7019 "GalleryConnector.c"
}
-void publishing_gallery3_gallery_publisher_set_scaling_constraint_id (PublishingGallery3GalleryPublisher* self, gint constraint) {
+void
+publishing_gallery3_gallery_publisher_set_scaling_constraint_id (PublishingGallery3GalleryPublisher* self,
+ gint constraint)
+{
SpitPublishingPluginHost* _tmp0_;
- gint _tmp1_;
#line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self));
#line 913 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp0_ = self->priv->host;
#line 913 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp1_ = constraint;
-#line 913 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "scaling-constraint-id", _tmp1_);
-#line 6758 "GalleryConnector.c"
+ spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "scaling-constraint-id", constraint);
+#line 7034 "GalleryConnector.c"
}
-gint* publishing_gallery3_gallery_publisher_get_scaling_pixels (PublishingGallery3GalleryPublisher* self) {
+gint*
+publishing_gallery3_gallery_publisher_get_scaling_pixels (PublishingGallery3GalleryPublisher* self)
+{
gint* result = NULL;
SpitPublishingPluginHost* _tmp0_;
gint _tmp1_;
@@ -6807,33 +7085,37 @@ gint* publishing_gallery3_gallery_publisher_get_scaling_pixels (PublishingGaller
result = _tmp2_;
#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return result;
-#line 6779 "GalleryConnector.c"
+#line 7057 "GalleryConnector.c"
}
-void publishing_gallery3_gallery_publisher_set_scaling_pixels (PublishingGallery3GalleryPublisher* self, gint pixels) {
+void
+publishing_gallery3_gallery_publisher_set_scaling_pixels (PublishingGallery3GalleryPublisher* self,
+ gint pixels)
+{
SpitPublishingPluginHost* _tmp0_;
- gint _tmp1_;
#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self));
#line 921 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp0_ = self->priv->host;
#line 921 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp1_ = pixels;
-#line 921 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "scaling-pixels", _tmp1_);
-#line 6794 "GalleryConnector.c"
+ spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "scaling-pixels", pixels);
+#line 7072 "GalleryConnector.c"
}
-static void _publishing_gallery3_gallery_publisher_on_service_welcome_login_spit_publishing_login_callback (gpointer self) {
+static void
+_publishing_gallery3_gallery_publisher_on_service_welcome_login_spit_publishing_login_callback (gpointer self)
+{
#line 928 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_gallery_publisher_on_service_welcome_login ((PublishingGallery3GalleryPublisher*) self);
-#line 6801 "GalleryConnector.c"
+#line 7081 "GalleryConnector.c"
}
-static void publishing_gallery3_gallery_publisher_do_show_service_welcome_pane (PublishingGallery3GalleryPublisher* self) {
+static void
+publishing_gallery3_gallery_publisher_do_show_service_welcome_pane (PublishingGallery3GalleryPublisher* self)
+{
SpitPublishingPluginHost* _tmp0_;
#line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self));
@@ -6843,124 +7125,138 @@ static void publishing_gallery3_gallery_publisher_do_show_service_welcome_pane (
_tmp0_ = self->priv->host;
#line 928 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
spit_publishing_plugin_host_install_welcome_pane (_tmp0_, PUBLISHING_GALLERY3_SERVICE_WELCOME_MESSAGE, _publishing_gallery3_gallery_publisher_on_service_welcome_login_spit_publishing_login_callback, self);
-#line 6815 "GalleryConnector.c"
+#line 7097 "GalleryConnector.c"
}
-static void _publishing_gallery3_gallery_publisher_on_credentials_go_back_publishing_gallery3_credentials_pane_go_back (PublishingGallery3CredentialsPane* _sender, gpointer self) {
+static void
+_publishing_gallery3_gallery_publisher_on_credentials_go_back_publishing_gallery3_credentials_pane_go_back (PublishingGallery3CredentialsPane* _sender,
+ gpointer self)
+{
#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_gallery_publisher_on_credentials_go_back ((PublishingGallery3GalleryPublisher*) self);
-#line 6822 "GalleryConnector.c"
+#line 7107 "GalleryConnector.c"
}
-static void _publishing_gallery3_gallery_publisher_on_credentials_login_publishing_gallery3_credentials_pane_login (PublishingGallery3CredentialsPane* _sender, const gchar* url, const gchar* uname, const gchar* password, const gchar* key, gpointer self) {
+static void
+_publishing_gallery3_gallery_publisher_on_credentials_login_publishing_gallery3_credentials_pane_login (PublishingGallery3CredentialsPane* _sender,
+ const gchar* url,
+ const gchar* uname,
+ const gchar* password,
+ const gchar* key,
+ gpointer self)
+{
#line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_gallery_publisher_on_credentials_login ((PublishingGallery3GalleryPublisher*) self, url, uname, password);
-#line 6829 "GalleryConnector.c"
+#line 7121 "GalleryConnector.c"
}
-static void publishing_gallery3_gallery_publisher_do_show_credentials_pane (PublishingGallery3GalleryPublisher* self, PublishingGallery3CredentialsPaneMode mode) {
- PublishingGallery3CredentialsPaneMode _tmp0_;
+static void
+publishing_gallery3_gallery_publisher_do_show_credentials_pane (PublishingGallery3GalleryPublisher* self,
+ PublishingGallery3CredentialsPaneMode mode)
+{
+ gchar* _tmp0_;
gchar* _tmp1_;
- gchar* _tmp2_;
- PublishingGallery3Session* _tmp3_;
+ PublishingGallery3Session* _tmp2_;
PublishingGallery3CredentialsPane* creds_pane = NULL;
- SpitPublishingPluginHost* _tmp4_;
- PublishingGallery3CredentialsPaneMode _tmp5_;
+ SpitPublishingPluginHost* _tmp3_;
+ gchar* _tmp4_;
+ gchar* _tmp5_;
gchar* _tmp6_;
gchar* _tmp7_;
gchar* _tmp8_;
gchar* _tmp9_;
- gchar* _tmp10_;
- gchar* _tmp11_;
- PublishingGallery3CredentialsPane* _tmp12_;
- PublishingGallery3CredentialsPane* _tmp13_;
- SpitPublishingPluginHost* _tmp14_;
+ PublishingGallery3CredentialsPane* _tmp10_;
+ PublishingGallery3CredentialsPane* _tmp11_;
+ SpitPublishingPluginHost* _tmp12_;
#line 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self));
#line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp0_ = mode;
+ _tmp0_ = publishing_gallery3_credentials_pane_mode_to_string (mode);
#line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp1_ = publishing_gallery3_credentials_pane_mode_to_string (_tmp0_);
-#line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp2_ = _tmp1_;
+ _tmp1_ = _tmp0_;
#line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_debug ("GalleryConnector.vala:933: ACTION: showing credentials capture pane in" \
-" %s mode.", _tmp2_);
+" %s mode.", _tmp1_);
#line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _g_free0 (_tmp2_);
+ _g_free0 (_tmp1_);
#line 936 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp3_ = self->priv->session;
+ _tmp2_ = self->priv->session;
#line 936 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- publishing_gallery3_session_deauthenticate (_tmp3_);
+ publishing_gallery3_session_deauthenticate (_tmp2_);
+#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
+ _tmp3_ = self->priv->host;
#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp4_ = self->priv->host;
+ _tmp4_ = publishing_gallery3_gallery_publisher_get_gallery_url (self);
#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp5_ = mode;
+ _tmp5_ = _tmp4_;
#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp6_ = publishing_gallery3_gallery_publisher_get_gallery_url (self);
+ _tmp6_ = publishing_gallery3_gallery_publisher_get_gallery_username (self);
#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp7_ = _tmp6_;
#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp8_ = publishing_gallery3_gallery_publisher_get_gallery_username (self);
+ _tmp8_ = publishing_gallery3_gallery_publisher_get_api_key (self);
#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp9_ = _tmp8_;
#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp10_ = publishing_gallery3_gallery_publisher_get_api_key (self);
+ _tmp10_ = publishing_gallery3_credentials_pane_new (_tmp3_, mode, _tmp5_, _tmp7_, _tmp9_);
#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp11_ = _tmp10_;
#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp12_ = publishing_gallery3_credentials_pane_new (_tmp4_, _tmp5_, _tmp7_, _tmp9_, _tmp11_);
-#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp13_ = _tmp12_;
-#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _g_free0 (_tmp11_);
-#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_free0 (_tmp9_);
#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_free0 (_tmp7_);
#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- creds_pane = _tmp13_;
+ _g_free0 (_tmp5_);
+#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
+ creds_pane = _tmp11_;
#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_signal_connect_object (creds_pane, "go-back", (GCallback) _publishing_gallery3_gallery_publisher_on_credentials_go_back_publishing_gallery3_credentials_pane_go_back, self, 0);
#line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_signal_connect_object (creds_pane, "login", (GCallback) _publishing_gallery3_gallery_publisher_on_credentials_login_publishing_gallery3_credentials_pane_login, self, 0);
#line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp14_ = self->priv->host;
+ _tmp12_ = self->priv->host;
#line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- spit_publishing_plugin_host_install_dialog_pane (_tmp14_, G_TYPE_CHECK_INSTANCE_CAST (creds_pane, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
+ spit_publishing_plugin_host_install_dialog_pane (_tmp12_, G_TYPE_CHECK_INSTANCE_CAST (creds_pane, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
#line 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_object_unref0 (creds_pane);
-#line 6904 "GalleryConnector.c"
+#line 7193 "GalleryConnector.c"
}
-static void _publishing_gallery3_gallery_publisher_on_key_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
+static void
+_publishing_gallery3_gallery_publisher_on_key_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+ GError* err,
+ gpointer self)
+{
#line 956 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_gallery_publisher_on_key_fetch_error ((PublishingGallery3GalleryPublisher*) self, _sender, err);
-#line 6911 "GalleryConnector.c"
+#line 7204 "GalleryConnector.c"
}
-static void _publishing_gallery3_gallery_publisher_on_key_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
+static void
+_publishing_gallery3_gallery_publisher_on_key_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+ gpointer self)
+{
#line 957 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_gallery_publisher_on_key_fetch_complete ((PublishingGallery3GalleryPublisher*) self, _sender);
-#line 6918 "GalleryConnector.c"
+#line 7214 "GalleryConnector.c"
}
-static void publishing_gallery3_gallery_publisher_do_network_login (PublishingGallery3GalleryPublisher* self, const gchar* url, const gchar* username, const gchar* password) {
- const gchar* _tmp0_;
- const gchar* _tmp1_;
- SpitPublishingPluginHost* _tmp2_;
+static void
+publishing_gallery3_gallery_publisher_do_network_login (PublishingGallery3GalleryPublisher* self,
+ const gchar* url,
+ const gchar* username,
+ const gchar* password)
+{
+ SpitPublishingPluginHost* _tmp0_;
PublishingGallery3KeyFetchTransaction* fetch_trans = NULL;
- PublishingGallery3Session* _tmp3_;
- const gchar* _tmp4_;
- const gchar* _tmp5_;
- const gchar* _tmp6_;
- PublishingGallery3KeyFetchTransaction* _tmp7_;
+ PublishingGallery3Session* _tmp1_;
+ PublishingGallery3KeyFetchTransaction* _tmp2_;
GError * _inner_error_ = NULL;
#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self));
@@ -6971,32 +7267,22 @@ static void publishing_gallery3_gallery_publisher_do_network_login (PublishingGa
#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (password != NULL);
#line 949 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp0_ = username;
-#line 949 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp1_ = url;
-#line 949 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_debug ("ACTION: attempting network login for user '%s' at URL " "'%s'.", _tmp0_, _tmp1_);
+ g_debug ("ACTION: attempting network login for user '%s' at URL " "'%s'.", username, url);
#line 952 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp2_ = self->priv->host;
+ _tmp0_ = self->priv->host;
#line 952 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- spit_publishing_plugin_host_install_login_wait_pane (_tmp2_);
-#line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp3_ = self->priv->session;
-#line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp4_ = url;
-#line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp5_ = username;
+ spit_publishing_plugin_host_install_login_wait_pane (_tmp0_);
#line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp6_ = password;
+ _tmp1_ = self->priv->session;
#line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp7_ = publishing_gallery3_key_fetch_transaction_new (_tmp3_, _tmp4_, _tmp5_, _tmp6_);
+ _tmp2_ = publishing_gallery3_key_fetch_transaction_new (_tmp1_, url, username, password);
#line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- fetch_trans = _tmp7_;
+ fetch_trans = _tmp2_;
#line 956 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (fetch_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_gallery3_gallery_publisher_on_key_fetch_error_publishing_rest_support_transaction_network_error, self, 0);
#line 957 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (fetch_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_gallery3_gallery_publisher_on_key_fetch_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 6967 "GalleryConnector.c"
+#line 7253 "GalleryConnector.c"
{
#line 960 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (fetch_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
@@ -7004,7 +7290,7 @@ static void publishing_gallery3_gallery_publisher_do_network_login (PublishingGa
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 960 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 6975 "GalleryConnector.c"
+#line 7261 "GalleryConnector.c"
goto __catch9_spit_publishing_publishing_error;
}
#line 960 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -7015,14 +7301,14 @@ static void publishing_gallery3_gallery_publisher_do_network_login (PublishingGa
g_clear_error (&_inner_error_);
#line 960 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return;
-#line 6986 "GalleryConnector.c"
+#line 7272 "GalleryConnector.c"
}
}
goto __finally9;
__catch9_spit_publishing_publishing_error:
{
GError* err = NULL;
- GError* _tmp8_;
+ GError* _tmp3_;
#line 959 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
err = _inner_error_;
#line 959 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -7030,12 +7316,12 @@ static void publishing_gallery3_gallery_publisher_do_network_login (PublishingGa
#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_debug ("GalleryConnector.vala:962: Caught an error attempting to login");
#line 965 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp8_ = err;
+ _tmp3_ = err;
#line 965 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- publishing_gallery3_gallery_publisher_on_key_fetch_error (self, G_TYPE_CHECK_INSTANCE_CAST (fetch_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp8_);
+ publishing_gallery3_gallery_publisher_on_key_fetch_error (self, G_TYPE_CHECK_INSTANCE_CAST (fetch_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp3_);
#line 959 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_error_free0 (err);
-#line 7006 "GalleryConnector.c"
+#line 7292 "GalleryConnector.c"
}
__finally9:
#line 959 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -7048,29 +7334,38 @@ static void publishing_gallery3_gallery_publisher_do_network_login (PublishingGa
g_clear_error (&_inner_error_);
#line 959 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return;
-#line 7019 "GalleryConnector.c"
+#line 7305 "GalleryConnector.c"
}
#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_publishing_rest_support_transaction_unref0 (fetch_trans);
-#line 7023 "GalleryConnector.c"
+#line 7309 "GalleryConnector.c"
}
-static void _publishing_gallery3_gallery_publisher_on_album_urls_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
+static void
+_publishing_gallery3_gallery_publisher_on_album_urls_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+ GError* err,
+ gpointer self)
+{
#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_gallery_publisher_on_album_urls_fetch_error ((PublishingGallery3GalleryPublisher*) self, _sender, err);
-#line 7030 "GalleryConnector.c"
+#line 7320 "GalleryConnector.c"
}
-static void _publishing_gallery3_gallery_publisher_on_album_urls_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
+static void
+_publishing_gallery3_gallery_publisher_on_album_urls_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+ gpointer self)
+{
#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_gallery_publisher_on_album_urls_fetch_complete ((PublishingGallery3GalleryPublisher*) self, _sender);
-#line 7037 "GalleryConnector.c"
+#line 7330 "GalleryConnector.c"
}
-static void publishing_gallery3_gallery_publisher_do_fetch_album_urls (PublishingGallery3GalleryPublisher* self) {
+static void
+publishing_gallery3_gallery_publisher_do_fetch_album_urls (PublishingGallery3GalleryPublisher* self)
+{
SpitPublishingPluginHost* _tmp0_;
PublishingGallery3GetAlbumURLsTransaction* album_trans = NULL;
PublishingGallery3Session* _tmp1_;
@@ -7092,7 +7387,7 @@ static void publishing_gallery3_gallery_publisher_do_fetch_album_urls (Publishin
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (album_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_gallery3_gallery_publisher_on_album_urls_fetch_error_publishing_rest_support_transaction_network_error, self, 0);
#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (album_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_gallery3_gallery_publisher_on_album_urls_fetch_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 7063 "GalleryConnector.c"
+#line 7358 "GalleryConnector.c"
{
#line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (album_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
@@ -7100,7 +7395,7 @@ static void publishing_gallery3_gallery_publisher_do_fetch_album_urls (Publishin
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 7071 "GalleryConnector.c"
+#line 7366 "GalleryConnector.c"
goto __catch10_spit_publishing_publishing_error;
}
#line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -7111,7 +7406,7 @@ static void publishing_gallery3_gallery_publisher_do_fetch_album_urls (Publishin
g_clear_error (&_inner_error_);
#line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return;
-#line 7082 "GalleryConnector.c"
+#line 7377 "GalleryConnector.c"
}
}
goto __finally10;
@@ -7131,7 +7426,7 @@ static void publishing_gallery3_gallery_publisher_do_fetch_album_urls (Publishin
publishing_gallery3_gallery_publisher_on_album_urls_fetch_error (self, G_TYPE_CHECK_INSTANCE_CAST (album_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp3_);
#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_error_free0 (err);
-#line 7102 "GalleryConnector.c"
+#line 7397 "GalleryConnector.c"
}
__finally10:
#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -7144,55 +7439,58 @@ static void publishing_gallery3_gallery_publisher_do_fetch_album_urls (Publishin
g_clear_error (&_inner_error_);
#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return;
-#line 7115 "GalleryConnector.c"
+#line 7410 "GalleryConnector.c"
}
#line 969 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_publishing_rest_support_transaction_unref0 (album_trans);
-#line 7119 "GalleryConnector.c"
+#line 7414 "GalleryConnector.c"
}
-static void _publishing_gallery3_gallery_publisher_on_album_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
+static void
+_publishing_gallery3_gallery_publisher_on_album_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+ GError* err,
+ gpointer self)
+{
#line 993 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_gallery_publisher_on_album_fetch_error ((PublishingGallery3GalleryPublisher*) self, _sender, err);
-#line 7126 "GalleryConnector.c"
+#line 7425 "GalleryConnector.c"
}
-static void _publishing_gallery3_gallery_publisher_on_album_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
+static void
+_publishing_gallery3_gallery_publisher_on_album_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+ gpointer self)
+{
#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_gallery_publisher_on_album_fetch_complete ((PublishingGallery3GalleryPublisher*) self, _sender);
-#line 7133 "GalleryConnector.c"
+#line 7435 "GalleryConnector.c"
}
-static void publishing_gallery3_gallery_publisher_do_fetch_albums (PublishingGallery3GalleryPublisher* self, gchar** album_urls, int album_urls_length1, guint start) {
+static void
+publishing_gallery3_gallery_publisher_do_fetch_albums (PublishingGallery3GalleryPublisher* self,
+ gchar** album_urls,
+ int album_urls_length1,
+ guint start)
+{
PublishingGallery3GetAlbumsTransaction* album_trans = NULL;
PublishingGallery3Session* _tmp0_;
- gchar** _tmp1_;
- gint _tmp1__length1;
- guint _tmp2_;
- PublishingGallery3GetAlbumsTransaction* _tmp3_;
+ PublishingGallery3GetAlbumsTransaction* _tmp1_;
GError * _inner_error_ = NULL;
#line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self));
#line 991 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp0_ = self->priv->session;
#line 991 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp1_ = album_urls;
-#line 991 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp1__length1 = album_urls_length1;
-#line 991 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp2_ = start;
+ _tmp1_ = publishing_gallery3_get_albums_transaction_new (_tmp0_, album_urls, album_urls_length1, start);
#line 991 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp3_ = publishing_gallery3_get_albums_transaction_new (_tmp0_, _tmp1_, _tmp1__length1, _tmp2_);
-#line 991 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- album_trans = _tmp3_;
+ album_trans = _tmp1_;
#line 993 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (album_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_gallery3_gallery_publisher_on_album_fetch_error_publishing_rest_support_transaction_network_error, self, 0);
#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (album_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_gallery3_gallery_publisher_on_album_fetch_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 7163 "GalleryConnector.c"
+#line 7461 "GalleryConnector.c"
{
#line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (album_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
@@ -7200,7 +7498,7 @@ static void publishing_gallery3_gallery_publisher_do_fetch_albums (PublishingGal
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 7171 "GalleryConnector.c"
+#line 7469 "GalleryConnector.c"
goto __catch11_spit_publishing_publishing_error;
}
#line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -7211,25 +7509,25 @@ static void publishing_gallery3_gallery_publisher_do_fetch_albums (PublishingGal
g_clear_error (&_inner_error_);
#line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return;
-#line 7182 "GalleryConnector.c"
+#line 7480 "GalleryConnector.c"
}
}
goto __finally11;
__catch11_spit_publishing_publishing_error:
{
GError* err = NULL;
- GError* _tmp4_;
+ GError* _tmp2_;
#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
err = _inner_error_;
#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_inner_error_ = NULL;
#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp4_ = err;
+ _tmp2_ = err;
#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- publishing_gallery3_gallery_publisher_on_album_fetch_error (self, G_TYPE_CHECK_INSTANCE_CAST (album_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp4_);
+ publishing_gallery3_gallery_publisher_on_album_fetch_error (self, G_TYPE_CHECK_INSTANCE_CAST (album_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp2_);
#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_error_free0 (err);
-#line 7200 "GalleryConnector.c"
+#line 7498 "GalleryConnector.c"
}
__finally11:
#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -7242,48 +7540,57 @@ static void publishing_gallery3_gallery_publisher_do_fetch_albums (PublishingGal
g_clear_error (&_inner_error_);
#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return;
-#line 7213 "GalleryConnector.c"
+#line 7511 "GalleryConnector.c"
}
#line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_publishing_rest_support_transaction_unref0 (album_trans);
-#line 7217 "GalleryConnector.c"
+#line 7515 "GalleryConnector.c"
}
-static void _publishing_gallery3_gallery_publisher_on_publishing_options_pane_publish_publishing_gallery3_publishing_options_pane_publish (PublishingGallery3PublishingOptionsPane* _sender, PublishingGallery3PublishingParameters* parameters, gpointer self) {
+static void
+_publishing_gallery3_gallery_publisher_on_publishing_options_pane_publish_publishing_gallery3_publishing_options_pane_publish (PublishingGallery3PublishingOptionsPane* _sender,
+ PublishingGallery3PublishingParameters* parameters,
+ gpointer self)
+{
#line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_gallery_publisher_on_publishing_options_pane_publish ((PublishingGallery3GalleryPublisher*) self, parameters);
-#line 7224 "GalleryConnector.c"
+#line 7526 "GalleryConnector.c"
}
-static void _publishing_gallery3_gallery_publisher_on_publishing_options_pane_logout_publishing_gallery3_publishing_options_pane_logout (PublishingGallery3PublishingOptionsPane* _sender, gpointer self) {
+static void
+_publishing_gallery3_gallery_publisher_on_publishing_options_pane_logout_publishing_gallery3_publishing_options_pane_logout (PublishingGallery3PublishingOptionsPane* _sender,
+ gpointer self)
+{
#line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_gallery_publisher_on_publishing_options_pane_logout ((PublishingGallery3GalleryPublisher*) self);
-#line 7231 "GalleryConnector.c"
+#line 7536 "GalleryConnector.c"
}
-static void publishing_gallery3_gallery_publisher_do_show_publishing_options_pane (PublishingGallery3GalleryPublisher* self, const gchar* url, const gchar* username) {
+static void
+publishing_gallery3_gallery_publisher_do_show_publishing_options_pane (PublishingGallery3GalleryPublisher* self,
+ const gchar* url,
+ const gchar* username)
+{
GtkBuilder* builder = NULL;
GtkBuilder* _tmp0_;
SpitPublishingPluginHost* _tmp9_;
- const gchar* _tmp10_;
- const gchar* _tmp11_;
- PublishingGallery3Album** _tmp12_;
- gint _tmp12__length1;
- GtkBuilder* _tmp13_;
- gboolean* _tmp14_;
- gboolean* _tmp15_;
+ PublishingGallery3Album** _tmp10_;
+ gint _tmp10__length1;
+ GtkBuilder* _tmp11_;
+ gboolean* _tmp12_;
+ gboolean* _tmp13_;
+ gint* _tmp14_;
+ gint* _tmp15_;
gint* _tmp16_;
gint* _tmp17_;
- gint* _tmp18_;
- gint* _tmp19_;
+ PublishingGallery3PublishingOptionsPane* _tmp18_;
+ PublishingGallery3PublishingOptionsPane* _tmp19_;
PublishingGallery3PublishingOptionsPane* _tmp20_;
- PublishingGallery3PublishingOptionsPane* _tmp21_;
+ SpitPublishingPluginHost* _tmp21_;
PublishingGallery3PublishingOptionsPane* _tmp22_;
- SpitPublishingPluginHost* _tmp23_;
- PublishingGallery3PublishingOptionsPane* _tmp24_;
GError * _inner_error_ = NULL;
#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self));
@@ -7297,7 +7604,7 @@ static void publishing_gallery3_gallery_publisher_do_show_publishing_options_pan
_tmp0_ = gtk_builder_new ();
#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
builder = _tmp0_;
-#line 7268 "GalleryConnector.c"
+#line 7575 "GalleryConnector.c"
{
GtkBuilder* _tmp1_;
#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -7306,7 +7613,7 @@ static void publishing_gallery3_gallery_publisher_do_show_publishing_options_pan
gtk_builder_add_from_resource (_tmp1_, PLUGIN_RESOURCE_PATH "/gallery3_publishing_options_pane.ui", &_inner_error_);
#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7277 "GalleryConnector.c"
+#line 7584 "GalleryConnector.c"
goto __catch12_g_error;
}
}
@@ -7354,7 +7661,7 @@ static void publishing_gallery3_gallery_publisher_do_show_publishing_options_pan
_g_object_unref0 (builder);
#line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return;
-#line 7324 "GalleryConnector.c"
+#line 7631 "GalleryConnector.c"
}
__finally12:
#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -7367,83 +7674,88 @@ static void publishing_gallery3_gallery_publisher_do_show_publishing_options_pan
g_clear_error (&_inner_error_);
#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return;
-#line 7337 "GalleryConnector.c"
+#line 7644 "GalleryConnector.c"
}
#line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp9_ = self->priv->host;
#line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp10_ = url;
+ _tmp10_ = self->priv->albums;
#line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp11_ = username;
+ _tmp10__length1 = self->priv->albums_length1;
#line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp12_ = self->priv->albums;
+ _tmp11_ = builder;
#line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp12__length1 = self->priv->albums_length1;
+ _tmp12_ = publishing_gallery3_gallery_publisher_get_persistent_strip_metadata (self);
#line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp13_ = builder;
+ _tmp13_ = _tmp12_;
#line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp14_ = publishing_gallery3_gallery_publisher_get_persistent_strip_metadata (self);
+ _tmp14_ = publishing_gallery3_gallery_publisher_get_scaling_constraint_id (self);
#line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp15_ = _tmp14_;
#line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp16_ = publishing_gallery3_gallery_publisher_get_scaling_constraint_id (self);
+ _tmp16_ = publishing_gallery3_gallery_publisher_get_scaling_pixels (self);
#line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp17_ = _tmp16_;
#line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp18_ = publishing_gallery3_gallery_publisher_get_scaling_pixels (self);
-#line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp19_ = _tmp18_;
-#line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp20_ = publishing_gallery3_publishing_options_pane_new (_tmp9_, _tmp10_, _tmp11_, _tmp12_, _tmp12__length1, _tmp13_, *_tmp15_, *_tmp17_, *_tmp19_);
+ _tmp18_ = publishing_gallery3_publishing_options_pane_new (_tmp9_, url, username, _tmp10_, _tmp10__length1, _tmp11_, *_tmp13_, *_tmp15_, *_tmp17_);
#line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_object_unref0 (self->priv->publishing_options_pane);
#line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self->priv->publishing_options_pane = _tmp20_;
-#line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _g_free0 (_tmp19_);
+ self->priv->publishing_options_pane = _tmp18_;
#line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_free0 (_tmp17_);
#line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_free0 (_tmp15_);
+#line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
+ _g_free0 (_tmp13_);
#line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp21_ = self->priv->publishing_options_pane;
+ _tmp19_ = self->priv->publishing_options_pane;
#line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_signal_connect_object (_tmp21_, "publish", (GCallback) _publishing_gallery3_gallery_publisher_on_publishing_options_pane_publish_publishing_gallery3_publishing_options_pane_publish, self, 0);
+ g_signal_connect_object (_tmp19_, "publish", (GCallback) _publishing_gallery3_gallery_publisher_on_publishing_options_pane_publish_publishing_gallery3_publishing_options_pane_publish, self, 0);
#line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp22_ = self->priv->publishing_options_pane;
+ _tmp20_ = self->priv->publishing_options_pane;
#line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_signal_connect_object (_tmp22_, "logout", (GCallback) _publishing_gallery3_gallery_publisher_on_publishing_options_pane_logout_publishing_gallery3_publishing_options_pane_logout, self, 0);
+ g_signal_connect_object (_tmp20_, "logout", (GCallback) _publishing_gallery3_gallery_publisher_on_publishing_options_pane_logout_publishing_gallery3_publishing_options_pane_logout, self, 0);
#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp23_ = self->priv->host;
+ _tmp21_ = self->priv->host;
#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp24_ = self->priv->publishing_options_pane;
+ _tmp22_ = self->priv->publishing_options_pane;
#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- spit_publishing_plugin_host_install_dialog_pane (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
+ spit_publishing_plugin_host_install_dialog_pane (_tmp21_, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_object_unref0 (builder);
-#line 7391 "GalleryConnector.c"
+#line 7694 "GalleryConnector.c"
}
-static void _publishing_gallery3_gallery_publisher_on_album_create_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
+static void
+_publishing_gallery3_gallery_publisher_on_album_create_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+ GError* err,
+ gpointer self)
+{
#line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_gallery_publisher_on_album_create_error ((PublishingGallery3GalleryPublisher*) self, _sender, err);
-#line 7398 "GalleryConnector.c"
+#line 7705 "GalleryConnector.c"
}
-static void _publishing_gallery3_gallery_publisher_on_album_create_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
+static void
+_publishing_gallery3_gallery_publisher_on_album_create_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+ gpointer self)
+{
#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_gallery_publisher_on_album_create_complete ((PublishingGallery3GalleryPublisher*) self, _sender);
-#line 7405 "GalleryConnector.c"
+#line 7715 "GalleryConnector.c"
}
-static void publishing_gallery3_gallery_publisher_do_create_album (PublishingGallery3GalleryPublisher* self, PublishingGallery3PublishingParameters* parameters) {
+static void
+publishing_gallery3_gallery_publisher_do_create_album (PublishingGallery3GalleryPublisher* self,
+ PublishingGallery3PublishingParameters* parameters)
+{
PublishingGallery3GalleryAlbumCreateTransaction* album_trans = NULL;
PublishingGallery3Session* _tmp0_;
- PublishingGallery3PublishingParameters* _tmp1_;
- PublishingGallery3GalleryAlbumCreateTransaction* _tmp2_;
+ PublishingGallery3GalleryAlbumCreateTransaction* _tmp1_;
GError * _inner_error_ = NULL;
#line 1040 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self));
@@ -7454,16 +7766,14 @@ static void publishing_gallery3_gallery_publisher_do_create_album (PublishingGal
#line 1044 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp0_ = self->priv->session;
#line 1044 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp1_ = parameters;
-#line 1044 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp2_ = publishing_gallery3_gallery_album_create_transaction_new (_tmp0_, _tmp1_);
+ _tmp1_ = publishing_gallery3_gallery_album_create_transaction_new (_tmp0_, parameters);
#line 1044 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- album_trans = _tmp2_;
+ album_trans = _tmp1_;
#line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (album_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_gallery3_gallery_publisher_on_album_create_error_publishing_rest_support_transaction_network_error, self, 0);
#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (album_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_gallery3_gallery_publisher_on_album_create_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 7433 "GalleryConnector.c"
+#line 7743 "GalleryConnector.c"
{
#line 1050 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (album_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
@@ -7471,7 +7781,7 @@ static void publishing_gallery3_gallery_publisher_do_create_album (PublishingGal
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1050 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 7441 "GalleryConnector.c"
+#line 7751 "GalleryConnector.c"
goto __catch13_spit_publishing_publishing_error;
}
#line 1050 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -7482,25 +7792,25 @@ static void publishing_gallery3_gallery_publisher_do_create_album (PublishingGal
g_clear_error (&_inner_error_);
#line 1050 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return;
-#line 7452 "GalleryConnector.c"
+#line 7762 "GalleryConnector.c"
}
}
goto __finally13;
__catch13_spit_publishing_publishing_error:
{
GError* err = NULL;
- GError* _tmp3_;
+ GError* _tmp2_;
#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
err = _inner_error_;
#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_inner_error_ = NULL;
#line 1054 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp3_ = err;
+ _tmp2_ = err;
#line 1054 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- publishing_gallery3_gallery_publisher_on_album_create_error (self, G_TYPE_CHECK_INSTANCE_CAST (album_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp3_);
+ publishing_gallery3_gallery_publisher_on_album_create_error (self, G_TYPE_CHECK_INSTANCE_CAST (album_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp2_);
#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_error_free0 (err);
-#line 7470 "GalleryConnector.c"
+#line 7780 "GalleryConnector.c"
}
__finally13:
#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -7513,71 +7823,79 @@ static void publishing_gallery3_gallery_publisher_do_create_album (PublishingGal
g_clear_error (&_inner_error_);
#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return;
-#line 7483 "GalleryConnector.c"
+#line 7793 "GalleryConnector.c"
}
#line 1040 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_publishing_rest_support_transaction_unref0 (album_trans);
-#line 7487 "GalleryConnector.c"
+#line 7797 "GalleryConnector.c"
}
-static void _publishing_gallery3_gallery_publisher_on_publish_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender, gint num_photos_published, gpointer self) {
+static void
+_publishing_gallery3_gallery_publisher_on_publish_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender,
+ gint num_photos_published,
+ gpointer self)
+{
#line 1083 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_gallery_publisher_on_publish_complete ((PublishingGallery3GalleryPublisher*) self, _sender, num_photos_published);
-#line 7494 "GalleryConnector.c"
+#line 7808 "GalleryConnector.c"
}
-static void _publishing_gallery3_gallery_publisher_on_publish_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender, GError* err, gpointer self) {
+static void
+_publishing_gallery3_gallery_publisher_on_publish_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender,
+ GError* err,
+ gpointer self)
+{
#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_gallery_publisher_on_publish_error ((PublishingGallery3GalleryPublisher*) self, _sender, err);
-#line 7501 "GalleryConnector.c"
+#line 7819 "GalleryConnector.c"
}
-static void _publishing_gallery3_gallery_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self) {
+static void
+_publishing_gallery3_gallery_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number,
+ gdouble fraction_complete,
+ gpointer self)
+{
#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_gallery_publisher_on_upload_status_updated ((PublishingGallery3GalleryPublisher*) self, file_number, fraction_complete);
-#line 7508 "GalleryConnector.c"
+#line 7830 "GalleryConnector.c"
}
-static void publishing_gallery3_gallery_publisher_do_publish (PublishingGallery3GalleryPublisher* self, PublishingGallery3PublishingParameters* parameters) {
- PublishingGallery3PublishingParameters* _tmp0_;
+static void
+publishing_gallery3_gallery_publisher_do_publish (PublishingGallery3GalleryPublisher* self,
+ PublishingGallery3PublishingParameters* parameters)
+{
+ gboolean _tmp0_;
gboolean _tmp1_;
- gboolean _tmp2_;
- gint _tmp3_ = 0;
- PublishingGallery3PublishingParameters* _tmp4_;
+ gint _tmp2_ = 0;
+ gint _tmp3_;
+ gint _tmp4_;
gint _tmp5_;
gint _tmp6_;
- PublishingGallery3PublishingParameters* _tmp7_;
- gint _tmp8_;
+ SpitPublishingPluginHost* _tmp7_;
+ SpitPublishingPluginHost* _tmp8_;
gint _tmp9_;
- SpitPublishingPluginHost* _tmp10_;
- SpitPublishingPluginHost* _tmp11_;
- PublishingGallery3PublishingParameters* _tmp12_;
- gint _tmp13_;
- gint _tmp14_;
- PublishingGallery3PublishingParameters* _tmp15_;
- gboolean _tmp16_;
- gboolean _tmp17_;
- void* _tmp18_;
- GDestroyNotify _tmp19_;
- SpitPublishingProgressCallback _tmp20_;
- gboolean _tmp21_;
+ gint _tmp10_;
+ gboolean _tmp11_;
+ gboolean _tmp12_;
+ void* _tmp13_;
+ GDestroyNotify _tmp14_;
+ SpitPublishingProgressCallback _tmp15_;
PublishingGallery3Uploader* uploader = NULL;
- PublishingGallery3Session* _tmp22_;
- SpitPublishingPluginHost* _tmp23_;
- gint _tmp24_;
- SpitPublishingPublishable** _tmp25_;
- SpitPublishingPublishable** _tmp26_;
- gint _tmp26__length1;
- PublishingGallery3PublishingParameters* _tmp27_;
- PublishingGallery3Uploader* _tmp28_;
- PublishingGallery3Uploader* _tmp29_;
- PublishingGallery3Uploader* _tmp30_;
- PublishingGallery3Uploader* _tmp31_;
- PublishingGallery3Uploader* _tmp32_;
+ PublishingGallery3Session* _tmp16_;
+ SpitPublishingPluginHost* _tmp17_;
+ gint _tmp18_;
+ SpitPublishingPublishable** _tmp19_;
+ SpitPublishingPublishable** _tmp20_;
+ gint _tmp20__length1;
+ PublishingGallery3Uploader* _tmp21_;
+ PublishingGallery3Uploader* _tmp22_;
+ PublishingGallery3Uploader* _tmp23_;
+ PublishingGallery3Uploader* _tmp24_;
+ PublishingGallery3Uploader* _tmp25_;
#line 1059 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self));
#line 1059 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -7585,59 +7903,49 @@ static void publishing_gallery3_gallery_publisher_do_publish (PublishingGallery3
#line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_debug ("GalleryConnector.vala:1061: ACTION: publishing items");
#line 1063 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp0_ = parameters;
-#line 1063 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp1_ = publishing_gallery3_publishing_parameters_get_strip_metadata (_tmp0_);
+ _tmp0_ = publishing_gallery3_publishing_parameters_get_strip_metadata (parameters);
#line 1063 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp2_ = _tmp1_;
+ _tmp1_ = _tmp0_;
#line 1063 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- publishing_gallery3_gallery_publisher_set_persistent_strip_metadata (self, _tmp2_);
+ publishing_gallery3_gallery_publisher_set_persistent_strip_metadata (self, _tmp1_);
#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp4_ = parameters;
+ _tmp3_ = publishing_gallery3_publishing_parameters_get_photo_major_axis_size (parameters);
#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp5_ = publishing_gallery3_publishing_parameters_get_photo_major_axis_size (_tmp4_);
-#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp6_ = _tmp5_;
+ _tmp4_ = _tmp3_;
#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (_tmp6_ <= 0) {
+ if (_tmp4_ <= 0) {
#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp3_ = 0;
-#line 7572 "GalleryConnector.c"
+ _tmp2_ = 0;
+#line 7886 "GalleryConnector.c"
} else {
#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp3_ = 1;
-#line 7576 "GalleryConnector.c"
+ _tmp2_ = 1;
+#line 7890 "GalleryConnector.c"
}
#line 1064 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- publishing_gallery3_gallery_publisher_set_scaling_constraint_id (self, _tmp3_);
+ publishing_gallery3_gallery_publisher_set_scaling_constraint_id (self, _tmp2_);
#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp7_ = parameters;
+ _tmp5_ = publishing_gallery3_publishing_parameters_get_photo_major_axis_size (parameters);
#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp8_ = publishing_gallery3_publishing_parameters_get_photo_major_axis_size (_tmp7_);
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp9_ = _tmp8_;
+ _tmp6_ = _tmp5_;
#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- publishing_gallery3_gallery_publisher_set_scaling_pixels (self, _tmp9_);
+ publishing_gallery3_gallery_publisher_set_scaling_pixels (self, _tmp6_);
#line 1067 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp10_ = self->priv->host;
+ _tmp7_ = self->priv->host;
#line 1067 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- spit_publishing_plugin_host_set_service_locked (_tmp10_, TRUE);
+ spit_publishing_plugin_host_set_service_locked (_tmp7_, TRUE);
#line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp11_ = self->priv->host;
+ _tmp8_ = self->priv->host;
#line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp12_ = parameters;
+ _tmp9_ = publishing_gallery3_publishing_parameters_get_photo_major_axis_size (parameters);
#line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp13_ = publishing_gallery3_publishing_parameters_get_photo_major_axis_size (_tmp12_);
-#line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp14_ = _tmp13_;
-#line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp15_ = parameters;
+ _tmp10_ = _tmp9_;
#line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp16_ = publishing_gallery3_publishing_parameters_get_strip_metadata (_tmp15_);
+ _tmp11_ = publishing_gallery3_publishing_parameters_get_strip_metadata (parameters);
#line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp17_ = _tmp16_;
+ _tmp12_ = _tmp11_;
#line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp20_ = spit_publishing_plugin_host_serialize_publishables (_tmp11_, _tmp14_, _tmp17_, &_tmp18_, &_tmp19_);
+ _tmp15_ = spit_publishing_plugin_host_serialize_publishables (_tmp8_, _tmp10_, _tmp12_, &_tmp13_, &_tmp14_);
#line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
(self->priv->progress_reporter_target_destroy_notify == NULL) ? NULL : (self->priv->progress_reporter_target_destroy_notify (self->priv->progress_reporter_target), NULL);
#line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -7647,58 +7955,56 @@ static void publishing_gallery3_gallery_publisher_do_publish (PublishingGallery3
#line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
self->priv->progress_reporter_target_destroy_notify = NULL;
#line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self->priv->progress_reporter = _tmp20_;
+ self->priv->progress_reporter = _tmp15_;
#line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self->priv->progress_reporter_target = _tmp18_;
+ self->priv->progress_reporter_target = _tmp13_;
#line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self->priv->progress_reporter_target_destroy_notify = _tmp19_;
+ self->priv->progress_reporter_target_destroy_notify = _tmp14_;
#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp21_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (!_tmp21_) {
+ if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
#line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return;
-#line 7628 "GalleryConnector.c"
+#line 7934 "GalleryConnector.c"
}
#line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp22_ = self->priv->session;
-#line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp23_ = self->priv->host;
+ _tmp16_ = self->priv->session;
#line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp25_ = spit_publishing_plugin_host_get_publishables (_tmp23_, &_tmp24_);
+ _tmp17_ = self->priv->host;
#line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp26_ = _tmp25_;
+ _tmp19_ = spit_publishing_plugin_host_get_publishables (_tmp17_, &_tmp18_);
#line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp26__length1 = _tmp24_;
+ _tmp20_ = _tmp19_;
#line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp27_ = parameters;
+ _tmp20__length1 = _tmp18_;
#line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp28_ = publishing_gallery3_uploader_new (_tmp22_, _tmp26_, _tmp24_, _tmp27_);
+ _tmp21_ = publishing_gallery3_uploader_new (_tmp16_, _tmp20_, _tmp18_, parameters);
#line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp29_ = _tmp28_;
+ _tmp22_ = _tmp21_;
#line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp26_ = (_vala_array_free (_tmp26_, _tmp26__length1, (GDestroyNotify) g_object_unref), NULL);
+ _tmp20_ = (_vala_array_free (_tmp20_, _tmp20__length1, (GDestroyNotify) g_object_unref), NULL);
#line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- uploader = _tmp29_;
+ uploader = _tmp22_;
#line 1083 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp30_ = uploader;
+ _tmp23_ = uploader;
#line 1083 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), "upload-complete", (GCallback) _publishing_gallery3_gallery_publisher_on_publish_complete_publishing_rest_support_batch_uploader_upload_complete, self, 0);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), "upload-complete", (GCallback) _publishing_gallery3_gallery_publisher_on_publish_complete_publishing_rest_support_batch_uploader_upload_complete, self, 0);
#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp31_ = uploader;
+ _tmp24_ = uploader;
#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), "upload-error", (GCallback) _publishing_gallery3_gallery_publisher_on_publish_error_publishing_rest_support_batch_uploader_upload_error, self, 0);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), "upload-error", (GCallback) _publishing_gallery3_gallery_publisher_on_publish_error_publishing_rest_support_batch_uploader_upload_error, self, 0);
#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp32_ = uploader;
+ _tmp25_ = uploader;
#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- publishing_rest_support_batch_uploader_upload (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), _publishing_gallery3_gallery_publisher_on_upload_status_updated_spit_publishing_progress_callback, self);
+ publishing_rest_support_batch_uploader_upload (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), _publishing_gallery3_gallery_publisher_on_upload_status_updated_spit_publishing_progress_callback, self);
#line 1059 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_publishing_rest_support_batch_uploader_unref0 (uploader);
-#line 7664 "GalleryConnector.c"
+#line 7968 "GalleryConnector.c"
}
-static void publishing_gallery3_gallery_publisher_do_show_success_pane (PublishingGallery3GalleryPublisher* self) {
+static void
+publishing_gallery3_gallery_publisher_do_show_success_pane (PublishingGallery3GalleryPublisher* self)
+{
SpitPublishingPluginHost* _tmp0_;
SpitPublishingPluginHost* _tmp1_;
#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -7713,39 +8019,36 @@ static void publishing_gallery3_gallery_publisher_do_show_success_pane (Publishi
_tmp1_ = self->priv->host;
#line 1093 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
spit_publishing_plugin_host_install_success_pane (_tmp1_);
-#line 7683 "GalleryConnector.c"
+#line 7989 "GalleryConnector.c"
}
-static void publishing_gallery3_gallery_publisher_on_service_welcome_login (PublishingGallery3GalleryPublisher* self) {
- gboolean _tmp0_;
+static void
+publishing_gallery3_gallery_publisher_on_service_welcome_login (PublishingGallery3GalleryPublisher* self)
+{
#line 1097 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self));
#line 1098 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 1098 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (!_tmp0_) {
+ if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return;
-#line 7697 "GalleryConnector.c"
+#line 8002 "GalleryConnector.c"
}
#line 1101 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_debug ("GalleryConnector.vala:1101: EVENT: user clicked 'Login' in welcome pan" \
"e.");
#line 1103 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_gallery_publisher_do_show_credentials_pane (self, PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_INTRO);
-#line 7703 "GalleryConnector.c"
+#line 8008 "GalleryConnector.c"
}
-static void publishing_gallery3_gallery_publisher_on_credentials_login (PublishingGallery3GalleryPublisher* self, const gchar* url, const gchar* username, const gchar* password) {
- gboolean _tmp0_;
- const gchar* _tmp1_;
- const gchar* _tmp2_;
- const gchar* _tmp3_;
- const gchar* _tmp4_;
- const gchar* _tmp5_;
- const gchar* _tmp6_;
+static void
+publishing_gallery3_gallery_publisher_on_credentials_login (PublishingGallery3GalleryPublisher* self,
+ const gchar* url,
+ const gchar* username,
+ const gchar* password)
+{
#line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self));
#line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -7755,619 +8058,501 @@ static void publishing_gallery3_gallery_publisher_on_credentials_login (Publishi
#line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (password != NULL);
#line 1108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 1108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (!_tmp0_) {
+ if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
#line 1109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return;
-#line 7729 "GalleryConnector.c"
+#line 8030 "GalleryConnector.c"
}
#line 1111 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp1_ = username;
-#line 1111 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_debug ("GalleryConnector.vala:1111: EVENT: user '%s' clicked 'Login' in creden" \
-"tials pane.", _tmp1_);
+"tials pane.", username);
#line 1114 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp2_ = url;
-#line 1114 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- publishing_gallery3_gallery_publisher_set_gallery_url (self, _tmp2_);
-#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp3_ = username;
+ publishing_gallery3_gallery_publisher_set_gallery_url (self, url);
#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- publishing_gallery3_gallery_publisher_set_gallery_username (self, _tmp3_);
-#line 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp4_ = url;
-#line 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp5_ = username;
-#line 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp6_ = password;
+ publishing_gallery3_gallery_publisher_set_gallery_username (self, username);
#line 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- publishing_gallery3_gallery_publisher_do_network_login (self, _tmp4_, _tmp5_, _tmp6_);
-#line 7751 "GalleryConnector.c"
+ publishing_gallery3_gallery_publisher_do_network_login (self, url, username, password);
+#line 8040 "GalleryConnector.c"
}
-static void publishing_gallery3_gallery_publisher_on_credentials_go_back (PublishingGallery3GalleryPublisher* self) {
- gboolean _tmp0_;
+static void
+publishing_gallery3_gallery_publisher_on_credentials_go_back (PublishingGallery3GalleryPublisher* self)
+{
#line 1119 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self));
#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (!_tmp0_) {
+ if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
#line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return;
-#line 7765 "GalleryConnector.c"
+#line 8053 "GalleryConnector.c"
}
#line 1123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_debug ("GalleryConnector.vala:1123: EVENT: user is attempting to go back.");
#line 1125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_gallery_publisher_do_show_service_welcome_pane (self);
-#line 7771 "GalleryConnector.c"
+#line 8059 "GalleryConnector.c"
}
-static void publishing_gallery3_gallery_publisher_on_key_fetch_error (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) {
- PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_gallery3_gallery_publisher_on_key_fetch_error (PublishingGallery3GalleryPublisher* self,
+ PublishingRESTSupportTransaction* bad_txn,
+ GError* err)
+{
+ guint _tmp0_;
guint _tmp1_;
- PublishingRESTSupportTransaction* _tmp2_;
- guint _tmp3_;
- gboolean _tmp4_;
- PublishingGallery3Session* _tmp5_;
- gboolean _tmp6_;
- PublishingRESTSupportTransaction* _tmp7_;
- gchar* _tmp8_;
- gchar* _tmp9_;
- PublishingRESTSupportTransaction* _tmp10_;
- guint _tmp11_;
+ PublishingGallery3Session* _tmp2_;
+ gchar* _tmp3_;
+ gchar* _tmp4_;
#line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self));
#line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (bad_txn));
#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp0_ = bad_txn;
-#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
+ g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_key_fetch_complete_publishing_rest_support_transaction_completed, self);
+ g_signal_handlers_disconnect_matched (bad_txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_key_fetch_complete_publishing_rest_support_transaction_completed, self);
#line 1132 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp2_ = bad_txn;
+ g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
#line 1132 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 1132 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_key_fetch_error_publishing_rest_support_transaction_network_error, self);
-#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
+ g_signal_handlers_disconnect_matched (bad_txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_key_fetch_error_publishing_rest_support_transaction_network_error, self);
#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (!_tmp4_) {
+ if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
#line 1135 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return;
-#line 7810 "GalleryConnector.c"
+#line 8089 "GalleryConnector.c"
}
#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp5_ = self->priv->session;
-#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp6_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
+ _tmp2_ = self->priv->session;
#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (_tmp6_) {
+ if (publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession))) {
#line 1139 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return;
-#line 7820 "GalleryConnector.c"
+#line 8097 "GalleryConnector.c"
}
#line 1141 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp7_ = bad_txn;
+ _tmp3_ = publishing_rest_support_transaction_get_response (bad_txn);
#line 1141 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp8_ = publishing_rest_support_transaction_get_response (_tmp7_);
-#line 1141 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp9_ = _tmp8_;
+ _tmp4_ = _tmp3_;
#line 1141 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_debug ("EVENT: network transaction to fetch key for login " "failed; response = '%s'.", _tmp9_);
+ g_debug ("EVENT: network transaction to fetch key for login " "failed; response = '%s'.", _tmp4_);
#line 1141 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _g_free0 (_tmp9_);
-#line 1150 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp10_ = bad_txn;
+ _g_free0 (_tmp4_);
#line 1150 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp11_ = publishing_rest_support_transaction_get_status_code (_tmp10_);
-#line 1150 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (_tmp11_ == ((guint) 403)) {
+ if (publishing_rest_support_transaction_get_status_code (bad_txn) == ((guint) 403)) {
#line 1152 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_gallery_publisher_do_show_credentials_pane (self, PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_FAILED_RETRY);
-#line 7840 "GalleryConnector.c"
+#line 8111 "GalleryConnector.c"
} else {
- PublishingRESTSupportTransaction* _tmp12_;
- guint _tmp13_;
-#line 1154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp12_ = bad_txn;
-#line 1154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp13_ = publishing_rest_support_transaction_get_status_code (_tmp12_);
#line 1154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (_tmp13_ == ((guint) 400)) {
+ if (publishing_rest_support_transaction_get_status_code (bad_txn) == ((guint) 400)) {
#line 1157 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_gallery_publisher_do_show_credentials_pane (self, PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_NOT_GALLERY_URL);
-#line 7852 "GalleryConnector.c"
+#line 8117 "GalleryConnector.c"
} else {
- SpitPublishingPluginHost* _tmp14_;
- GError* _tmp15_;
-#line 1160 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp14_ = self->priv->host;
+ SpitPublishingPluginHost* _tmp5_;
#line 1160 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp15_ = err;
+ _tmp5_ = self->priv->host;
#line 1160 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- spit_publishing_plugin_host_post_error (_tmp14_, _tmp15_);
-#line 7862 "GalleryConnector.c"
+ spit_publishing_plugin_host_post_error (_tmp5_, err);
+#line 8124 "GalleryConnector.c"
}
}
}
-static void publishing_gallery3_gallery_publisher_on_key_fetch_complete (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportTransaction* txn) {
- PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_gallery3_gallery_publisher_on_key_fetch_complete (PublishingGallery3GalleryPublisher* self,
+ PublishingRESTSupportTransaction* txn)
+{
+ guint _tmp0_;
guint _tmp1_;
- PublishingRESTSupportTransaction* _tmp2_;
- guint _tmp3_;
- gboolean _tmp4_;
- PublishingGallery3Session* _tmp5_;
- gboolean _tmp6_;
- PublishingRESTSupportTransaction* _tmp7_;
- gchar* _tmp8_;
- const gchar* _tmp9_;
+ PublishingGallery3Session* _tmp2_;
+ gchar* _tmp3_;
+ const gchar* _tmp4_;
#line 1164 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self));
#line 1164 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
#line 1166 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp0_ = txn;
+ g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
#line 1166 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 1166 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_key_fetch_complete_publishing_rest_support_transaction_completed, self);
-#line 1167 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp2_ = txn;
+ g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_key_fetch_complete_publishing_rest_support_transaction_completed, self);
#line 1167 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
+ g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
#line 1167 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_key_fetch_error_publishing_rest_support_transaction_network_error, self);
-#line 1169 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
+ g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_key_fetch_error_publishing_rest_support_transaction_network_error, self);
#line 1169 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (!_tmp4_) {
+ if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
#line 1170 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return;
-#line 7901 "GalleryConnector.c"
+#line 8155 "GalleryConnector.c"
}
#line 1173 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp5_ = self->priv->session;
+ _tmp2_ = self->priv->session;
#line 1173 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp6_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 1173 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (_tmp6_) {
+ if (publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession))) {
#line 1174 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return;
-#line 7911 "GalleryConnector.c"
+#line 8163 "GalleryConnector.c"
}
#line 1176 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp7_ = txn;
-#line 1176 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp8_ = publishing_gallery3_key_fetch_transaction_get_key (G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, PUBLISHING_GALLERY3_TYPE_KEY_FETCH_TRANSACTION) ? ((PublishingGallery3KeyFetchTransaction*) _tmp7_) : NULL);
+ _tmp3_ = publishing_gallery3_key_fetch_transaction_get_key (G_TYPE_CHECK_INSTANCE_TYPE (txn, PUBLISHING_GALLERY3_TYPE_KEY_FETCH_TRANSACTION) ? ((PublishingGallery3KeyFetchTransaction*) txn) : NULL);
#line 1176 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_free0 (self->priv->key);
#line 1176 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self->priv->key = _tmp8_;
+ self->priv->key = _tmp3_;
#line 1178 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp9_ = self->priv->key;
+ _tmp4_ = self->priv->key;
#line 1178 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (_tmp9_ == NULL) {
+ if (_tmp4_ == NULL) {
#line 1178 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_error ("GalleryConnector.vala:1178: key doesn\'t exist");
-#line 7927 "GalleryConnector.c"
+#line 8177 "GalleryConnector.c"
} else {
gchar* url = NULL;
- gchar* _tmp10_;
+ gchar* _tmp5_;
gchar* username = NULL;
- gchar* _tmp11_;
- const gchar* _tmp12_;
- PublishingGallery3Session* _tmp13_;
- const gchar* _tmp14_;
- const gchar* _tmp15_;
- const gchar* _tmp16_;
+ gchar* _tmp6_;
+ const gchar* _tmp7_;
+ PublishingGallery3Session* _tmp8_;
+ const gchar* _tmp9_;
+ const gchar* _tmp10_;
+ const gchar* _tmp11_;
#line 1180 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp10_ = publishing_gallery3_gallery_publisher_get_gallery_url (self);
+ _tmp5_ = publishing_gallery3_gallery_publisher_get_gallery_url (self);
#line 1180 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- url = _tmp10_;
+ url = _tmp5_;
#line 1181 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp11_ = publishing_gallery3_gallery_publisher_get_gallery_username (self);
+ _tmp6_ = publishing_gallery3_gallery_publisher_get_gallery_username (self);
#line 1181 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- username = _tmp11_;
+ username = _tmp6_;
#line 1183 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_debug ("GalleryConnector.vala:1183: %s", "EVENT: network transaction to fetch key completed " "successfully.");
#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp12_ = self->priv->key;
+ _tmp7_ = self->priv->key;
#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- publishing_gallery3_gallery_publisher_set_api_key (self, _tmp12_);
+ publishing_gallery3_gallery_publisher_set_api_key (self, _tmp7_);
#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp13_ = self->priv->session;
+ _tmp8_ = self->priv->session;
#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp14_ = url;
+ _tmp9_ = url;
#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp15_ = username;
+ _tmp10_ = username;
#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp16_ = self->priv->key;
+ _tmp11_ = self->priv->key;
#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- publishing_gallery3_session_authenticate (_tmp13_, _tmp14_, _tmp15_, _tmp16_);
+ publishing_gallery3_session_authenticate (_tmp8_, _tmp9_, _tmp10_, _tmp11_);
#line 1190 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_gallery_publisher_do_fetch_album_urls (self);
#line 1178 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_free0 (username);
#line 1178 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_free0 (url);
-#line 7968 "GalleryConnector.c"
+#line 8218 "GalleryConnector.c"
}
}
-static void publishing_gallery3_gallery_publisher_on_album_urls_fetch_error (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) {
- PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_gallery3_gallery_publisher_on_album_urls_fetch_error (PublishingGallery3GalleryPublisher* self,
+ PublishingRESTSupportTransaction* bad_txn,
+ GError* err)
+{
+ guint _tmp0_;
guint _tmp1_;
- PublishingRESTSupportTransaction* _tmp2_;
- guint _tmp3_;
- gboolean _tmp4_;
- PublishingGallery3Session* _tmp5_;
- gboolean _tmp6_;
- PublishingRESTSupportTransaction* _tmp7_;
- gchar* _tmp8_;
- gchar* _tmp9_;
- PublishingRESTSupportTransaction* _tmp10_;
- guint _tmp11_;
+ PublishingGallery3Session* _tmp2_;
+ gchar* _tmp3_;
+ gchar* _tmp4_;
#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self));
#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (bad_txn));
#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp0_ = bad_txn;
-#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
+ g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_album_urls_fetch_complete_publishing_rest_support_transaction_completed, self);
+ g_signal_handlers_disconnect_matched (bad_txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_album_urls_fetch_complete_publishing_rest_support_transaction_completed, self);
#line 1198 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp2_ = bad_txn;
+ g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
#line 1198 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 1198 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_album_urls_fetch_error_publishing_rest_support_transaction_network_error, self);
-#line 1200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
+ g_signal_handlers_disconnect_matched (bad_txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_album_urls_fetch_error_publishing_rest_support_transaction_network_error, self);
#line 1200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (!_tmp4_) {
+ if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
#line 1201 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return;
-#line 8008 "GalleryConnector.c"
+#line 8249 "GalleryConnector.c"
}
#line 1204 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp5_ = self->priv->session;
+ _tmp2_ = self->priv->session;
#line 1204 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp6_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 1204 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (!_tmp6_) {
+ if (!publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession))) {
#line 1205 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return;
-#line 8018 "GalleryConnector.c"
+#line 8257 "GalleryConnector.c"
}
#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp7_ = bad_txn;
-#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp8_ = publishing_rest_support_transaction_get_response (_tmp7_);
+ _tmp3_ = publishing_rest_support_transaction_get_response (bad_txn);
#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp9_ = _tmp8_;
+ _tmp4_ = _tmp3_;
#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_debug ("EVENT: network transaction to fetch album URLs " "failed; response = \'%s\'.", _tmp9_);
+ g_debug ("EVENT: network transaction to fetch album URLs " "failed; response = \'%s\'.", _tmp4_);
#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _g_free0 (_tmp9_);
-#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp10_ = bad_txn;
-#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp11_ = publishing_rest_support_transaction_get_status_code (_tmp10_);
+ _g_free0 (_tmp4_);
#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (_tmp11_ == ((guint) 403)) {
+ if (publishing_rest_support_transaction_get_status_code (bad_txn) == ((guint) 403)) {
#line 1218 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_gallery_publisher_do_show_credentials_pane (self, PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_FAILED_RETRY);
-#line 8038 "GalleryConnector.c"
+#line 8271 "GalleryConnector.c"
} else {
- PublishingRESTSupportTransaction* _tmp12_;
- guint _tmp13_;
#line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp12_ = bad_txn;
-#line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp13_ = publishing_rest_support_transaction_get_status_code (_tmp12_);
-#line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (_tmp13_ == ((guint) 400)) {
+ if (publishing_rest_support_transaction_get_status_code (bad_txn) == ((guint) 400)) {
#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_gallery_publisher_do_show_credentials_pane (self, PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_NOT_GALLERY_URL);
-#line 8050 "GalleryConnector.c"
+#line 8277 "GalleryConnector.c"
} else {
- SpitPublishingPluginHost* _tmp14_;
- GError* _tmp15_;
-#line 1226 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp14_ = self->priv->host;
+ SpitPublishingPluginHost* _tmp5_;
#line 1226 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp15_ = err;
+ _tmp5_ = self->priv->host;
#line 1226 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- spit_publishing_plugin_host_post_error (_tmp14_, _tmp15_);
-#line 8060 "GalleryConnector.c"
+ spit_publishing_plugin_host_post_error (_tmp5_, err);
+#line 8284 "GalleryConnector.c"
}
}
}
-static void publishing_gallery3_gallery_publisher_on_album_urls_fetch_complete (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportTransaction* txn) {
- PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_gallery3_gallery_publisher_on_album_urls_fetch_complete (PublishingGallery3GalleryPublisher* self,
+ PublishingRESTSupportTransaction* txn)
+{
+ guint _tmp0_;
guint _tmp1_;
- PublishingRESTSupportTransaction* _tmp2_;
- guint _tmp3_;
- gboolean _tmp4_;
- PublishingGallery3Session* _tmp5_;
- gboolean _tmp6_;
+ PublishingGallery3Session* _tmp2_;
gchar** album_urls = NULL;
- PublishingRESTSupportTransaction* _tmp7_;
- gint _tmp8_;
- gchar** _tmp9_;
+ gint _tmp3_;
+ gchar** _tmp4_;
gint album_urls_length1;
gint _album_urls_size_;
- gchar** _tmp10_;
- gint _tmp10__length1;
+ gchar** _tmp5_;
+ gint _tmp5__length1;
#line 1230 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self));
#line 1230 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
#line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp0_ = txn;
+ g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
#line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_album_urls_fetch_complete_publishing_rest_support_transaction_completed, self);
-#line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp2_ = txn;
+ g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_album_urls_fetch_complete_publishing_rest_support_transaction_completed, self);
#line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
+ g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
#line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_album_urls_fetch_error_publishing_rest_support_transaction_network_error, self);
-#line 1235 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
+ g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_album_urls_fetch_error_publishing_rest_support_transaction_network_error, self);
#line 1235 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (!_tmp4_) {
+ if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
#line 1236 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return;
-#line 8104 "GalleryConnector.c"
+#line 8320 "GalleryConnector.c"
}
#line 1239 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp5_ = self->priv->session;
+ _tmp2_ = self->priv->session;
#line 1239 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp6_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 1239 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (!_tmp6_) {
+ if (!publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession))) {
#line 1240 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return;
-#line 8114 "GalleryConnector.c"
+#line 8328 "GalleryConnector.c"
}
#line 1242 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_debug ("GalleryConnector.vala:1242: EVENT: retrieving all album URLs.");
#line 1244 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp7_ = txn;
-#line 1244 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp9_ = publishing_gallery3_get_album_ur_ls_transaction_get_album_urls (G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, PUBLISHING_GALLERY3_TYPE_GET_ALBUM_UR_LS_TRANSACTION) ? ((PublishingGallery3GetAlbumURLsTransaction*) _tmp7_) : NULL, &_tmp8_);
+ _tmp4_ = publishing_gallery3_get_album_ur_ls_transaction_get_album_urls (G_TYPE_CHECK_INSTANCE_TYPE (txn, PUBLISHING_GALLERY3_TYPE_GET_ALBUM_UR_LS_TRANSACTION) ? ((PublishingGallery3GetAlbumURLsTransaction*) txn) : NULL, &_tmp3_);
#line 1244 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- album_urls = _tmp9_;
+ album_urls = _tmp4_;
#line 1244 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- album_urls_length1 = _tmp8_;
+ album_urls_length1 = _tmp3_;
#line 1244 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_album_urls_size_ = album_urls_length1;
#line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp10_ = album_urls;
+ _tmp5_ = album_urls;
#line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp10__length1 = album_urls_length1;
+ _tmp5__length1 = album_urls_length1;
#line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (NULL == _tmp10_) {
-#line 8134 "GalleryConnector.c"
+ if (NULL == _tmp5_) {
+#line 8346 "GalleryConnector.c"
gchar* url = NULL;
- PublishingGallery3Session* _tmp11_;
- const gchar* _tmp12_;
- const gchar* _tmp13_;
- gchar* _tmp14_;
+ PublishingGallery3Session* _tmp6_;
+ const gchar* _tmp7_;
+ const gchar* _tmp8_;
+ gchar* _tmp9_;
gchar* username = NULL;
- PublishingGallery3Session* _tmp15_;
- const gchar* _tmp16_;
- const gchar* _tmp17_;
- gchar* _tmp18_;
- const gchar* _tmp19_;
- const gchar* _tmp20_;
+ PublishingGallery3Session* _tmp10_;
+ const gchar* _tmp11_;
+ const gchar* _tmp12_;
+ gchar* _tmp13_;
+ const gchar* _tmp14_;
+ const gchar* _tmp15_;
#line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp11_ = self->priv->session;
+ _tmp6_ = self->priv->session;
#line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp12_ = publishing_gallery3_session_get_url (_tmp11_);
+ _tmp7_ = publishing_gallery3_session_get_url (_tmp6_);
#line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp13_ = _tmp12_;
+ _tmp8_ = _tmp7_;
#line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp14_ = g_strdup (_tmp13_);
+ _tmp9_ = g_strdup (_tmp8_);
#line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- url = _tmp14_;
+ url = _tmp9_;
#line 1250 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp15_ = self->priv->session;
+ _tmp10_ = self->priv->session;
#line 1250 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp16_ = publishing_gallery3_session_get_username (_tmp15_);
+ _tmp11_ = publishing_gallery3_session_get_username (_tmp10_);
#line 1250 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp17_ = _tmp16_;
+ _tmp12_ = _tmp11_;
#line 1250 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp18_ = g_strdup (_tmp17_);
+ _tmp13_ = g_strdup (_tmp12_);
#line 1250 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- username = _tmp18_;
+ username = _tmp13_;
#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp19_ = url;
+ _tmp14_ = url;
#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp20_ = username;
+ _tmp15_ = username;
#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- publishing_gallery3_gallery_publisher_do_show_publishing_options_pane (self, _tmp19_, _tmp20_);
+ publishing_gallery3_gallery_publisher_do_show_publishing_options_pane (self, _tmp14_, _tmp15_);
#line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_free0 (username);
#line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_free0 (url);
-#line 8177 "GalleryConnector.c"
+#line 8389 "GalleryConnector.c"
} else {
- gchar** _tmp21_;
- gint _tmp21__length1;
+ gchar** _tmp16_;
+ gint _tmp16__length1;
#line 1256 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp21_ = album_urls;
+ _tmp16_ = album_urls;
#line 1256 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp21__length1 = album_urls_length1;
+ _tmp16__length1 = album_urls_length1;
#line 1256 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- publishing_gallery3_gallery_publisher_do_fetch_albums (self, _tmp21_, _tmp21__length1, (guint) 0);
-#line 8187 "GalleryConnector.c"
+ publishing_gallery3_gallery_publisher_do_fetch_albums (self, _tmp16_, _tmp16__length1, (guint) 0);
+#line 8399 "GalleryConnector.c"
}
#line 1230 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
album_urls = (_vala_array_free (album_urls, album_urls_length1, (GDestroyNotify) g_free), NULL);
-#line 8191 "GalleryConnector.c"
+#line 8403 "GalleryConnector.c"
}
-static void publishing_gallery3_gallery_publisher_on_album_fetch_error (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) {
- PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_gallery3_gallery_publisher_on_album_fetch_error (PublishingGallery3GalleryPublisher* self,
+ PublishingRESTSupportTransaction* bad_txn,
+ GError* err)
+{
+ guint _tmp0_;
guint _tmp1_;
- PublishingRESTSupportTransaction* _tmp2_;
- guint _tmp3_;
- gboolean _tmp4_;
- PublishingGallery3Session* _tmp5_;
- gboolean _tmp6_;
- PublishingRESTSupportTransaction* _tmp7_;
- gchar* _tmp8_;
- gchar* _tmp9_;
- PublishingRESTSupportTransaction* _tmp10_;
- guint _tmp11_;
+ PublishingGallery3Session* _tmp2_;
+ gchar* _tmp3_;
+ gchar* _tmp4_;
#line 1259 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self));
#line 1259 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (bad_txn));
#line 1262 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp0_ = bad_txn;
-#line 1262 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
+ g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
#line 1262 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_album_fetch_complete_publishing_rest_support_transaction_completed, self);
-#line 1263 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp2_ = bad_txn;
+ g_signal_handlers_disconnect_matched (bad_txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_album_fetch_complete_publishing_rest_support_transaction_completed, self);
#line 1263 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
+ g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
#line 1263 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_album_fetch_error_publishing_rest_support_transaction_network_error, self);
+ g_signal_handlers_disconnect_matched (bad_txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_album_fetch_error_publishing_rest_support_transaction_network_error, self);
#line 1265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 1265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (!_tmp4_) {
+ if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
#line 1266 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return;
-#line 8230 "GalleryConnector.c"
+#line 8433 "GalleryConnector.c"
}
#line 1269 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp5_ = self->priv->session;
-#line 1269 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp6_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
+ _tmp2_ = self->priv->session;
#line 1269 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (!_tmp6_) {
+ if (!publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession))) {
#line 1270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return;
-#line 8240 "GalleryConnector.c"
+#line 8441 "GalleryConnector.c"
}
#line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp7_ = bad_txn;
+ _tmp3_ = publishing_rest_support_transaction_get_response (bad_txn);
#line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp8_ = publishing_rest_support_transaction_get_response (_tmp7_);
-#line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp9_ = _tmp8_;
+ _tmp4_ = _tmp3_;
#line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_debug ("EVENT: network transaction to fetch albums " "failed; response = \'%s\'.", _tmp9_);
+ g_debug ("EVENT: network transaction to fetch albums " "failed; response = \'%s\'.", _tmp4_);
#line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _g_free0 (_tmp9_);
-#line 1281 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp10_ = bad_txn;
+ _g_free0 (_tmp4_);
#line 1281 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp11_ = publishing_rest_support_transaction_get_status_code (_tmp10_);
-#line 1281 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (_tmp11_ == ((guint) 403)) {
+ if (publishing_rest_support_transaction_get_status_code (bad_txn) == ((guint) 403)) {
#line 1283 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_gallery_publisher_do_show_credentials_pane (self, PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_FAILED_RETRY);
-#line 8260 "GalleryConnector.c"
+#line 8455 "GalleryConnector.c"
} else {
- PublishingRESTSupportTransaction* _tmp12_;
- guint _tmp13_;
-#line 1285 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp12_ = bad_txn;
#line 1285 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp13_ = publishing_rest_support_transaction_get_status_code (_tmp12_);
-#line 1285 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (_tmp13_ == ((guint) 400)) {
+ if (publishing_rest_support_transaction_get_status_code (bad_txn) == ((guint) 400)) {
#line 1288 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_gallery_publisher_do_show_credentials_pane (self, PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_NOT_GALLERY_URL);
-#line 8272 "GalleryConnector.c"
+#line 8461 "GalleryConnector.c"
} else {
- SpitPublishingPluginHost* _tmp14_;
- GError* _tmp15_;
+ SpitPublishingPluginHost* _tmp5_;
#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp14_ = self->priv->host;
+ _tmp5_ = self->priv->host;
#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp15_ = err;
-#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- spit_publishing_plugin_host_post_error (_tmp14_, _tmp15_);
-#line 8282 "GalleryConnector.c"
+ spit_publishing_plugin_host_post_error (_tmp5_, err);
+#line 8468 "GalleryConnector.c"
}
}
}
-static void _vala_array_add5 (PublishingGallery3Album** * array, int* length, int* size, PublishingGallery3Album* value) {
+static void
+_vala_array_add5 (PublishingGallery3Album** * array,
+ int* length,
+ int* size,
+ PublishingGallery3Album* value)
+{
#line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
if ((*length) == (*size)) {
#line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
*array = g_renew (PublishingGallery3Album*, *array, (*size) + 1);
-#line 8295 "GalleryConnector.c"
+#line 8486 "GalleryConnector.c"
}
#line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
(*array)[(*length)++] = value;
#line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
(*array)[*length] = NULL;
-#line 8301 "GalleryConnector.c"
+#line 8492 "GalleryConnector.c"
}
-static void publishing_gallery3_gallery_publisher_on_album_fetch_complete (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportTransaction* txn) {
- PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_gallery3_gallery_publisher_on_album_fetch_complete (PublishingGallery3GalleryPublisher* self,
+ PublishingRESTSupportTransaction* txn)
+{
+ guint _tmp0_;
guint _tmp1_;
- PublishingRESTSupportTransaction* _tmp2_;
- guint _tmp3_;
PublishingGallery3Album** new_albums = NULL;
gint new_albums_length1;
gint _new_albums_size_;
- gboolean _tmp4_;
- PublishingGallery3Session* _tmp5_;
- gboolean _tmp6_;
- PublishingRESTSupportTransaction* _tmp23_;
- gboolean _tmp24_;
- gboolean _tmp25_;
+ PublishingGallery3Session* _tmp2_;
+ gboolean _tmp17_;
+ gboolean _tmp18_;
GError * _inner_error_ = NULL;
#line 1295 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self));
#line 1295 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
#line 1297 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp0_ = txn;
+ g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
#line 1297 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 1297 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_album_fetch_complete_publishing_rest_support_transaction_completed, self);
-#line 1298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp2_ = txn;
+ g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_album_fetch_complete_publishing_rest_support_transaction_completed, self);
#line 1298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
+ g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
#line 1298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_album_fetch_error_publishing_rest_support_transaction_network_error, self);
+ g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_album_fetch_error_publishing_rest_support_transaction_network_error, self);
#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
new_albums = NULL;
#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -8375,55 +8560,48 @@ static void publishing_gallery3_gallery_publisher_on_album_fetch_complete (Publi
#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_new_albums_size_ = new_albums_length1;
#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (!_tmp4_) {
+ if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
new_albums = (_vala_array_free (new_albums, new_albums_length1, (GDestroyNotify) publishing_gallery3_album_unref), NULL);
#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return;
-#line 8350 "GalleryConnector.c"
+#line 8533 "GalleryConnector.c"
}
#line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp5_ = self->priv->session;
+ _tmp2_ = self->priv->session;
#line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp6_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (!_tmp6_) {
+ if (!publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession))) {
#line 1307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
new_albums = (_vala_array_free (new_albums, new_albums_length1, (GDestroyNotify) publishing_gallery3_album_unref), NULL);
#line 1307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return;
-#line 8362 "GalleryConnector.c"
+#line 8543 "GalleryConnector.c"
}
#line 1309 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_debug ("GalleryConnector.vala:1309: EVENT: user is attempting to populate the " \
"album list.");
-#line 8366 "GalleryConnector.c"
+#line 8547 "GalleryConnector.c"
{
- PublishingGallery3Album** _tmp7_ = NULL;
- PublishingRESTSupportTransaction* _tmp8_;
- gint _tmp9_;
- PublishingGallery3Album** _tmp10_;
- gint _tmp7__length1;
- gint __tmp7__size_;
- PublishingGallery3Album** _tmp11_;
- gint _tmp11__length1;
-#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp8_ = txn;
+ PublishingGallery3Album** _tmp3_ = NULL;
+ gint _tmp4_;
+ PublishingGallery3Album** _tmp5_;
+ gint _tmp3__length1;
+ gint __tmp3__size_;
+ PublishingGallery3Album** _tmp6_;
+ gint _tmp6__length1;
#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp10_ = publishing_gallery3_get_albums_transaction_get_albums (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, PUBLISHING_GALLERY3_TYPE_GET_ALBUMS_TRANSACTION) ? ((PublishingGallery3GetAlbumsTransaction*) _tmp8_) : NULL, &_tmp9_, &_inner_error_);
+ _tmp5_ = publishing_gallery3_get_albums_transaction_get_albums (G_TYPE_CHECK_INSTANCE_TYPE (txn, PUBLISHING_GALLERY3_TYPE_GET_ALBUMS_TRANSACTION) ? ((PublishingGallery3GetAlbumsTransaction*) txn) : NULL, &_tmp4_, &_inner_error_);
#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp7_ = _tmp10_;
+ _tmp3_ = _tmp5_;
#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp7__length1 = _tmp9_;
+ _tmp3__length1 = _tmp4_;
#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- __tmp7__size_ = _tmp7__length1;
+ __tmp3__size_ = _tmp3__length1;
#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 8390 "GalleryConnector.c"
+#line 8568 "GalleryConnector.c"
goto __catch14_spit_publishing_publishing_error;
}
#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -8434,47 +8612,44 @@ static void publishing_gallery3_gallery_publisher_on_album_fetch_complete (Publi
g_clear_error (&_inner_error_);
#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return;
-#line 8401 "GalleryConnector.c"
+#line 8579 "GalleryConnector.c"
}
#line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp11_ = _tmp7_;
+ _tmp6_ = _tmp3_;
#line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp11__length1 = _tmp7__length1;
+ _tmp6__length1 = _tmp3__length1;
#line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp7_ = NULL;
+ _tmp3_ = NULL;
#line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp7__length1 = 0;
+ _tmp3__length1 = 0;
#line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
new_albums = (_vala_array_free (new_albums, new_albums_length1, (GDestroyNotify) publishing_gallery3_album_unref), NULL);
#line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- new_albums = _tmp11_;
+ new_albums = _tmp6_;
#line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- new_albums_length1 = _tmp11__length1;
+ new_albums_length1 = _tmp6__length1;
#line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_new_albums_size_ = new_albums_length1;
#line 1311 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp7_ = (_vala_array_free (_tmp7_, _tmp7__length1, (GDestroyNotify) publishing_gallery3_album_unref), NULL);
-#line 8421 "GalleryConnector.c"
+ _tmp3_ = (_vala_array_free (_tmp3_, _tmp3__length1, (GDestroyNotify) publishing_gallery3_album_unref), NULL);
+#line 8599 "GalleryConnector.c"
}
goto __finally14;
__catch14_spit_publishing_publishing_error:
{
GError* err = NULL;
- PublishingRESTSupportTransaction* _tmp12_;
- GError* _tmp13_;
+ GError* _tmp7_;
#line 1311 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
err = _inner_error_;
#line 1311 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_inner_error_ = NULL;
#line 1315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp12_ = txn;
+ _tmp7_ = err;
#line 1315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp13_ = err;
-#line 1315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- publishing_gallery3_gallery_publisher_on_album_fetch_error (self, _tmp12_, _tmp13_);
+ publishing_gallery3_gallery_publisher_on_album_fetch_error (self, txn, _tmp7_);
#line 1311 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_error_free0 (err);
-#line 8441 "GalleryConnector.c"
+#line 8616 "GalleryConnector.c"
}
__finally14:
#line 1311 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -8487,626 +8662,553 @@ static void publishing_gallery3_gallery_publisher_on_album_fetch_complete (Publi
g_clear_error (&_inner_error_);
#line 1311 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return;
-#line 8454 "GalleryConnector.c"
+#line 8629 "GalleryConnector.c"
}
{
gint i = 0;
#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
i = 0;
-#line 8460 "GalleryConnector.c"
+#line 8635 "GalleryConnector.c"
{
- gboolean _tmp14_ = FALSE;
+ gboolean _tmp8_ = FALSE;
#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp14_ = TRUE;
+ _tmp8_ = TRUE;
#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
while (TRUE) {
-#line 8467 "GalleryConnector.c"
- gint _tmp16_;
- PublishingGallery3Album** _tmp17_;
- gint _tmp17__length1;
- PublishingGallery3Album** _tmp18_;
- gint _tmp18__length1;
- PublishingGallery3Album** _tmp19_;
- gint _tmp19__length1;
- gint _tmp20_;
- PublishingGallery3Album* _tmp21_;
- PublishingGallery3Album* _tmp22_;
+#line 8642 "GalleryConnector.c"
+ gint _tmp10_;
+ PublishingGallery3Album** _tmp11_;
+ gint _tmp11__length1;
+ PublishingGallery3Album** _tmp12_;
+ gint _tmp12__length1;
+ PublishingGallery3Album** _tmp13_;
+ gint _tmp13__length1;
+ gint _tmp14_;
+ PublishingGallery3Album* _tmp15_;
+ PublishingGallery3Album* _tmp16_;
#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (!_tmp14_) {
-#line 8480 "GalleryConnector.c"
- gint _tmp15_;
+ if (!_tmp8_) {
+#line 8655 "GalleryConnector.c"
+ gint _tmp9_;
#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp15_ = i;
+ _tmp9_ = i;
#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- i = _tmp15_ + 1;
-#line 8486 "GalleryConnector.c"
+ i = _tmp9_ + 1;
+#line 8661 "GalleryConnector.c"
}
#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp14_ = FALSE;
+ _tmp8_ = FALSE;
#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp16_ = i;
+ _tmp10_ = i;
#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp17_ = new_albums;
+ _tmp11_ = new_albums;
#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp17__length1 = new_albums_length1;
+ _tmp11__length1 = new_albums_length1;
#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (!(_tmp16_ <= (_tmp17__length1 - 1))) {
+ if (!(_tmp10_ <= (_tmp11__length1 - 1))) {
#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
break;
-#line 8500 "GalleryConnector.c"
+#line 8675 "GalleryConnector.c"
}
#line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp18_ = self->priv->albums;
+ _tmp12_ = self->priv->albums;
#line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp18__length1 = self->priv->albums_length1;
+ _tmp12__length1 = self->priv->albums_length1;
#line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp19_ = new_albums;
+ _tmp13_ = new_albums;
#line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp19__length1 = new_albums_length1;
+ _tmp13__length1 = new_albums_length1;
#line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp20_ = i;
+ _tmp14_ = i;
#line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp21_ = _tmp19_[_tmp20_];
+ _tmp15_ = _tmp13_[_tmp14_];
#line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp22_ = _publishing_gallery3_album_ref0 (_tmp21_);
+ _tmp16_ = _publishing_gallery3_album_ref0 (_tmp15_);
#line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _vala_array_add5 (&self->priv->albums, &self->priv->albums_length1, &self->priv->_albums_size_, _tmp22_);
-#line 8518 "GalleryConnector.c"
+ _vala_array_add5 (&self->priv->albums, &self->priv->albums_length1, &self->priv->_albums_size_, _tmp16_);
+#line 8693 "GalleryConnector.c"
}
}
}
#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp23_ = txn;
-#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp24_ = publishing_gallery3_get_albums_transaction_get_more_urls (G_TYPE_CHECK_INSTANCE_TYPE (_tmp23_, PUBLISHING_GALLERY3_TYPE_GET_ALBUMS_TRANSACTION) ? ((PublishingGallery3GetAlbumsTransaction*) _tmp23_) : NULL);
+ _tmp17_ = publishing_gallery3_get_albums_transaction_get_more_urls (G_TYPE_CHECK_INSTANCE_TYPE (txn, PUBLISHING_GALLERY3_TYPE_GET_ALBUMS_TRANSACTION) ? ((PublishingGallery3GetAlbumsTransaction*) txn) : NULL);
#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp25_ = _tmp24_;
+ _tmp18_ = _tmp17_;
#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (_tmp25_) {
-#line 8530 "GalleryConnector.c"
- PublishingRESTSupportTransaction* _tmp26_;
- gchar** _tmp27_;
- gint _tmp27__length1;
- gchar** _tmp28_;
- gint _tmp28__length1;
- PublishingRESTSupportTransaction* _tmp29_;
- guint _tmp30_;
- guint _tmp31_;
-#line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp26_ = txn;
+ if (_tmp18_) {
+#line 8703 "GalleryConnector.c"
+ gchar** _tmp19_;
+ gint _tmp19__length1;
+ gchar** _tmp20_;
+ gint _tmp20__length1;
+ guint _tmp21_;
+ guint _tmp22_;
#line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp27_ = publishing_gallery3_get_albums_transaction_get_album_urls (G_TYPE_CHECK_INSTANCE_TYPE (_tmp26_, PUBLISHING_GALLERY3_TYPE_GET_ALBUMS_TRANSACTION) ? ((PublishingGallery3GetAlbumsTransaction*) _tmp26_) : NULL, &_tmp27__length1);
+ _tmp19_ = publishing_gallery3_get_albums_transaction_get_album_urls (G_TYPE_CHECK_INSTANCE_TYPE (txn, PUBLISHING_GALLERY3_TYPE_GET_ALBUMS_TRANSACTION) ? ((PublishingGallery3GetAlbumsTransaction*) txn) : NULL, &_tmp19__length1);
#line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp28_ = _tmp27_;
+ _tmp20_ = _tmp19_;
#line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp28__length1 = _tmp27__length1;
+ _tmp20__length1 = _tmp19__length1;
#line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp29_ = txn;
+ _tmp21_ = publishing_gallery3_get_albums_transaction_get_urls_sent (G_TYPE_CHECK_INSTANCE_TYPE (txn, PUBLISHING_GALLERY3_TYPE_GET_ALBUMS_TRANSACTION) ? ((PublishingGallery3GetAlbumsTransaction*) txn) : NULL);
#line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp30_ = publishing_gallery3_get_albums_transaction_get_urls_sent (G_TYPE_CHECK_INSTANCE_TYPE (_tmp29_, PUBLISHING_GALLERY3_TYPE_GET_ALBUMS_TRANSACTION) ? ((PublishingGallery3GetAlbumsTransaction*) _tmp29_) : NULL);
-#line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp31_ = _tmp30_;
+ _tmp22_ = _tmp21_;
#line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- publishing_gallery3_gallery_publisher_do_fetch_albums (self, _tmp28_, _tmp28__length1, _tmp31_);
-#line 8555 "GalleryConnector.c"
+ publishing_gallery3_gallery_publisher_do_fetch_albums (self, _tmp20_, _tmp20__length1, _tmp22_);
+#line 8722 "GalleryConnector.c"
} else {
gchar* url = NULL;
- PublishingGallery3Session* _tmp32_;
- const gchar* _tmp33_;
- const gchar* _tmp34_;
- gchar* _tmp35_;
+ PublishingGallery3Session* _tmp23_;
+ const gchar* _tmp24_;
+ const gchar* _tmp25_;
+ gchar* _tmp26_;
gchar* username = NULL;
- PublishingGallery3Session* _tmp36_;
- const gchar* _tmp37_;
- const gchar* _tmp38_;
- gchar* _tmp39_;
- const gchar* _tmp40_;
- const gchar* _tmp41_;
+ PublishingGallery3Session* _tmp27_;
+ const gchar* _tmp28_;
+ const gchar* _tmp29_;
+ gchar* _tmp30_;
+ const gchar* _tmp31_;
+ const gchar* _tmp32_;
#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp32_ = self->priv->session;
+ _tmp23_ = self->priv->session;
#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp33_ = publishing_gallery3_session_get_url (_tmp32_);
+ _tmp24_ = publishing_gallery3_session_get_url (_tmp23_);
#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp34_ = _tmp33_;
+ _tmp25_ = _tmp24_;
#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp35_ = g_strdup (_tmp34_);
+ _tmp26_ = g_strdup (_tmp25_);
#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- url = _tmp35_;
+ url = _tmp26_;
#line 1331 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp36_ = self->priv->session;
+ _tmp27_ = self->priv->session;
#line 1331 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp37_ = publishing_gallery3_session_get_username (_tmp36_);
+ _tmp28_ = publishing_gallery3_session_get_username (_tmp27_);
#line 1331 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp38_ = _tmp37_;
+ _tmp29_ = _tmp28_;
#line 1331 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp39_ = g_strdup (_tmp38_);
+ _tmp30_ = g_strdup (_tmp29_);
#line 1331 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- username = _tmp39_;
+ username = _tmp30_;
#line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp40_ = url;
+ _tmp31_ = url;
#line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp41_ = username;
+ _tmp32_ = username;
#line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- publishing_gallery3_gallery_publisher_do_show_publishing_options_pane (self, _tmp40_, _tmp41_);
+ publishing_gallery3_gallery_publisher_do_show_publishing_options_pane (self, _tmp31_, _tmp32_);
#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_free0 (username);
#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_free0 (url);
-#line 8599 "GalleryConnector.c"
+#line 8766 "GalleryConnector.c"
}
#line 1295 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
new_albums = (_vala_array_free (new_albums, new_albums_length1, (GDestroyNotify) publishing_gallery3_album_unref), NULL);
-#line 8603 "GalleryConnector.c"
+#line 8770 "GalleryConnector.c"
}
-static void publishing_gallery3_gallery_publisher_on_album_create_error (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) {
- PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_gallery3_gallery_publisher_on_album_create_error (PublishingGallery3GalleryPublisher* self,
+ PublishingRESTSupportTransaction* bad_txn,
+ GError* err)
+{
+ guint _tmp0_;
guint _tmp1_;
- PublishingRESTSupportTransaction* _tmp2_;
- guint _tmp3_;
- gboolean _tmp4_;
- PublishingGallery3Session* _tmp5_;
- gboolean _tmp6_;
- PublishingRESTSupportTransaction* _tmp7_;
- gchar* _tmp8_;
- gchar* _tmp9_;
- PublishingRESTSupportTransaction* _tmp10_;
- guint _tmp11_;
+ PublishingGallery3Session* _tmp2_;
+ gchar* _tmp3_;
+ gchar* _tmp4_;
#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self));
#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (bad_txn));
#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp0_ = bad_txn;
-#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
+ g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_album_create_complete_publishing_rest_support_transaction_completed, self);
+ g_signal_handlers_disconnect_matched (bad_txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_album_create_complete_publishing_rest_support_transaction_completed, self);
#line 1342 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp2_ = bad_txn;
+ g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
#line 1342 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 1342 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_album_create_error_publishing_rest_support_transaction_network_error, self);
-#line 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
+ g_signal_handlers_disconnect_matched (bad_txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_album_create_error_publishing_rest_support_transaction_network_error, self);
#line 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (!_tmp4_) {
+ if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
#line 1345 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return;
-#line 8642 "GalleryConnector.c"
+#line 8800 "GalleryConnector.c"
}
#line 1348 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp5_ = self->priv->session;
+ _tmp2_ = self->priv->session;
#line 1348 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp6_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 1348 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (!_tmp6_) {
+ if (!publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession))) {
#line 1349 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return;
-#line 8652 "GalleryConnector.c"
+#line 8808 "GalleryConnector.c"
}
#line 1351 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp7_ = bad_txn;
-#line 1351 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp8_ = publishing_rest_support_transaction_get_response (_tmp7_);
+ _tmp3_ = publishing_rest_support_transaction_get_response (bad_txn);
#line 1351 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp9_ = _tmp8_;
+ _tmp4_ = _tmp3_;
#line 1351 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_debug ("EVENT: network transaction to create an album " "failed; response = \'%s\'.", _tmp9_);
+ g_debug ("EVENT: network transaction to create an album " "failed; response = \'%s\'.", _tmp4_);
#line 1351 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _g_free0 (_tmp9_);
-#line 1360 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp10_ = bad_txn;
-#line 1360 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp11_ = publishing_rest_support_transaction_get_status_code (_tmp10_);
+ _g_free0 (_tmp4_);
#line 1360 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (_tmp11_ == ((guint) 403)) {
+ if (publishing_rest_support_transaction_get_status_code (bad_txn) == ((guint) 403)) {
#line 1362 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_gallery_publisher_do_show_credentials_pane (self, PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_FAILED_RETRY);
-#line 8672 "GalleryConnector.c"
+#line 8822 "GalleryConnector.c"
} else {
- PublishingRESTSupportTransaction* _tmp12_;
- guint _tmp13_;
#line 1364 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp12_ = bad_txn;
-#line 1364 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp13_ = publishing_rest_support_transaction_get_status_code (_tmp12_);
-#line 1364 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (_tmp13_ == ((guint) 400)) {
+ if (publishing_rest_support_transaction_get_status_code (bad_txn) == ((guint) 400)) {
#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_gallery_publisher_do_show_credentials_pane (self, PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_NOT_GALLERY_URL);
-#line 8684 "GalleryConnector.c"
+#line 8828 "GalleryConnector.c"
} else {
- SpitPublishingPluginHost* _tmp14_;
- GError* _tmp15_;
+ SpitPublishingPluginHost* _tmp5_;
#line 1370 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp14_ = self->priv->host;
-#line 1370 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp15_ = err;
+ _tmp5_ = self->priv->host;
#line 1370 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- spit_publishing_plugin_host_post_error (_tmp14_, _tmp15_);
-#line 8694 "GalleryConnector.c"
+ spit_publishing_plugin_host_post_error (_tmp5_, err);
+#line 8835 "GalleryConnector.c"
}
}
}
-static void publishing_gallery3_gallery_publisher_on_album_create_complete (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportTransaction* txn) {
- PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_gallery3_gallery_publisher_on_album_create_complete (PublishingGallery3GalleryPublisher* self,
+ PublishingRESTSupportTransaction* txn)
+{
+ guint _tmp0_;
guint _tmp1_;
- PublishingRESTSupportTransaction* _tmp2_;
- guint _tmp3_;
- gboolean _tmp4_;
- PublishingGallery3Session* _tmp5_;
- gboolean _tmp6_;
+ PublishingGallery3Session* _tmp2_;
PublishingGallery3PublishingParameters* new_params = NULL;
- PublishingRESTSupportTransaction* _tmp7_;
- PublishingGallery3PublishingParameters* _tmp8_;
+ PublishingGallery3PublishingParameters* _tmp3_;
+ PublishingGallery3PublishingParameters* _tmp4_;
+ PublishingGallery3PublishingParameters* _tmp5_;
+ PublishingGallery3PublishingParameters* _tmp6_;
+ gchar* _tmp7_;
+ gchar* _tmp8_;
PublishingGallery3PublishingParameters* _tmp9_;
- PublishingGallery3PublishingParameters* _tmp10_;
- PublishingGallery3PublishingParameters* _tmp11_;
- PublishingRESTSupportTransaction* _tmp12_;
- gchar* _tmp13_;
- gchar* _tmp14_;
- PublishingGallery3PublishingParameters* _tmp15_;
- const gchar* _tmp16_;
- const gchar* _tmp17_;
- PublishingGallery3PublishingParameters* _tmp18_;
+ const gchar* _tmp10_;
+ const gchar* _tmp11_;
+ PublishingGallery3PublishingParameters* _tmp12_;
#line 1374 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self));
#line 1374 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
#line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp0_ = txn;
-#line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
+ g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
#line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_album_create_complete_publishing_rest_support_transaction_completed, self);
+ g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_album_create_complete_publishing_rest_support_transaction_completed, self);
#line 1377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp2_ = txn;
+ g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
#line 1377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 1377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_album_create_error_publishing_rest_support_transaction_network_error, self);
-#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
+ g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_album_create_error_publishing_rest_support_transaction_network_error, self);
#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (!_tmp4_) {
+ if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
#line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return;
-#line 8743 "GalleryConnector.c"
+#line 8875 "GalleryConnector.c"
}
#line 1383 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp5_ = self->priv->session;
-#line 1383 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp6_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
+ _tmp2_ = self->priv->session;
#line 1383 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (!_tmp6_) {
+ if (!publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession))) {
#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return;
-#line 8753 "GalleryConnector.c"
+#line 8883 "GalleryConnector.c"
}
#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp7_ = txn;
+ _tmp3_ = publishing_gallery3_gallery_album_create_transaction_get_parameters (G_TYPE_CHECK_INSTANCE_TYPE (txn, PUBLISHING_GALLERY3_TYPE_GALLERY_ALBUM_CREATE_TRANSACTION) ? ((PublishingGallery3GalleryAlbumCreateTransaction*) txn) : NULL);
#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp8_ = publishing_gallery3_gallery_album_create_transaction_get_parameters (G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, PUBLISHING_GALLERY3_TYPE_GALLERY_ALBUM_CREATE_TRANSACTION) ? ((PublishingGallery3GalleryAlbumCreateTransaction*) _tmp7_) : NULL);
-#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp9_ = _tmp8_;
+ _tmp4_ = _tmp3_;
#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp10_ = _publishing_gallery3_publishing_parameters_ref0 (_tmp9_);
+ _tmp5_ = _publishing_gallery3_publishing_parameters_ref0 (_tmp4_);
#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- new_params = _tmp10_;
-#line 1388 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp11_ = new_params;
+ new_params = _tmp5_;
#line 1388 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp12_ = txn;
+ _tmp6_ = new_params;
#line 1388 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp13_ = publishing_gallery3_gallery_album_create_transaction_get_new_album_path (G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, PUBLISHING_GALLERY3_TYPE_GALLERY_ALBUM_CREATE_TRANSACTION) ? ((PublishingGallery3GalleryAlbumCreateTransaction*) _tmp12_) : NULL);
+ _tmp7_ = publishing_gallery3_gallery_album_create_transaction_get_new_album_path (G_TYPE_CHECK_INSTANCE_TYPE (txn, PUBLISHING_GALLERY3_TYPE_GALLERY_ALBUM_CREATE_TRANSACTION) ? ((PublishingGallery3GalleryAlbumCreateTransaction*) txn) : NULL);
#line 1388 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp14_ = _tmp13_;
+ _tmp8_ = _tmp7_;
#line 1388 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- publishing_gallery3_publishing_parameters_set_album_path (_tmp11_, _tmp14_);
+ publishing_gallery3_publishing_parameters_set_album_path (_tmp6_, _tmp8_);
#line 1388 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _g_free0 (_tmp14_);
+ _g_free0 (_tmp8_);
#line 1391 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp15_ = new_params;
+ _tmp9_ = new_params;
#line 1391 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp16_ = publishing_gallery3_publishing_parameters_get_album_path (_tmp15_);
+ _tmp10_ = publishing_gallery3_publishing_parameters_get_album_path (_tmp9_);
#line 1391 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp17_ = _tmp16_;
+ _tmp11_ = _tmp10_;
#line 1391 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_debug ("GalleryConnector.vala:1391: EVENT: user has created an album at \"%s\"" \
-".", _tmp17_);
+".", _tmp11_);
#line 1394 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp18_ = new_params;
+ _tmp12_ = new_params;
#line 1394 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- publishing_gallery3_gallery_publisher_do_publish (self, _tmp18_);
+ publishing_gallery3_gallery_publisher_do_publish (self, _tmp12_);
#line 1374 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_publishing_gallery3_publishing_parameters_unref0 (new_params);
-#line 8791 "GalleryConnector.c"
+#line 8917 "GalleryConnector.c"
}
-static gpointer _publishing_rest_support_batch_uploader_ref0 (gpointer self) {
+static gpointer
+_publishing_rest_support_batch_uploader_ref0 (gpointer self)
+{
#line 1403 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return self ? publishing_rest_support_batch_uploader_ref (self) : NULL;
-#line 8798 "GalleryConnector.c"
+#line 8926 "GalleryConnector.c"
}
-static void publishing_gallery3_gallery_publisher_on_publish_error (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportBatchUploader* _uploader, GError* err) {
- gboolean _tmp0_;
+static void
+publishing_gallery3_gallery_publisher_on_publish_error (PublishingGallery3GalleryPublisher* self,
+ PublishingRESTSupportBatchUploader* _uploader,
+ GError* err)
+{
PublishingGallery3Uploader* uploader = NULL;
- PublishingRESTSupportBatchUploader* _tmp1_;
- PublishingGallery3Uploader* _tmp2_;
+ PublishingGallery3Uploader* _tmp0_;
GError* g3_err = NULL;
- GError* _tmp3_;
- GError* _tmp4_;
- GError* _tmp5_;
- const gchar* _tmp6_;
- PublishingGallery3Uploader* _tmp7_;
- const gchar* _tmp8_;
- const gchar* _tmp9_;
- PublishingGallery3Uploader* _tmp10_;
- guint _tmp11_;
+ GError* _tmp1_;
+ const gchar* _tmp2_;
+ PublishingGallery3Uploader* _tmp3_;
+ const gchar* _tmp4_;
+ const gchar* _tmp5_;
+ PublishingGallery3Uploader* _tmp6_;
+ guint _tmp7_;
+ guint _tmp8_;
+ PublishingGallery3Uploader* _tmp9_;
+ guint _tmp10_;
+ PublishingGallery3Uploader* _tmp11_;
guint _tmp12_;
PublishingGallery3Uploader* _tmp13_;
guint _tmp14_;
- PublishingGallery3Uploader* _tmp15_;
- guint _tmp16_;
- PublishingGallery3Uploader* _tmp17_;
- guint _tmp18_;
- guint _tmp19_;
- SpitPublishingPluginHost* _tmp36_;
- GError* _tmp37_;
+ guint _tmp15_;
+ SpitPublishingPluginHost* _tmp32_;
+ GError* _tmp33_;
#line 1397 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self));
#line 1397 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (_uploader));
#line 1400 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 1400 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (!_tmp0_) {
+ if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
#line 1401 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return;
-#line 8837 "GalleryConnector.c"
+#line 8963 "GalleryConnector.c"
}
#line 1403 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp1_ = _uploader;
-#line 1403 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp2_ = _publishing_rest_support_batch_uploader_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, PUBLISHING_GALLERY3_TYPE_UPLOADER) ? ((PublishingGallery3Uploader*) _tmp1_) : NULL);
+ _tmp0_ = _publishing_rest_support_batch_uploader_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_uploader, PUBLISHING_GALLERY3_TYPE_UPLOADER) ? ((PublishingGallery3Uploader*) _uploader) : NULL);
#line 1403 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- uploader = _tmp2_;
+ uploader = _tmp0_;
#line 1404 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp3_ = err;
+ _tmp1_ = g_error_copy (err);
#line 1404 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp4_ = g_error_copy (_tmp3_);
-#line 1404 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g3_err = _tmp4_;
-#line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp5_ = err;
+ g3_err = _tmp1_;
#line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp6_ = _tmp5_->message;
+ _tmp2_ = err->message;
#line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp7_ = uploader;
+ _tmp3_ = uploader;
#line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp8_ = publishing_gallery3_uploader_get_current_publishable_name (_tmp7_);
+ _tmp4_ = publishing_gallery3_uploader_get_current_publishable_name (_tmp3_);
#line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp9_ = _tmp8_;
+ _tmp5_ = _tmp4_;
#line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp10_ = uploader;
+ _tmp6_ = uploader;
#line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp11_ = publishing_gallery3_uploader_get_status_code (_tmp10_);
+ _tmp7_ = publishing_gallery3_uploader_get_status_code (_tmp6_);
#line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp12_ = _tmp11_;
+ _tmp8_ = _tmp7_;
#line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_debug ("EVENT: uploader reports upload error = '%s' " "for file '%s' (code %d)", _tmp6_, _tmp9_, _tmp12_);
+ g_debug ("EVENT: uploader reports upload error = '%s' " "for file '%s' (code %d)", _tmp2_, _tmp5_, _tmp8_);
#line 1410 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp13_ = uploader;
+ _tmp9_ = uploader;
#line 1410 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp14_, NULL, FALSE);
+ g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp10_, NULL, FALSE);
#line 1410 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp14_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_publish_complete_publishing_rest_support_batch_uploader_upload_complete, self);
+ g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_publish_complete_publishing_rest_support_batch_uploader_upload_complete, self);
#line 1411 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp15_ = uploader;
+ _tmp11_ = uploader;
#line 1411 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp16_, NULL, FALSE);
+ g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp12_, NULL, FALSE);
#line 1411 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp16_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_publish_error_publishing_rest_support_batch_uploader_upload_error, self);
+ g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp12_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_publish_error_publishing_rest_support_batch_uploader_upload_error, self);
#line 1414 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp17_ = uploader;
+ _tmp13_ = uploader;
#line 1414 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp18_ = publishing_gallery3_uploader_get_status_code (_tmp17_);
+ _tmp14_ = publishing_gallery3_uploader_get_status_code (_tmp13_);
#line 1414 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp19_ = _tmp18_;
+ _tmp15_ = _tmp14_;
#line 1414 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (_tmp19_ == ((guint) 400)) {
-#line 8889 "GalleryConnector.c"
- GError* _tmp20_;
- GError* _tmp21_;
- const gchar* _tmp22_;
- PublishingGallery3Uploader* _tmp23_;
- const gchar* _tmp24_;
- const gchar* _tmp25_;
- gchar* _tmp26_;
- gchar* _tmp27_;
- gchar* _tmp28_;
- PublishingGallery3Uploader* _tmp29_;
- SpitPublishingPublisherMediaType _tmp30_;
- SpitPublishingPublisherMediaType _tmp31_;
+ if (_tmp15_ == ((guint) 400)) {
+#line 9009 "GalleryConnector.c"
+ GError* _tmp16_;
+ GError* _tmp17_;
+ const gchar* _tmp18_;
+ PublishingGallery3Uploader* _tmp19_;
+ const gchar* _tmp20_;
+ const gchar* _tmp21_;
+ gchar* _tmp22_;
+ gchar* _tmp23_;
+ gchar* _tmp24_;
+ PublishingGallery3Uploader* _tmp25_;
+ SpitPublishingPublisherMediaType _tmp26_;
+ SpitPublishingPublisherMediaType _tmp27_;
#line 1415 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp20_ = g3_err;
+ _tmp16_ = g3_err;
#line 1415 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp21_ = g3_err;
+ _tmp17_ = g3_err;
#line 1415 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp22_ = _tmp21_->message;
+ _tmp18_ = _tmp17_->message;
#line 1415 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp23_ = uploader;
+ _tmp19_ = uploader;
#line 1415 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp24_ = publishing_gallery3_uploader_get_current_publishable_name (_tmp23_);
+ _tmp20_ = publishing_gallery3_uploader_get_current_publishable_name (_tmp19_);
#line 1415 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp25_ = _tmp24_;
+ _tmp21_ = _tmp20_;
#line 1415 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp26_ = g_strdup_printf (PUBLISHING_GALLERY3_GALLERY_PUBLISHER_BAD_FILE_MSG, _tmp25_);
+ _tmp22_ = g_strdup_printf (PUBLISHING_GALLERY3_GALLERY_PUBLISHER_BAD_FILE_MSG, _tmp21_);
#line 1415 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp27_ = _tmp26_;
+ _tmp23_ = _tmp22_;
#line 1415 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp28_ = g_strconcat (_tmp22_, _tmp27_, NULL);
+ _tmp24_ = g_strconcat (_tmp18_, _tmp23_, NULL);
#line 1415 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _g_free0 (_tmp21_->message);
+ _g_free0 (_tmp17_->message);
#line 1415 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp21_->message = _tmp28_;
+ _tmp17_->message = _tmp24_;
#line 1415 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _g_free0 (_tmp27_);
+ _g_free0 (_tmp23_);
#line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp29_ = uploader;
+ _tmp25_ = uploader;
#line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp30_ = publishing_gallery3_uploader_get_current_publishable_type (_tmp29_);
+ _tmp26_ = publishing_gallery3_uploader_get_current_publishable_type (_tmp25_);
#line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp31_ = _tmp30_;
+ _tmp27_ = _tmp26_;
#line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (_tmp31_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 8934 "GalleryConnector.c"
- GError* _tmp32_;
- GError* _tmp33_;
- const gchar* _tmp34_;
- gchar* _tmp35_;
+ if (_tmp27_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
+#line 9054 "GalleryConnector.c"
+ GError* _tmp28_;
+ GError* _tmp29_;
+ const gchar* _tmp30_;
+ gchar* _tmp31_;
#line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp32_ = g3_err;
+ _tmp28_ = g3_err;
#line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp33_ = g3_err;
+ _tmp29_ = g3_err;
#line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp34_ = _tmp33_->message;
+ _tmp30_ = _tmp29_->message;
#line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp35_ = g_strconcat (_tmp34_, PUBLISHING_GALLERY3_GALLERY_PUBLISHER_BAD_MOVIE_MSG, NULL);
+ _tmp31_ = g_strconcat (_tmp30_, PUBLISHING_GALLERY3_GALLERY_PUBLISHER_BAD_MOVIE_MSG, NULL);
#line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _g_free0 (_tmp33_->message);
+ _g_free0 (_tmp29_->message);
#line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp33_->message = _tmp35_;
-#line 8951 "GalleryConnector.c"
+ _tmp29_->message = _tmp31_;
+#line 9071 "GalleryConnector.c"
}
}
#line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp36_ = self->priv->host;
+ _tmp32_ = self->priv->host;
#line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp37_ = g3_err;
+ _tmp33_ = g3_err;
#line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- spit_publishing_plugin_host_post_error (_tmp36_, _tmp37_);
+ spit_publishing_plugin_host_post_error (_tmp32_, _tmp33_);
#line 1397 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_error_free0 (g3_err);
#line 1397 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_publishing_rest_support_batch_uploader_unref0 (uploader);
-#line 8964 "GalleryConnector.c"
+#line 9084 "GalleryConnector.c"
}
-static void publishing_gallery3_gallery_publisher_on_upload_status_updated (PublishingGallery3GalleryPublisher* self, gint file_number, gdouble completed_fraction) {
- gboolean _tmp0_;
- gdouble _tmp1_;
- SpitPublishingProgressCallback _tmp2_;
- void* _tmp2__target;
- SpitPublishingProgressCallback _tmp3_;
- void* _tmp3__target;
- gint _tmp4_;
- gdouble _tmp5_;
+static void
+publishing_gallery3_gallery_publisher_on_upload_status_updated (PublishingGallery3GalleryPublisher* self,
+ gint file_number,
+ gdouble completed_fraction)
+{
+ SpitPublishingProgressCallback _tmp0_;
+ void* _tmp0__target;
+ SpitPublishingProgressCallback _tmp1_;
+ void* _tmp1__target;
#line 1426 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self));
#line 1429 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 1429 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (!_tmp0_) {
+ if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
#line 1430 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return;
-#line 8985 "GalleryConnector.c"
+#line 9103 "GalleryConnector.c"
}
#line 1432 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp1_ = completed_fraction;
-#line 1432 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_debug ("GalleryConnector.vala:1432: EVENT: uploader reports upload %.2f percen" \
-"t complete.", 100.0 * _tmp1_);
+"t complete.", 100.0 * completed_fraction);
#line 1435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp2_ = self->priv->progress_reporter;
+ _tmp0_ = self->priv->progress_reporter;
#line 1435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp2__target = self->priv->progress_reporter_target;
+ _tmp0__target = self->priv->progress_reporter_target;
#line 1435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _vala_assert (_tmp2_ != NULL, "progress_reporter != null");
-#line 1437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp3_ = self->priv->progress_reporter;
-#line 1437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp3__target = self->priv->progress_reporter_target;
+ _vala_assert (_tmp0_ != NULL, "progress_reporter != null");
#line 1437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp4_ = file_number;
+ _tmp1_ = self->priv->progress_reporter;
#line 1437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp5_ = completed_fraction;
+ _tmp1__target = self->priv->progress_reporter_target;
#line 1437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp3_ (_tmp4_, _tmp5_, _tmp3__target);
-#line 9007 "GalleryConnector.c"
+ _tmp1_ (file_number, completed_fraction, _tmp1__target);
+#line 9119 "GalleryConnector.c"
}
-static void publishing_gallery3_gallery_publisher_on_publish_complete (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportBatchUploader* uploader, gint num_published) {
- PublishingRESTSupportBatchUploader* _tmp0_;
+static void
+publishing_gallery3_gallery_publisher_on_publish_complete (PublishingGallery3GalleryPublisher* self,
+ PublishingRESTSupportBatchUploader* uploader,
+ gint num_published)
+{
+ guint _tmp0_;
guint _tmp1_;
- PublishingRESTSupportBatchUploader* _tmp2_;
- guint _tmp3_;
- gboolean _tmp4_;
- PublishingGallery3Session* _tmp5_;
- gboolean _tmp6_;
- gint _tmp7_;
+ PublishingGallery3Session* _tmp2_;
#line 1441 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self));
#line 1441 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (uploader));
#line 1444 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp0_ = uploader;
-#line 1444 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp1_, NULL, FALSE);
+ g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp0_, NULL, FALSE);
#line 1444 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_publish_complete_publishing_rest_support_batch_uploader_upload_complete, self);
+ g_signal_handlers_disconnect_matched (uploader, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_publish_complete_publishing_rest_support_batch_uploader_upload_complete, self);
#line 1445 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp2_ = uploader;
+ g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp1_, NULL, FALSE);
#line 1445 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp3_, NULL, FALSE);
-#line 1445 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_publish_error_publishing_rest_support_batch_uploader_upload_error, self);
-#line 1447 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
+ g_signal_handlers_disconnect_matched (uploader, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_publish_error_publishing_rest_support_batch_uploader_upload_error, self);
#line 1447 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (!_tmp4_) {
+ if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
#line 1448 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return;
-#line 9042 "GalleryConnector.c"
+#line 9147 "GalleryConnector.c"
}
#line 1451 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp5_ = self->priv->session;
-#line 1451 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp6_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
+ _tmp2_ = self->priv->session;
#line 1451 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (!_tmp6_) {
+ if (!publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession))) {
#line 1452 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return;
-#line 9052 "GalleryConnector.c"
+#line 9155 "GalleryConnector.c"
}
#line 1454 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp7_ = num_published;
-#line 1454 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_debug ("GalleryConnector.vala:1454: EVENT: publishing complete; %d items publi" \
-"shed", _tmp7_);
+"shed", num_published);
#line 1457 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_gallery_publisher_do_show_success_pane (self);
-#line 9060 "GalleryConnector.c"
+#line 9161 "GalleryConnector.c"
}
-static void publishing_gallery3_gallery_publisher_on_publishing_options_pane_logout (PublishingGallery3GalleryPublisher* self) {
+static void
+publishing_gallery3_gallery_publisher_on_publishing_options_pane_logout (PublishingGallery3GalleryPublisher* self)
+{
PublishingGallery3PublishingOptionsPane* _tmp0_;
guint _tmp1_;
PublishingGallery3PublishingOptionsPane* _tmp2_;
guint _tmp3_;
- gboolean _tmp4_;
- PublishingGallery3Session* _tmp5_;
+ PublishingGallery3Session* _tmp4_;
#line 1461 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self));
#line 1462 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -9122,33 +9224,31 @@ static void publishing_gallery3_gallery_publisher_on_publishing_options_pane_log
#line 1464 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_publishing_options_pane_logout_publishing_gallery3_publishing_options_pane_logout, self);
#line 1467 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 1467 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (!_tmp4_) {
+ if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
#line 1468 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return;
-#line 9091 "GalleryConnector.c"
+#line 9191 "GalleryConnector.c"
}
#line 1470 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_debug ("GalleryConnector.vala:1470: EVENT: user is attempting to log out.");
#line 1472 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp5_ = self->priv->session;
+ _tmp4_ = self->priv->session;
#line 1472 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- publishing_gallery3_session_deauthenticate (_tmp5_);
+ publishing_gallery3_session_deauthenticate (_tmp4_);
#line 1473 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_gallery_publisher_do_show_service_welcome_pane (self);
-#line 9101 "GalleryConnector.c"
+#line 9201 "GalleryConnector.c"
}
-static void publishing_gallery3_gallery_publisher_on_publishing_options_pane_publish (PublishingGallery3GalleryPublisher* self, PublishingGallery3PublishingParameters* parameters) {
+static void
+publishing_gallery3_gallery_publisher_on_publishing_options_pane_publish (PublishingGallery3GalleryPublisher* self,
+ PublishingGallery3PublishingParameters* parameters)
+{
PublishingGallery3PublishingOptionsPane* _tmp0_;
guint _tmp1_;
PublishingGallery3PublishingOptionsPane* _tmp2_;
guint _tmp3_;
- gboolean _tmp4_;
- PublishingGallery3PublishingParameters* _tmp5_;
- gboolean _tmp6_;
#line 1476 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self));
#line 1476 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -9166,63 +9266,52 @@ static void publishing_gallery3_gallery_publisher_on_publishing_options_pane_pub
#line 1479 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_publishing_options_pane_logout_publishing_gallery3_publishing_options_pane_logout, self);
#line 1482 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 1482 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (!_tmp4_) {
+ if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
#line 1483 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return;
-#line 9135 "GalleryConnector.c"
+#line 9233 "GalleryConnector.c"
}
#line 1485 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_debug ("GalleryConnector.vala:1485: EVENT: user is attempting to publish somet" \
"hing.");
#line 1487 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp5_ = parameters;
-#line 1487 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp6_ = publishing_gallery3_publishing_parameters_is_to_new_album (_tmp5_);
-#line 1487 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (_tmp6_) {
-#line 9145 "GalleryConnector.c"
- PublishingGallery3PublishingParameters* _tmp7_;
- const gchar* _tmp8_;
- const gchar* _tmp9_;
- PublishingGallery3PublishingParameters* _tmp10_;
-#line 1488 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp7_ = parameters;
+ if (publishing_gallery3_publishing_parameters_is_to_new_album (parameters)) {
+#line 9239 "GalleryConnector.c"
+ const gchar* _tmp4_;
+ const gchar* _tmp5_;
#line 1488 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp8_ = publishing_gallery3_publishing_parameters_get_album_name (_tmp7_);
+ _tmp4_ = publishing_gallery3_publishing_parameters_get_album_name (parameters);
#line 1488 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp9_ = _tmp8_;
+ _tmp5_ = _tmp4_;
#line 1488 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_debug ("GalleryConnector.vala:1488: EVENT: must create new album \"%s\" first.", _tmp9_);
-#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp10_ = parameters;
+ g_debug ("GalleryConnector.vala:1488: EVENT: must create new album \"%s\" first.", _tmp5_);
#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- publishing_gallery3_gallery_publisher_do_create_album (self, _tmp10_);
-#line 9162 "GalleryConnector.c"
+ publishing_gallery3_gallery_publisher_do_create_album (self, parameters);
+#line 9250 "GalleryConnector.c"
} else {
- PublishingGallery3PublishingParameters* _tmp11_;
#line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp11_ = parameters;
-#line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- publishing_gallery3_gallery_publisher_do_publish (self, _tmp11_);
-#line 9169 "GalleryConnector.c"
+ publishing_gallery3_gallery_publisher_do_publish (self, parameters);
+#line 9254 "GalleryConnector.c"
}
}
-static void publishing_gallery3_gallery_publisher_class_init (PublishingGallery3GalleryPublisherClass * klass) {
+static void
+publishing_gallery3_gallery_publisher_class_init (PublishingGallery3GalleryPublisherClass * klass)
+{
#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_gallery_publisher_parent_class = g_type_class_peek_parent (klass);
#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_type_class_add_private (klass, sizeof (PublishingGallery3GalleryPublisherPrivate));
#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
G_OBJECT_CLASS (klass)->finalize = publishing_gallery3_gallery_publisher_finalize;
-#line 9181 "GalleryConnector.c"
+#line 9268 "GalleryConnector.c"
}
-static void publishing_gallery3_gallery_publisher_spit_publishing_publisher_interface_init (SpitPublishingPublisherIface * iface) {
+static void
+publishing_gallery3_gallery_publisher_spit_publishing_publisher_interface_init (SpitPublishingPublisherIface * iface)
+{
#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_gallery_publisher_spit_publishing_publisher_parent_iface = g_type_interface_peek_parent (iface);
#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -9233,11 +9322,13 @@ static void publishing_gallery3_gallery_publisher_spit_publishing_publisher_inte
iface->start = (void (*) (SpitPublishingPublisher *)) publishing_gallery3_gallery_publisher_real_start;
#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
iface->stop = (void (*) (SpitPublishingPublisher *)) publishing_gallery3_gallery_publisher_real_stop;
-#line 9196 "GalleryConnector.c"
+#line 9285 "GalleryConnector.c"
}
-static void publishing_gallery3_gallery_publisher_instance_init (PublishingGallery3GalleryPublisher * self) {
+static void
+publishing_gallery3_gallery_publisher_instance_init (PublishingGallery3GalleryPublisher * self)
+{
#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
self->priv = PUBLISHING_GALLERY3_GALLERY_PUBLISHER_GET_PRIVATE (self);
#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -9264,11 +9355,13 @@ static void publishing_gallery3_gallery_publisher_instance_init (PublishingGalle
self->priv->key = NULL;
#line 812 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
self->priv->publishing_options_pane = NULL;
-#line 9227 "GalleryConnector.c"
+#line 9318 "GalleryConnector.c"
}
-static void publishing_gallery3_gallery_publisher_finalize (GObject * obj) {
+static void
+publishing_gallery3_gallery_publisher_finalize (GObject * obj)
+{
PublishingGallery3GalleryPublisher * self;
#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_GALLERY3_TYPE_GALLERY_PUBLISHER, PublishingGallery3GalleryPublisher);
@@ -9290,11 +9383,13 @@ static void publishing_gallery3_gallery_publisher_finalize (GObject * obj) {
_g_object_unref0 (self->priv->publishing_options_pane);
#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
G_OBJECT_CLASS (publishing_gallery3_gallery_publisher_parent_class)->finalize (obj);
-#line 9253 "GalleryConnector.c"
+#line 9346 "GalleryConnector.c"
}
-GType publishing_gallery3_gallery_publisher_get_type (void) {
+GType
+publishing_gallery3_gallery_publisher_get_type (void)
+{
static volatile gsize publishing_gallery3_gallery_publisher_type_id__volatile = 0;
if (g_once_init_enter (&publishing_gallery3_gallery_publisher_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingGallery3GalleryPublisherClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_gallery3_gallery_publisher_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingGallery3GalleryPublisher), 0, (GInstanceInitFunc) publishing_gallery3_gallery_publisher_instance_init, NULL };
@@ -9308,143 +9403,156 @@ GType publishing_gallery3_gallery_publisher_get_type (void) {
}
-static PublishingGallery3Album** _vala_array_dup3 (PublishingGallery3Album** self, int length) {
+static PublishingGallery3Album**
+_vala_array_dup3 (PublishingGallery3Album** self,
+ int length)
+{
PublishingGallery3Album** result;
int i;
#line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
result = g_new0 (PublishingGallery3Album*, length + 1);
#line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
for (i = 0; i < length; i++) {
-#line 9278 "GalleryConnector.c"
+#line 9376 "GalleryConnector.c"
PublishingGallery3Album* _tmp0_;
#line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp0_ = _publishing_gallery3_album_ref0 (self[i]);
#line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
result[i] = _tmp0_;
-#line 9284 "GalleryConnector.c"
+#line 9382 "GalleryConnector.c"
}
#line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return result;
-#line 9288 "GalleryConnector.c"
+#line 9386 "GalleryConnector.c"
}
-static void _publishing_gallery3_publishing_options_pane_on_use_existing_radio_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+_publishing_gallery3_publishing_options_pane_on_use_existing_radio_clicked_gtk_button_clicked (GtkButton* _sender,
+ gpointer self)
+{
#line 1556 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_publishing_options_pane_on_use_existing_radio_clicked ((PublishingGallery3PublishingOptionsPane*) self);
-#line 9295 "GalleryConnector.c"
+#line 9396 "GalleryConnector.c"
}
-static void _publishing_gallery3_publishing_options_pane_on_create_new_radio_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+_publishing_gallery3_publishing_options_pane_on_create_new_radio_clicked_gtk_button_clicked (GtkButton* _sender,
+ gpointer self)
+{
#line 1557 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_publishing_options_pane_on_create_new_radio_clicked ((PublishingGallery3PublishingOptionsPane*) self);
-#line 9302 "GalleryConnector.c"
+#line 9406 "GalleryConnector.c"
}
-static void _publishing_gallery3_publishing_options_pane_on_new_album_entry_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
+static void
+_publishing_gallery3_publishing_options_pane_on_new_album_entry_changed_gtk_editable_changed (GtkEditable* _sender,
+ gpointer self)
+{
#line 1558 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_publishing_options_pane_on_new_album_entry_changed ((PublishingGallery3PublishingOptionsPane*) self);
-#line 9309 "GalleryConnector.c"
+#line 9416 "GalleryConnector.c"
}
-static void _publishing_gallery3_publishing_options_pane_on_scaling_constraint_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
+static void
+_publishing_gallery3_publishing_options_pane_on_scaling_constraint_changed_gtk_combo_box_changed (GtkComboBox* _sender,
+ gpointer self)
+{
#line 1559 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_publishing_options_pane_on_scaling_constraint_changed ((PublishingGallery3PublishingOptionsPane*) self);
-#line 9316 "GalleryConnector.c"
+#line 9426 "GalleryConnector.c"
}
-static void _publishing_gallery3_publishing_options_pane_on_pixels_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
+static void
+_publishing_gallery3_publishing_options_pane_on_pixels_changed_gtk_editable_changed (GtkEditable* _sender,
+ gpointer self)
+{
#line 1560 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_publishing_options_pane_on_pixels_changed ((PublishingGallery3PublishingOptionsPane*) self);
-#line 9323 "GalleryConnector.c"
+#line 9436 "GalleryConnector.c"
}
-static void _publishing_gallery3_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+_publishing_gallery3_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender,
+ gpointer self)
+{
#line 1561 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_publishing_options_pane_on_logout_clicked ((PublishingGallery3PublishingOptionsPane*) self);
-#line 9330 "GalleryConnector.c"
+#line 9446 "GalleryConnector.c"
}
-static void _publishing_gallery3_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+_publishing_gallery3_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender,
+ gpointer self)
+{
#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_publishing_options_pane_on_publish_clicked ((PublishingGallery3PublishingOptionsPane*) self);
-#line 9337 "GalleryConnector.c"
-}
-
-
-PublishingGallery3PublishingOptionsPane* publishing_gallery3_publishing_options_pane_construct (GType object_type, SpitPublishingPluginHost* host, const gchar* url, const gchar* username, PublishingGallery3Album** albums, int albums_length1, GtkBuilder* builder, gboolean strip_metadata, gint scaling_id, gint scaling_pixels) {
+#line 9456 "GalleryConnector.c"
+}
+
+
+PublishingGallery3PublishingOptionsPane*
+publishing_gallery3_publishing_options_pane_construct (GType object_type,
+ SpitPublishingPluginHost* host,
+ const gchar* url,
+ const gchar* username,
+ PublishingGallery3Album** albums,
+ int albums_length1,
+ GtkBuilder* builder,
+ gboolean strip_metadata,
+ gint scaling_id,
+ gint scaling_pixels)
+{
PublishingGallery3PublishingOptionsPane * self = NULL;
PublishingGallery3Album** _tmp0_;
gint _tmp0__length1;
- PublishingGallery3Album** _tmp1_;
- gint _tmp1__length1;
- SpitPublishingPluginHost* _tmp2_;
- GtkBuilder* _tmp3_;
- GtkBuilder* _tmp4_;
- GtkBuilder* _tmp5_;
- GtkBuilder* _tmp6_;
- GSList* _tmp7_;
- GSList* _tmp8_;
- guint _tmp9_;
- GtkBuilder* _tmp10_;
- GObject* _tmp11_;
- GtkGrid* _tmp12_;
- GtkBuilder* _tmp13_;
+ GtkBuilder* _tmp1_;
+ GSList* _tmp2_;
+ GSList* _tmp3_;
+ GObject* _tmp4_;
+ GtkGrid* _tmp5_;
+ GObject* _tmp6_;
+ GtkLabel* _tmp7_;
+ GObject* _tmp8_;
+ GtkRadioButton* _tmp9_;
+ GObject* _tmp10_;
+ GtkComboBoxText* _tmp11_;
+ GObject* _tmp12_;
+ GtkComboBoxText* _tmp13_;
GObject* _tmp14_;
- GtkLabel* _tmp15_;
- GtkBuilder* _tmp16_;
- GObject* _tmp17_;
- GtkRadioButton* _tmp18_;
- GtkBuilder* _tmp19_;
- GObject* _tmp20_;
- GtkComboBoxText* _tmp21_;
- GtkBuilder* _tmp22_;
+ GtkEntry* _tmp15_;
+ GObject* _tmp16_;
+ GtkRadioButton* _tmp17_;
+ GObject* _tmp18_;
+ GtkEntry* _tmp19_;
+ GtkBuilder* _tmp20_;
+ GObject* _tmp21_;
+ GtkCheckButton* _tmp22_;
GObject* _tmp23_;
- GtkComboBoxText* _tmp24_;
- GtkBuilder* _tmp25_;
- GObject* _tmp26_;
- GtkEntry* _tmp27_;
- GtkBuilder* _tmp28_;
- GObject* _tmp29_;
- GtkRadioButton* _tmp30_;
- GtkBuilder* _tmp31_;
- GObject* _tmp32_;
- GtkEntry* _tmp33_;
- GtkBuilder* _tmp34_;
- GObject* _tmp35_;
- GtkCheckButton* _tmp36_;
- GtkBuilder* _tmp37_;
- GObject* _tmp38_;
- GtkButton* _tmp39_;
- GtkBuilder* _tmp40_;
- GObject* _tmp41_;
- GtkButton* _tmp42_;
- GtkLabel* _tmp43_;
- const gchar* _tmp44_;
- const gchar* _tmp45_;
- gchar* _tmp46_;
- gchar* _tmp47_;
- GtkCheckButton* _tmp48_;
- gboolean _tmp49_;
- GtkComboBoxText* _tmp50_;
- gint _tmp51_;
- GtkEntry* _tmp52_;
- gint _tmp53_;
- gchar* _tmp54_;
- gchar* _tmp55_;
- GtkRadioButton* _tmp56_;
- GtkRadioButton* _tmp57_;
- GtkEntry* _tmp58_;
- GtkComboBoxText* _tmp59_;
- GtkEntry* _tmp60_;
- GtkButton* _tmp61_;
- GtkButton* _tmp62_;
+ GtkButton* _tmp24_;
+ GObject* _tmp25_;
+ GtkButton* _tmp26_;
+ GtkLabel* _tmp27_;
+ gchar* _tmp28_;
+ gchar* _tmp29_;
+ GtkCheckButton* _tmp30_;
+ GtkComboBoxText* _tmp31_;
+ GtkEntry* _tmp32_;
+ gchar* _tmp33_;
+ gchar* _tmp34_;
+ GtkRadioButton* _tmp35_;
+ GtkRadioButton* _tmp36_;
+ GtkEntry* _tmp37_;
+ GtkComboBoxText* _tmp38_;
+ GtkEntry* _tmp39_;
+ GtkButton* _tmp40_;
+ GtkButton* _tmp41_;
#line 1523 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL);
#line 1523 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -9456,430 +9564,382 @@ PublishingGallery3PublishingOptionsPane* publishing_gallery3_publishing_options_
#line 1523 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
self = (PublishingGallery3PublishingOptionsPane*) g_object_new (object_type, NULL);
#line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp0_ = albums;
+ _tmp0_ = (albums != NULL) ? _vala_array_dup3 (albums, albums_length1) : ((gpointer) albums);
#line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp0__length1 = albums_length1;
#line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup3 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
-#line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp1__length1 = _tmp0__length1;
-#line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
self->priv->albums = (_vala_array_free (self->priv->albums, self->priv->albums_length1, (GDestroyNotify) publishing_gallery3_album_unref), NULL);
#line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self->priv->albums = _tmp1_;
+ self->priv->albums = _tmp0_;
#line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self->priv->albums_length1 = _tmp1__length1;
+ self->priv->albums_length1 = _tmp0__length1;
#line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
self->priv->_albums_size_ = self->priv->albums_length1;
#line 1528 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp2_ = host;
-#line 1528 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self->priv->host = _tmp2_;
-#line 1530 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp3_ = builder;
+ self->priv->host = host;
#line 1530 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp4_ = _g_object_ref0 (_tmp3_);
+ _tmp1_ = _g_object_ref0 (builder);
#line 1530 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_object_unref0 (self->priv->builder);
#line 1530 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self->priv->builder = _tmp4_;
-#line 1531 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp5_ = builder;
+ self->priv->builder = _tmp1_;
#line 1531 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _vala_assert (NULL != _tmp5_, "null != builder");
+ _vala_assert (NULL != builder, "null != builder");
#line 1532 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp6_ = builder;
+ _tmp2_ = gtk_builder_get_objects (builder);
#line 1532 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp7_ = gtk_builder_get_objects (_tmp6_);
+ _tmp3_ = _tmp2_;
#line 1532 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp8_ = _tmp7_;
-#line 1532 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp9_ = g_slist_length (_tmp8_);
-#line 1532 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _vala_assert (_tmp9_ > ((guint) 0), "builder.get_objects().length() > 0");
+ _vala_assert (g_slist_length (_tmp3_) > ((guint) 0), "builder.get_objects().length() > 0");
#line 1532 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _g_slist_free0 (_tmp8_);
+ _g_slist_free0 (_tmp3_);
#line 1535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp10_ = builder;
+ _tmp4_ = gtk_builder_get_object (builder, "pane_widget");
#line 1535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp11_ = gtk_builder_get_object (_tmp10_, "pane_widget");
-#line 1535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp12_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, gtk_grid_get_type ()) ? ((GtkGrid*) _tmp11_) : NULL);
+ _tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, gtk_grid_get_type ()) ? ((GtkGrid*) _tmp4_) : NULL);
#line 1535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_object_unref0 (self->priv->pane_widget);
#line 1535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self->priv->pane_widget = _tmp12_;
-#line 1536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp13_ = builder;
+ self->priv->pane_widget = _tmp5_;
#line 1536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp14_ = gtk_builder_get_object (_tmp13_, "title_label");
+ _tmp6_ = gtk_builder_get_object (builder, "title_label");
#line 1536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp15_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp14_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp14_) : NULL);
+ _tmp7_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp6_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp6_) : NULL);
#line 1536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_object_unref0 (self->priv->title_label);
#line 1536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self->priv->title_label = _tmp15_;
+ self->priv->title_label = _tmp7_;
#line 1537 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp16_ = builder;
+ _tmp8_ = gtk_builder_get_object (builder, "publish_to_existing_radio");
#line 1537 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp17_ = gtk_builder_get_object (_tmp16_, "publish_to_existing_radio");
-#line 1537 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp18_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp17_, gtk_radio_button_get_type ()) ? ((GtkRadioButton*) _tmp17_) : NULL);
+ _tmp9_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, gtk_radio_button_get_type ()) ? ((GtkRadioButton*) _tmp8_) : NULL);
#line 1537 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_object_unref0 (self->priv->use_existing_radio);
#line 1537 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self->priv->use_existing_radio = _tmp18_;
-#line 1538 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp19_ = builder;
+ self->priv->use_existing_radio = _tmp9_;
#line 1538 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp20_ = gtk_builder_get_object (_tmp19_, "existing_albums_combo");
+ _tmp10_ = gtk_builder_get_object (builder, "existing_albums_combo");
#line 1538 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp21_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp20_, gtk_combo_box_text_get_type ()) ? ((GtkComboBoxText*) _tmp20_) : NULL);
+ _tmp11_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp10_, gtk_combo_box_text_get_type ()) ? ((GtkComboBoxText*) _tmp10_) : NULL);
#line 1538 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_object_unref0 (self->priv->existing_albums_combo);
#line 1538 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self->priv->existing_albums_combo = _tmp21_;
-#line 1539 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp22_ = builder;
+ self->priv->existing_albums_combo = _tmp11_;
#line 1539 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp23_ = gtk_builder_get_object (_tmp22_, "scaling_constraint_combo");
+ _tmp12_ = gtk_builder_get_object (builder, "scaling_constraint_combo");
#line 1539 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp24_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp23_, gtk_combo_box_text_get_type ()) ? ((GtkComboBoxText*) _tmp23_) : NULL);
+ _tmp13_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, gtk_combo_box_text_get_type ()) ? ((GtkComboBoxText*) _tmp12_) : NULL);
#line 1539 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_object_unref0 (self->priv->scaling_combo);
#line 1539 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self->priv->scaling_combo = _tmp24_;
+ self->priv->scaling_combo = _tmp13_;
#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp25_ = builder;
+ _tmp14_ = gtk_builder_get_object (builder, "major_axis_pixels");
#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp26_ = gtk_builder_get_object (_tmp25_, "major_axis_pixels");
-#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp27_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp26_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp26_) : NULL);
+ _tmp15_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp14_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp14_) : NULL);
#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_object_unref0 (self->priv->pixels);
#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self->priv->pixels = _tmp27_;
-#line 1541 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp28_ = builder;
+ self->priv->pixels = _tmp15_;
#line 1541 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp29_ = gtk_builder_get_object (_tmp28_, "publish_new_radio");
+ _tmp16_ = gtk_builder_get_object (builder, "publish_new_radio");
#line 1541 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp30_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp29_, gtk_radio_button_get_type ()) ? ((GtkRadioButton*) _tmp29_) : NULL);
+ _tmp17_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp16_, gtk_radio_button_get_type ()) ? ((GtkRadioButton*) _tmp16_) : NULL);
#line 1541 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_object_unref0 (self->priv->create_new_radio);
#line 1541 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self->priv->create_new_radio = _tmp30_;
+ self->priv->create_new_radio = _tmp17_;
#line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp31_ = builder;
+ _tmp18_ = gtk_builder_get_object (builder, "new_album_name");
#line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp32_ = gtk_builder_get_object (_tmp31_, "new_album_name");
-#line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp33_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp32_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp32_) : NULL);
+ _tmp19_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp18_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp18_) : NULL);
#line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_object_unref0 (self->priv->new_album_entry);
#line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self->priv->new_album_entry = _tmp33_;
+ self->priv->new_album_entry = _tmp19_;
#line 1543 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp34_ = self->priv->builder;
+ _tmp20_ = self->priv->builder;
#line 1543 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp35_ = gtk_builder_get_object (_tmp34_, "strip_metadata_check");
+ _tmp21_ = gtk_builder_get_object (_tmp20_, "strip_metadata_check");
#line 1543 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp36_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp35_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp35_) : NULL);
+ _tmp22_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp21_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp21_) : NULL);
#line 1543 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_object_unref0 (self->priv->strip_metadata_check);
#line 1543 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self->priv->strip_metadata_check = _tmp36_;
-#line 1544 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp37_ = builder;
+ self->priv->strip_metadata_check = _tmp22_;
#line 1544 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp38_ = gtk_builder_get_object (_tmp37_, "publish_button");
+ _tmp23_ = gtk_builder_get_object (builder, "publish_button");
#line 1544 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp39_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp38_, gtk_button_get_type ()) ? ((GtkButton*) _tmp38_) : NULL);
+ _tmp24_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp23_, gtk_button_get_type ()) ? ((GtkButton*) _tmp23_) : NULL);
#line 1544 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_object_unref0 (self->priv->publish_button);
#line 1544 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self->priv->publish_button = _tmp39_;
-#line 1545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp40_ = builder;
+ self->priv->publish_button = _tmp24_;
#line 1545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp41_ = gtk_builder_get_object (_tmp40_, "logout_button");
+ _tmp25_ = gtk_builder_get_object (builder, "logout_button");
#line 1545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp42_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp41_, gtk_button_get_type ()) ? ((GtkButton*) _tmp41_) : NULL);
+ _tmp26_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp25_, gtk_button_get_type ()) ? ((GtkButton*) _tmp25_) : NULL);
#line 1545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_object_unref0 (self->priv->logout_button);
#line 1545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self->priv->logout_button = _tmp42_;
-#line 1549 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp43_ = self->priv->title_label;
-#line 1549 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp44_ = url;
+ self->priv->logout_button = _tmp26_;
#line 1549 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp45_ = username;
+ _tmp27_ = self->priv->title_label;
#line 1549 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp46_ = g_strdup_printf (_ ("Publishing to %s as %s."), _tmp44_, _tmp45_);
+ _tmp28_ = g_strdup_printf (_ ("Publishing to %s as %s."), url, username);
#line 1549 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp47_ = _tmp46_;
+ _tmp29_ = _tmp28_;
#line 1549 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- gtk_label_set_label (_tmp43_, _tmp47_);
+ gtk_label_set_label (_tmp27_, _tmp29_);
#line 1549 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _g_free0 (_tmp47_);
+ _g_free0 (_tmp29_);
#line 1551 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp48_ = self->priv->strip_metadata_check;
+ _tmp30_ = self->priv->strip_metadata_check;
#line 1551 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp49_ = strip_metadata;
-#line 1551 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp49_);
-#line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp50_ = self->priv->scaling_combo;
+ gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_toggle_button_get_type (), GtkToggleButton), strip_metadata);
#line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp51_ = scaling_id;
+ _tmp31_ = self->priv->scaling_combo;
#line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_combo_box_get_type (), GtkComboBox), _tmp51_);
-#line 1553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp52_ = self->priv->pixels;
+ gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_combo_box_get_type (), GtkComboBox), scaling_id);
#line 1553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp53_ = scaling_pixels;
+ _tmp32_ = self->priv->pixels;
#line 1553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp54_ = g_strdup_printf ("%i", _tmp53_);
+ _tmp33_ = g_strdup_printf ("%i", scaling_pixels);
#line 1553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp55_ = _tmp54_;
+ _tmp34_ = _tmp33_;
#line 1553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- gtk_entry_set_text (_tmp52_, _tmp55_);
+ gtk_entry_set_text (_tmp32_, _tmp34_);
#line 1553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _g_free0 (_tmp55_);
+ _g_free0 (_tmp34_);
#line 1556 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp56_ = self->priv->use_existing_radio;
+ _tmp35_ = self->priv->use_existing_radio;
#line 1556 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _publishing_gallery3_publishing_options_pane_on_use_existing_radio_clicked_gtk_button_clicked, self, 0);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _publishing_gallery3_publishing_options_pane_on_use_existing_radio_clicked_gtk_button_clicked, self, 0);
#line 1557 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp57_ = self->priv->create_new_radio;
+ _tmp36_ = self->priv->create_new_radio;
#line 1557 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _publishing_gallery3_publishing_options_pane_on_create_new_radio_clicked_gtk_button_clicked, self, 0);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _publishing_gallery3_publishing_options_pane_on_create_new_radio_clicked_gtk_button_clicked, self, 0);
#line 1558 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp58_ = self->priv->new_album_entry;
+ _tmp37_ = self->priv->new_album_entry;
#line 1558 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_gallery3_publishing_options_pane_on_new_album_entry_changed_gtk_editable_changed, self, 0);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_editable_get_type (), GtkEditable), "changed", (GCallback) _publishing_gallery3_publishing_options_pane_on_new_album_entry_changed_gtk_editable_changed, self, 0);
#line 1559 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp59_ = self->priv->scaling_combo;
+ _tmp38_ = self->priv->scaling_combo;
#line 1559 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _publishing_gallery3_publishing_options_pane_on_scaling_constraint_changed_gtk_combo_box_changed, self, 0);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _publishing_gallery3_publishing_options_pane_on_scaling_constraint_changed_gtk_combo_box_changed, self, 0);
#line 1560 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp60_ = self->priv->pixels;
+ _tmp39_ = self->priv->pixels;
#line 1560 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_gallery3_publishing_options_pane_on_pixels_changed_gtk_editable_changed, self, 0);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_editable_get_type (), GtkEditable), "changed", (GCallback) _publishing_gallery3_publishing_options_pane_on_pixels_changed_gtk_editable_changed, self, 0);
#line 1561 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp61_ = self->priv->logout_button;
+ _tmp40_ = self->priv->logout_button;
#line 1561 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_signal_connect_object (_tmp61_, "clicked", (GCallback) _publishing_gallery3_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0);
+ g_signal_connect_object (_tmp40_, "clicked", (GCallback) _publishing_gallery3_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0);
#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp62_ = self->priv->publish_button;
+ _tmp41_ = self->priv->publish_button;
#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_signal_connect_object (_tmp62_, "clicked", (GCallback) _publishing_gallery3_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0);
+ g_signal_connect_object (_tmp41_, "clicked", (GCallback) _publishing_gallery3_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0);
#line 1523 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return self;
-#line 9640 "GalleryConnector.c"
+#line 9704 "GalleryConnector.c"
}
-PublishingGallery3PublishingOptionsPane* publishing_gallery3_publishing_options_pane_new (SpitPublishingPluginHost* host, const gchar* url, const gchar* username, PublishingGallery3Album** albums, int albums_length1, GtkBuilder* builder, gboolean strip_metadata, gint scaling_id, gint scaling_pixels) {
+PublishingGallery3PublishingOptionsPane*
+publishing_gallery3_publishing_options_pane_new (SpitPublishingPluginHost* host,
+ const gchar* url,
+ const gchar* username,
+ PublishingGallery3Album** albums,
+ int albums_length1,
+ GtkBuilder* builder,
+ gboolean strip_metadata,
+ gint scaling_id,
+ gint scaling_pixels)
+{
#line 1523 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return publishing_gallery3_publishing_options_pane_construct (PUBLISHING_GALLERY3_TYPE_PUBLISHING_OPTIONS_PANE, host, url, username, albums, albums_length1, builder, strip_metadata, scaling_id, scaling_pixels);
-#line 9647 "GalleryConnector.c"
+#line 9721 "GalleryConnector.c"
}
-static void publishing_gallery3_publishing_options_pane_on_publish_clicked (PublishingGallery3PublishingOptionsPane* self) {
+static void
+publishing_gallery3_publishing_options_pane_on_publish_clicked (PublishingGallery3PublishingOptionsPane* self)
+{
gchar* album_name = NULL;
gint _tmp0_ = 0;
GtkComboBoxText* _tmp1_;
- gint _tmp2_;
gint photo_major_axis_size = 0;
PublishingGallery3PublishingParameters* param = NULL;
- GtkRadioButton* _tmp6_;
- gboolean _tmp7_;
- PublishingGallery3PublishingParameters* _tmp34_;
- gint _tmp35_;
- PublishingGallery3PublishingParameters* _tmp36_;
- GtkCheckButton* _tmp37_;
- gboolean _tmp38_;
- PublishingGallery3PublishingParameters* _tmp39_;
+ GtkRadioButton* _tmp4_;
+ PublishingGallery3PublishingParameters* _tmp29_;
+ gint _tmp30_;
+ PublishingGallery3PublishingParameters* _tmp31_;
+ GtkCheckButton* _tmp32_;
+ PublishingGallery3PublishingParameters* _tmp33_;
#line 1565 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_OPTIONS_PANE (self));
#line 1568 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp1_ = self->priv->scaling_combo;
#line 1568 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp2_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox));
-#line 1568 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (_tmp2_ == 1) {
-#line 9674 "GalleryConnector.c"
- GtkEntry* _tmp3_;
- const gchar* _tmp4_;
- gint _tmp5_;
-#line 1569 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp3_ = self->priv->pixels;
+ if (gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox)) == 1) {
+#line 9745 "GalleryConnector.c"
+ GtkEntry* _tmp2_;
+ const gchar* _tmp3_;
#line 1569 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp4_ = gtk_entry_get_text (_tmp3_);
+ _tmp2_ = self->priv->pixels;
#line 1569 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp5_ = atoi (_tmp4_);
+ _tmp3_ = gtk_entry_get_text (_tmp2_);
#line 1569 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp0_ = _tmp5_;
-#line 9686 "GalleryConnector.c"
+ _tmp0_ = atoi (_tmp3_);
+#line 9754 "GalleryConnector.c"
} else {
#line 1569 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp0_ = -1;
-#line 9690 "GalleryConnector.c"
+#line 9758 "GalleryConnector.c"
}
#line 1567 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
photo_major_axis_size = _tmp0_;
#line 1572 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp6_ = self->priv->create_new_radio;
-#line 1572 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp7_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_toggle_button_get_type (), GtkToggleButton));
+ _tmp4_ = self->priv->create_new_radio;
#line 1572 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (_tmp7_) {
-#line 9700 "GalleryConnector.c"
- GtkEntry* _tmp8_;
+ if (gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_toggle_button_get_type (), GtkToggleButton))) {
+#line 9766 "GalleryConnector.c"
+ GtkEntry* _tmp5_;
+ const gchar* _tmp6_;
+ gchar* _tmp7_;
+ SpitPublishingPluginHost* _tmp8_;
const gchar* _tmp9_;
- gchar* _tmp10_;
- SpitPublishingPluginHost* _tmp11_;
+ const gchar* _tmp10_;
+ PublishingGallery3PublishingParameters* _tmp11_;
const gchar* _tmp12_;
- const gchar* _tmp13_;
- PublishingGallery3PublishingParameters* _tmp14_;
- const gchar* _tmp15_;
#line 1573 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp8_ = self->priv->new_album_entry;
+ _tmp5_ = self->priv->new_album_entry;
#line 1573 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp9_ = gtk_entry_get_text (_tmp8_);
+ _tmp6_ = gtk_entry_get_text (_tmp5_);
#line 1573 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp10_ = g_strdup (_tmp9_);
+ _tmp7_ = g_strdup (_tmp6_);
#line 1573 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_free0 (album_name);
#line 1573 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- album_name = _tmp10_;
+ album_name = _tmp7_;
#line 1574 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp11_ = self->priv->host;
+ _tmp8_ = self->priv->host;
#line 1574 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp12_ = album_name;
+ _tmp9_ = album_name;
#line 1574 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_LAST_ALBUM_CONFIG_KEY, _tmp12_);
+ spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_LAST_ALBUM_CONFIG_KEY, _tmp9_);
#line 1575 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp13_ = album_name;
+ _tmp10_ = album_name;
#line 1575 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp14_ = publishing_gallery3_publishing_parameters_new_to_new_album (_tmp13_);
+ _tmp11_ = publishing_gallery3_publishing_parameters_new_to_new_album (_tmp10_);
#line 1575 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_publishing_gallery3_publishing_parameters_unref0 (param);
#line 1575 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- param = _tmp14_;
+ param = _tmp11_;
#line 1577 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp15_ = album_name;
+ _tmp12_ = album_name;
#line 1577 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_debug ("GalleryConnector.vala:1577: Trying to publish to \"%s\"", _tmp15_);
-#line 9737 "GalleryConnector.c"
+ g_debug ("GalleryConnector.vala:1577: Trying to publish to \"%s\"", _tmp12_);
+#line 9803 "GalleryConnector.c"
} else {
- PublishingGallery3Album** _tmp16_;
- gint _tmp16__length1;
- GtkComboBoxText* _tmp17_;
- gint _tmp18_;
- PublishingGallery3Album* _tmp19_;
+ PublishingGallery3Album** _tmp13_;
+ gint _tmp13__length1;
+ GtkComboBoxText* _tmp14_;
+ PublishingGallery3Album* _tmp15_;
+ const gchar* _tmp16_;
+ const gchar* _tmp17_;
+ gchar* _tmp18_;
+ SpitPublishingPluginHost* _tmp19_;
const gchar* _tmp20_;
- const gchar* _tmp21_;
- gchar* _tmp22_;
- SpitPublishingPluginHost* _tmp23_;
- const gchar* _tmp24_;
gchar* album_path = NULL;
- PublishingGallery3Album** _tmp25_;
- gint _tmp25__length1;
- GtkComboBoxText* _tmp26_;
- gint _tmp27_;
- PublishingGallery3Album* _tmp28_;
- const gchar* _tmp29_;
- const gchar* _tmp30_;
- gchar* _tmp31_;
- const gchar* _tmp32_;
- PublishingGallery3PublishingParameters* _tmp33_;
-#line 1579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp16_ = self->priv->albums;
+ PublishingGallery3Album** _tmp21_;
+ gint _tmp21__length1;
+ GtkComboBoxText* _tmp22_;
+ PublishingGallery3Album* _tmp23_;
+ const gchar* _tmp24_;
+ const gchar* _tmp25_;
+ gchar* _tmp26_;
+ const gchar* _tmp27_;
+ PublishingGallery3PublishingParameters* _tmp28_;
#line 1579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp16__length1 = self->priv->albums_length1;
+ _tmp13_ = self->priv->albums;
#line 1579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp17_ = self->priv->existing_albums_combo;
+ _tmp13__length1 = self->priv->albums_length1;
#line 1579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp18_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_combo_box_get_type (), GtkComboBox));
+ _tmp14_ = self->priv->existing_albums_combo;
#line 1579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp19_ = _tmp16_[_tmp18_];
+ _tmp15_ = _tmp13_[gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_combo_box_get_type (), GtkComboBox))];
#line 1579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp20_ = publishing_gallery3_album_get_title (_tmp19_);
+ _tmp16_ = publishing_gallery3_album_get_title (_tmp15_);
#line 1579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp21_ = _tmp20_;
+ _tmp17_ = _tmp16_;
#line 1579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp22_ = g_strdup (_tmp21_);
+ _tmp18_ = g_strdup (_tmp17_);
#line 1579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_free0 (album_name);
#line 1579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- album_name = _tmp22_;
+ album_name = _tmp18_;
#line 1581 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp23_ = self->priv->host;
+ _tmp19_ = self->priv->host;
#line 1581 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp24_ = album_name;
+ _tmp20_ = album_name;
#line 1581 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_LAST_ALBUM_CONFIG_KEY, _tmp24_);
-#line 1582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp25_ = self->priv->albums;
+ spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_LAST_ALBUM_CONFIG_KEY, _tmp20_);
#line 1582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp25__length1 = self->priv->albums_length1;
+ _tmp21_ = self->priv->albums;
#line 1582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp26_ = self->priv->existing_albums_combo;
+ _tmp21__length1 = self->priv->albums_length1;
#line 1582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp27_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_combo_box_get_type (), GtkComboBox));
+ _tmp22_ = self->priv->existing_albums_combo;
#line 1582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp28_ = _tmp25_[_tmp27_];
+ _tmp23_ = _tmp21_[gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_combo_box_get_type (), GtkComboBox))];
#line 1582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp29_ = publishing_gallery3_album_get_path (_tmp28_);
+ _tmp24_ = publishing_gallery3_album_get_path (_tmp23_);
#line 1582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp30_ = _tmp29_;
+ _tmp25_ = _tmp24_;
#line 1582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp31_ = g_strdup (_tmp30_);
+ _tmp26_ = g_strdup (_tmp25_);
#line 1582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- album_path = _tmp31_;
+ album_path = _tmp26_;
#line 1584 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp32_ = album_path;
+ _tmp27_ = album_path;
#line 1584 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp33_ = publishing_gallery3_publishing_parameters_new_to_existing_album (_tmp32_);
+ _tmp28_ = publishing_gallery3_publishing_parameters_new_to_existing_album (_tmp27_);
#line 1584 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_publishing_gallery3_publishing_parameters_unref0 (param);
#line 1584 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- param = _tmp33_;
+ param = _tmp28_;
#line 1572 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_free0 (album_path);
-#line 9814 "GalleryConnector.c"
+#line 9874 "GalleryConnector.c"
}
#line 1588 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp34_ = param;
+ _tmp29_ = param;
#line 1588 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp35_ = photo_major_axis_size;
+ _tmp30_ = photo_major_axis_size;
#line 1588 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- publishing_gallery3_publishing_parameters_set_photo_major_axis_size (_tmp34_, _tmp35_);
-#line 1589 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp36_ = param;
+ publishing_gallery3_publishing_parameters_set_photo_major_axis_size (_tmp29_, _tmp30_);
#line 1589 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp37_ = self->priv->strip_metadata_check;
+ _tmp31_ = param;
#line 1589 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp38_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_toggle_button_get_type (), GtkToggleButton));
+ _tmp32_ = self->priv->strip_metadata_check;
#line 1589 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- publishing_gallery3_publishing_parameters_set_strip_metadata (_tmp36_, _tmp38_);
+ publishing_gallery3_publishing_parameters_set_strip_metadata (_tmp31_, gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_toggle_button_get_type (), GtkToggleButton)));
#line 1591 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp39_ = param;
+ _tmp33_ = param;
#line 1591 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_signal_emit (self, publishing_gallery3_publishing_options_pane_signals[PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0, _tmp39_);
+ g_signal_emit (self, publishing_gallery3_publishing_options_pane_signals[PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0, _tmp33_);
#line 1565 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_publishing_gallery3_publishing_parameters_unref0 (param);
#line 1565 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_free0 (album_name);
-#line 9838 "GalleryConnector.c"
+#line 9896 "GalleryConnector.c"
}
-static void publishing_gallery3_publishing_options_pane_on_use_existing_radio_clicked (PublishingGallery3PublishingOptionsPane* self) {
+static void
+publishing_gallery3_publishing_options_pane_on_use_existing_radio_clicked (PublishingGallery3PublishingOptionsPane* self)
+{
GtkComboBoxText* _tmp0_;
GtkEntry* _tmp1_;
GtkComboBoxText* _tmp2_;
@@ -9899,11 +9959,13 @@ static void publishing_gallery3_publishing_options_pane_on_use_existing_radio_cl
gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
#line 1598 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_publishing_options_pane_update_publish_button_sensitivity (self);
-#line 9862 "GalleryConnector.c"
+#line 9922 "GalleryConnector.c"
}
-static void publishing_gallery3_publishing_options_pane_on_create_new_radio_clicked (PublishingGallery3PublishingOptionsPane* self) {
+static void
+publishing_gallery3_publishing_options_pane_on_create_new_radio_clicked (PublishingGallery3PublishingOptionsPane* self)
+{
GtkEntry* _tmp0_;
GtkComboBoxText* _tmp1_;
GtkEntry* _tmp2_;
@@ -9923,43 +9985,49 @@ static void publishing_gallery3_publishing_options_pane_on_create_new_radio_clic
gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
#line 1605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_publishing_options_pane_update_publish_button_sensitivity (self);
-#line 9886 "GalleryConnector.c"
+#line 9948 "GalleryConnector.c"
}
-static void publishing_gallery3_publishing_options_pane_on_logout_clicked (PublishingGallery3PublishingOptionsPane* self) {
+static void
+publishing_gallery3_publishing_options_pane_on_logout_clicked (PublishingGallery3PublishingOptionsPane* self)
+{
#line 1608 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_OPTIONS_PANE (self));
#line 1609 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_signal_emit (self, publishing_gallery3_publishing_options_pane_signals[PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL], 0);
-#line 9895 "GalleryConnector.c"
+#line 9959 "GalleryConnector.c"
}
-static gchar* string_strip (const gchar* self) {
+static gchar*
+string_strip (const gchar* self)
+{
gchar* result = NULL;
gchar* _result_ = NULL;
gchar* _tmp0_;
const gchar* _tmp1_;
-#line 1234 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1248 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1249 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp0_ = g_strdup (self);
-#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1249 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_result_ = _tmp0_;
-#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1250 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp1_ = _result_;
-#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1250 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_strstrip (_tmp1_);
-#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1251 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
result = _result_;
-#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1251 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 9918 "GalleryConnector.c"
+#line 9984 "GalleryConnector.c"
}
-static void publishing_gallery3_publishing_options_pane_update_publish_button_sensitivity (PublishingGallery3PublishingOptionsPane* self) {
+static void
+publishing_gallery3_publishing_options_pane_update_publish_button_sensitivity (PublishingGallery3PublishingOptionsPane* self)
+{
gchar* album_name = NULL;
GtkEntry* _tmp0_;
const gchar* _tmp1_;
@@ -9969,7 +10037,7 @@ static void publishing_gallery3_publishing_options_pane_update_publish_button_se
gchar* _tmp5_;
gchar* _tmp6_;
gboolean _tmp7_;
- GtkButton* _tmp10_;
+ GtkButton* _tmp9_;
#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_OPTIONS_PANE (self));
#line 1613 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -9992,44 +10060,44 @@ static void publishing_gallery3_publishing_options_pane_update_publish_button_se
_g_free0 (_tmp6_);
#line 1614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
if (_tmp7_) {
-#line 9955 "GalleryConnector.c"
+#line 10023 "GalleryConnector.c"
GtkRadioButton* _tmp8_;
- gboolean _tmp9_;
#line 1615 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp8_ = self->priv->create_new_radio;
#line 1615 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp9_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1615 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp3_ = _tmp9_;
-#line 9964 "GalleryConnector.c"
+ _tmp3_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_toggle_button_get_type (), GtkToggleButton));
+#line 10029 "GalleryConnector.c"
} else {
#line 1614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp3_ = FALSE;
-#line 9968 "GalleryConnector.c"
+#line 10033 "GalleryConnector.c"
}
#line 1614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp10_ = self->priv->publish_button;
+ _tmp9_ = self->priv->publish_button;
#line 1614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), !_tmp3_);
+ gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), !_tmp3_);
#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_free0 (album_name);
-#line 9976 "GalleryConnector.c"
+#line 10041 "GalleryConnector.c"
}
-static void publishing_gallery3_publishing_options_pane_on_new_album_entry_changed (PublishingGallery3PublishingOptionsPane* self) {
+static void
+publishing_gallery3_publishing_options_pane_on_new_album_entry_changed (PublishingGallery3PublishingOptionsPane* self)
+{
#line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_OPTIONS_PANE (self));
#line 1619 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_publishing_options_pane_update_publish_button_sensitivity (self);
-#line 9985 "GalleryConnector.c"
+#line 10052 "GalleryConnector.c"
}
-static void publishing_gallery3_publishing_options_pane_update_pixel_entry_sensitivity (PublishingGallery3PublishingOptionsPane* self) {
+static void
+publishing_gallery3_publishing_options_pane_update_pixel_entry_sensitivity (PublishingGallery3PublishingOptionsPane* self)
+{
GtkEntry* _tmp0_;
GtkComboBoxText* _tmp1_;
- gint _tmp2_;
#line 1622 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_OPTIONS_PANE (self));
#line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -10037,191 +10105,140 @@ static void publishing_gallery3_publishing_options_pane_update_pixel_entry_sensi
#line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp1_ = self->priv->scaling_combo;
#line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp2_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox));
-#line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), _tmp2_ == 1);
-#line 10003 "GalleryConnector.c"
+ gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox)) == 1);
+#line 10069 "GalleryConnector.c"
}
-static void publishing_gallery3_publishing_options_pane_on_scaling_constraint_changed (PublishingGallery3PublishingOptionsPane* self) {
+static void
+publishing_gallery3_publishing_options_pane_on_scaling_constraint_changed (PublishingGallery3PublishingOptionsPane* self)
+{
#line 1626 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_OPTIONS_PANE (self));
#line 1627 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_publishing_options_pane_update_pixel_entry_sensitivity (self);
-#line 10012 "GalleryConnector.c"
+#line 10080 "GalleryConnector.c"
}
-static glong string_strnlen (gchar* str, glong maxlen) {
+static glong
+string_strnlen (gchar* str,
+ glong maxlen)
+{
glong result = 0L;
gchar* end = NULL;
gchar* _tmp0_;
- glong _tmp1_;
- gchar* _tmp2_;
- gchar* _tmp3_;
-#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp0_ = str;
-#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp1_ = maxlen;
-#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- end = _tmp2_;
-#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp3_ = end;
-#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp3_ == NULL) {
-#line 10035 "GalleryConnector.c"
- glong _tmp4_;
-#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp4_ = maxlen;
-#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- result = _tmp4_;
-#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ gchar* _tmp1_;
+#line 1336 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp0_ = memchr (str, 0, (gsize) maxlen);
+#line 1336 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ end = _tmp0_;
+#line 1337 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp1_ = end;
+#line 1337 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (_tmp1_ == NULL) {
+#line 1338 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = maxlen;
+#line 1338 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 10043 "GalleryConnector.c"
+#line 10104 "GalleryConnector.c"
} else {
- gchar* _tmp5_;
- gchar* _tmp6_;
-#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp5_ = end;
-#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp6_ = str;
-#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- result = (glong) (_tmp5_ - _tmp6_);
-#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ gchar* _tmp2_;
+#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp2_ = end;
+#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = (glong) (_tmp2_ - str);
+#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 10055 "GalleryConnector.c"
+#line 10113 "GalleryConnector.c"
}
}
-static gchar* string_substring (const gchar* self, glong offset, glong len) {
+static gchar*
+string_substring (const gchar* self,
+ glong offset,
+ glong len)
+{
gchar* result = NULL;
glong string_length = 0L;
gboolean _tmp0_ = FALSE;
- glong _tmp1_;
- glong _tmp8_;
- glong _tmp14_;
- glong _tmp17_;
- glong _tmp18_;
- glong _tmp19_;
- glong _tmp20_;
- glong _tmp21_;
- gchar* _tmp22_;
-#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ glong _tmp6_;
+ gchar* _tmp7_;
+#line 1347 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp1_ = offset;
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp1_ >= ((glong) 0)) {
-#line 10079 "GalleryConnector.c"
- glong _tmp2_;
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp2_ = len;
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp0_ = _tmp2_ >= ((glong) 0);
-#line 10085 "GalleryConnector.c"
+#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (offset >= ((glong) 0)) {
+#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp0_ = len >= ((glong) 0);
+#line 10134 "GalleryConnector.c"
} else {
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp0_ = FALSE;
-#line 10089 "GalleryConnector.c"
+#line 10138 "GalleryConnector.c"
}
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
if (_tmp0_) {
-#line 10093 "GalleryConnector.c"
+#line 1351 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ string_length = string_strnlen ((gchar*) self, offset + len);
+#line 10144 "GalleryConnector.c"
+ } else {
+ gint _tmp1_;
+ gint _tmp2_;
+#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp1_ = strlen (self);
+#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp2_ = _tmp1_;
+#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ string_length = (glong) _tmp2_;
+#line 10154 "GalleryConnector.c"
+ }
+#line 1356 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (offset < ((glong) 0)) {
+#line 10158 "GalleryConnector.c"
glong _tmp3_;
+#line 1357 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp3_ = string_length;
+#line 1357 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ offset = _tmp3_ + offset;
+#line 1358 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ g_return_val_if_fail (offset >= ((glong) 0), NULL);
+#line 10166 "GalleryConnector.c"
+ } else {
glong _tmp4_;
+#line 1360 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp4_ = string_length;
+#line 1360 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ g_return_val_if_fail (offset <= _tmp4_, NULL);
+#line 10173 "GalleryConnector.c"
+ }
+#line 1362 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (len < ((glong) 0)) {
+#line 10177 "GalleryConnector.c"
glong _tmp5_;
-#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp3_ = offset;
-#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp4_ = len;
-#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- string_length = _tmp5_;
-#line 10105 "GalleryConnector.c"
- } else {
- gint _tmp6_;
- gint _tmp7_;
-#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp6_ = strlen (self);
-#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp7_ = _tmp6_;
-#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- string_length = (glong) _tmp7_;
-#line 10115 "GalleryConnector.c"
- }
-#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp8_ = offset;
-#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp8_ < ((glong) 0)) {
-#line 10121 "GalleryConnector.c"
- glong _tmp9_;
- glong _tmp10_;
- glong _tmp11_;
-#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp9_ = string_length;
-#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp10_ = offset;
-#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- offset = _tmp9_ + _tmp10_;
-#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp11_ = offset;
-#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 10135 "GalleryConnector.c"
- } else {
- glong _tmp12_;
- glong _tmp13_;
-#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp12_ = offset;
-#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp13_ = string_length;
-#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 10145 "GalleryConnector.c"
- }
-#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp14_ = len;
-#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp14_ < ((glong) 0)) {
-#line 10151 "GalleryConnector.c"
- glong _tmp15_;
- glong _tmp16_;
-#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp15_ = string_length;
-#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp16_ = offset;
-#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- len = _tmp15_ - _tmp16_;
-#line 10160 "GalleryConnector.c"
- }
-#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp17_ = offset;
-#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp18_ = len;
-#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp19_ = string_length;
-#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp20_ = offset;
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp21_ = len;
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- result = _tmp22_;
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1363 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp5_ = string_length;
+#line 1363 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ len = _tmp5_ - offset;
+#line 10183 "GalleryConnector.c"
+ }
+#line 1365 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp6_ = string_length;
+#line 1365 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ g_return_val_if_fail ((offset + len) <= _tmp6_, NULL);
+#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp7_ = g_strndup (((gchar*) self) + offset, (gsize) len);
+#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = _tmp7_;
+#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 10180 "GalleryConnector.c"
+#line 10195 "GalleryConnector.c"
}
-static void publishing_gallery3_publishing_options_pane_on_pixels_changed (PublishingGallery3PublishingOptionsPane* self) {
+static void
+publishing_gallery3_publishing_options_pane_on_pixels_changed (PublishingGallery3PublishingOptionsPane* self)
+{
gchar* orig_text = NULL;
GtkEntry* _tmp0_;
const gchar* _tmp1_;
@@ -10231,10 +10248,9 @@ static void publishing_gallery3_publishing_options_pane_on_pixels_changed (Publi
const gchar* _tmp4_;
gint _tmp5_;
gint _tmp6_;
- gchar _tmp7_;
- const gchar* _tmp8_;
+ const gchar* _tmp7_;
+ gint _tmp8_;
gint _tmp9_;
- gint _tmp10_;
#line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_OPTIONS_PANE (self));
#line 1631 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -10254,62 +10270,59 @@ static void publishing_gallery3_publishing_options_pane_on_pixels_changed (Publi
#line 1632 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp6_ = _tmp5_;
#line 1632 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp7_ = string_get (_tmp3_, (glong) (_tmp6_ - 1));
-#line 1632 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- last_char = _tmp7_;
+ last_char = string_get (_tmp3_, (glong) (_tmp6_ - 1));
#line 1634 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp8_ = orig_text;
+ _tmp7_ = orig_text;
#line 1634 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp9_ = strlen (_tmp8_);
+ _tmp8_ = strlen (_tmp7_);
#line 1634 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp10_ = _tmp9_;
+ _tmp9_ = _tmp8_;
#line 1634 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (_tmp10_ > 0) {
-#line 10228 "GalleryConnector.c"
- gchar _tmp11_;
- gboolean _tmp12_;
+ if (_tmp9_ > 0) {
+#line 10242 "GalleryConnector.c"
+ gchar _tmp10_;
#line 1635 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp11_ = last_char;
+ _tmp10_ = last_char;
#line 1635 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp12_ = g_ascii_isdigit (_tmp11_);
-#line 1635 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (!_tmp12_) {
-#line 10237 "GalleryConnector.c"
- GtkEntry* _tmp13_;
- const gchar* _tmp14_;
- const gchar* _tmp15_;
- gint _tmp16_;
- gint _tmp17_;
- gchar* _tmp18_;
- gchar* _tmp19_;
+ if (!g_ascii_isdigit (_tmp10_)) {
+#line 10248 "GalleryConnector.c"
+ GtkEntry* _tmp11_;
+ const gchar* _tmp12_;
+ const gchar* _tmp13_;
+ gint _tmp14_;
+ gint _tmp15_;
+ gchar* _tmp16_;
+ gchar* _tmp17_;
#line 1636 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp13_ = self->priv->pixels;
+ _tmp11_ = self->priv->pixels;
#line 1636 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp14_ = orig_text;
+ _tmp12_ = orig_text;
#line 1636 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp15_ = orig_text;
+ _tmp13_ = orig_text;
#line 1636 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp16_ = strlen (_tmp15_);
+ _tmp14_ = strlen (_tmp13_);
#line 1636 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp17_ = _tmp16_;
+ _tmp15_ = _tmp14_;
#line 1636 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp18_ = string_substring (_tmp14_, (glong) 0, (glong) (_tmp17_ - 1));
+ _tmp16_ = string_substring (_tmp12_, (glong) 0, (glong) (_tmp15_ - 1));
#line 1636 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp19_ = _tmp18_;
+ _tmp17_ = _tmp16_;
#line 1636 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- gtk_entry_set_text (_tmp13_, _tmp19_);
+ gtk_entry_set_text (_tmp11_, _tmp17_);
#line 1636 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _g_free0 (_tmp19_);
-#line 10263 "GalleryConnector.c"
+ _g_free0 (_tmp17_);
+#line 10274 "GalleryConnector.c"
}
}
#line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_free0 (orig_text);
-#line 10268 "GalleryConnector.c"
+#line 10279 "GalleryConnector.c"
}
-void publishing_gallery3_publishing_options_pane_installed (PublishingGallery3PublishingOptionsPane* self) {
+void
+publishing_gallery3_publishing_options_pane_installed (PublishingGallery3PublishingOptionsPane* self)
+{
gint default_album_id = 0;
gchar* last_album = NULL;
SpitPublishingPluginHost* _tmp0_;
@@ -10326,19 +10339,19 @@ void publishing_gallery3_publishing_options_pane_installed (PublishingGallery3Pu
_tmp1_ = spit_host_interface_get_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_LAST_ALBUM_CONFIG_KEY, "");
#line 1643 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
last_album = _tmp1_;
-#line 10289 "GalleryConnector.c"
+#line 10302 "GalleryConnector.c"
{
gint i = 0;
#line 1645 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
i = 0;
-#line 10294 "GalleryConnector.c"
+#line 10307 "GalleryConnector.c"
{
gboolean _tmp2_ = FALSE;
#line 1645 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp2_ = TRUE;
#line 1645 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
while (TRUE) {
-#line 10301 "GalleryConnector.c"
+#line 10314 "GalleryConnector.c"
gint _tmp4_;
PublishingGallery3Album** _tmp5_;
gint _tmp5__length1;
@@ -10359,13 +10372,13 @@ void publishing_gallery3_publishing_options_pane_installed (PublishingGallery3Pu
const gchar* _tmp18_;
#line 1645 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
if (!_tmp2_) {
-#line 10322 "GalleryConnector.c"
+#line 10335 "GalleryConnector.c"
gint _tmp3_;
#line 1645 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp3_ = i;
#line 1645 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
i = _tmp3_ + 1;
-#line 10328 "GalleryConnector.c"
+#line 10341 "GalleryConnector.c"
}
#line 1645 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp2_ = FALSE;
@@ -10379,7 +10392,7 @@ void publishing_gallery3_publishing_options_pane_installed (PublishingGallery3Pu
if (!(_tmp4_ <= (_tmp5__length1 - 1))) {
#line 1645 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
break;
-#line 10342 "GalleryConnector.c"
+#line 10355 "GalleryConnector.c"
}
#line 1646 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp6_ = self->priv->existing_albums_combo;
@@ -10415,7 +10428,7 @@ void publishing_gallery3_publishing_options_pane_installed (PublishingGallery3Pu
if (g_strcmp0 (_tmp17_, _tmp18_) == 0) {
#line 1647 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp12_ = TRUE;
-#line 10378 "GalleryConnector.c"
+#line 10391 "GalleryConnector.c"
} else {
gboolean _tmp19_ = FALSE;
PublishingGallery3Album** _tmp20_;
@@ -10438,31 +10451,31 @@ void publishing_gallery3_publishing_options_pane_installed (PublishingGallery3Pu
_tmp24_ = _tmp23_;
#line 1648 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
if (g_strcmp0 (PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_DEFAULT_ALBUM_NAME, _tmp24_) == 0) {
-#line 10401 "GalleryConnector.c"
+#line 10414 "GalleryConnector.c"
gint _tmp25_;
#line 1649 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp25_ = default_album_id;
#line 1649 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp19_ = -1 == _tmp25_;
-#line 10407 "GalleryConnector.c"
+#line 10420 "GalleryConnector.c"
} else {
#line 1648 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp19_ = FALSE;
-#line 10411 "GalleryConnector.c"
+#line 10424 "GalleryConnector.c"
}
#line 1648 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp12_ = _tmp19_;
-#line 10415 "GalleryConnector.c"
+#line 10428 "GalleryConnector.c"
}
#line 1647 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
if (_tmp12_) {
-#line 10419 "GalleryConnector.c"
+#line 10432 "GalleryConnector.c"
gint _tmp26_;
#line 1650 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp26_ = i;
#line 1650 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
default_album_id = _tmp26_;
-#line 10425 "GalleryConnector.c"
+#line 10438 "GalleryConnector.c"
}
}
}
@@ -10473,7 +10486,7 @@ void publishing_gallery3_publishing_options_pane_installed (PublishingGallery3Pu
_tmp27__length1 = self->priv->albums_length1;
#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
if (_tmp27__length1 == 0) {
-#line 10436 "GalleryConnector.c"
+#line 10449 "GalleryConnector.c"
GtkComboBoxText* _tmp28_;
GtkRadioButton* _tmp29_;
GtkRadioButton* _tmp30_;
@@ -10499,14 +10512,14 @@ void publishing_gallery3_publishing_options_pane_installed (PublishingGallery3Pu
_tmp32_ = self->priv->new_album_entry;
#line 1658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
gtk_entry_set_text (_tmp32_, PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_DEFAULT_ALBUM_NAME);
-#line 10462 "GalleryConnector.c"
+#line 10475 "GalleryConnector.c"
} else {
gint _tmp33_;
#line 1660 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp33_ = default_album_id;
#line 1660 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
if (_tmp33_ >= 0) {
-#line 10469 "GalleryConnector.c"
+#line 10482 "GalleryConnector.c"
GtkRadioButton* _tmp34_;
GtkComboBoxText* _tmp35_;
gint _tmp36_;
@@ -10525,7 +10538,7 @@ void publishing_gallery3_publishing_options_pane_installed (PublishingGallery3Pu
_tmp37_ = self->priv->new_album_entry;
#line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 10488 "GalleryConnector.c"
+#line 10501 "GalleryConnector.c"
} else {
GtkRadioButton* _tmp38_;
GtkComboBoxText* _tmp39_;
@@ -10547,7 +10560,7 @@ void publishing_gallery3_publishing_options_pane_installed (PublishingGallery3Pu
_tmp41_ = self->priv->new_album_entry;
#line 1668 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_widget_get_type (), GtkWidget));
-#line 10510 "GalleryConnector.c"
+#line 10523 "GalleryConnector.c"
}
}
#line 1671 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -10556,11 +10569,13 @@ void publishing_gallery3_publishing_options_pane_installed (PublishingGallery3Pu
publishing_gallery3_publishing_options_pane_update_pixel_entry_sensitivity (self);
#line 1641 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_free0 (last_album);
-#line 10519 "GalleryConnector.c"
+#line 10532 "GalleryConnector.c"
}
-static GtkWidget* publishing_gallery3_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base) {
+static GtkWidget*
+publishing_gallery3_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base)
+{
PublishingGallery3PublishingOptionsPane * self;
GtkWidget* result = NULL;
GtkGrid* _tmp0_;
@@ -10575,11 +10590,13 @@ static GtkWidget* publishing_gallery3_publishing_options_pane_real_get_widget (S
result = _tmp1_;
#line 1676 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return result;
-#line 10538 "GalleryConnector.c"
+#line 10553 "GalleryConnector.c"
}
-static SpitPublishingDialogPaneGeometryOptions publishing_gallery3_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) {
+static SpitPublishingDialogPaneGeometryOptions
+publishing_gallery3_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base)
+{
PublishingGallery3PublishingOptionsPane * self;
SpitPublishingDialogPaneGeometryOptions result = 0;
#line 1679 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -10588,29 +10605,40 @@ static SpitPublishingDialogPaneGeometryOptions publishing_gallery3_publishing_op
result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
#line 1680 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return result;
-#line 10551 "GalleryConnector.c"
+#line 10568 "GalleryConnector.c"
}
-static void publishing_gallery3_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base) {
+static void
+publishing_gallery3_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base)
+{
PublishingGallery3PublishingOptionsPane * self;
#line 1683 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_GALLERY3_TYPE_PUBLISHING_OPTIONS_PANE, PublishingGallery3PublishingOptionsPane);
#line 1684 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_publishing_options_pane_installed (self);
-#line 10561 "GalleryConnector.c"
+#line 10580 "GalleryConnector.c"
}
-static void publishing_gallery3_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) {
+static void
+publishing_gallery3_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base)
+{
PublishingGallery3PublishingOptionsPane * self;
#line 1687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_GALLERY3_TYPE_PUBLISHING_OPTIONS_PANE, PublishingGallery3PublishingOptionsPane);
-#line 10569 "GalleryConnector.c"
+#line 10590 "GalleryConnector.c"
}
-static void g_cclosure_user_marshal_VOID__PUBLISHING_GALLERY3_PUBLISHING_PARAMETERS (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) {
+static void
+g_cclosure_user_marshal_VOID__PUBLISHING_GALLERY3_PUBLISHING_PARAMETERS (GClosure * closure,
+ GValue * return_value,
+ guint n_param_values,
+ const GValue * param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data)
+{
typedef void (*GMarshalFunc_VOID__PUBLISHING_GALLERY3_PUBLISHING_PARAMETERS) (gpointer data1, gpointer arg_1, gpointer data2);
register GMarshalFunc_VOID__PUBLISHING_GALLERY3_PUBLISHING_PARAMETERS callback;
register GCClosure * cc;
@@ -10625,23 +10653,25 @@ static void g_cclosure_user_marshal_VOID__PUBLISHING_GALLERY3_PUBLISHING_PARAMET
data1 = closure->data;
#line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
data2 = param_values->data[0].v_pointer;
-#line 10588 "GalleryConnector.c"
+#line 10616 "GalleryConnector.c"
} else {
#line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
data1 = param_values->data[0].v_pointer;
#line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
data2 = closure->data;
-#line 10594 "GalleryConnector.c"
+#line 10622 "GalleryConnector.c"
}
#line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
callback = (GMarshalFunc_VOID__PUBLISHING_GALLERY3_PUBLISHING_PARAMETERS) (marshal_data ? marshal_data : cc->callback);
#line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
callback (data1, publishing_gallery3_value_get_publishing_parameters (param_values + 1), data2);
-#line 10600 "GalleryConnector.c"
+#line 10628 "GalleryConnector.c"
}
-static void publishing_gallery3_publishing_options_pane_class_init (PublishingGallery3PublishingOptionsPaneClass * klass) {
+static void
+publishing_gallery3_publishing_options_pane_class_init (PublishingGallery3PublishingOptionsPaneClass * klass)
+{
#line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_publishing_options_pane_parent_class = g_type_class_peek_parent (klass);
#line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -10652,11 +10682,13 @@ static void publishing_gallery3_publishing_options_pane_class_init (PublishingGa
publishing_gallery3_publishing_options_pane_signals[PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL] = g_signal_new ("publish", PUBLISHING_GALLERY3_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__PUBLISHING_GALLERY3_PUBLISHING_PARAMETERS, G_TYPE_NONE, 1, PUBLISHING_GALLERY3_TYPE_PUBLISHING_PARAMETERS);
#line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_publishing_options_pane_signals[PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL] = g_signal_new ("logout", PUBLISHING_GALLERY3_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 10615 "GalleryConnector.c"
+#line 10645 "GalleryConnector.c"
}
-static void publishing_gallery3_publishing_options_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) {
+static void
+publishing_gallery3_publishing_options_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface)
+{
#line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
#line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -10667,11 +10699,13 @@ static void publishing_gallery3_publishing_options_pane_spit_publishing_dialog_p
iface->on_pane_installed = (void (*) (SpitPublishingDialogPane *)) publishing_gallery3_publishing_options_pane_real_on_pane_installed;
#line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
iface->on_pane_uninstalled = (void (*) (SpitPublishingDialogPane *)) publishing_gallery3_publishing_options_pane_real_on_pane_uninstalled;
-#line 10630 "GalleryConnector.c"
+#line 10662 "GalleryConnector.c"
}
-static void publishing_gallery3_publishing_options_pane_instance_init (PublishingGallery3PublishingOptionsPane * self) {
+static void
+publishing_gallery3_publishing_options_pane_instance_init (PublishingGallery3PublishingOptionsPane * self)
+{
#line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
self->priv = PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_GET_PRIVATE (self);
#line 1503 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -10698,11 +10732,13 @@ static void publishing_gallery3_publishing_options_pane_instance_init (Publishin
self->priv->publish_button = NULL;
#line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
self->priv->logout_button = NULL;
-#line 10661 "GalleryConnector.c"
+#line 10695 "GalleryConnector.c"
}
-static void publishing_gallery3_publishing_options_pane_finalize (GObject * obj) {
+static void
+publishing_gallery3_publishing_options_pane_finalize (GObject * obj)
+{
PublishingGallery3PublishingOptionsPane * self;
#line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_GALLERY3_TYPE_PUBLISHING_OPTIONS_PANE, PublishingGallery3PublishingOptionsPane);
@@ -10734,11 +10770,13 @@ static void publishing_gallery3_publishing_options_pane_finalize (GObject * obj)
self->priv->albums = (_vala_array_free (self->priv->albums, self->priv->albums_length1, (GDestroyNotify) publishing_gallery3_album_unref), NULL);
#line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
G_OBJECT_CLASS (publishing_gallery3_publishing_options_pane_parent_class)->finalize (obj);
-#line 10697 "GalleryConnector.c"
+#line 10733 "GalleryConnector.c"
}
-GType publishing_gallery3_publishing_options_pane_get_type (void) {
+GType
+publishing_gallery3_publishing_options_pane_get_type (void)
+{
static volatile gsize publishing_gallery3_publishing_options_pane_type_id__volatile = 0;
if (g_once_init_enter (&publishing_gallery3_publishing_options_pane_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingGallery3PublishingOptionsPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_gallery3_publishing_options_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingGallery3PublishingOptionsPane), 0, (GInstanceInitFunc) publishing_gallery3_publishing_options_pane_instance_init, NULL };
@@ -10752,116 +10790,121 @@ GType publishing_gallery3_publishing_options_pane_get_type (void) {
}
-static PublishingGallery3PublishingParameters* publishing_gallery3_publishing_parameters_construct (GType object_type) {
+static PublishingGallery3PublishingParameters*
+publishing_gallery3_publishing_parameters_construct (GType object_type)
+{
PublishingGallery3PublishingParameters* self = NULL;
#line 1710 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
self = (PublishingGallery3PublishingParameters*) g_type_create_instance (object_type);
#line 1710 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return self;
-#line 10721 "GalleryConnector.c"
+#line 10761 "GalleryConnector.c"
}
-static PublishingGallery3PublishingParameters* publishing_gallery3_publishing_parameters_new (void) {
+static PublishingGallery3PublishingParameters*
+publishing_gallery3_publishing_parameters_new (void)
+{
#line 1710 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return publishing_gallery3_publishing_parameters_construct (PUBLISHING_GALLERY3_TYPE_PUBLISHING_PARAMETERS);
-#line 10728 "GalleryConnector.c"
+#line 10770 "GalleryConnector.c"
}
-static gchar* string_delimit (const gchar* self, const gchar* delimiters, gchar new_delimiter) {
+static gchar*
+string_delimit (const gchar* self,
+ const gchar* delimiters,
+ gchar new_delimiter)
+{
gchar* result = NULL;
gchar* _result_ = NULL;
gchar* _tmp0_;
const gchar* _tmp1_;
- const gchar* _tmp2_;
- gchar _tmp3_;
-#line 1242 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1256 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1242 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1256 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (delimiters != NULL, NULL);
-#line 1243 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1257 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp0_ = g_strdup (self);
-#line 1243 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1257 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_result_ = _tmp0_;
-#line 1244 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1258 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp1_ = _result_;
-#line 1244 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp2_ = delimiters;
-#line 1244 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp3_ = new_delimiter;
-#line 1244 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- g_strdelimit (_tmp1_, _tmp2_, _tmp3_);
-#line 1245 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1258 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ g_strdelimit (_tmp1_, delimiters, new_delimiter);
+#line 1259 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
result = _result_;
-#line 1245 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1259 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 10759 "GalleryConnector.c"
+#line 10799 "GalleryConnector.c"
}
-PublishingGallery3PublishingParameters* publishing_gallery3_publishing_parameters_construct_to_new_album (GType object_type, const gchar* album_title) {
+PublishingGallery3PublishingParameters*
+publishing_gallery3_publishing_parameters_construct_to_new_album (GType object_type,
+ const gchar* album_title)
+{
PublishingGallery3PublishingParameters* self = NULL;
- const gchar* _tmp0_;
+ gchar* _tmp0_;
gchar* _tmp1_;
- gchar* _tmp2_;
- const gchar* _tmp3_;
#line 1713 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_val_if_fail (album_title != NULL, NULL);
#line 1713 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
self = (PublishingGallery3PublishingParameters*) g_type_create_instance (object_type);
#line 1714 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp0_ = album_title;
-#line 1714 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp1_ = string_delimit (_tmp0_, " ", '-');
+ _tmp0_ = string_delimit (album_title, " ", '-');
#line 1714 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp2_ = _tmp1_;
+ _tmp1_ = _tmp0_;
#line 1714 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- publishing_gallery3_publishing_parameters_set_album_name (self, _tmp2_);
+ publishing_gallery3_publishing_parameters_set_album_name (self, _tmp1_);
#line 1714 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _g_free0 (_tmp2_);
-#line 1716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp3_ = album_title;
+ _g_free0 (_tmp1_);
#line 1716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- publishing_gallery3_publishing_parameters_set_album_title (self, _tmp3_);
+ publishing_gallery3_publishing_parameters_set_album_title (self, album_title);
#line 1713 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return self;
-#line 10789 "GalleryConnector.c"
+#line 10826 "GalleryConnector.c"
}
-PublishingGallery3PublishingParameters* publishing_gallery3_publishing_parameters_new_to_new_album (const gchar* album_title) {
+PublishingGallery3PublishingParameters*
+publishing_gallery3_publishing_parameters_new_to_new_album (const gchar* album_title)
+{
#line 1713 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return publishing_gallery3_publishing_parameters_construct_to_new_album (PUBLISHING_GALLERY3_TYPE_PUBLISHING_PARAMETERS, album_title);
-#line 10796 "GalleryConnector.c"
+#line 10835 "GalleryConnector.c"
}
-PublishingGallery3PublishingParameters* publishing_gallery3_publishing_parameters_construct_to_existing_album (GType object_type, const gchar* album_path) {
+PublishingGallery3PublishingParameters*
+publishing_gallery3_publishing_parameters_construct_to_existing_album (GType object_type,
+ const gchar* album_path)
+{
PublishingGallery3PublishingParameters* self = NULL;
- const gchar* _tmp0_;
#line 1719 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_val_if_fail (album_path != NULL, NULL);
#line 1719 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
self = (PublishingGallery3PublishingParameters*) g_type_create_instance (object_type);
#line 1720 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp0_ = album_path;
-#line 1720 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- publishing_gallery3_publishing_parameters_set_album_path (self, _tmp0_);
+ publishing_gallery3_publishing_parameters_set_album_path (self, album_path);
#line 1719 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return self;
-#line 10813 "GalleryConnector.c"
+#line 10852 "GalleryConnector.c"
}
-PublishingGallery3PublishingParameters* publishing_gallery3_publishing_parameters_new_to_existing_album (const gchar* album_path) {
+PublishingGallery3PublishingParameters*
+publishing_gallery3_publishing_parameters_new_to_existing_album (const gchar* album_path)
+{
#line 1719 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return publishing_gallery3_publishing_parameters_construct_to_existing_album (PUBLISHING_GALLERY3_TYPE_PUBLISHING_PARAMETERS, album_path);
-#line 10820 "GalleryConnector.c"
+#line 10861 "GalleryConnector.c"
}
-gboolean publishing_gallery3_publishing_parameters_is_to_new_album (PublishingGallery3PublishingParameters* self) {
+gboolean
+publishing_gallery3_publishing_parameters_is_to_new_album (PublishingGallery3PublishingParameters* self)
+{
gboolean result = FALSE;
const gchar* _tmp0_;
#line 1723 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -10872,48 +10915,49 @@ gboolean publishing_gallery3_publishing_parameters_is_to_new_album (PublishingGa
result = g_strcmp0 (_tmp0_, "") != 0;
#line 1724 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return result;
-#line 10835 "GalleryConnector.c"
+#line 10878 "GalleryConnector.c"
}
-const gchar* publishing_gallery3_publishing_parameters_get_album_title (PublishingGallery3PublishingParameters* self) {
+const gchar*
+publishing_gallery3_publishing_parameters_get_album_title (PublishingGallery3PublishingParameters* self)
+{
const gchar* result;
- gboolean _tmp0_;
- const gchar* _tmp1_;
+ const gchar* _tmp0_;
#line 1698 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_val_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_PARAMETERS (self), NULL);
#line 1699 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp0_ = publishing_gallery3_publishing_parameters_is_to_new_album (self);
-#line 1699 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _vala_assert (_tmp0_, "is_to_new_album()");
+ _vala_assert (publishing_gallery3_publishing_parameters_is_to_new_album (self), "is_to_new_album()");
#line 1700 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp1_ = self->priv->_album_title;
+ _tmp0_ = self->priv->_album_title;
#line 1700 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- result = _tmp1_;
+ result = _tmp0_;
#line 1700 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return result;
-#line 10855 "GalleryConnector.c"
+#line 10897 "GalleryConnector.c"
}
-static void publishing_gallery3_publishing_parameters_set_album_title (PublishingGallery3PublishingParameters* self, const gchar* value) {
- const gchar* _tmp0_;
- gchar* _tmp1_;
+static void
+publishing_gallery3_publishing_parameters_set_album_title (PublishingGallery3PublishingParameters* self,
+ const gchar* value)
+{
+ gchar* _tmp0_;
#line 1702 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_PARAMETERS (self));
#line 1702 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp0_ = value;
-#line 1702 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp1_ = g_strdup (_tmp0_);
+ _tmp0_ = g_strdup (value);
#line 1702 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_free0 (self->priv->_album_title);
#line 1702 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self->priv->_album_title = _tmp1_;
-#line 10872 "GalleryConnector.c"
+ self->priv->_album_title = _tmp0_;
+#line 10914 "GalleryConnector.c"
}
-const gchar* publishing_gallery3_publishing_parameters_get_album_name (PublishingGallery3PublishingParameters* self) {
+const gchar*
+publishing_gallery3_publishing_parameters_get_album_name (PublishingGallery3PublishingParameters* self)
+{
const gchar* result;
const gchar* _tmp0_;
#line 1704 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -10924,28 +10968,30 @@ const gchar* publishing_gallery3_publishing_parameters_get_album_name (Publishin
result = _tmp0_;
#line 1704 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return result;
-#line 10887 "GalleryConnector.c"
+#line 10931 "GalleryConnector.c"
}
-static void publishing_gallery3_publishing_parameters_set_album_name (PublishingGallery3PublishingParameters* self, const gchar* value) {
- const gchar* _tmp0_;
- gchar* _tmp1_;
+static void
+publishing_gallery3_publishing_parameters_set_album_name (PublishingGallery3PublishingParameters* self,
+ const gchar* value)
+{
+ gchar* _tmp0_;
#line 1704 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_PARAMETERS (self));
#line 1704 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp0_ = value;
-#line 1704 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp1_ = g_strdup (_tmp0_);
+ _tmp0_ = g_strdup (value);
#line 1704 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_free0 (self->priv->_album_name);
#line 1704 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self->priv->_album_name = _tmp1_;
-#line 10904 "GalleryConnector.c"
+ self->priv->_album_name = _tmp0_;
+#line 10948 "GalleryConnector.c"
}
-const gchar* publishing_gallery3_publishing_parameters_get_album_path (PublishingGallery3PublishingParameters* self) {
+const gchar*
+publishing_gallery3_publishing_parameters_get_album_path (PublishingGallery3PublishingParameters* self)
+{
const gchar* result;
const gchar* _tmp0_;
#line 1705 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -10956,28 +11002,30 @@ const gchar* publishing_gallery3_publishing_parameters_get_album_path (Publishin
result = _tmp0_;
#line 1705 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return result;
-#line 10919 "GalleryConnector.c"
+#line 10965 "GalleryConnector.c"
}
-void publishing_gallery3_publishing_parameters_set_album_path (PublishingGallery3PublishingParameters* self, const gchar* value) {
- const gchar* _tmp0_;
- gchar* _tmp1_;
+void
+publishing_gallery3_publishing_parameters_set_album_path (PublishingGallery3PublishingParameters* self,
+ const gchar* value)
+{
+ gchar* _tmp0_;
#line 1705 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_PARAMETERS (self));
#line 1705 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp0_ = value;
-#line 1705 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp1_ = g_strdup (_tmp0_);
+ _tmp0_ = g_strdup (value);
#line 1705 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_free0 (self->priv->_album_path);
#line 1705 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self->priv->_album_path = _tmp1_;
-#line 10936 "GalleryConnector.c"
+ self->priv->_album_path = _tmp0_;
+#line 10982 "GalleryConnector.c"
}
-const gchar* publishing_gallery3_publishing_parameters_get_entity_title (PublishingGallery3PublishingParameters* self) {
+const gchar*
+publishing_gallery3_publishing_parameters_get_entity_title (PublishingGallery3PublishingParameters* self)
+{
const gchar* result;
const gchar* _tmp0_;
#line 1706 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -10988,28 +11036,30 @@ const gchar* publishing_gallery3_publishing_parameters_get_entity_title (Publish
result = _tmp0_;
#line 1706 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return result;
-#line 10951 "GalleryConnector.c"
+#line 10999 "GalleryConnector.c"
}
-static void publishing_gallery3_publishing_parameters_set_entity_title (PublishingGallery3PublishingParameters* self, const gchar* value) {
- const gchar* _tmp0_;
- gchar* _tmp1_;
+static void
+publishing_gallery3_publishing_parameters_set_entity_title (PublishingGallery3PublishingParameters* self,
+ const gchar* value)
+{
+ gchar* _tmp0_;
#line 1706 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_PARAMETERS (self));
#line 1706 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp0_ = value;
-#line 1706 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp1_ = g_strdup (_tmp0_);
+ _tmp0_ = g_strdup (value);
#line 1706 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_free0 (self->priv->_entity_title);
#line 1706 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self->priv->_entity_title = _tmp1_;
-#line 10968 "GalleryConnector.c"
+ self->priv->_entity_title = _tmp0_;
+#line 11016 "GalleryConnector.c"
}
-gint publishing_gallery3_publishing_parameters_get_photo_major_axis_size (PublishingGallery3PublishingParameters* self) {
+gint
+publishing_gallery3_publishing_parameters_get_photo_major_axis_size (PublishingGallery3PublishingParameters* self)
+{
gint result;
gint _tmp0_;
#line 1707 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -11020,23 +11070,25 @@ gint publishing_gallery3_publishing_parameters_get_photo_major_axis_size (Publis
result = _tmp0_;
#line 1707 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return result;
-#line 10983 "GalleryConnector.c"
+#line 11033 "GalleryConnector.c"
}
-void publishing_gallery3_publishing_parameters_set_photo_major_axis_size (PublishingGallery3PublishingParameters* self, gint value) {
- gint _tmp0_;
+void
+publishing_gallery3_publishing_parameters_set_photo_major_axis_size (PublishingGallery3PublishingParameters* self,
+ gint value)
+{
#line 1707 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_PARAMETERS (self));
#line 1707 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp0_ = value;
-#line 1707 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self->priv->_photo_major_axis_size = _tmp0_;
-#line 10995 "GalleryConnector.c"
+ self->priv->_photo_major_axis_size = value;
+#line 11045 "GalleryConnector.c"
}
-gboolean publishing_gallery3_publishing_parameters_get_strip_metadata (PublishingGallery3PublishingParameters* self) {
+gboolean
+publishing_gallery3_publishing_parameters_get_strip_metadata (PublishingGallery3PublishingParameters* self)
+{
gboolean result;
gboolean _tmp0_;
#line 1708 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -11047,120 +11099,145 @@ gboolean publishing_gallery3_publishing_parameters_get_strip_metadata (Publishin
result = _tmp0_;
#line 1708 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return result;
-#line 11010 "GalleryConnector.c"
+#line 11062 "GalleryConnector.c"
}
-void publishing_gallery3_publishing_parameters_set_strip_metadata (PublishingGallery3PublishingParameters* self, gboolean value) {
- gboolean _tmp0_;
+void
+publishing_gallery3_publishing_parameters_set_strip_metadata (PublishingGallery3PublishingParameters* self,
+ gboolean value)
+{
#line 1708 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_PARAMETERS (self));
#line 1708 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp0_ = value;
-#line 1708 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self->priv->_strip_metadata = _tmp0_;
-#line 11022 "GalleryConnector.c"
+ self->priv->_strip_metadata = value;
+#line 11074 "GalleryConnector.c"
}
-static void publishing_gallery3_value_publishing_parameters_init (GValue* value) {
+static void
+publishing_gallery3_value_publishing_parameters_init (GValue* value)
+{
#line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
value->data[0].v_pointer = NULL;
-#line 11029 "GalleryConnector.c"
+#line 11083 "GalleryConnector.c"
}
-static void publishing_gallery3_value_publishing_parameters_free_value (GValue* value) {
+static void
+publishing_gallery3_value_publishing_parameters_free_value (GValue* value)
+{
#line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
if (value->data[0].v_pointer) {
#line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_publishing_parameters_unref (value->data[0].v_pointer);
-#line 11038 "GalleryConnector.c"
+#line 11094 "GalleryConnector.c"
}
}
-static void publishing_gallery3_value_publishing_parameters_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+publishing_gallery3_value_publishing_parameters_copy_value (const GValue* src_value,
+ GValue* dest_value)
+{
#line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
if (src_value->data[0].v_pointer) {
#line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
dest_value->data[0].v_pointer = publishing_gallery3_publishing_parameters_ref (src_value->data[0].v_pointer);
-#line 11048 "GalleryConnector.c"
+#line 11107 "GalleryConnector.c"
} else {
#line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
dest_value->data[0].v_pointer = NULL;
-#line 11052 "GalleryConnector.c"
+#line 11111 "GalleryConnector.c"
}
}
-static gpointer publishing_gallery3_value_publishing_parameters_peek_pointer (const GValue* value) {
+static gpointer
+publishing_gallery3_value_publishing_parameters_peek_pointer (const GValue* value)
+{
#line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return value->data[0].v_pointer;
-#line 11060 "GalleryConnector.c"
+#line 11121 "GalleryConnector.c"
}
-static gchar* publishing_gallery3_value_publishing_parameters_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_gallery3_value_publishing_parameters_collect_value (GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
#line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
if (collect_values[0].v_pointer) {
-#line 11067 "GalleryConnector.c"
+#line 11133 "GalleryConnector.c"
PublishingGallery3PublishingParameters * object;
object = collect_values[0].v_pointer;
#line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
if (object->parent_instance.g_class == NULL) {
#line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 11074 "GalleryConnector.c"
+#line 11140 "GalleryConnector.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 11078 "GalleryConnector.c"
+#line 11144 "GalleryConnector.c"
}
#line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
value->data[0].v_pointer = publishing_gallery3_publishing_parameters_ref (object);
-#line 11082 "GalleryConnector.c"
+#line 11148 "GalleryConnector.c"
} else {
#line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
value->data[0].v_pointer = NULL;
-#line 11086 "GalleryConnector.c"
+#line 11152 "GalleryConnector.c"
}
#line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return NULL;
-#line 11090 "GalleryConnector.c"
+#line 11156 "GalleryConnector.c"
}
-static gchar* publishing_gallery3_value_publishing_parameters_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_gallery3_value_publishing_parameters_lcopy_value (const GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
PublishingGallery3PublishingParameters ** object_p;
object_p = collect_values[0].v_pointer;
#line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
if (!object_p) {
#line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 11101 "GalleryConnector.c"
+#line 11172 "GalleryConnector.c"
}
#line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
if (!value->data[0].v_pointer) {
#line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
*object_p = NULL;
-#line 11107 "GalleryConnector.c"
+#line 11178 "GalleryConnector.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
*object_p = value->data[0].v_pointer;
-#line 11111 "GalleryConnector.c"
+#line 11182 "GalleryConnector.c"
} else {
#line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
*object_p = publishing_gallery3_publishing_parameters_ref (value->data[0].v_pointer);
-#line 11115 "GalleryConnector.c"
+#line 11186 "GalleryConnector.c"
}
#line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return NULL;
-#line 11119 "GalleryConnector.c"
+#line 11190 "GalleryConnector.c"
}
-GParamSpec* publishing_gallery3_param_spec_publishing_parameters (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+publishing_gallery3_param_spec_publishing_parameters (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags)
+{
PublishingGallery3ParamSpecPublishingParameters* spec;
#line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_GALLERY3_TYPE_PUBLISHING_PARAMETERS), NULL);
@@ -11170,20 +11247,25 @@ GParamSpec* publishing_gallery3_param_spec_publishing_parameters (const gchar* n
G_PARAM_SPEC (spec)->value_type = object_type;
#line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return G_PARAM_SPEC (spec);
-#line 11133 "GalleryConnector.c"
+#line 11210 "GalleryConnector.c"
}
-gpointer publishing_gallery3_value_get_publishing_parameters (const GValue* value) {
+gpointer
+publishing_gallery3_value_get_publishing_parameters (const GValue* value)
+{
#line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_GALLERY3_TYPE_PUBLISHING_PARAMETERS), NULL);
#line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return value->data[0].v_pointer;
-#line 11142 "GalleryConnector.c"
+#line 11221 "GalleryConnector.c"
}
-void publishing_gallery3_value_set_publishing_parameters (GValue* value, gpointer v_object) {
+void
+publishing_gallery3_value_set_publishing_parameters (GValue* value,
+ gpointer v_object)
+{
PublishingGallery3PublishingParameters * old;
#line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_GALLERY3_TYPE_PUBLISHING_PARAMETERS));
@@ -11199,22 +11281,25 @@ void publishing_gallery3_value_set_publishing_parameters (GValue* value, gpointe
value->data[0].v_pointer = v_object;
#line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_publishing_parameters_ref (value->data[0].v_pointer);
-#line 11162 "GalleryConnector.c"
+#line 11244 "GalleryConnector.c"
} else {
#line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
value->data[0].v_pointer = NULL;
-#line 11166 "GalleryConnector.c"
+#line 11248 "GalleryConnector.c"
}
#line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
if (old) {
#line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_publishing_parameters_unref (old);
-#line 11172 "GalleryConnector.c"
+#line 11254 "GalleryConnector.c"
}
}
-void publishing_gallery3_value_take_publishing_parameters (GValue* value, gpointer v_object) {
+void
+publishing_gallery3_value_take_publishing_parameters (GValue* value,
+ gpointer v_object)
+{
PublishingGallery3PublishingParameters * old;
#line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_GALLERY3_TYPE_PUBLISHING_PARAMETERS));
@@ -11228,33 +11313,37 @@ void publishing_gallery3_value_take_publishing_parameters (GValue* value, gpoint
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
value->data[0].v_pointer = v_object;
-#line 11191 "GalleryConnector.c"
+#line 11276 "GalleryConnector.c"
} else {
#line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
value->data[0].v_pointer = NULL;
-#line 11195 "GalleryConnector.c"
+#line 11280 "GalleryConnector.c"
}
#line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
if (old) {
#line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_publishing_parameters_unref (old);
-#line 11201 "GalleryConnector.c"
+#line 11286 "GalleryConnector.c"
}
}
-static void publishing_gallery3_publishing_parameters_class_init (PublishingGallery3PublishingParametersClass * klass) {
+static void
+publishing_gallery3_publishing_parameters_class_init (PublishingGallery3PublishingParametersClass * klass)
+{
#line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_publishing_parameters_parent_class = g_type_class_peek_parent (klass);
#line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
((PublishingGallery3PublishingParametersClass *) klass)->finalize = publishing_gallery3_publishing_parameters_finalize;
#line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_type_class_add_private (klass, sizeof (PublishingGallery3PublishingParametersPrivate));
-#line 11213 "GalleryConnector.c"
+#line 11300 "GalleryConnector.c"
}
-static void publishing_gallery3_publishing_parameters_instance_init (PublishingGallery3PublishingParameters * self) {
+static void
+publishing_gallery3_publishing_parameters_instance_init (PublishingGallery3PublishingParameters * self)
+{
gchar* _tmp0_;
gchar* _tmp1_;
gchar* _tmp2_;
@@ -11283,11 +11372,13 @@ static void publishing_gallery3_publishing_parameters_instance_init (PublishingG
self->priv->_strip_metadata = FALSE;
#line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
self->ref_count = 1;
-#line 11246 "GalleryConnector.c"
+#line 11335 "GalleryConnector.c"
}
-static void publishing_gallery3_publishing_parameters_finalize (PublishingGallery3PublishingParameters * obj) {
+static void
+publishing_gallery3_publishing_parameters_finalize (PublishingGallery3PublishingParameters * obj)
+{
PublishingGallery3PublishingParameters * self;
#line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_GALLERY3_TYPE_PUBLISHING_PARAMETERS, PublishingGallery3PublishingParameters);
@@ -11301,11 +11392,13 @@ static void publishing_gallery3_publishing_parameters_finalize (PublishingGaller
_g_free0 (self->priv->_album_path);
#line 1706 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_free0 (self->priv->_entity_title);
-#line 11264 "GalleryConnector.c"
+#line 11355 "GalleryConnector.c"
}
-GType publishing_gallery3_publishing_parameters_get_type (void) {
+GType
+publishing_gallery3_publishing_parameters_get_type (void)
+{
static volatile gsize publishing_gallery3_publishing_parameters_type_id__volatile = 0;
if (g_once_init_enter (&publishing_gallery3_publishing_parameters_type_id__volatile)) {
static const GTypeValueTable g_define_type_value_table = { publishing_gallery3_value_publishing_parameters_init, publishing_gallery3_value_publishing_parameters_free_value, publishing_gallery3_value_publishing_parameters_copy_value, publishing_gallery3_value_publishing_parameters_peek_pointer, "p", publishing_gallery3_value_publishing_parameters_collect_value, "p", publishing_gallery3_value_publishing_parameters_lcopy_value };
@@ -11319,18 +11412,22 @@ GType publishing_gallery3_publishing_parameters_get_type (void) {
}
-gpointer publishing_gallery3_publishing_parameters_ref (gpointer instance) {
+gpointer
+publishing_gallery3_publishing_parameters_ref (gpointer instance)
+{
PublishingGallery3PublishingParameters * self;
self = instance;
#line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_atomic_int_inc (&self->ref_count);
#line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return instance;
-#line 11289 "GalleryConnector.c"
+#line 11384 "GalleryConnector.c"
}
-void publishing_gallery3_publishing_parameters_unref (gpointer instance) {
+void
+publishing_gallery3_publishing_parameters_unref (gpointer instance)
+{
PublishingGallery3PublishingParameters * self;
self = instance;
#line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -11339,18 +11436,20 @@ void publishing_gallery3_publishing_parameters_unref (gpointer instance) {
PUBLISHING_GALLERY3_PUBLISHING_PARAMETERS_GET_CLASS (self)->finalize (self);
#line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 11302 "GalleryConnector.c"
+#line 11399 "GalleryConnector.c"
}
}
-gchar* publishing_gallery3_credentials_pane_mode_to_string (PublishingGallery3CredentialsPaneMode self) {
+gchar*
+publishing_gallery3_credentials_pane_mode_to_string (PublishingGallery3CredentialsPaneMode self)
+{
gchar* result = NULL;
#line 1735 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
switch (self) {
#line 1735 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
case PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_INTRO:
-#line 11313 "GalleryConnector.c"
+#line 11412 "GalleryConnector.c"
{
gchar* _tmp0_;
#line 1737 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -11359,11 +11458,11 @@ gchar* publishing_gallery3_credentials_pane_mode_to_string (PublishingGallery3Cr
result = _tmp0_;
#line 1737 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return result;
-#line 11322 "GalleryConnector.c"
+#line 11421 "GalleryConnector.c"
}
#line 1735 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
case PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_FAILED_RETRY:
-#line 11326 "GalleryConnector.c"
+#line 11425 "GalleryConnector.c"
{
gchar* _tmp1_;
#line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -11372,11 +11471,11 @@ gchar* publishing_gallery3_credentials_pane_mode_to_string (PublishingGallery3Cr
result = _tmp1_;
#line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return result;
-#line 11335 "GalleryConnector.c"
+#line 11434 "GalleryConnector.c"
}
#line 1735 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
case PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_NOT_GALLERY_URL:
-#line 11339 "GalleryConnector.c"
+#line 11438 "GalleryConnector.c"
{
gchar* _tmp2_;
#line 1743 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -11385,20 +11484,22 @@ gchar* publishing_gallery3_credentials_pane_mode_to_string (PublishingGallery3Cr
result = _tmp2_;
#line 1743 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return result;
-#line 11348 "GalleryConnector.c"
+#line 11447 "GalleryConnector.c"
}
default:
{
#line 1746 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_error ("GalleryConnector.vala:1746: unrecognized CredentialsPane.Mode enumerat" \
"ion value");
-#line 11354 "GalleryConnector.c"
+#line 11453 "GalleryConnector.c"
}
}
}
-GType publishing_gallery3_credentials_pane_mode_get_type (void) {
+GType
+publishing_gallery3_credentials_pane_mode_get_type (void)
+{
static volatile gsize publishing_gallery3_credentials_pane_mode_type_id__volatile = 0;
if (g_once_init_enter (&publishing_gallery3_credentials_pane_mode_type_id__volatile)) {
static const GEnumValue values[] = {{PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_INTRO, "PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_INTRO", "intro"}, {PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_FAILED_RETRY, "PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_FAILED_RETRY", "failed-retry"}, {PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_NOT_GALLERY_URL, "PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_NOT_GALLERY_URL", "not-gallery-url"}, {0, NULL, NULL}};
@@ -11410,21 +11511,23 @@ GType publishing_gallery3_credentials_pane_mode_get_type (void) {
}
-PublishingGallery3CredentialsPane* publishing_gallery3_credentials_pane_construct (GType object_type, SpitPublishingPluginHost* host, PublishingGallery3CredentialsPaneMode mode, const gchar* url, const gchar* username, const gchar* key) {
+PublishingGallery3CredentialsPane*
+publishing_gallery3_credentials_pane_construct (GType object_type,
+ SpitPublishingPluginHost* host,
+ PublishingGallery3CredentialsPaneMode mode,
+ const gchar* url,
+ const gchar* username,
+ const gchar* key)
+{
PublishingGallery3CredentialsPane * self = NULL;
GtkBuilder* builder = NULL;
GtkBuilder* _tmp0_;
- SpitPublishingPluginHost* _tmp9_;
- PublishingGallery3CredentialsPaneMode _tmp10_;
- const gchar* _tmp11_;
- const gchar* _tmp12_;
- const gchar* _tmp13_;
- GtkBuilder* _tmp14_;
- PublishingGallery3CredentialsGrid* _tmp15_;
- PublishingGallery3CredentialsGrid* _tmp16_;
- GtkGrid* _tmp17_;
- GtkGrid* _tmp18_;
- GtkWidget* _tmp19_;
+ GtkBuilder* _tmp8_;
+ PublishingGallery3CredentialsGrid* _tmp9_;
+ PublishingGallery3CredentialsGrid* _tmp10_;
+ GtkGrid* _tmp11_;
+ GtkGrid* _tmp12_;
+ GtkWidget* _tmp13_;
GError * _inner_error_ = NULL;
#line 1758 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL);
@@ -11434,7 +11537,7 @@ PublishingGallery3CredentialsPane* publishing_gallery3_credentials_pane_construc
_tmp0_ = gtk_builder_new ();
#line 1763 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
builder = _tmp0_;
-#line 11396 "GalleryConnector.c"
+#line 11499 "GalleryConnector.c"
{
GtkBuilder* _tmp1_;
#line 1766 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -11443,7 +11546,7 @@ PublishingGallery3CredentialsPane* publishing_gallery3_credentials_pane_construc
gtk_builder_add_from_resource (_tmp1_, PLUGIN_RESOURCE_PATH "/gallery3_authentication_pane.ui", &_inner_error_);
#line 1766 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 11405 "GalleryConnector.c"
+#line 11508 "GalleryConnector.c"
goto __catch15_g_error;
}
}
@@ -11453,11 +11556,10 @@ PublishingGallery3CredentialsPane* publishing_gallery3_credentials_pane_construc
GError* e = NULL;
GError* _tmp2_;
const gchar* _tmp3_;
- SpitPublishingPluginHost* _tmp4_;
+ gchar* _tmp4_;
gchar* _tmp5_;
- gchar* _tmp6_;
+ GError* _tmp6_;
GError* _tmp7_;
- GError* _tmp8_;
#line 1765 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
e = _inner_error_;
#line 1765 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -11469,29 +11571,27 @@ PublishingGallery3CredentialsPane* publishing_gallery3_credentials_pane_construc
#line 1770 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_warning ("GalleryConnector.vala:1770: Could not parse UI file! Error: %s.", _tmp3_);
#line 1771 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp4_ = host;
-#line 1771 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp5_ = g_strdup_printf (_ ("A file required for publishing is unavailable. Publishing to %s can’t " \
+ _tmp4_ = g_strdup_printf (_ ("A file required for publishing is unavailable. Publishing to %s can’t " \
"continue."), PUBLISHING_GALLERY3_SERVICE_NAME);
#line 1771 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp6_ = _tmp5_;
+ _tmp5_ = _tmp4_;
#line 1771 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp7_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp6_);
+ _tmp6_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp5_);
#line 1771 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp8_ = _tmp7_;
+ _tmp7_ = _tmp6_;
#line 1771 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- spit_publishing_plugin_host_post_error (_tmp4_, _tmp8_);
+ spit_publishing_plugin_host_post_error (host, _tmp7_);
#line 1771 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _g_error_free0 (_tmp8_);
+ _g_error_free0 (_tmp7_);
#line 1771 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _g_free0 (_tmp6_);
+ _g_free0 (_tmp5_);
#line 1778 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_error_free0 (e);
#line 1778 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_object_unref0 (builder);
#line 1778 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return self;
-#line 11452 "GalleryConnector.c"
+#line 11552 "GalleryConnector.c"
}
__finally15:
#line 1765 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -11504,67 +11604,67 @@ PublishingGallery3CredentialsPane* publishing_gallery3_credentials_pane_construc
g_clear_error (&_inner_error_);
#line 1765 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return NULL;
-#line 11465 "GalleryConnector.c"
+#line 11565 "GalleryConnector.c"
}
#line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp9_ = host;
-#line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp10_ = mode;
-#line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp11_ = url;
-#line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp12_ = username;
+ _tmp8_ = builder;
#line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp13_ = key;
-#line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp14_ = builder;
-#line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp15_ = publishing_gallery3_credentials_grid_new (_tmp9_, _tmp10_, _tmp11_, _tmp12_, _tmp13_, _tmp14_);
+ _tmp9_ = publishing_gallery3_credentials_grid_new (host, mode, url, username, key, _tmp8_);
#line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_object_unref0 (self->priv->frame);
#line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self->priv->frame = _tmp15_;
+ self->priv->frame = _tmp9_;
#line 1782 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp16_ = self->priv->frame;
+ _tmp10_ = self->priv->frame;
#line 1782 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp17_ = publishing_gallery3_credentials_grid_get_pane_widget (_tmp16_);
+ _tmp11_ = publishing_gallery3_credentials_grid_get_pane_widget (_tmp10_);
#line 1782 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp18_ = _tmp17_;
+ _tmp12_ = _tmp11_;
#line 1782 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp19_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp18_, gtk_widget_get_type ()) ? ((GtkWidget*) _tmp18_) : NULL);
+ _tmp13_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, gtk_widget_get_type ()) ? ((GtkWidget*) _tmp12_) : NULL);
#line 1782 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_object_unref0 (self->priv->grid_widget);
#line 1782 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self->priv->grid_widget = _tmp19_;
+ self->priv->grid_widget = _tmp13_;
#line 1758 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_object_unref0 (builder);
#line 1758 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return self;
-#line 11501 "GalleryConnector.c"
+#line 11591 "GalleryConnector.c"
}
-PublishingGallery3CredentialsPane* publishing_gallery3_credentials_pane_new (SpitPublishingPluginHost* host, PublishingGallery3CredentialsPaneMode mode, const gchar* url, const gchar* username, const gchar* key) {
+PublishingGallery3CredentialsPane*
+publishing_gallery3_credentials_pane_new (SpitPublishingPluginHost* host,
+ PublishingGallery3CredentialsPaneMode mode,
+ const gchar* url,
+ const gchar* username,
+ const gchar* key)
+{
#line 1758 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return publishing_gallery3_credentials_pane_construct (PUBLISHING_GALLERY3_TYPE_CREDENTIALS_PANE, host, mode, url, username, key);
-#line 11508 "GalleryConnector.c"
+#line 11604 "GalleryConnector.c"
}
-void publishing_gallery3_credentials_pane_notify_go_back (PublishingGallery3CredentialsPane* self) {
+void
+publishing_gallery3_credentials_pane_notify_go_back (PublishingGallery3CredentialsPane* self)
+{
#line 1785 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (PUBLISHING_GALLERY3_IS_CREDENTIALS_PANE (self));
#line 1786 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_signal_emit (self, publishing_gallery3_credentials_pane_signals[PUBLISHING_GALLERY3_CREDENTIALS_PANE_GO_BACK_SIGNAL], 0);
-#line 11517 "GalleryConnector.c"
+#line 11615 "GalleryConnector.c"
}
-void publishing_gallery3_credentials_pane_notify_login (PublishingGallery3CredentialsPane* self, const gchar* url, const gchar* uname, const gchar* password, const gchar* key) {
- const gchar* _tmp0_;
- const gchar* _tmp1_;
- const gchar* _tmp2_;
- const gchar* _tmp3_;
+void
+publishing_gallery3_credentials_pane_notify_login (PublishingGallery3CredentialsPane* self,
+ const gchar* url,
+ const gchar* uname,
+ const gchar* password,
+ const gchar* key)
+{
#line 1789 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (PUBLISHING_GALLERY3_IS_CREDENTIALS_PANE (self));
#line 1789 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -11576,20 +11676,14 @@ void publishing_gallery3_credentials_pane_notify_login (PublishingGallery3Creden
#line 1789 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (key != NULL);
#line 1791 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp0_ = url;
-#line 1791 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp1_ = uname;
-#line 1791 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp2_ = password;
-#line 1791 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp3_ = key;
-#line 1791 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_signal_emit (self, publishing_gallery3_credentials_pane_signals[PUBLISHING_GALLERY3_CREDENTIALS_PANE_LOGIN_SIGNAL], 0, _tmp0_, _tmp1_, _tmp2_, _tmp3_);
-#line 11546 "GalleryConnector.c"
+ g_signal_emit (self, publishing_gallery3_credentials_pane_signals[PUBLISHING_GALLERY3_CREDENTIALS_PANE_LOGIN_SIGNAL], 0, url, uname, password, key);
+#line 11638 "GalleryConnector.c"
}
-static GtkWidget* publishing_gallery3_credentials_pane_real_get_widget (SpitPublishingDialogPane* base) {
+static GtkWidget*
+publishing_gallery3_credentials_pane_real_get_widget (SpitPublishingDialogPane* base)
+{
PublishingGallery3CredentialsPane * self;
GtkWidget* result = NULL;
GtkWidget* _tmp0_;
@@ -11609,11 +11703,13 @@ static GtkWidget* publishing_gallery3_credentials_pane_real_get_widget (SpitPubl
result = _tmp2_;
#line 1796 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return result;
-#line 11570 "GalleryConnector.c"
+#line 11664 "GalleryConnector.c"
}
-static SpitPublishingDialogPaneGeometryOptions publishing_gallery3_credentials_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) {
+static SpitPublishingDialogPaneGeometryOptions
+publishing_gallery3_credentials_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base)
+{
PublishingGallery3CredentialsPane * self;
SpitPublishingDialogPaneGeometryOptions result = 0;
#line 1799 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -11622,25 +11718,37 @@ static SpitPublishingDialogPaneGeometryOptions publishing_gallery3_credentials_p
result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
#line 1800 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return result;
-#line 11583 "GalleryConnector.c"
+#line 11679 "GalleryConnector.c"
}
-static void _publishing_gallery3_credentials_pane_notify_go_back_publishing_gallery3_credentials_grid_go_back (PublishingGallery3CredentialsGrid* _sender, gpointer self) {
+static void
+_publishing_gallery3_credentials_pane_notify_go_back_publishing_gallery3_credentials_grid_go_back (PublishingGallery3CredentialsGrid* _sender,
+ gpointer self)
+{
#line 1804 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_credentials_pane_notify_go_back ((PublishingGallery3CredentialsPane*) self);
-#line 11590 "GalleryConnector.c"
+#line 11689 "GalleryConnector.c"
}
-static void _publishing_gallery3_credentials_pane_notify_login_publishing_gallery3_credentials_grid_login (PublishingGallery3CredentialsGrid* _sender, const gchar* url, const gchar* username, const gchar* password, const gchar* key, gpointer self) {
+static void
+_publishing_gallery3_credentials_pane_notify_login_publishing_gallery3_credentials_grid_login (PublishingGallery3CredentialsGrid* _sender,
+ const gchar* url,
+ const gchar* username,
+ const gchar* password,
+ const gchar* key,
+ gpointer self)
+{
#line 1805 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_credentials_pane_notify_login ((PublishingGallery3CredentialsPane*) self, url, username, password, key);
-#line 11597 "GalleryConnector.c"
+#line 11703 "GalleryConnector.c"
}
-static void publishing_gallery3_credentials_pane_real_on_pane_installed (SpitPublishingDialogPane* base) {
+static void
+publishing_gallery3_credentials_pane_real_on_pane_installed (SpitPublishingDialogPane* base)
+{
PublishingGallery3CredentialsPane * self;
PublishingGallery3CredentialsGrid* _tmp0_;
PublishingGallery3CredentialsGrid* _tmp1_;
@@ -11659,11 +11767,13 @@ static void publishing_gallery3_credentials_pane_real_on_pane_installed (SpitPub
_tmp2_ = self->priv->frame;
#line 1807 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_credentials_grid_installed (_tmp2_);
-#line 11620 "GalleryConnector.c"
+#line 11728 "GalleryConnector.c"
}
-static void publishing_gallery3_credentials_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) {
+static void
+publishing_gallery3_credentials_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base)
+{
PublishingGallery3CredentialsPane * self;
PublishingGallery3CredentialsGrid* _tmp0_;
guint _tmp1_;
@@ -11683,11 +11793,18 @@ static void publishing_gallery3_credentials_pane_real_on_pane_uninstalled (SpitP
g_signal_parse_name ("login", PUBLISHING_GALLERY3_TYPE_CREDENTIALS_GRID, &_tmp3_, NULL, FALSE);
#line 1812 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_gallery3_credentials_pane_notify_login_publishing_gallery3_credentials_grid_login, self);
-#line 11644 "GalleryConnector.c"
+#line 11754 "GalleryConnector.c"
}
-static void g_cclosure_user_marshal_VOID__STRING_STRING_STRING_STRING (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) {
+static void
+g_cclosure_user_marshal_VOID__STRING_STRING_STRING_STRING (GClosure * closure,
+ GValue * return_value,
+ guint n_param_values,
+ const GValue * param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data)
+{
typedef void (*GMarshalFunc_VOID__STRING_STRING_STRING_STRING) (gpointer data1, const char* arg_1, const char* arg_2, const char* arg_3, const char* arg_4, gpointer data2);
register GMarshalFunc_VOID__STRING_STRING_STRING_STRING callback;
register GCClosure * cc;
@@ -11702,23 +11819,25 @@ static void g_cclosure_user_marshal_VOID__STRING_STRING_STRING_STRING (GClosure
data1 = closure->data;
#line 1728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
data2 = param_values->data[0].v_pointer;
-#line 11663 "GalleryConnector.c"
+#line 11780 "GalleryConnector.c"
} else {
#line 1728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
data1 = param_values->data[0].v_pointer;
#line 1728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
data2 = closure->data;
-#line 11669 "GalleryConnector.c"
+#line 11786 "GalleryConnector.c"
}
#line 1728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
callback = (GMarshalFunc_VOID__STRING_STRING_STRING_STRING) (marshal_data ? marshal_data : cc->callback);
#line 1728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
callback (data1, g_value_get_string (param_values + 1), g_value_get_string (param_values + 2), g_value_get_string (param_values + 3), g_value_get_string (param_values + 4), data2);
-#line 11675 "GalleryConnector.c"
+#line 11792 "GalleryConnector.c"
}
-static void publishing_gallery3_credentials_pane_class_init (PublishingGallery3CredentialsPaneClass * klass) {
+static void
+publishing_gallery3_credentials_pane_class_init (PublishingGallery3CredentialsPaneClass * klass)
+{
#line 1728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_credentials_pane_parent_class = g_type_class_peek_parent (klass);
#line 1728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -11729,11 +11848,13 @@ static void publishing_gallery3_credentials_pane_class_init (PublishingGallery3C
publishing_gallery3_credentials_pane_signals[PUBLISHING_GALLERY3_CREDENTIALS_PANE_GO_BACK_SIGNAL] = g_signal_new ("go-back", PUBLISHING_GALLERY3_TYPE_CREDENTIALS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
#line 1728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_credentials_pane_signals[PUBLISHING_GALLERY3_CREDENTIALS_PANE_LOGIN_SIGNAL] = g_signal_new ("login", PUBLISHING_GALLERY3_TYPE_CREDENTIALS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__STRING_STRING_STRING_STRING, G_TYPE_NONE, 4, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
-#line 11690 "GalleryConnector.c"
+#line 11809 "GalleryConnector.c"
}
-static void publishing_gallery3_credentials_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) {
+static void
+publishing_gallery3_credentials_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface)
+{
#line 1728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_credentials_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
#line 1728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -11744,22 +11865,26 @@ static void publishing_gallery3_credentials_pane_spit_publishing_dialog_pane_int
iface->on_pane_installed = (void (*) (SpitPublishingDialogPane *)) publishing_gallery3_credentials_pane_real_on_pane_installed;
#line 1728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
iface->on_pane_uninstalled = (void (*) (SpitPublishingDialogPane *)) publishing_gallery3_credentials_pane_real_on_pane_uninstalled;
-#line 11705 "GalleryConnector.c"
+#line 11826 "GalleryConnector.c"
}
-static void publishing_gallery3_credentials_pane_instance_init (PublishingGallery3CredentialsPane * self) {
+static void
+publishing_gallery3_credentials_pane_instance_init (PublishingGallery3CredentialsPane * self)
+{
#line 1728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
self->priv = PUBLISHING_GALLERY3_CREDENTIALS_PANE_GET_PRIVATE (self);
#line 1751 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
self->priv->frame = NULL;
#line 1752 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
self->priv->grid_widget = NULL;
-#line 11716 "GalleryConnector.c"
+#line 11839 "GalleryConnector.c"
}
-static void publishing_gallery3_credentials_pane_finalize (GObject * obj) {
+static void
+publishing_gallery3_credentials_pane_finalize (GObject * obj)
+{
PublishingGallery3CredentialsPane * self;
#line 1728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_GALLERY3_TYPE_CREDENTIALS_PANE, PublishingGallery3CredentialsPane);
@@ -11769,11 +11894,13 @@ static void publishing_gallery3_credentials_pane_finalize (GObject * obj) {
_g_object_unref0 (self->priv->grid_widget);
#line 1728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
G_OBJECT_CLASS (publishing_gallery3_credentials_pane_parent_class)->finalize (obj);
-#line 11730 "GalleryConnector.c"
+#line 11855 "GalleryConnector.c"
}
-GType publishing_gallery3_credentials_pane_get_type (void) {
+GType
+publishing_gallery3_credentials_pane_get_type (void)
+{
static volatile gsize publishing_gallery3_credentials_pane_type_id__volatile = 0;
if (g_once_init_enter (&publishing_gallery3_credentials_pane_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingGallery3CredentialsPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_gallery3_credentials_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingGallery3CredentialsPane), 0, (GInstanceInitFunc) publishing_gallery3_credentials_pane_instance_init, NULL };
@@ -11787,78 +11914,74 @@ GType publishing_gallery3_credentials_pane_get_type (void) {
}
-static void _publishing_gallery3_credentials_grid_on_url_or_username_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
+static void
+_publishing_gallery3_credentials_grid_on_url_or_username_changed_gtk_editable_changed (GtkEditable* _sender,
+ gpointer self)
+{
#line 1890 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_credentials_grid_on_url_or_username_changed ((PublishingGallery3CredentialsGrid*) self);
-#line 11751 "GalleryConnector.c"
+#line 11881 "GalleryConnector.c"
}
-static void _publishing_gallery3_credentials_grid_on_go_back_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+_publishing_gallery3_credentials_grid_on_go_back_button_clicked_gtk_button_clicked (GtkButton* _sender,
+ gpointer self)
+{
#line 1906 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_credentials_grid_on_go_back_button_clicked ((PublishingGallery3CredentialsGrid*) self);
-#line 11758 "GalleryConnector.c"
+#line 11891 "GalleryConnector.c"
}
-static void _publishing_gallery3_credentials_grid_on_login_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+_publishing_gallery3_credentials_grid_on_login_button_clicked_gtk_button_clicked (GtkButton* _sender,
+ gpointer self)
+{
#line 1907 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_credentials_grid_on_login_button_clicked ((PublishingGallery3CredentialsGrid*) self);
-#line 11765 "GalleryConnector.c"
+#line 11901 "GalleryConnector.c"
}
-PublishingGallery3CredentialsGrid* publishing_gallery3_credentials_grid_construct (GType object_type, SpitPublishingPluginHost* host, PublishingGallery3CredentialsPaneMode mode, const gchar* url, const gchar* username, const gchar* key, GtkBuilder* builder) {
+PublishingGallery3CredentialsGrid*
+publishing_gallery3_credentials_grid_construct (GType object_type,
+ SpitPublishingPluginHost* host,
+ PublishingGallery3CredentialsPaneMode mode,
+ const gchar* url,
+ const gchar* username,
+ const gchar* key,
+ GtkBuilder* builder)
+{
PublishingGallery3CredentialsGrid * self = NULL;
- SpitPublishingPluginHost* _tmp0_;
- const gchar* _tmp1_;
+ gchar* _tmp0_;
+ gchar* _tmp1_;
gchar* _tmp2_;
- const gchar* _tmp3_;
- gchar* _tmp4_;
- const gchar* _tmp5_;
- gchar* _tmp6_;
- GtkBuilder* _tmp7_;
- GtkBuilder* _tmp8_;
- GtkBuilder* _tmp9_;
- GtkBuilder* _tmp10_;
- GSList* _tmp11_;
- GSList* _tmp12_;
- guint _tmp13_;
- GtkBuilder* _tmp14_;
+ GtkBuilder* _tmp3_;
+ GSList* _tmp4_;
+ GSList* _tmp5_;
+ GObject* _tmp6_;
+ GObject* _tmp7_;
+ GtkLabel* _tmp8_;
+ GObject* _tmp9_;
+ GtkEntry* _tmp10_;
+ GObject* _tmp11_;
+ GtkEntry* _tmp12_;
+ GObject* _tmp13_;
+ GtkEntry* _tmp14_;
GObject* _tmp15_;
- GtkBuilder* _tmp16_;
+ GtkEntry* _tmp16_;
GObject* _tmp17_;
- GtkLabel* _tmp18_;
- GtkBuilder* _tmp19_;
- GObject* _tmp20_;
- GtkEntry* _tmp21_;
- GtkBuilder* _tmp22_;
- GObject* _tmp23_;
- GtkEntry* _tmp24_;
- GtkBuilder* _tmp25_;
- GObject* _tmp26_;
- GtkEntry* _tmp27_;
- GtkBuilder* _tmp28_;
- GObject* _tmp29_;
+ GtkButton* _tmp18_;
+ GObject* _tmp19_;
+ GtkButton* _tmp20_;
GtkEntry* _tmp30_;
- GtkBuilder* _tmp31_;
- GObject* _tmp32_;
- GtkButton* _tmp33_;
- GtkBuilder* _tmp34_;
- GObject* _tmp35_;
- GtkButton* _tmp36_;
- PublishingGallery3CredentialsPaneMode _tmp37_;
- const gchar* _tmp45_;
- GtkEntry* _tmp49_;
- const gchar* _tmp50_;
- GtkEntry* _tmp54_;
- const gchar* _tmp55_;
- GtkEntry* _tmp59_;
- GtkButton* _tmp60_;
- GtkButton* _tmp61_;
- gboolean _tmp62_ = FALSE;
- const gchar* _tmp63_;
- GtkButton* _tmp65_;
+ GtkEntry* _tmp33_;
+ GtkEntry* _tmp36_;
+ GtkButton* _tmp37_;
+ GtkButton* _tmp38_;
+ gboolean _tmp39_ = FALSE;
+ GtkButton* _tmp40_;
#line 1840 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL);
#line 1840 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -11866,313 +11989,267 @@ PublishingGallery3CredentialsGrid* publishing_gallery3_credentials_grid_construc
#line 1840 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
self = (PublishingGallery3CredentialsGrid*) g_object_new (object_type, NULL);
#line 1845 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp0_ = host;
-#line 1845 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self->priv->host = _tmp0_;
-#line 1846 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp1_ = url;
+ self->priv->host = host;
#line 1846 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp2_ = g_strdup (_tmp1_);
+ _tmp0_ = g_strdup (url);
#line 1846 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_free0 (self->priv->url);
#line 1846 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self->priv->url = _tmp2_;
+ self->priv->url = _tmp0_;
#line 1847 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp3_ = key;
-#line 1847 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp4_ = g_strdup (_tmp3_);
+ _tmp1_ = g_strdup (key);
#line 1847 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_free0 (self->priv->key);
#line 1847 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self->priv->key = _tmp4_;
+ self->priv->key = _tmp1_;
#line 1848 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp5_ = username;
-#line 1848 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp6_ = g_strdup (_tmp5_);
+ _tmp2_ = g_strdup (username);
#line 1848 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_free0 (self->priv->username);
#line 1848 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self->priv->username = _tmp6_;
-#line 1850 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp7_ = builder;
+ self->priv->username = _tmp2_;
#line 1850 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp8_ = _g_object_ref0 (_tmp7_);
+ _tmp3_ = _g_object_ref0 (builder);
#line 1850 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_object_unref0 (self->priv->builder);
#line 1850 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self->priv->builder = _tmp8_;
-#line 1851 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp9_ = builder;
+ self->priv->builder = _tmp3_;
#line 1851 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _vala_assert (_tmp9_ != NULL, "builder != null");
-#line 1852 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp10_ = builder;
-#line 1852 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp11_ = gtk_builder_get_objects (_tmp10_);
+ _vala_assert (builder != NULL, "builder != null");
#line 1852 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp12_ = _tmp11_;
+ _tmp4_ = gtk_builder_get_objects (builder);
#line 1852 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp13_ = g_slist_length (_tmp12_);
+ _tmp5_ = _tmp4_;
#line 1852 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _vala_assert (_tmp13_ > ((guint) 0), "builder.get_objects().length() > 0");
+ _vala_assert (g_slist_length (_tmp5_) > ((guint) 0), "builder.get_objects().length() > 0");
#line 1852 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _g_slist_free0 (_tmp12_);
-#line 1855 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp14_ = builder;
+ _g_slist_free0 (_tmp5_);
#line 1855 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp15_ = gtk_builder_get_object (_tmp14_, "gallery3_auth_pane_widget");
+ _tmp6_ = gtk_builder_get_object (builder, "gallery3_auth_pane_widget");
#line 1855 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- publishing_gallery3_credentials_grid_set_pane_widget (self, G_TYPE_CHECK_INSTANCE_TYPE (_tmp15_, gtk_grid_get_type ()) ? ((GtkGrid*) _tmp15_) : NULL);
-#line 1856 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp16_ = builder;
+ publishing_gallery3_credentials_grid_set_pane_widget (self, G_TYPE_CHECK_INSTANCE_TYPE (_tmp6_, gtk_grid_get_type ()) ? ((GtkGrid*) _tmp6_) : NULL);
#line 1856 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp17_ = gtk_builder_get_object (_tmp16_, "intro_message_label");
+ _tmp7_ = gtk_builder_get_object (builder, "intro_message_label");
#line 1856 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp18_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp17_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp17_) : NULL);
+ _tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp7_) : NULL);
#line 1856 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_object_unref0 (self->priv->intro_message_label);
#line 1856 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self->priv->intro_message_label = _tmp18_;
+ self->priv->intro_message_label = _tmp8_;
#line 1857 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp19_ = builder;
+ _tmp9_ = gtk_builder_get_object (builder, "url_entry");
#line 1857 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp20_ = gtk_builder_get_object (_tmp19_, "url_entry");
-#line 1857 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp21_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp20_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp20_) : NULL);
+ _tmp10_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp9_) : NULL);
#line 1857 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_object_unref0 (self->priv->url_entry);
#line 1857 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self->priv->url_entry = _tmp21_;
-#line 1858 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp22_ = builder;
+ self->priv->url_entry = _tmp10_;
#line 1858 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp23_ = gtk_builder_get_object (_tmp22_, "username_entry");
+ _tmp11_ = gtk_builder_get_object (builder, "username_entry");
#line 1858 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp24_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp23_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp23_) : NULL);
+ _tmp12_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp11_) : NULL);
#line 1858 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_object_unref0 (self->priv->username_entry);
#line 1858 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self->priv->username_entry = _tmp24_;
+ self->priv->username_entry = _tmp12_;
#line 1859 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp25_ = builder;
+ _tmp13_ = gtk_builder_get_object (builder, "key_entry");
#line 1859 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp26_ = gtk_builder_get_object (_tmp25_, "key_entry");
-#line 1859 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp27_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp26_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp26_) : NULL);
+ _tmp14_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp13_) : NULL);
#line 1859 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_object_unref0 (self->priv->key_entry);
#line 1859 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self->priv->key_entry = _tmp27_;
-#line 1860 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp28_ = builder;
+ self->priv->key_entry = _tmp14_;
#line 1860 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp29_ = gtk_builder_get_object (_tmp28_, "password_entry");
+ _tmp15_ = gtk_builder_get_object (builder, "password_entry");
#line 1860 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp30_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp29_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp29_) : NULL);
+ _tmp16_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp15_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp15_) : NULL);
#line 1860 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_object_unref0 (self->priv->password_entry);
#line 1860 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self->priv->password_entry = _tmp30_;
-#line 1861 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp31_ = builder;
+ self->priv->password_entry = _tmp16_;
#line 1861 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp32_ = gtk_builder_get_object (_tmp31_, "go_back_button");
+ _tmp17_ = gtk_builder_get_object (builder, "go_back_button");
#line 1861 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp33_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp32_, gtk_button_get_type ()) ? ((GtkButton*) _tmp32_) : NULL);
+ _tmp18_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp17_, gtk_button_get_type ()) ? ((GtkButton*) _tmp17_) : NULL);
#line 1861 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_object_unref0 (self->priv->go_back_button);
#line 1861 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self->priv->go_back_button = _tmp33_;
+ self->priv->go_back_button = _tmp18_;
#line 1862 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp34_ = builder;
+ _tmp19_ = gtk_builder_get_object (builder, "login_button");
#line 1862 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp35_ = gtk_builder_get_object (_tmp34_, "login_button");
-#line 1862 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp36_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp35_, gtk_button_get_type ()) ? ((GtkButton*) _tmp35_) : NULL);
+ _tmp20_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, gtk_button_get_type ()) ? ((GtkButton*) _tmp19_) : NULL);
#line 1862 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_object_unref0 (self->priv->login_button);
#line 1862 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self->priv->login_button = _tmp36_;
-#line 1865 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp37_ = mode;
+ self->priv->login_button = _tmp20_;
#line 1865 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- switch (_tmp37_) {
+ switch (mode) {
#line 1865 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
case PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_INTRO:
-#line 11960 "GalleryConnector.c"
+#line 12049 "GalleryConnector.c"
{
- GtkLabel* _tmp38_;
+ GtkLabel* _tmp21_;
#line 1867 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp38_ = self->priv->intro_message_label;
+ _tmp21_ = self->priv->intro_message_label;
#line 1867 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- gtk_label_set_markup (_tmp38_, PUBLISHING_GALLERY3_CREDENTIALS_GRID_INTRO_MESSAGE);
+ gtk_label_set_markup (_tmp21_, PUBLISHING_GALLERY3_CREDENTIALS_GRID_INTRO_MESSAGE);
#line 1868 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
break;
-#line 11969 "GalleryConnector.c"
+#line 12058 "GalleryConnector.c"
}
#line 1865 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
case PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_FAILED_RETRY:
-#line 11973 "GalleryConnector.c"
+#line 12062 "GalleryConnector.c"
{
- GtkLabel* _tmp39_;
- gchar* _tmp40_;
- gchar* _tmp41_;
+ GtkLabel* _tmp22_;
+ gchar* _tmp23_;
+ gchar* _tmp24_;
#line 1871 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp39_ = self->priv->intro_message_label;
+ _tmp22_ = self->priv->intro_message_label;
#line 1871 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp40_ = g_strdup_printf ("<b>%s</b>\n\n%s", _ ("Unrecognized User"), PUBLISHING_GALLERY3_CREDENTIALS_GRID_FAILED_RETRY_MESSAGE);
+ _tmp23_ = g_strdup_printf ("<b>%s</b>\n\n%s", _ ("Unrecognized User"), PUBLISHING_GALLERY3_CREDENTIALS_GRID_FAILED_RETRY_MESSAGE);
#line 1871 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp41_ = _tmp40_;
+ _tmp24_ = _tmp23_;
#line 1871 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- gtk_label_set_markup (_tmp39_, _tmp41_);
+ gtk_label_set_markup (_tmp22_, _tmp24_);
#line 1871 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _g_free0 (_tmp41_);
+ _g_free0 (_tmp24_);
#line 1873 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
break;
-#line 11990 "GalleryConnector.c"
+#line 12079 "GalleryConnector.c"
}
#line 1865 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
case PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_NOT_GALLERY_URL:
-#line 11994 "GalleryConnector.c"
+#line 12083 "GalleryConnector.c"
{
- GtkLabel* _tmp42_;
- gchar* _tmp43_;
- gchar* _tmp44_;
+ GtkLabel* _tmp25_;
+ gchar* _tmp26_;
+ gchar* _tmp27_;
#line 1876 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp42_ = self->priv->intro_message_label;
+ _tmp25_ = self->priv->intro_message_label;
#line 1876 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp43_ = g_strdup_printf ("<b>%s</b>\n\n%s", _ (PUBLISHING_GALLERY3_SERVICE_NAME " Site Not Found"), PUBLISHING_GALLERY3_CREDENTIALS_GRID_NOT_GALLERY_URL_MESSAGE);
+ _tmp26_ = g_strdup_printf ("<b>%s</b>\n\n%s", _ (PUBLISHING_GALLERY3_SERVICE_NAME " Site Not Found"), PUBLISHING_GALLERY3_CREDENTIALS_GRID_NOT_GALLERY_URL_MESSAGE);
#line 1876 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp44_ = _tmp43_;
+ _tmp27_ = _tmp26_;
#line 1876 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- gtk_label_set_markup (_tmp42_, _tmp44_);
+ gtk_label_set_markup (_tmp25_, _tmp27_);
#line 1876 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _g_free0 (_tmp44_);
+ _g_free0 (_tmp27_);
#line 1879 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
break;
-#line 12011 "GalleryConnector.c"
+#line 12100 "GalleryConnector.c"
}
default:
{
#line 1882 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_error ("GalleryConnector.vala:1882: Invalid CredentialsPane mode");
-#line 12017 "GalleryConnector.c"
+#line 12106 "GalleryConnector.c"
}
}
#line 1886 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp45_ = url;
-#line 1886 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (_tmp45_ != NULL) {
-#line 12024 "GalleryConnector.c"
- GtkEntry* _tmp46_;
- const gchar* _tmp47_;
- GtkEntry* _tmp48_;
-#line 1887 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp46_ = self->priv->url_entry;
+ if (url != NULL) {
+#line 12111 "GalleryConnector.c"
+ GtkEntry* _tmp28_;
+ GtkEntry* _tmp29_;
#line 1887 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp47_ = url;
+ _tmp28_ = self->priv->url_entry;
#line 1887 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- gtk_entry_set_text (_tmp46_, _tmp47_);
+ gtk_entry_set_text (_tmp28_, url);
#line 1888 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp48_ = self->priv->username_entry;
+ _tmp29_ = self->priv->username_entry;
#line 1888 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_widget_get_type (), GtkWidget));
-#line 12038 "GalleryConnector.c"
+ gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_widget_get_type (), GtkWidget));
+#line 12122 "GalleryConnector.c"
}
#line 1890 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp49_ = self->priv->url_entry;
+ _tmp30_ = self->priv->url_entry;
#line 1890 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_gallery3_credentials_grid_on_url_or_username_changed_gtk_editable_changed, self, 0);
-#line 1892 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp50_ = username;
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_editable_get_type (), GtkEditable), "changed", (GCallback) _publishing_gallery3_credentials_grid_on_url_or_username_changed_gtk_editable_changed, self, 0);
#line 1892 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (_tmp50_ != NULL) {
-#line 12048 "GalleryConnector.c"
- GtkEntry* _tmp51_;
- const gchar* _tmp52_;
- GtkEntry* _tmp53_;
-#line 1893 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp51_ = self->priv->username_entry;
+ if (username != NULL) {
+#line 12130 "GalleryConnector.c"
+ GtkEntry* _tmp31_;
+ GtkEntry* _tmp32_;
#line 1893 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp52_ = username;
+ _tmp31_ = self->priv->username_entry;
#line 1893 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- gtk_entry_set_text (_tmp51_, _tmp52_);
+ gtk_entry_set_text (_tmp31_, username);
#line 1894 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp53_ = self->priv->password_entry;
+ _tmp32_ = self->priv->password_entry;
#line 1894 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, gtk_widget_get_type (), GtkWidget));
-#line 12062 "GalleryConnector.c"
+ gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_widget_get_type (), GtkWidget));
+#line 12141 "GalleryConnector.c"
}
#line 1896 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp54_ = self->priv->username_entry;
+ _tmp33_ = self->priv->username_entry;
#line 1896 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_gallery3_credentials_grid_on_url_or_username_changed_gtk_editable_changed, self, 0);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_editable_get_type (), GtkEditable), "changed", (GCallback) _publishing_gallery3_credentials_grid_on_url_or_username_changed_gtk_editable_changed, self, 0);
#line 1899 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp55_ = key;
-#line 1899 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (_tmp55_ != NULL) {
-#line 12072 "GalleryConnector.c"
- GtkEntry* _tmp56_;
- const gchar* _tmp57_;
- GtkEntry* _tmp58_;
-#line 1900 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp56_ = self->priv->key_entry;
+ if (key != NULL) {
+#line 12149 "GalleryConnector.c"
+ GtkEntry* _tmp34_;
+ GtkEntry* _tmp35_;
#line 1900 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp57_ = key;
+ _tmp34_ = self->priv->key_entry;
#line 1900 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- gtk_entry_set_text (_tmp56_, _tmp57_);
+ gtk_entry_set_text (_tmp34_, key);
#line 1901 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp58_ = self->priv->key_entry;
+ _tmp35_ = self->priv->key_entry;
#line 1901 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_widget_get_type (), GtkWidget));
-#line 12086 "GalleryConnector.c"
+ gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_widget_get_type (), GtkWidget));
+#line 12160 "GalleryConnector.c"
}
#line 1903 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp59_ = self->priv->key_entry;
+ _tmp36_ = self->priv->key_entry;
#line 1903 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_gallery3_credentials_grid_on_url_or_username_changed_gtk_editable_changed, self, 0);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_editable_get_type (), GtkEditable), "changed", (GCallback) _publishing_gallery3_credentials_grid_on_url_or_username_changed_gtk_editable_changed, self, 0);
#line 1906 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp60_ = self->priv->go_back_button;
+ _tmp37_ = self->priv->go_back_button;
#line 1906 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_signal_connect_object (_tmp60_, "clicked", (GCallback) _publishing_gallery3_credentials_grid_on_go_back_button_clicked_gtk_button_clicked, self, 0);
+ g_signal_connect_object (_tmp37_, "clicked", (GCallback) _publishing_gallery3_credentials_grid_on_go_back_button_clicked_gtk_button_clicked, self, 0);
#line 1907 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp61_ = self->priv->login_button;
+ _tmp38_ = self->priv->login_button;
#line 1907 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_signal_connect_object (_tmp61_, "clicked", (GCallback) _publishing_gallery3_credentials_grid_on_login_button_clicked_gtk_button_clicked, self, 0);
+ g_signal_connect_object (_tmp38_, "clicked", (GCallback) _publishing_gallery3_credentials_grid_on_login_button_clicked_gtk_button_clicked, self, 0);
#line 1908 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp63_ = url;
+ if (url != NULL) {
#line 1908 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- if (_tmp63_ != NULL) {
-#line 12104 "GalleryConnector.c"
- const gchar* _tmp64_;
-#line 1908 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp64_ = username;
-#line 1908 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp62_ = _tmp64_ != NULL;
-#line 12110 "GalleryConnector.c"
+ _tmp39_ = username != NULL;
+#line 12178 "GalleryConnector.c"
} else {
#line 1908 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp62_ = FALSE;
-#line 12114 "GalleryConnector.c"
+ _tmp39_ = FALSE;
+#line 12182 "GalleryConnector.c"
}
#line 1908 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp65_ = self->priv->login_button;
+ _tmp40_ = self->priv->login_button;
#line 1908 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, gtk_widget_get_type (), GtkWidget), _tmp62_);
+ gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_widget_get_type (), GtkWidget), _tmp39_);
#line 1840 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return self;
-#line 12122 "GalleryConnector.c"
+#line 12190 "GalleryConnector.c"
}
-PublishingGallery3CredentialsGrid* publishing_gallery3_credentials_grid_new (SpitPublishingPluginHost* host, PublishingGallery3CredentialsPaneMode mode, const gchar* url, const gchar* username, const gchar* key, GtkBuilder* builder) {
+PublishingGallery3CredentialsGrid*
+publishing_gallery3_credentials_grid_new (SpitPublishingPluginHost* host,
+ PublishingGallery3CredentialsPaneMode mode,
+ const gchar* url,
+ const gchar* username,
+ const gchar* key,
+ GtkBuilder* builder)
+{
#line 1840 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return publishing_gallery3_credentials_grid_construct (PUBLISHING_GALLERY3_TYPE_CREDENTIALS_GRID, host, mode, url, username, key, builder);
-#line 12129 "GalleryConnector.c"
+#line 12204 "GalleryConnector.c"
}
-static void publishing_gallery3_credentials_grid_on_login_button_clicked (PublishingGallery3CredentialsGrid* self) {
+static void
+publishing_gallery3_credentials_grid_on_login_button_clicked (PublishingGallery3CredentialsGrid* self)
+{
GtkEntry* _tmp0_;
const gchar* _tmp1_;
GtkEntry* _tmp2_;
@@ -12201,20 +12278,24 @@ static void publishing_gallery3_credentials_grid_on_login_button_clicked (Publis
_tmp7_ = gtk_entry_get_text (_tmp6_);
#line 1912 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_signal_emit (self, publishing_gallery3_credentials_grid_signals[PUBLISHING_GALLERY3_CREDENTIALS_GRID_LOGIN_SIGNAL], 0, _tmp1_, _tmp3_, _tmp5_, _tmp7_);
-#line 12162 "GalleryConnector.c"
+#line 12239 "GalleryConnector.c"
}
-static void publishing_gallery3_credentials_grid_on_go_back_button_clicked (PublishingGallery3CredentialsGrid* self) {
+static void
+publishing_gallery3_credentials_grid_on_go_back_button_clicked (PublishingGallery3CredentialsGrid* self)
+{
#line 1916 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (PUBLISHING_GALLERY3_IS_CREDENTIALS_GRID (self));
#line 1917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_signal_emit (self, publishing_gallery3_credentials_grid_signals[PUBLISHING_GALLERY3_CREDENTIALS_GRID_GO_BACK_SIGNAL], 0);
-#line 12171 "GalleryConnector.c"
+#line 12250 "GalleryConnector.c"
}
-static void publishing_gallery3_credentials_grid_on_url_or_username_changed (PublishingGallery3CredentialsGrid* self) {
+static void
+publishing_gallery3_credentials_grid_on_url_or_username_changed (PublishingGallery3CredentialsGrid* self)
+{
gboolean _tmp0_ = FALSE;
gboolean _tmp1_ = FALSE;
GtkEntry* _tmp2_;
@@ -12228,7 +12309,7 @@ static void publishing_gallery3_credentials_grid_on_url_or_username_changed (Pub
_tmp3_ = gtk_entry_get_text (_tmp2_);
#line 1922 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
if (g_strcmp0 (_tmp3_, "") != 0) {
-#line 12189 "GalleryConnector.c"
+#line 12270 "GalleryConnector.c"
GtkEntry* _tmp4_;
const gchar* _tmp5_;
#line 1923 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -12237,17 +12318,17 @@ static void publishing_gallery3_credentials_grid_on_url_or_username_changed (Pub
_tmp5_ = gtk_entry_get_text (_tmp4_);
#line 1923 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp1_ = g_strcmp0 (_tmp5_, "") != 0;
-#line 12198 "GalleryConnector.c"
+#line 12279 "GalleryConnector.c"
} else {
#line 1922 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp1_ = FALSE;
-#line 12202 "GalleryConnector.c"
+#line 12283 "GalleryConnector.c"
}
#line 1922 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
if (_tmp1_) {
#line 1922 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp0_ = TRUE;
-#line 12208 "GalleryConnector.c"
+#line 12289 "GalleryConnector.c"
} else {
GtkEntry* _tmp6_;
const gchar* _tmp7_;
@@ -12257,17 +12338,19 @@ static void publishing_gallery3_credentials_grid_on_url_or_username_changed (Pub
_tmp7_ = gtk_entry_get_text (_tmp6_);
#line 1924 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp0_ = g_strcmp0 (_tmp7_, "") != 0;
-#line 12218 "GalleryConnector.c"
+#line 12299 "GalleryConnector.c"
}
#line 1921 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp8_ = self->priv->login_button;
#line 1921 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), _tmp0_);
-#line 12224 "GalleryConnector.c"
+#line 12305 "GalleryConnector.c"
}
-void publishing_gallery3_credentials_grid_installed (PublishingGallery3CredentialsGrid* self) {
+void
+publishing_gallery3_credentials_grid_installed (PublishingGallery3CredentialsGrid* self)
+{
SpitPublishingPluginHost* _tmp0_;
SpitPublishingPluginHost* _tmp1_;
GtkButton* _tmp2_;
@@ -12283,11 +12366,13 @@ void publishing_gallery3_credentials_grid_installed (PublishingGallery3Credentia
_tmp2_ = self->priv->login_button;
#line 1931 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
spit_publishing_plugin_host_set_dialog_default_widget (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
-#line 12244 "GalleryConnector.c"
+#line 12327 "GalleryConnector.c"
}
-GtkGrid* publishing_gallery3_credentials_grid_get_pane_widget (PublishingGallery3CredentialsGrid* self) {
+GtkGrid*
+publishing_gallery3_credentials_grid_get_pane_widget (PublishingGallery3CredentialsGrid* self)
+{
GtkGrid* result;
GtkGrid* _tmp0_;
#line 1821 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -12298,34 +12383,36 @@ GtkGrid* publishing_gallery3_credentials_grid_get_pane_widget (PublishingGallery
result = _tmp0_;
#line 1821 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return result;
-#line 12259 "GalleryConnector.c"
+#line 12344 "GalleryConnector.c"
}
-static void publishing_gallery3_credentials_grid_set_pane_widget (PublishingGallery3CredentialsGrid* self, GtkGrid* value) {
+static void
+publishing_gallery3_credentials_grid_set_pane_widget (PublishingGallery3CredentialsGrid* self,
+ GtkGrid* value)
+{
#line 1821 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (PUBLISHING_GALLERY3_IS_CREDENTIALS_GRID (self));
#line 1821 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
if (publishing_gallery3_credentials_grid_get_pane_widget (self) != value) {
-#line 12268 "GalleryConnector.c"
+#line 12356 "GalleryConnector.c"
GtkGrid* _tmp0_;
- GtkGrid* _tmp1_;
#line 1821 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp0_ = value;
-#line 1821 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp1_ = _g_object_ref0 (_tmp0_);
+ _tmp0_ = _g_object_ref0 (value);
#line 1821 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_object_unref0 (self->priv->_pane_widget);
#line 1821 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self->priv->_pane_widget = _tmp1_;
+ self->priv->_pane_widget = _tmp0_;
#line 1821 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_object_notify ((GObject *) self, "pane-widget");
-#line 12281 "GalleryConnector.c"
+ g_object_notify_by_pspec ((GObject *) self, publishing_gallery3_credentials_grid_properties[PUBLISHING_GALLERY3_CREDENTIALS_GRID_PANE_WIDGET_PROPERTY]);
+#line 12366 "GalleryConnector.c"
}
}
-static void publishing_gallery3_credentials_grid_class_init (PublishingGallery3CredentialsGridClass * klass) {
+static void
+publishing_gallery3_credentials_grid_class_init (PublishingGallery3CredentialsGridClass * klass)
+{
#line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_credentials_grid_parent_class = g_type_class_peek_parent (klass);
#line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -12337,16 +12424,18 @@ static void publishing_gallery3_credentials_grid_class_init (PublishingGallery3C
#line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
G_OBJECT_CLASS (klass)->finalize = publishing_gallery3_credentials_grid_finalize;
#line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_GALLERY3_CREDENTIALS_GRID_PANE_WIDGET_PROPERTY, g_param_spec_object ("pane-widget", "pane-widget", "pane-widget", gtk_grid_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+ g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_GALLERY3_CREDENTIALS_GRID_PANE_WIDGET_PROPERTY, publishing_gallery3_credentials_grid_properties[PUBLISHING_GALLERY3_CREDENTIALS_GRID_PANE_WIDGET_PROPERTY] = g_param_spec_object ("pane-widget", "pane-widget", "pane-widget", gtk_grid_get_type (), G_PARAM_STATIC_STRINGS | G_PARAM_READABLE));
#line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_credentials_grid_signals[PUBLISHING_GALLERY3_CREDENTIALS_GRID_GO_BACK_SIGNAL] = g_signal_new ("go-back", PUBLISHING_GALLERY3_TYPE_CREDENTIALS_GRID, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
#line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_credentials_grid_signals[PUBLISHING_GALLERY3_CREDENTIALS_GRID_LOGIN_SIGNAL] = g_signal_new ("login", PUBLISHING_GALLERY3_TYPE_CREDENTIALS_GRID, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__STRING_STRING_STRING_STRING, G_TYPE_NONE, 4, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
-#line 12303 "GalleryConnector.c"
+#line 12390 "GalleryConnector.c"
}
-static void publishing_gallery3_credentials_grid_instance_init (PublishingGallery3CredentialsGrid * self) {
+static void
+publishing_gallery3_credentials_grid_instance_init (PublishingGallery3CredentialsGrid * self)
+{
#line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
self->priv = PUBLISHING_GALLERY3_CREDENTIALS_GRID_GET_PRIVATE (self);
#line 1821 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -12375,11 +12464,13 @@ static void publishing_gallery3_credentials_grid_instance_init (PublishingGaller
self->priv->username = NULL;
#line 1834 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
self->priv->key = NULL;
-#line 12336 "GalleryConnector.c"
+#line 12425 "GalleryConnector.c"
}
-static void publishing_gallery3_credentials_grid_finalize (GObject * obj) {
+static void
+publishing_gallery3_credentials_grid_finalize (GObject * obj)
+{
PublishingGallery3CredentialsGrid * self;
#line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_GALLERY3_TYPE_CREDENTIALS_GRID, PublishingGallery3CredentialsGrid);
@@ -12409,11 +12500,13 @@ static void publishing_gallery3_credentials_grid_finalize (GObject * obj) {
_g_free0 (self->priv->key);
#line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
G_OBJECT_CLASS (publishing_gallery3_credentials_grid_parent_class)->finalize (obj);
-#line 12370 "GalleryConnector.c"
+#line 12461 "GalleryConnector.c"
}
-GType publishing_gallery3_credentials_grid_get_type (void) {
+GType
+publishing_gallery3_credentials_grid_get_type (void)
+{
static volatile gsize publishing_gallery3_credentials_grid_type_id__volatile = 0;
if (g_once_init_enter (&publishing_gallery3_credentials_grid_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingGallery3CredentialsGridClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_gallery3_credentials_grid_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingGallery3CredentialsGrid), 0, (GInstanceInitFunc) publishing_gallery3_credentials_grid_instance_init, NULL };
@@ -12425,7 +12518,12 @@ GType publishing_gallery3_credentials_grid_get_type (void) {
}
-static void _vala_publishing_gallery3_credentials_grid_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) {
+static void
+_vala_publishing_gallery3_credentials_grid_get_property (GObject * object,
+ guint property_id,
+ GValue * value,
+ GParamSpec * pspec)
+{
PublishingGallery3CredentialsGrid * self;
self = G_TYPE_CHECK_INSTANCE_CAST (object, PUBLISHING_GALLERY3_TYPE_CREDENTIALS_GRID, PublishingGallery3CredentialsGrid);
#line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -12436,18 +12534,23 @@ static void _vala_publishing_gallery3_credentials_grid_get_property (GObject * o
g_value_set_object (value, publishing_gallery3_credentials_grid_get_pane_widget (self));
#line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
break;
-#line 12397 "GalleryConnector.c"
+#line 12495 "GalleryConnector.c"
default:
#line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
#line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
break;
-#line 12403 "GalleryConnector.c"
+#line 12501 "GalleryConnector.c"
}
}
-static void _vala_publishing_gallery3_credentials_grid_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) {
+static void
+_vala_publishing_gallery3_credentials_grid_set_property (GObject * object,
+ guint property_id,
+ const GValue * value,
+ GParamSpec * pspec)
+{
PublishingGallery3CredentialsGrid * self;
self = G_TYPE_CHECK_INSTANCE_CAST (object, PUBLISHING_GALLERY3_TYPE_CREDENTIALS_GRID, PublishingGallery3CredentialsGrid);
#line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -12458,35 +12561,41 @@ static void _vala_publishing_gallery3_credentials_grid_set_property (GObject * o
publishing_gallery3_credentials_grid_set_pane_widget (self, g_value_get_object (value));
#line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
break;
-#line 12419 "GalleryConnector.c"
+#line 12522 "GalleryConnector.c"
default:
#line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
#line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
break;
-#line 12425 "GalleryConnector.c"
+#line 12528 "GalleryConnector.c"
}
}
-PublishingGallery3Session* publishing_gallery3_session_construct (GType object_type) {
+PublishingGallery3Session*
+publishing_gallery3_session_construct (GType object_type)
+{
PublishingGallery3Session* self = NULL;
#line 1942 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
self = (PublishingGallery3Session*) publishing_rest_support_session_construct (object_type, NULL);
#line 1942 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return self;
-#line 12436 "GalleryConnector.c"
+#line 12541 "GalleryConnector.c"
}
-PublishingGallery3Session* publishing_gallery3_session_new (void) {
+PublishingGallery3Session*
+publishing_gallery3_session_new (void)
+{
#line 1942 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return publishing_gallery3_session_construct (PUBLISHING_GALLERY3_TYPE_SESSION);
-#line 12443 "GalleryConnector.c"
+#line 12550 "GalleryConnector.c"
}
-static gboolean publishing_gallery3_session_real_is_authenticated (PublishingRESTSupportSession* base) {
+static gboolean
+publishing_gallery3_session_real_is_authenticated (PublishingRESTSupportSession* base)
+{
PublishingGallery3Session * self;
gboolean result = FALSE;
const gchar* _tmp0_;
@@ -12498,14 +12607,16 @@ static gboolean publishing_gallery3_session_real_is_authenticated (PublishingRES
result = NULL != _tmp0_;
#line 1946 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return result;
-#line 12459 "GalleryConnector.c"
+#line 12568 "GalleryConnector.c"
}
-void publishing_gallery3_session_authenticate (PublishingGallery3Session* self, const gchar* gallery_url, const gchar* username, const gchar* key) {
- const gchar* _tmp0_;
- const gchar* _tmp1_;
- const gchar* _tmp2_;
+void
+publishing_gallery3_session_authenticate (PublishingGallery3Session* self,
+ const gchar* gallery_url,
+ const gchar* username,
+ const gchar* key)
+{
#line 1949 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (PUBLISHING_GALLERY3_IS_SESSION (self));
#line 1949 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -12515,24 +12626,20 @@ void publishing_gallery3_session_authenticate (PublishingGallery3Session* self,
#line 1949 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (key != NULL);
#line 1950 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp0_ = gallery_url;
-#line 1950 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- publishing_gallery3_session_set_url (self, _tmp0_);
+ publishing_gallery3_session_set_url (self, gallery_url);
#line 1951 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp1_ = username;
-#line 1951 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- publishing_gallery3_session_set_username (self, _tmp1_);
-#line 1952 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp2_ = key;
+ publishing_gallery3_session_set_username (self, username);
#line 1952 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- publishing_gallery3_session_set_key (self, _tmp2_);
+ publishing_gallery3_session_set_key (self, key);
#line 1954 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_rest_support_session_notify_authenticated (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 12489 "GalleryConnector.c"
+#line 12594 "GalleryConnector.c"
}
-void publishing_gallery3_session_deauthenticate (PublishingGallery3Session* self) {
+void
+publishing_gallery3_session_deauthenticate (PublishingGallery3Session* self)
+{
#line 1957 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (PUBLISHING_GALLERY3_IS_SESSION (self));
#line 1958 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -12541,11 +12648,13 @@ void publishing_gallery3_session_deauthenticate (PublishingGallery3Session* self
publishing_gallery3_session_set_username (self, NULL);
#line 1960 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_session_set_key (self, NULL);
-#line 12502 "GalleryConnector.c"
+#line 12609 "GalleryConnector.c"
}
-const gchar* publishing_gallery3_session_get_url (PublishingGallery3Session* self) {
+const gchar*
+publishing_gallery3_session_get_url (PublishingGallery3Session* self)
+{
const gchar* result;
const gchar* _tmp0_;
#line 1938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -12556,28 +12665,30 @@ const gchar* publishing_gallery3_session_get_url (PublishingGallery3Session* sel
result = _tmp0_;
#line 1938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return result;
-#line 12517 "GalleryConnector.c"
+#line 12626 "GalleryConnector.c"
}
-static void publishing_gallery3_session_set_url (PublishingGallery3Session* self, const gchar* value) {
- const gchar* _tmp0_;
- gchar* _tmp1_;
+static void
+publishing_gallery3_session_set_url (PublishingGallery3Session* self,
+ const gchar* value)
+{
+ gchar* _tmp0_;
#line 1938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (PUBLISHING_GALLERY3_IS_SESSION (self));
#line 1938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp0_ = value;
-#line 1938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp1_ = g_strdup (_tmp0_);
+ _tmp0_ = g_strdup (value);
#line 1938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_free0 (self->priv->_url);
#line 1938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self->priv->_url = _tmp1_;
-#line 12534 "GalleryConnector.c"
+ self->priv->_url = _tmp0_;
+#line 12643 "GalleryConnector.c"
}
-const gchar* publishing_gallery3_session_get_username (PublishingGallery3Session* self) {
+const gchar*
+publishing_gallery3_session_get_username (PublishingGallery3Session* self)
+{
const gchar* result;
const gchar* _tmp0_;
#line 1939 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -12588,28 +12699,30 @@ const gchar* publishing_gallery3_session_get_username (PublishingGallery3Session
result = _tmp0_;
#line 1939 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return result;
-#line 12549 "GalleryConnector.c"
+#line 12660 "GalleryConnector.c"
}
-static void publishing_gallery3_session_set_username (PublishingGallery3Session* self, const gchar* value) {
- const gchar* _tmp0_;
- gchar* _tmp1_;
+static void
+publishing_gallery3_session_set_username (PublishingGallery3Session* self,
+ const gchar* value)
+{
+ gchar* _tmp0_;
#line 1939 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (PUBLISHING_GALLERY3_IS_SESSION (self));
#line 1939 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp0_ = value;
-#line 1939 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp1_ = g_strdup (_tmp0_);
+ _tmp0_ = g_strdup (value);
#line 1939 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_free0 (self->priv->_username);
#line 1939 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self->priv->_username = _tmp1_;
-#line 12566 "GalleryConnector.c"
+ self->priv->_username = _tmp0_;
+#line 12677 "GalleryConnector.c"
}
-const gchar* publishing_gallery3_session_get_key (PublishingGallery3Session* self) {
+const gchar*
+publishing_gallery3_session_get_key (PublishingGallery3Session* self)
+{
const gchar* result;
const gchar* _tmp0_;
#line 1940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -12620,28 +12733,30 @@ const gchar* publishing_gallery3_session_get_key (PublishingGallery3Session* sel
result = _tmp0_;
#line 1940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return result;
-#line 12581 "GalleryConnector.c"
+#line 12694 "GalleryConnector.c"
}
-static void publishing_gallery3_session_set_key (PublishingGallery3Session* self, const gchar* value) {
- const gchar* _tmp0_;
- gchar* _tmp1_;
+static void
+publishing_gallery3_session_set_key (PublishingGallery3Session* self,
+ const gchar* value)
+{
+ gchar* _tmp0_;
#line 1940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_if_fail (PUBLISHING_GALLERY3_IS_SESSION (self));
#line 1940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp0_ = value;
-#line 1940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp1_ = g_strdup (_tmp0_);
+ _tmp0_ = g_strdup (value);
#line 1940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_free0 (self->priv->_key);
#line 1940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self->priv->_key = _tmp1_;
-#line 12598 "GalleryConnector.c"
+ self->priv->_key = _tmp0_;
+#line 12711 "GalleryConnector.c"
}
-static void publishing_gallery3_session_class_init (PublishingGallery3SessionClass * klass) {
+static void
+publishing_gallery3_session_class_init (PublishingGallery3SessionClass * klass)
+{
#line 1935 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_session_parent_class = g_type_class_peek_parent (klass);
#line 1935 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -12650,11 +12765,13 @@ static void publishing_gallery3_session_class_init (PublishingGallery3SessionCla
g_type_class_add_private (klass, sizeof (PublishingGallery3SessionPrivate));
#line 1935 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*) (PublishingRESTSupportSession *)) publishing_gallery3_session_real_is_authenticated;
-#line 12611 "GalleryConnector.c"
+#line 12726 "GalleryConnector.c"
}
-static void publishing_gallery3_session_instance_init (PublishingGallery3Session * self) {
+static void
+publishing_gallery3_session_instance_init (PublishingGallery3Session * self)
+{
#line 1935 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
self->priv = PUBLISHING_GALLERY3_SESSION_GET_PRIVATE (self);
#line 1938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -12663,11 +12780,13 @@ static void publishing_gallery3_session_instance_init (PublishingGallery3Session
self->priv->_username = NULL;
#line 1940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
self->priv->_key = NULL;
-#line 12624 "GalleryConnector.c"
+#line 12741 "GalleryConnector.c"
}
-static void publishing_gallery3_session_finalize (PublishingRESTSupportSession * obj) {
+static void
+publishing_gallery3_session_finalize (PublishingRESTSupportSession * obj)
+{
PublishingGallery3Session * self;
#line 1935 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_GALLERY3_TYPE_SESSION, PublishingGallery3Session);
@@ -12679,11 +12798,13 @@ static void publishing_gallery3_session_finalize (PublishingRESTSupportSession *
_g_free0 (self->priv->_key);
#line 1935 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
PUBLISHING_REST_SUPPORT_SESSION_CLASS (publishing_gallery3_session_parent_class)->finalize (obj);
-#line 12640 "GalleryConnector.c"
+#line 12759 "GalleryConnector.c"
}
-GType publishing_gallery3_session_get_type (void) {
+GType
+publishing_gallery3_session_get_type (void)
+{
static volatile gsize publishing_gallery3_session_type_id__volatile = 0;
if (g_once_init_enter (&publishing_gallery3_session_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingGallery3SessionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_gallery3_session_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingGallery3Session), 0, (GInstanceInitFunc) publishing_gallery3_session_instance_init, NULL };
@@ -12695,66 +12816,69 @@ GType publishing_gallery3_session_get_type (void) {
}
-PublishingGallery3Uploader* publishing_gallery3_uploader_construct (GType object_type, PublishingGallery3Session* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingGallery3PublishingParameters* parameters) {
+PublishingGallery3Uploader*
+publishing_gallery3_uploader_construct (GType object_type,
+ PublishingGallery3Session* session,
+ SpitPublishingPublishable** publishables,
+ int publishables_length1,
+ PublishingGallery3PublishingParameters* parameters)
+{
PublishingGallery3Uploader* self = NULL;
- PublishingGallery3Session* _tmp0_;
- SpitPublishingPublishable** _tmp1_;
- gint _tmp1__length1;
- PublishingGallery3PublishingParameters* _tmp2_;
- PublishingGallery3PublishingParameters* _tmp3_;
+ PublishingGallery3PublishingParameters* _tmp0_;
#line 1990 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_val_if_fail (PUBLISHING_GALLERY3_IS_SESSION (session), NULL);
#line 1990 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_val_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_PARAMETERS (parameters), NULL);
#line 1994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp0_ = session;
-#line 1994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp1_ = publishables;
-#line 1994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp1__length1 = publishables_length1;
-#line 1994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self = (PublishingGallery3Uploader*) publishing_rest_support_batch_uploader_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, _tmp1__length1);
-#line 1996 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp2_ = parameters;
+ self = (PublishingGallery3Uploader*) publishing_rest_support_batch_uploader_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), publishables, publishables_length1);
#line 1996 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp3_ = _publishing_gallery3_publishing_parameters_ref0 (_tmp2_);
+ _tmp0_ = _publishing_gallery3_publishing_parameters_ref0 (parameters);
#line 1996 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_publishing_gallery3_publishing_parameters_unref0 (self->priv->parameters);
#line 1996 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self->priv->parameters = _tmp3_;
+ self->priv->parameters = _tmp0_;
#line 1990 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return self;
-#line 12685 "GalleryConnector.c"
+#line 12800 "GalleryConnector.c"
}
-PublishingGallery3Uploader* publishing_gallery3_uploader_new (PublishingGallery3Session* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingGallery3PublishingParameters* parameters) {
+PublishingGallery3Uploader*
+publishing_gallery3_uploader_new (PublishingGallery3Session* session,
+ SpitPublishingPublishable** publishables,
+ int publishables_length1,
+ PublishingGallery3PublishingParameters* parameters)
+{
#line 1990 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return publishing_gallery3_uploader_construct (PUBLISHING_GALLERY3_TYPE_UPLOADER, session, publishables, publishables_length1, parameters);
-#line 12692 "GalleryConnector.c"
+#line 12812 "GalleryConnector.c"
}
-static gpointer _publishing_rest_support_transaction_ref0 (gpointer self) {
+static gpointer
+_publishing_rest_support_transaction_ref0 (gpointer self)
+{
#line 2011 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return self ? publishing_rest_support_transaction_ref (self) : NULL;
-#line 12699 "GalleryConnector.c"
+#line 12821 "GalleryConnector.c"
}
-static PublishingRESTSupportTransaction* publishing_gallery3_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base, SpitPublishingPublishable* publishable) {
+static PublishingRESTSupportTransaction*
+publishing_gallery3_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base,
+ SpitPublishingPublishable* publishable)
+{
PublishingGallery3Uploader * self;
PublishingRESTSupportTransaction* result = NULL;
SpitPublishingPublishable* p = NULL;
SpitPublishingPublishable* _tmp0_;
gchar* _tmp1_;
- SpitPublishingPublisherMediaType _tmp2_;
- PublishingRESTSupportSession* _tmp3_;
- PublishingGallery3Session* _tmp4_;
- PublishingGallery3PublishingParameters* _tmp5_;
- PublishingGallery3GalleryUploadTransaction* _tmp6_;
+ PublishingRESTSupportSession* _tmp2_;
+ PublishingGallery3Session* _tmp3_;
+ PublishingGallery3PublishingParameters* _tmp4_;
+ PublishingGallery3GalleryUploadTransaction* _tmp5_;
+ PublishingRESTSupportTransaction* _tmp6_;
PublishingRESTSupportTransaction* _tmp7_;
- PublishingRESTSupportTransaction* _tmp8_;
#line 2000 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_GALLERY3_TYPE_UPLOADER, PublishingGallery3Uploader);
#line 2000 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -12770,38 +12894,38 @@ static PublishingRESTSupportTransaction* publishing_gallery3_uploader_real_creat
#line 2004 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
self->priv->_current_publishable_name = _tmp1_;
#line 2006 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp2_ = spit_publishing_publishable_get_media_type (p);
-#line 2006 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self->priv->_current_media_type = _tmp2_;
+ self->priv->_current_media_type = spit_publishing_publishable_get_media_type (p);
#line 2008 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp3_ = publishing_rest_support_batch_uploader_get_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader));
+ _tmp2_ = publishing_rest_support_batch_uploader_get_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader));
#line 2008 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, PUBLISHING_GALLERY3_TYPE_SESSION, PublishingGallery3Session);
+ _tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, PUBLISHING_GALLERY3_TYPE_SESSION, PublishingGallery3Session);
#line 2008 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp5_ = self->priv->parameters;
+ _tmp4_ = self->priv->parameters;
#line 2008 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp6_ = publishing_gallery3_gallery_upload_transaction_new (_tmp4_, _tmp5_, p);
+ _tmp5_ = publishing_gallery3_gallery_upload_transaction_new (_tmp3_, _tmp4_, p);
#line 2008 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_publishing_rest_support_transaction_unref0 (self->priv->_current_transaction);
#line 2008 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- self->priv->_current_transaction = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction);
+ self->priv->_current_transaction = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction);
#line 2008 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _publishing_rest_support_session_unref0 (_tmp4_);
+ _publishing_rest_support_session_unref0 (_tmp3_);
#line 2011 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp7_ = self->priv->_current_transaction;
+ _tmp6_ = self->priv->_current_transaction;
#line 2011 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp8_ = _publishing_rest_support_transaction_ref0 (_tmp7_);
+ _tmp7_ = _publishing_rest_support_transaction_ref0 (_tmp6_);
#line 2011 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- result = _tmp8_;
+ result = _tmp7_;
#line 2011 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_g_object_unref0 (p);
#line 2011 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return result;
-#line 12758 "GalleryConnector.c"
+#line 12880 "GalleryConnector.c"
}
-const gchar* publishing_gallery3_uploader_get_current_publishable_name (PublishingGallery3Uploader* self) {
+const gchar*
+publishing_gallery3_uploader_get_current_publishable_name (PublishingGallery3Uploader* self)
+{
const gchar* result;
const gchar* _tmp0_;
#line 1974 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -12812,29 +12936,30 @@ const gchar* publishing_gallery3_uploader_get_current_publishable_name (Publishi
result = _tmp0_;
#line 1975 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return result;
-#line 12773 "GalleryConnector.c"
+#line 12897 "GalleryConnector.c"
}
-guint publishing_gallery3_uploader_get_status_code (PublishingGallery3Uploader* self) {
+guint
+publishing_gallery3_uploader_get_status_code (PublishingGallery3Uploader* self)
+{
guint result;
PublishingRESTSupportTransaction* _tmp0_;
- guint _tmp1_;
#line 1979 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_val_if_fail (PUBLISHING_GALLERY3_IS_UPLOADER (self), 0U);
#line 1980 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp0_ = self->priv->_current_transaction;
#line 1980 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp1_ = publishing_rest_support_transaction_get_status_code (_tmp0_);
-#line 1980 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- result = _tmp1_;
+ result = publishing_rest_support_transaction_get_status_code (_tmp0_);
#line 1980 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return result;
-#line 12791 "GalleryConnector.c"
+#line 12914 "GalleryConnector.c"
}
-SpitPublishingPublisherMediaType publishing_gallery3_uploader_get_current_publishable_type (PublishingGallery3Uploader* self) {
+SpitPublishingPublisherMediaType
+publishing_gallery3_uploader_get_current_publishable_type (PublishingGallery3Uploader* self)
+{
SpitPublishingPublisherMediaType result;
SpitPublishingPublisherMediaType _tmp0_;
#line 1985 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -12845,11 +12970,13 @@ SpitPublishingPublisherMediaType publishing_gallery3_uploader_get_current_publis
result = _tmp0_;
#line 1986 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return result;
-#line 12806 "GalleryConnector.c"
+#line 12931 "GalleryConnector.c"
}
-static void publishing_gallery3_uploader_class_init (PublishingGallery3UploaderClass * klass) {
+static void
+publishing_gallery3_uploader_class_init (PublishingGallery3UploaderClass * klass)
+{
#line 1965 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
publishing_gallery3_uploader_parent_class = g_type_class_peek_parent (klass);
#line 1965 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
@@ -12858,18 +12985,22 @@ static void publishing_gallery3_uploader_class_init (PublishingGallery3UploaderC
g_type_class_add_private (klass, sizeof (PublishingGallery3UploaderPrivate));
#line 1965 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = (PublishingRESTSupportTransaction* (*) (PublishingRESTSupportBatchUploader *, SpitPublishingPublishable*)) publishing_gallery3_uploader_real_create_transaction;
-#line 12819 "GalleryConnector.c"
+#line 12946 "GalleryConnector.c"
}
-static void publishing_gallery3_uploader_instance_init (PublishingGallery3Uploader * self) {
+static void
+publishing_gallery3_uploader_instance_init (PublishingGallery3Uploader * self)
+{
#line 1965 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
self->priv = PUBLISHING_GALLERY3_UPLOADER_GET_PRIVATE (self);
-#line 12826 "GalleryConnector.c"
+#line 12955 "GalleryConnector.c"
}
-static void publishing_gallery3_uploader_finalize (PublishingRESTSupportBatchUploader * obj) {
+static void
+publishing_gallery3_uploader_finalize (PublishingRESTSupportBatchUploader * obj)
+{
PublishingGallery3Uploader * self;
#line 1965 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_GALLERY3_TYPE_UPLOADER, PublishingGallery3Uploader);
@@ -12881,11 +13012,13 @@ static void publishing_gallery3_uploader_finalize (PublishingRESTSupportBatchUpl
_publishing_rest_support_transaction_unref0 (self->priv->_current_transaction);
#line 1965 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_CLASS (publishing_gallery3_uploader_parent_class)->finalize (obj);
-#line 12842 "GalleryConnector.c"
+#line 12973 "GalleryConnector.c"
}
-GType publishing_gallery3_uploader_get_type (void) {
+GType
+publishing_gallery3_uploader_get_type (void)
+{
static volatile gsize publishing_gallery3_uploader_type_id__volatile = 0;
if (g_once_init_enter (&publishing_gallery3_uploader_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingGallery3UploaderClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_gallery3_uploader_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingGallery3Uploader), 0, (GInstanceInitFunc) publishing_gallery3_uploader_instance_init, NULL };
@@ -12897,97 +13030,85 @@ GType publishing_gallery3_uploader_get_type (void) {
}
-static gint string_last_index_of (const gchar* self, const gchar* needle, gint start_index) {
+static gint
+string_last_index_of (const gchar* self,
+ const gchar* needle,
+ gint start_index)
+{
gint result = 0;
gchar* _result_ = NULL;
- gint _tmp0_;
- const gchar* _tmp1_;
- gchar* _tmp2_;
- gchar* _tmp3_;
-#line 1021 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ gchar* _tmp0_;
+ gchar* _tmp1_;
+#line 1035 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, 0);
-#line 1021 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1035 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (needle != NULL, 0);
-#line 1022 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp0_ = start_index;
-#line 1022 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp1_ = needle;
-#line 1022 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp2_ = g_strrstr (((gchar*) self) + _tmp0_, (gchar*) _tmp1_);
-#line 1022 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _result_ = _tmp2_;
-#line 1024 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp3_ = _result_;
-#line 1024 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp3_ != NULL) {
-#line 12881 "GalleryConnector.c"
- gchar* _tmp4_;
-#line 1025 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp4_ = _result_;
-#line 1025 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- result = (gint) (_tmp4_ - ((gchar*) self));
-#line 1025 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1036 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp0_ = g_strrstr (((gchar*) self) + start_index, (gchar*) needle);
+#line 1036 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _result_ = _tmp0_;
+#line 1038 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp1_ = _result_;
+#line 1038 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (_tmp1_ != NULL) {
+#line 13012 "GalleryConnector.c"
+ gchar* _tmp2_;
+#line 1039 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp2_ = _result_;
+#line 1039 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = (gint) (_tmp2_ - ((gchar*) self));
+#line 1039 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 12889 "GalleryConnector.c"
+#line 13020 "GalleryConnector.c"
} else {
-#line 1027 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1041 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
result = -1;
-#line 1027 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1041 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 12895 "GalleryConnector.c"
+#line 13026 "GalleryConnector.c"
}
}
-gchar* publishing_gallery3_strip_session_url (const gchar* url) {
+gchar*
+publishing_gallery3_strip_session_url (const gchar* url)
+{
gchar* result = NULL;
- const gchar* _tmp0_;
gint item_loc = 0;
- const gchar* _tmp1_;
- gint _tmp2_;
- const gchar* _tmp4_;
- gint _tmp5_;
- gint _tmp6_;
- gchar* _tmp7_;
+ gint _tmp0_;
+ gint _tmp1_;
+ gchar* _tmp2_;
#line 2017 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
g_return_val_if_fail (url != NULL, NULL);
#line 2020 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp0_ = url;
-#line 2020 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_debug ("GalleryConnector.vala:2020: Searching for \"%s\" in \"%s\"", PUBLISHING_GALLERY3_REST_PATH, _tmp0_);
-#line 2022 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp1_ = url;
-#line 2022 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp2_ = string_last_index_of (_tmp1_, PUBLISHING_GALLERY3_REST_PATH, 0);
+ g_debug ("GalleryConnector.vala:2020: Searching for \"%s\" in \"%s\"", PUBLISHING_GALLERY3_REST_PATH, url);
#line 2022 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- item_loc = _tmp2_;
+ item_loc = string_last_index_of (url, PUBLISHING_GALLERY3_REST_PATH, 0);
#line 2025 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
if (-1 == item_loc) {
-#line 12924 "GalleryConnector.c"
- const gchar* _tmp3_;
-#line 2026 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp3_ = url;
#line 2026 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- g_error ("Did not find \"%s\" in the base of the new item " "URL \"%s\"", PUBLISHING_GALLERY3_REST_PATH, _tmp3_);
-#line 12930 "GalleryConnector.c"
+ g_error ("Did not find \"%s\" in the base of the new item " "URL \"%s\"", PUBLISHING_GALLERY3_REST_PATH, url);
+#line 13049 "GalleryConnector.c"
}
#line 2029 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp4_ = url;
+ _tmp0_ = strlen (PUBLISHING_GALLERY3_REST_PATH);
#line 2029 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp5_ = strlen (PUBLISHING_GALLERY3_REST_PATH);
-#line 2029 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp6_ = _tmp5_;
+ _tmp1_ = _tmp0_;
#line 2029 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp7_ = string_substring (_tmp4_, (glong) (item_loc + _tmp6_), (glong) -1);
+ _tmp2_ = string_substring (url, (glong) (item_loc + _tmp1_), (glong) -1);
#line 2029 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- result = _tmp7_;
+ result = _tmp2_;
#line 2029 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
return result;
-#line 12944 "GalleryConnector.c"
+#line 13061 "GalleryConnector.c"
}
-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) {
@@ -12999,7 +13120,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/plugins/shotwell-publishing-extras/RajcePublishing.c b/plugins/shotwell-publishing-extras/RajcePublishing.c
index c63d685..c3963aa 100644
--- a/plugins/shotwell-publishing-extras/RajcePublishing.c
+++ b/plugins/shotwell-publishing-extras/RajcePublishing.c
@@ -1,4 +1,4 @@
-/* RajcePublishing.c generated by valac 0.36.6, the Vala compiler
+/* RajcePublishing.c generated by valac 0.40.4, the Vala compiler
* generated from RajcePublishing.vala, do not modify */
/* Copyright 2014 rajce.net
@@ -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>
@@ -36,6 +37,11 @@
typedef struct _RajceService RajceService;
typedef struct _RajceServiceClass RajceServiceClass;
typedef struct _RajceServicePrivate RajceServicePrivate;
+enum {
+ RAJCE_SERVICE_0_PROPERTY,
+ RAJCE_SERVICE_NUM_PROPERTIES
+};
+static GParamSpec* rajce_service_properties[RAJCE_SERVICE_NUM_PROPERTIES];
#define _g_free0(var) (var = (g_free (var), NULL))
#define PUBLISHING_RAJCE_TYPE_RAJCE_PUBLISHER (publishing_rajce_rajce_publisher_get_type ())
@@ -78,6 +84,11 @@ typedef struct _PublishingRajceAlbumClass PublishingRajceAlbumClass;
typedef struct _PublishingRajcePublishingParameters PublishingRajcePublishingParameters;
typedef struct _PublishingRajcePublishingParametersClass PublishingRajcePublishingParametersClass;
+enum {
+ PUBLISHING_RAJCE_RAJCE_PUBLISHER_0_PROPERTY,
+ PUBLISHING_RAJCE_RAJCE_PUBLISHER_NUM_PROPERTIES
+};
+static GParamSpec* publishing_rajce_rajce_publisher_properties[PUBLISHING_RAJCE_RAJCE_PUBLISHER_NUM_PROPERTIES];
#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
#define _publishing_rest_support_session_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rest_support_session_unref (var), NULL)))
#define _publishing_rajce_publishing_parameters_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rajce_publishing_parameters_unref (var), NULL)))
@@ -204,17 +215,27 @@ typedef struct _PublishingRajceAddPhotoTransaction PublishingRajceAddPhotoTransa
typedef struct _PublishingRajceAddPhotoTransactionClass PublishingRajceAddPhotoTransactionClass;
typedef struct _PublishingRajceAuthenticationPanePrivate PublishingRajceAuthenticationPanePrivate;
enum {
+ PUBLISHING_RAJCE_AUTHENTICATION_PANE_0_PROPERTY,
+ PUBLISHING_RAJCE_AUTHENTICATION_PANE_NUM_PROPERTIES
+};
+static GParamSpec* publishing_rajce_authentication_pane_properties[PUBLISHING_RAJCE_AUTHENTICATION_PANE_NUM_PROPERTIES];
+enum {
PUBLISHING_RAJCE_AUTHENTICATION_PANE_LOGIN_SIGNAL,
- PUBLISHING_RAJCE_AUTHENTICATION_PANE_LAST_SIGNAL
+ PUBLISHING_RAJCE_AUTHENTICATION_PANE_NUM_SIGNALS
};
-static guint publishing_rajce_authentication_pane_signals[PUBLISHING_RAJCE_AUTHENTICATION_PANE_LAST_SIGNAL] = {0};
+static guint publishing_rajce_authentication_pane_signals[PUBLISHING_RAJCE_AUTHENTICATION_PANE_NUM_SIGNALS] = {0};
typedef struct _PublishingRajcePublishingOptionsPanePrivate PublishingRajcePublishingOptionsPanePrivate;
enum {
+ PUBLISHING_RAJCE_PUBLISHING_OPTIONS_PANE_0_PROPERTY,
+ PUBLISHING_RAJCE_PUBLISHING_OPTIONS_PANE_NUM_PROPERTIES
+};
+static GParamSpec* publishing_rajce_publishing_options_pane_properties[PUBLISHING_RAJCE_PUBLISHING_OPTIONS_PANE_NUM_PROPERTIES];
+enum {
PUBLISHING_RAJCE_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL,
PUBLISHING_RAJCE_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL,
- PUBLISHING_RAJCE_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL
+ PUBLISHING_RAJCE_PUBLISHING_OPTIONS_PANE_NUM_SIGNALS
};
-static guint publishing_rajce_publishing_options_pane_signals[PUBLISHING_RAJCE_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL] = {0};
+static guint publishing_rajce_publishing_options_pane_signals[PUBLISHING_RAJCE_PUBLISHING_OPTIONS_PANE_NUM_SIGNALS] = {0};
typedef struct _PublishingRajceParamSpecPublishingParameters PublishingRajceParamSpecPublishingParameters;
typedef struct _PublishingRajceSessionPrivate PublishingRajceSessionPrivate;
@@ -592,43 +613,59 @@ static gpointer publishing_rajce_get_categories_transaction_parent_class = NULL;
static gpointer publishing_rajce_add_photo_transaction_parent_class = NULL;
GType rajce_service_get_type (void) G_GNUC_CONST;
-enum {
- RAJCE_SERVICE_DUMMY_PROPERTY
-};
#define RAJCE_SERVICE_ICON_FILENAME "rajce.png"
RajceService* rajce_service_new (GFile* resource_directory);
-RajceService* rajce_service_construct (GType object_type, GFile* resource_directory);
-static gint rajce_service_real_get_pluggable_interface (SpitPluggable* base, gint min_host_interface, gint max_host_interface);
+RajceService* rajce_service_construct (GType object_type,
+ GFile* resource_directory);
+static gint rajce_service_real_get_pluggable_interface (SpitPluggable* base,
+ gint min_host_interface,
+ gint max_host_interface);
static const gchar* rajce_service_real_get_id (SpitPluggable* base);
static const gchar* rajce_service_real_get_pluggable_name (SpitPluggable* base);
-static void rajce_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info);
-static GdkPixbuf** _vala_array_dup4 (GdkPixbuf** self, int length);
-static SpitPublishingPublisher* rajce_service_real_create_publisher (SpitPublishingService* base, SpitPublishingPluginHost* host);
-PublishingRajceRajcePublisher* publishing_rajce_rajce_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host);
-PublishingRajceRajcePublisher* publishing_rajce_rajce_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host);
+static void rajce_service_real_get_info (SpitPluggable* base,
+ SpitPluggableInfo* info);
+static GdkPixbuf** _vala_array_dup4 (GdkPixbuf** self,
+ int length);
+static SpitPublishingPublisher* rajce_service_real_create_publisher (SpitPublishingService* base,
+ SpitPublishingPluginHost* host);
+PublishingRajceRajcePublisher* publishing_rajce_rajce_publisher_new (SpitPublishingService* service,
+ SpitPublishingPluginHost* host);
+PublishingRajceRajcePublisher* publishing_rajce_rajce_publisher_construct (GType object_type,
+ SpitPublishingService* service,
+ SpitPublishingPluginHost* host);
GType publishing_rajce_rajce_publisher_get_type (void) G_GNUC_CONST;
static SpitPublishingPublisherMediaType rajce_service_real_get_supported_media (SpitPublishingService* base);
-static void rajce_service_real_activation (SpitPluggable* base, gboolean enabled);
+static void rajce_service_real_activation (SpitPluggable* base,
+ gboolean enabled);
static void rajce_service_finalize (GObject * obj);
GType publishing_rajce_session_get_type (void) G_GNUC_CONST;
gpointer publishing_rajce_album_ref (gpointer instance);
void publishing_rajce_album_unref (gpointer instance);
-GParamSpec* publishing_rajce_param_spec_album (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void publishing_rajce_value_set_album (GValue* value, gpointer v_object);
-void publishing_rajce_value_take_album (GValue* value, gpointer v_object);
+GParamSpec* publishing_rajce_param_spec_album (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void publishing_rajce_value_set_album (GValue* value,
+ gpointer v_object);
+void publishing_rajce_value_take_album (GValue* value,
+ gpointer v_object);
gpointer publishing_rajce_value_get_album (const GValue* value);
GType publishing_rajce_album_get_type (void) G_GNUC_CONST;
gpointer publishing_rajce_publishing_parameters_ref (gpointer instance);
void publishing_rajce_publishing_parameters_unref (gpointer instance);
-GParamSpec* publishing_rajce_param_spec_publishing_parameters (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void publishing_rajce_value_set_publishing_parameters (GValue* value, gpointer v_object);
-void publishing_rajce_value_take_publishing_parameters (GValue* value, gpointer v_object);
+GParamSpec* publishing_rajce_param_spec_publishing_parameters (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void publishing_rajce_value_set_publishing_parameters (GValue* value,
+ gpointer v_object);
+void publishing_rajce_value_take_publishing_parameters (GValue* value,
+ gpointer v_object);
gpointer publishing_rajce_value_get_publishing_parameters (const GValue* value);
GType publishing_rajce_publishing_parameters_get_type (void) G_GNUC_CONST;
#define PUBLISHING_RAJCE_RAJCE_PUBLISHER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_RAJCE_TYPE_RAJCE_PUBLISHER, PublishingRajceRajcePublisherPrivate))
-enum {
- PUBLISHING_RAJCE_RAJCE_PUBLISHER_DUMMY_PROPERTY
-};
PublishingRajceSession* publishing_rajce_session_new (void);
PublishingRajceSession* publishing_rajce_session_construct (GType object_type);
static gchar* publishing_rajce_rajce_publisher_get_rajce_url (PublishingRajceRajcePublisher* self);
@@ -641,269 +678,469 @@ gchar* publishing_rajce_rajce_publisher_get_username (PublishingRajceRajcePublis
gchar* publishing_rajce_rajce_publisher_get_token (PublishingRajceRajcePublisher* self);
gboolean publishing_rajce_rajce_publisher_get_remember (PublishingRajceRajcePublisher* self);
static gboolean* _bool_dup (gboolean* self);
-static void publishing_rajce_rajce_publisher_do_network_login (PublishingRajceRajcePublisher* self, const gchar* username, const gchar* token, gboolean remember);
+static void publishing_rajce_rajce_publisher_do_network_login (PublishingRajceRajcePublisher* self,
+ const gchar* username,
+ const gchar* token,
+ gboolean remember);
GType publishing_rajce_authentication_pane_mode_get_type (void) G_GNUC_CONST;
-static void publishing_rajce_rajce_publisher_do_show_authentication_pane (PublishingRajceRajcePublisher* self, PublishingRajceAuthenticationPaneMode mode);
+static void publishing_rajce_rajce_publisher_do_show_authentication_pane (PublishingRajceRajcePublisher* self,
+ PublishingRajceAuthenticationPaneMode mode);
static void publishing_rajce_rajce_publisher_real_stop (SpitPublishingPublisher* base);
gchar* publishing_rajce_rajce_publisher_get_url (PublishingRajceRajcePublisher* self);
-static void publishing_rajce_rajce_publisher_set_username (PublishingRajceRajcePublisher* self, const gchar* username);
-static void publishing_rajce_rajce_publisher_set_token (PublishingRajceRajcePublisher* self, const gchar* token);
-static void publishing_rajce_rajce_publisher_set_remember (PublishingRajceRajcePublisher* self, gboolean remember);
+static void publishing_rajce_rajce_publisher_set_username (PublishingRajceRajcePublisher* self,
+ const gchar* username);
+static void publishing_rajce_rajce_publisher_set_token (PublishingRajceRajcePublisher* self,
+ const gchar* token);
+static void publishing_rajce_rajce_publisher_set_remember (PublishingRajceRajcePublisher* self,
+ gboolean remember);
gboolean publishing_rajce_rajce_publisher_get_hide_album (PublishingRajceRajcePublisher* self);
-void publishing_rajce_rajce_publisher_set_hide_album (PublishingRajceRajcePublisher* self, gboolean hide_album);
+void publishing_rajce_rajce_publisher_set_hide_album (PublishingRajceRajcePublisher* self,
+ gboolean hide_album);
gboolean publishing_rajce_rajce_publisher_get_show_album (PublishingRajceRajcePublisher* self);
-void publishing_rajce_rajce_publisher_set_show_album (PublishingRajceRajcePublisher* self, gboolean show_album);
+void publishing_rajce_rajce_publisher_set_show_album (PublishingRajceRajcePublisher* self,
+ gboolean show_album);
GType publishing_rajce_authentication_pane_get_type (void) G_GNUC_CONST;
-PublishingRajceAuthenticationPane* publishing_rajce_authentication_pane_new (PublishingRajceRajcePublisher* publisher, PublishingRajceAuthenticationPaneMode mode);
-PublishingRajceAuthenticationPane* publishing_rajce_authentication_pane_construct (GType object_type, PublishingRajceRajcePublisher* publisher, PublishingRajceAuthenticationPaneMode mode);
-static void publishing_rajce_rajce_publisher_on_authentication_pane_login_clicked (PublishingRajceRajcePublisher* self, const gchar* username, const gchar* token, gboolean remember);
-static void _publishing_rajce_rajce_publisher_on_authentication_pane_login_clicked_publishing_rajce_authentication_pane_login (PublishingRajceAuthenticationPane* _sender, const gchar* user, const gchar* token, gboolean remember, gpointer self);
+PublishingRajceAuthenticationPane* publishing_rajce_authentication_pane_new (PublishingRajceRajcePublisher* publisher,
+ PublishingRajceAuthenticationPaneMode mode);
+PublishingRajceAuthenticationPane* publishing_rajce_authentication_pane_construct (GType object_type,
+ PublishingRajceRajcePublisher* publisher,
+ PublishingRajceAuthenticationPaneMode mode);
+static void publishing_rajce_rajce_publisher_on_authentication_pane_login_clicked (PublishingRajceRajcePublisher* self,
+ const gchar* username,
+ const gchar* token,
+ gboolean remember);
+static void _publishing_rajce_rajce_publisher_on_authentication_pane_login_clicked_publishing_rajce_authentication_pane_login (PublishingRajceAuthenticationPane* _sender,
+ const gchar* user,
+ const gchar* token,
+ gboolean remember,
+ gpointer self);
GtkWidget* publishing_rajce_authentication_pane_get_default_widget (PublishingRajceAuthenticationPane* self);
GType publishing_rajce_transaction_get_type (void) G_GNUC_CONST;
GType publishing_rajce_session_login_transaction_get_type (void) G_GNUC_CONST;
-PublishingRajceSessionLoginTransaction* publishing_rajce_session_login_transaction_new (PublishingRajceSession* session, const gchar* url, const gchar* username, const gchar* token);
-PublishingRajceSessionLoginTransaction* publishing_rajce_session_login_transaction_construct (GType object_type, PublishingRajceSession* session, const gchar* url, const gchar* username, const gchar* token);
-static void publishing_rajce_rajce_publisher_on_login_network_error (PublishingRajceRajcePublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err);
-static void _publishing_rajce_rajce_publisher_on_login_network_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self);
-static void publishing_rajce_rajce_publisher_on_login_network_complete (PublishingRajceRajcePublisher* self, PublishingRESTSupportTransaction* txn);
-static void _publishing_rajce_rajce_publisher_on_login_network_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
-static void publishing_rajce_rajce_publisher_do_show_error (PublishingRajceRajcePublisher* self, GError* e);
+PublishingRajceSessionLoginTransaction* publishing_rajce_session_login_transaction_new (PublishingRajceSession* session,
+ const gchar* url,
+ const gchar* username,
+ const gchar* token);
+PublishingRajceSessionLoginTransaction* publishing_rajce_session_login_transaction_construct (GType object_type,
+ PublishingRajceSession* session,
+ const gchar* url,
+ const gchar* username,
+ const gchar* token);
+static void publishing_rajce_rajce_publisher_on_login_network_error (PublishingRajceRajcePublisher* self,
+ PublishingRESTSupportTransaction* bad_txn,
+ GError* err);
+static void _publishing_rajce_rajce_publisher_on_login_network_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+ GError* err,
+ gpointer self);
+static void publishing_rajce_rajce_publisher_on_login_network_complete (PublishingRajceRajcePublisher* self,
+ PublishingRESTSupportTransaction* txn);
+static void _publishing_rajce_rajce_publisher_on_login_network_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+ gpointer self);
+static void publishing_rajce_rajce_publisher_do_show_error (PublishingRajceRajcePublisher* self,
+ GError* e);
gchar* publishing_rajce_transaction_validate_xml (PublishingRESTSupportXmlDocument* doc);
-static gchar* _publishing_rajce_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response (PublishingRESTSupportXmlDocument* doc, gpointer self);
-void publishing_rajce_session_authenticate (PublishingRajceSession* self, const gchar* token, const gchar* name, gint id, gint maxsize, gint quality);
+static gchar* _publishing_rajce_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response (PublishingRESTSupportXmlDocument* doc,
+ gpointer self);
+void publishing_rajce_session_authenticate (PublishingRajceSession* self,
+ const gchar* token,
+ const gchar* name,
+ gint id,
+ gint maxsize,
+ gint quality);
GType publishing_rajce_get_albums_transaction_get_type (void) G_GNUC_CONST;
-PublishingRajceGetAlbumsTransaction* publishing_rajce_get_albums_transaction_new (PublishingRajceSession* session, const gchar* url);
-PublishingRajceGetAlbumsTransaction* publishing_rajce_get_albums_transaction_construct (GType object_type, PublishingRajceSession* session, const gchar* url);
-static void publishing_rajce_rajce_publisher_on_albums_fetch_error (PublishingRajceRajcePublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err);
-static void _publishing_rajce_rajce_publisher_on_albums_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self);
-static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (PublishingRajceRajcePublisher* self, PublishingRESTSupportTransaction* txn);
-static void _publishing_rajce_rajce_publisher_on_albums_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
-PublishingRajceAlbum* publishing_rajce_album_new (gint id, const gchar* albumName, const gchar* url, const gchar* thumbUrl, const gchar* createDate, const gchar* updateDate, gboolean hidden, gboolean secure, gint photoCount);
-PublishingRajceAlbum* publishing_rajce_album_construct (GType object_type, gint id, const gchar* albumName, const gchar* url, const gchar* thumbUrl, const gchar* createDate, const gchar* updateDate, gboolean hidden, gboolean secure, gint photoCount);
-gint publishing_rajce_album_compare_albums (PublishingRajceAlbum* a, PublishingRajceAlbum* b);
-static gint _publishing_rajce_album_compare_albums_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self);
-void publishing_rajce_session_set_usertoken (PublishingRajceSession* self, const gchar* usertoken);
+PublishingRajceGetAlbumsTransaction* publishing_rajce_get_albums_transaction_new (PublishingRajceSession* session,
+ const gchar* url);
+PublishingRajceGetAlbumsTransaction* publishing_rajce_get_albums_transaction_construct (GType object_type,
+ PublishingRajceSession* session,
+ const gchar* url);
+static void publishing_rajce_rajce_publisher_on_albums_fetch_error (PublishingRajceRajcePublisher* self,
+ PublishingRESTSupportTransaction* bad_txn,
+ GError* err);
+static void _publishing_rajce_rajce_publisher_on_albums_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+ GError* err,
+ gpointer self);
+static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (PublishingRajceRajcePublisher* self,
+ PublishingRESTSupportTransaction* txn);
+static void _publishing_rajce_rajce_publisher_on_albums_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+ gpointer self);
+PublishingRajceAlbum* publishing_rajce_album_new (gint id,
+ const gchar* albumName,
+ const gchar* url,
+ const gchar* thumbUrl,
+ const gchar* createDate,
+ const gchar* updateDate,
+ gboolean hidden,
+ gboolean secure,
+ gint photoCount);
+PublishingRajceAlbum* publishing_rajce_album_construct (GType object_type,
+ gint id,
+ const gchar* albumName,
+ const gchar* url,
+ const gchar* thumbUrl,
+ const gchar* createDate,
+ const gchar* updateDate,
+ gboolean hidden,
+ gboolean secure,
+ gint photoCount);
+gint publishing_rajce_album_compare_albums (PublishingRajceAlbum* a,
+ PublishingRajceAlbum* b);
+static gint _publishing_rajce_album_compare_albums_gcompare_data_func (gconstpointer a,
+ gconstpointer b,
+ gpointer self);
+void publishing_rajce_session_set_usertoken (PublishingRajceSession* self,
+ const gchar* usertoken);
static void publishing_rajce_rajce_publisher_do_show_publishing_options_pane (PublishingRajceRajcePublisher* self);
-static void publishing_rajce_rajce_publisher_on_network_error (PublishingRajceRajcePublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err);
+static void publishing_rajce_rajce_publisher_on_network_error (PublishingRajceRajcePublisher* self,
+ PublishingRESTSupportTransaction* bad_txn,
+ GError* err);
GType publishing_rajce_publishing_options_pane_get_type (void) G_GNUC_CONST;
gchar* publishing_rajce_session_get_username (PublishingRajceSession* self);
-PublishingRajcePublishingOptionsPane* publishing_rajce_publishing_options_pane_new (PublishingRajceRajcePublisher* publisher, const gchar* username, PublishingRajceAlbum** albums, int albums_length1);
-PublishingRajcePublishingOptionsPane* publishing_rajce_publishing_options_pane_construct (GType object_type, PublishingRajceRajcePublisher* publisher, const gchar* username, PublishingRajceAlbum** albums, int albums_length1);
+PublishingRajcePublishingOptionsPane* publishing_rajce_publishing_options_pane_new (PublishingRajceRajcePublisher* publisher,
+ const gchar* username,
+ PublishingRajceAlbum** albums,
+ int albums_length1);
+PublishingRajcePublishingOptionsPane* publishing_rajce_publishing_options_pane_construct (GType object_type,
+ PublishingRajceRajcePublisher* publisher,
+ const gchar* username,
+ PublishingRajceAlbum** albums,
+ int albums_length1);
static void publishing_rajce_rajce_publisher_on_publishing_options_pane_logout_clicked (PublishingRajceRajcePublisher* self);
-static void _publishing_rajce_rajce_publisher_on_publishing_options_pane_logout_clicked_publishing_rajce_publishing_options_pane_logout (PublishingRajcePublishingOptionsPane* _sender, gpointer self);
-static void publishing_rajce_rajce_publisher_on_publishing_options_pane_publish_clicked (PublishingRajceRajcePublisher* self, PublishingRajcePublishingParameters* parameters);
-static void _publishing_rajce_rajce_publisher_on_publishing_options_pane_publish_clicked_publishing_rajce_publishing_options_pane_publish (PublishingRajcePublishingOptionsPane* _sender, PublishingRajcePublishingParameters* parameters, gpointer self);
+static void _publishing_rajce_rajce_publisher_on_publishing_options_pane_logout_clicked_publishing_rajce_publishing_options_pane_logout (PublishingRajcePublishingOptionsPane* _sender,
+ gpointer self);
+static void publishing_rajce_rajce_publisher_on_publishing_options_pane_publish_clicked (PublishingRajceRajcePublisher* self,
+ PublishingRajcePublishingParameters* parameters);
+static void _publishing_rajce_rajce_publisher_on_publishing_options_pane_publish_clicked_publishing_rajce_publishing_options_pane_publish (PublishingRajcePublishingOptionsPane* _sender,
+ PublishingRajcePublishingParameters* parameters,
+ gpointer self);
GtkWidget* publishing_rajce_publishing_options_pane_get_default_widget (PublishingRajcePublishingOptionsPane* self);
void publishing_rajce_session_deauthenticate (PublishingRajceSession* self);
static void publishing_rajce_rajce_publisher_do_begin_upload (PublishingRajceRajcePublisher* self);
-static gboolean _int_equal (const gint * s1, const gint * s2);
+static gboolean _int_equal (const gint * s1,
+ const gint * s2);
GType publishing_rajce_create_album_transaction_get_type (void) G_GNUC_CONST;
-PublishingRajceCreateAlbumTransaction* publishing_rajce_create_album_transaction_new (PublishingRajceSession* session, const gchar* url, const gchar* albumName, gboolean hidden);
-PublishingRajceCreateAlbumTransaction* publishing_rajce_create_album_transaction_construct (GType object_type, PublishingRajceSession* session, const gchar* url, const gchar* albumName, gboolean hidden);
-static void publishing_rajce_rajce_publisher_on_create_album_error (PublishingRajceRajcePublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err);
-static void _publishing_rajce_rajce_publisher_on_create_album_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self);
-static void publishing_rajce_rajce_publisher_on_create_album_complete (PublishingRajceRajcePublisher* self, PublishingRESTSupportTransaction* txn);
-static void _publishing_rajce_rajce_publisher_on_create_album_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
+PublishingRajceCreateAlbumTransaction* publishing_rajce_create_album_transaction_new (PublishingRajceSession* session,
+ const gchar* url,
+ const gchar* albumName,
+ gboolean hidden);
+PublishingRajceCreateAlbumTransaction* publishing_rajce_create_album_transaction_construct (GType object_type,
+ PublishingRajceSession* session,
+ const gchar* url,
+ const gchar* albumName,
+ gboolean hidden);
+static void publishing_rajce_rajce_publisher_on_create_album_error (PublishingRajceRajcePublisher* self,
+ PublishingRESTSupportTransaction* bad_txn,
+ GError* err);
+static void _publishing_rajce_rajce_publisher_on_create_album_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+ GError* err,
+ gpointer self);
+static void publishing_rajce_rajce_publisher_on_create_album_complete (PublishingRajceRajcePublisher* self,
+ PublishingRESTSupportTransaction* txn);
+static void _publishing_rajce_rajce_publisher_on_create_album_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+ gpointer self);
GType publishing_rajce_open_album_transaction_get_type (void) G_GNUC_CONST;
-PublishingRajceOpenAlbumTransaction* publishing_rajce_open_album_transaction_new (PublishingRajceSession* session, const gchar* url, gint albumID);
-PublishingRajceOpenAlbumTransaction* publishing_rajce_open_album_transaction_construct (GType object_type, PublishingRajceSession* session, const gchar* url, gint albumID);
-static void publishing_rajce_rajce_publisher_on_open_album_error (PublishingRajceRajcePublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err);
-static void _publishing_rajce_rajce_publisher_on_open_album_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self);
-static void publishing_rajce_rajce_publisher_on_open_album_complete (PublishingRajceRajcePublisher* self, PublishingRESTSupportTransaction* txn);
-static void _publishing_rajce_rajce_publisher_on_open_album_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
+PublishingRajceOpenAlbumTransaction* publishing_rajce_open_album_transaction_new (PublishingRajceSession* session,
+ const gchar* url,
+ gint albumID);
+PublishingRajceOpenAlbumTransaction* publishing_rajce_open_album_transaction_construct (GType object_type,
+ PublishingRajceSession* session,
+ const gchar* url,
+ gint albumID);
+static void publishing_rajce_rajce_publisher_on_open_album_error (PublishingRajceRajcePublisher* self,
+ PublishingRESTSupportTransaction* bad_txn,
+ GError* err);
+static void _publishing_rajce_rajce_publisher_on_open_album_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+ GError* err,
+ gpointer self);
+static void publishing_rajce_rajce_publisher_on_open_album_complete (PublishingRajceRajcePublisher* self,
+ PublishingRESTSupportTransaction* txn);
+static void _publishing_rajce_rajce_publisher_on_open_album_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+ gpointer self);
static gint* _int_dup (gint* self);
-void publishing_rajce_session_set_albumtoken (PublishingRajceSession* self, const gchar* albumtoken);
+void publishing_rajce_session_set_albumtoken (PublishingRajceSession* self,
+ const gchar* albumtoken);
static void publishing_rajce_rajce_publisher_do_upload_photos (PublishingRajceRajcePublisher* self);
gint publishing_rajce_session_get_maxsize (PublishingRajceSession* self);
GType publishing_rajce_uploader_get_type (void) G_GNUC_CONST;
-PublishingRajceUploader* publishing_rajce_uploader_new (PublishingRajceSession* session, const gchar* url, SpitPublishingPublishable** publishables, int publishables_length1, PublishingRajcePublishingParameters* parameters);
-PublishingRajceUploader* publishing_rajce_uploader_construct (GType object_type, PublishingRajceSession* session, const gchar* url, SpitPublishingPublishable** publishables, int publishables_length1, PublishingRajcePublishingParameters* parameters);
-static void publishing_rajce_rajce_publisher_on_upload_photos_complete (PublishingRajceRajcePublisher* self, PublishingRESTSupportBatchUploader* uploader, gint num_published);
-static void _publishing_rajce_rajce_publisher_on_upload_photos_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender, gint num_photos_published, gpointer self);
-static void publishing_rajce_rajce_publisher_on_upload_photos_error (PublishingRajceRajcePublisher* self, PublishingRESTSupportBatchUploader* uploader, GError* err);
-static void _publishing_rajce_rajce_publisher_on_upload_photos_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender, GError* err, gpointer self);
-static void publishing_rajce_rajce_publisher_on_upload_photos_status_updated (PublishingRajceRajcePublisher* self, gint file_number, gdouble completed_fraction);
-static void _publishing_rajce_rajce_publisher_on_upload_photos_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self);
+PublishingRajceUploader* publishing_rajce_uploader_new (PublishingRajceSession* session,
+ const gchar* url,
+ SpitPublishingPublishable** publishables,
+ int publishables_length1,
+ PublishingRajcePublishingParameters* parameters);
+PublishingRajceUploader* publishing_rajce_uploader_construct (GType object_type,
+ PublishingRajceSession* session,
+ const gchar* url,
+ SpitPublishingPublishable** publishables,
+ int publishables_length1,
+ PublishingRajcePublishingParameters* parameters);
+static void publishing_rajce_rajce_publisher_on_upload_photos_complete (PublishingRajceRajcePublisher* self,
+ PublishingRESTSupportBatchUploader* uploader,
+ gint num_published);
+static void _publishing_rajce_rajce_publisher_on_upload_photos_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender,
+ gint num_photos_published,
+ gpointer self);
+static void publishing_rajce_rajce_publisher_on_upload_photos_error (PublishingRajceRajcePublisher* self,
+ PublishingRESTSupportBatchUploader* uploader,
+ GError* err);
+static void _publishing_rajce_rajce_publisher_on_upload_photos_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender,
+ GError* err,
+ gpointer self);
+static void publishing_rajce_rajce_publisher_on_upload_photos_status_updated (PublishingRajceRajcePublisher* self,
+ gint file_number,
+ gdouble completed_fraction);
+static void _publishing_rajce_rajce_publisher_on_upload_photos_status_updated_spit_publishing_progress_callback (gint file_number,
+ gdouble fraction_complete,
+ gpointer self);
static void publishing_rajce_rajce_publisher_do_end_upload (PublishingRajceRajcePublisher* self);
static void publishing_rajce_rajce_publisher_do_get_album_url (PublishingRajceRajcePublisher* self);
static void publishing_rajce_rajce_publisher_do_close_album (PublishingRajceRajcePublisher* self);
GType publishing_rajce_get_album_url_transaction_get_type (void) G_GNUC_CONST;
-PublishingRajceGetAlbumUrlTransaction* publishing_rajce_get_album_url_transaction_new (PublishingRajceSession* session, const gchar* url);
-PublishingRajceGetAlbumUrlTransaction* publishing_rajce_get_album_url_transaction_construct (GType object_type, PublishingRajceSession* session, const gchar* url);
-static void publishing_rajce_rajce_publisher_on_get_album_url_error (PublishingRajceRajcePublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err);
-static void _publishing_rajce_rajce_publisher_on_get_album_url_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self);
-static void publishing_rajce_rajce_publisher_on_get_album_url_complete (PublishingRajceRajcePublisher* self, PublishingRESTSupportTransaction* txn);
-static void _publishing_rajce_rajce_publisher_on_get_album_url_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
-void publishing_rajce_session_set_albumticket (PublishingRajceSession* self, const gchar* albumticket);
+PublishingRajceGetAlbumUrlTransaction* publishing_rajce_get_album_url_transaction_new (PublishingRajceSession* session,
+ const gchar* url);
+PublishingRajceGetAlbumUrlTransaction* publishing_rajce_get_album_url_transaction_construct (GType object_type,
+ PublishingRajceSession* session,
+ const gchar* url);
+static void publishing_rajce_rajce_publisher_on_get_album_url_error (PublishingRajceRajcePublisher* self,
+ PublishingRESTSupportTransaction* bad_txn,
+ GError* err);
+static void _publishing_rajce_rajce_publisher_on_get_album_url_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+ GError* err,
+ gpointer self);
+static void publishing_rajce_rajce_publisher_on_get_album_url_complete (PublishingRajceRajcePublisher* self,
+ PublishingRESTSupportTransaction* txn);
+static void _publishing_rajce_rajce_publisher_on_get_album_url_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+ gpointer self);
+void publishing_rajce_session_set_albumticket (PublishingRajceSession* self,
+ const gchar* albumticket);
GType publishing_rajce_close_album_transaction_get_type (void) G_GNUC_CONST;
-PublishingRajceCloseAlbumTransaction* publishing_rajce_close_album_transaction_new (PublishingRajceSession* session, const gchar* url);
-PublishingRajceCloseAlbumTransaction* publishing_rajce_close_album_transaction_construct (GType object_type, PublishingRajceSession* session, const gchar* url);
-static void publishing_rajce_rajce_publisher_on_close_album_error (PublishingRajceRajcePublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err);
-static void _publishing_rajce_rajce_publisher_on_close_album_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self);
-static void publishing_rajce_rajce_publisher_on_close_album_complete (PublishingRajceRajcePublisher* self, PublishingRESTSupportTransaction* txn);
-static void _publishing_rajce_rajce_publisher_on_close_album_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
+PublishingRajceCloseAlbumTransaction* publishing_rajce_close_album_transaction_new (PublishingRajceSession* session,
+ const gchar* url);
+PublishingRajceCloseAlbumTransaction* publishing_rajce_close_album_transaction_construct (GType object_type,
+ PublishingRajceSession* session,
+ const gchar* url);
+static void publishing_rajce_rajce_publisher_on_close_album_error (PublishingRajceRajcePublisher* self,
+ PublishingRESTSupportTransaction* bad_txn,
+ GError* err);
+static void _publishing_rajce_rajce_publisher_on_close_album_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+ GError* err,
+ gpointer self);
+static void publishing_rajce_rajce_publisher_on_close_album_complete (PublishingRajceRajcePublisher* self,
+ PublishingRESTSupportTransaction* txn);
+static void _publishing_rajce_rajce_publisher_on_close_album_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+ gpointer self);
static void publishing_rajce_rajce_publisher_do_show_success_pane (PublishingRajceRajcePublisher* self);
gchar* publishing_rajce_session_get_albumticket (PublishingRajceSession* self);
-static void publishing_rajce_rajce_publisher_do_show_error_message (PublishingRajceRajcePublisher* self, const gchar* message);
+static void publishing_rajce_rajce_publisher_do_show_error_message (PublishingRajceRajcePublisher* self,
+ const gchar* message);
static void publishing_rajce_rajce_publisher_finalize (GObject * obj);
-enum {
- PUBLISHING_RAJCE_ALBUM_DUMMY_PROPERTY
-};
static void publishing_rajce_album_finalize (PublishingRajceAlbum * obj);
#define PUBLISHING_RAJCE_UPLOADER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_RAJCE_TYPE_UPLOADER, PublishingRajceUploaderPrivate))
-enum {
- PUBLISHING_RAJCE_UPLOADER_DUMMY_PROPERTY
-};
-static PublishingRESTSupportTransaction* publishing_rajce_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base, SpitPublishingPublishable* publishable);
-PublishingRajceAddPhotoTransaction* publishing_rajce_add_photo_transaction_new (PublishingRajceSession* session, const gchar* url, PublishingRajcePublishingParameters* parameters, SpitPublishingPublishable* publishable);
-PublishingRajceAddPhotoTransaction* publishing_rajce_add_photo_transaction_construct (GType object_type, PublishingRajceSession* session, const gchar* url, PublishingRajcePublishingParameters* parameters, SpitPublishingPublishable* publishable);
+static PublishingRESTSupportTransaction* publishing_rajce_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base,
+ SpitPublishingPublishable* publishable);
+PublishingRajceAddPhotoTransaction* publishing_rajce_add_photo_transaction_new (PublishingRajceSession* session,
+ const gchar* url,
+ PublishingRajcePublishingParameters* parameters,
+ SpitPublishingPublishable* publishable);
+PublishingRajceAddPhotoTransaction* publishing_rajce_add_photo_transaction_construct (GType object_type,
+ PublishingRajceSession* session,
+ const gchar* url,
+ PublishingRajcePublishingParameters* parameters,
+ SpitPublishingPublishable* publishable);
GType publishing_rajce_add_photo_transaction_get_type (void) G_GNUC_CONST;
static void publishing_rajce_uploader_finalize (PublishingRESTSupportBatchUploader * obj);
#define PUBLISHING_RAJCE_AUTHENTICATION_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_RAJCE_TYPE_AUTHENTICATION_PANE, PublishingRajceAuthenticationPanePrivate))
-enum {
- PUBLISHING_RAJCE_AUTHENTICATION_PANE_DUMMY_PROPERTY
-};
static void publishing_rajce_authentication_pane_on_user_changed (PublishingRajceAuthenticationPane* self);
-static void _publishing_rajce_authentication_pane_on_user_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self);
+static void _publishing_rajce_authentication_pane_on_user_changed_gtk_editable_changed (GtkEditable* _sender,
+ gpointer self);
static void publishing_rajce_authentication_pane_on_password_changed (PublishingRajceAuthenticationPane* self);
-static void _publishing_rajce_authentication_pane_on_password_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self);
+static void _publishing_rajce_authentication_pane_on_password_changed_gtk_editable_changed (GtkEditable* _sender,
+ gpointer self);
static void publishing_rajce_authentication_pane_on_login_button_clicked (PublishingRajceAuthenticationPane* self);
-static void _publishing_rajce_authentication_pane_on_login_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void _publishing_rajce_authentication_pane_on_login_button_clicked_gtk_button_clicked (GtkButton* _sender,
+ gpointer self);
static void publishing_rajce_authentication_pane_update_login_button_sensitivity (PublishingRajceAuthenticationPane* self);
static GtkWidget* publishing_rajce_authentication_pane_real_get_widget (SpitPublishingDialogPane* base);
static SpitPublishingDialogPaneGeometryOptions publishing_rajce_authentication_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base);
static void publishing_rajce_authentication_pane_real_on_pane_installed (SpitPublishingDialogPane* base);
static void publishing_rajce_authentication_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base);
-static void g_cclosure_user_marshal_VOID__STRING_STRING_BOOLEAN (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
+static void g_cclosure_user_marshal_VOID__STRING_STRING_BOOLEAN (GClosure * closure,
+ GValue * return_value,
+ guint n_param_values,
+ const GValue * param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data);
static void publishing_rajce_authentication_pane_finalize (GObject * obj);
#define PUBLISHING_RAJCE_PUBLISHING_OPTIONS_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_RAJCE_TYPE_PUBLISHING_OPTIONS_PANE, PublishingRajcePublishingOptionsPanePrivate))
-enum {
- PUBLISHING_RAJCE_PUBLISHING_OPTIONS_PANE_DUMMY_PROPERTY
-};
-static PublishingRajceAlbum** _vala_array_dup5 (PublishingRajceAlbum** self, int length);
+static PublishingRajceAlbum** _vala_array_dup5 (PublishingRajceAlbum** self,
+ int length);
static void publishing_rajce_publishing_options_pane_on_use_existing_radio_clicked (PublishingRajcePublishingOptionsPane* self);
-static void _publishing_rajce_publishing_options_pane_on_use_existing_radio_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void _publishing_rajce_publishing_options_pane_on_use_existing_radio_clicked_gtk_button_clicked (GtkButton* _sender,
+ gpointer self);
static void publishing_rajce_publishing_options_pane_on_create_new_radio_clicked (PublishingRajcePublishingOptionsPane* self);
-static void _publishing_rajce_publishing_options_pane_on_create_new_radio_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void _publishing_rajce_publishing_options_pane_on_create_new_radio_clicked_gtk_button_clicked (GtkButton* _sender,
+ gpointer self);
static void publishing_rajce_publishing_options_pane_on_new_album_entry_changed (PublishingRajcePublishingOptionsPane* self);
-static void _publishing_rajce_publishing_options_pane_on_new_album_entry_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self);
+static void _publishing_rajce_publishing_options_pane_on_new_album_entry_changed_gtk_editable_changed (GtkEditable* _sender,
+ gpointer self);
static void publishing_rajce_publishing_options_pane_on_logout_clicked (PublishingRajcePublishingOptionsPane* self);
-static void _publishing_rajce_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void _publishing_rajce_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender,
+ gpointer self);
static void publishing_rajce_publishing_options_pane_on_publish_clicked (PublishingRajcePublishingOptionsPane* self);
-static void _publishing_rajce_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
-PublishingRajcePublishingParameters* publishing_rajce_publishing_parameters_new_to_new_album (const gchar* album_name, gboolean album_hidden);
-PublishingRajcePublishingParameters* publishing_rajce_publishing_parameters_construct_to_new_album (GType object_type, const gchar* album_name, gboolean album_hidden);
-PublishingRajcePublishingParameters* publishing_rajce_publishing_parameters_new_to_existing_album (const gchar* album_name, gint album_id);
-PublishingRajcePublishingParameters* publishing_rajce_publishing_parameters_construct_to_existing_album (GType object_type, const gchar* album_name, gint album_id);
+static void _publishing_rajce_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender,
+ gpointer self);
+PublishingRajcePublishingParameters* publishing_rajce_publishing_parameters_new_to_new_album (const gchar* album_name,
+ gboolean album_hidden);
+PublishingRajcePublishingParameters* publishing_rajce_publishing_parameters_construct_to_new_album (GType object_type,
+ const gchar* album_name,
+ gboolean album_hidden);
+PublishingRajcePublishingParameters* publishing_rajce_publishing_parameters_new_to_existing_album (const gchar* album_name,
+ gint album_id);
+PublishingRajcePublishingParameters* publishing_rajce_publishing_parameters_construct_to_existing_album (GType object_type,
+ const gchar* album_name,
+ gint album_id);
static void publishing_rajce_publishing_options_pane_update_publish_button_sensitivity (PublishingRajcePublishingOptionsPane* self);
void publishing_rajce_publishing_options_pane_installed (PublishingRajcePublishingOptionsPane* self);
-void publishing_rajce_publishing_options_pane_notify_publish (PublishingRajcePublishingOptionsPane* self, PublishingRajcePublishingParameters* parameters);
+void publishing_rajce_publishing_options_pane_notify_publish (PublishingRajcePublishingOptionsPane* self,
+ PublishingRajcePublishingParameters* parameters);
void publishing_rajce_publishing_options_pane_notify_logout (PublishingRajcePublishingOptionsPane* self);
static GtkWidget* publishing_rajce_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base);
static SpitPublishingDialogPaneGeometryOptions publishing_rajce_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base);
static void publishing_rajce_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base);
-static void _publishing_rajce_publishing_options_pane_notify_publish_publishing_rajce_publishing_options_pane_publish (PublishingRajcePublishingOptionsPane* _sender, PublishingRajcePublishingParameters* parameters, gpointer self);
-static void _publishing_rajce_publishing_options_pane_notify_logout_publishing_rajce_publishing_options_pane_logout (PublishingRajcePublishingOptionsPane* _sender, gpointer self);
+static void _publishing_rajce_publishing_options_pane_notify_publish_publishing_rajce_publishing_options_pane_publish (PublishingRajcePublishingOptionsPane* _sender,
+ PublishingRajcePublishingParameters* parameters,
+ gpointer self);
+static void _publishing_rajce_publishing_options_pane_notify_logout_publishing_rajce_publishing_options_pane_logout (PublishingRajcePublishingOptionsPane* _sender,
+ gpointer self);
static void publishing_rajce_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base);
-static void g_cclosure_user_marshal_VOID__PUBLISHING_RAJCE_PUBLISHING_PARAMETERS (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
+static void g_cclosure_user_marshal_VOID__PUBLISHING_RAJCE_PUBLISHING_PARAMETERS (GClosure * closure,
+ GValue * return_value,
+ guint n_param_values,
+ const GValue * param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data);
static void publishing_rajce_publishing_options_pane_finalize (GObject * obj);
-enum {
- PUBLISHING_RAJCE_PUBLISHING_PARAMETERS_DUMMY_PROPERTY
-};
static PublishingRajcePublishingParameters* publishing_rajce_publishing_parameters_new (void);
static PublishingRajcePublishingParameters* publishing_rajce_publishing_parameters_construct (GType object_type);
static void publishing_rajce_publishing_parameters_finalize (PublishingRajcePublishingParameters * obj);
#define PUBLISHING_RAJCE_SESSION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_RAJCE_TYPE_SESSION, PublishingRajceSessionPrivate))
-enum {
- PUBLISHING_RAJCE_SESSION_DUMMY_PROPERTY
-};
static gboolean publishing_rajce_session_real_is_authenticated (PublishingRESTSupportSession* base);
gchar* publishing_rajce_session_get_usertoken (PublishingRajceSession* self);
gchar* publishing_rajce_session_get_albumtoken (PublishingRajceSession* self);
static void publishing_rajce_session_finalize (PublishingRESTSupportSession * obj);
gpointer publishing_rajce_arg_item_ref (gpointer instance);
void publishing_rajce_arg_item_unref (gpointer instance);
-GParamSpec* publishing_rajce_param_spec_arg_item (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void publishing_rajce_value_set_arg_item (GValue* value, gpointer v_object);
-void publishing_rajce_value_take_arg_item (GValue* value, gpointer v_object);
+GParamSpec* publishing_rajce_param_spec_arg_item (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void publishing_rajce_value_set_arg_item (GValue* value,
+ gpointer v_object);
+void publishing_rajce_value_take_arg_item (GValue* value,
+ gpointer v_object);
gpointer publishing_rajce_value_get_arg_item (const GValue* value);
GType publishing_rajce_arg_item_get_type (void) G_GNUC_CONST;
-enum {
- PUBLISHING_RAJCE_ARG_ITEM_DUMMY_PROPERTY
-};
-PublishingRajceArgItem* publishing_rajce_arg_item_new (const gchar* k, const gchar* v);
-PublishingRajceArgItem* publishing_rajce_arg_item_construct (GType object_type, const gchar* k, const gchar* v);
-void publishing_rajce_arg_item_AddChild (PublishingRajceArgItem* self, PublishingRajceArgItem* child);
-static void _vala_array_add6 (PublishingRajceArgItem** * array, int* length, int* size, PublishingRajceArgItem* value);
-void publishing_rajce_arg_item_AddChildren (PublishingRajceArgItem* self, PublishingRajceArgItem** newchildren, int newchildren_length1);
+PublishingRajceArgItem* publishing_rajce_arg_item_new (const gchar* k,
+ const gchar* v);
+PublishingRajceArgItem* publishing_rajce_arg_item_construct (GType object_type,
+ const gchar* k,
+ const gchar* v);
+void publishing_rajce_arg_item_AddChild (PublishingRajceArgItem* self,
+ PublishingRajceArgItem* child);
+static void _vala_array_add6 (PublishingRajceArgItem** * array,
+ int* length,
+ int* size,
+ PublishingRajceArgItem* value);
+void publishing_rajce_arg_item_AddChildren (PublishingRajceArgItem* self,
+ PublishingRajceArgItem** newchildren,
+ int newchildren_length1);
static void publishing_rajce_arg_item_finalize (PublishingRajceArgItem * obj);
gpointer publishing_rajce_live_api_request_ref (gpointer instance);
void publishing_rajce_live_api_request_unref (gpointer instance);
-GParamSpec* publishing_rajce_param_spec_live_api_request (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void publishing_rajce_value_set_live_api_request (GValue* value, gpointer v_object);
-void publishing_rajce_value_take_live_api_request (GValue* value, gpointer v_object);
+GParamSpec* publishing_rajce_param_spec_live_api_request (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void publishing_rajce_value_set_live_api_request (GValue* value,
+ gpointer v_object);
+void publishing_rajce_value_take_live_api_request (GValue* value,
+ gpointer v_object);
gpointer publishing_rajce_value_get_live_api_request (const GValue* value);
GType publishing_rajce_live_api_request_get_type (void) G_GNUC_CONST;
#define PUBLISHING_RAJCE_LIVE_API_REQUEST_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_RAJCE_TYPE_LIVE_API_REQUEST, PublishingRajceLiveApiRequestPrivate))
-enum {
- PUBLISHING_RAJCE_LIVE_API_REQUEST_DUMMY_PROPERTY
-};
PublishingRajceLiveApiRequest* publishing_rajce_live_api_request_new (const gchar* cmd);
-PublishingRajceLiveApiRequest* publishing_rajce_live_api_request_construct (GType object_type, const gchar* cmd);
-void publishing_rajce_live_api_request_AddParam (PublishingRajceLiveApiRequest* self, const gchar* name, const gchar* val);
-static void _vala_array_add7 (PublishingRajceArgItem** * array, int* length, int* size, PublishingRajceArgItem* value);
-void publishing_rajce_live_api_request_AddParamBool (PublishingRajceLiveApiRequest* self, const gchar* name, gboolean val);
-void publishing_rajce_live_api_request_AddParamInt (PublishingRajceLiveApiRequest* self, const gchar* name, gint val);
-void publishing_rajce_live_api_request_AddParamNode (PublishingRajceLiveApiRequest* self, const gchar* name, PublishingRajceArgItem** val, int val_length1);
-static void _vala_array_add8 (PublishingRajceArgItem** * array, int* length, int* size, PublishingRajceArgItem* value);
-gchar* publishing_rajce_live_api_request_Params2XmlString (PublishingRajceLiveApiRequest* self, gboolean urlencode);
-static void publishing_rajce_live_api_request_WriteParam (xmlNode* node, PublishingRajceArgItem* arg);
+PublishingRajceLiveApiRequest* publishing_rajce_live_api_request_construct (GType object_type,
+ const gchar* cmd);
+void publishing_rajce_live_api_request_AddParam (PublishingRajceLiveApiRequest* self,
+ const gchar* name,
+ const gchar* val);
+static void _vala_array_add7 (PublishingRajceArgItem** * array,
+ int* length,
+ int* size,
+ PublishingRajceArgItem* value);
+void publishing_rajce_live_api_request_AddParamBool (PublishingRajceLiveApiRequest* self,
+ const gchar* name,
+ gboolean val);
+void publishing_rajce_live_api_request_AddParamInt (PublishingRajceLiveApiRequest* self,
+ const gchar* name,
+ gint val);
+void publishing_rajce_live_api_request_AddParamNode (PublishingRajceLiveApiRequest* self,
+ const gchar* name,
+ PublishingRajceArgItem** val,
+ int val_length1);
+static void _vala_array_add8 (PublishingRajceArgItem** * array,
+ int* length,
+ int* size,
+ PublishingRajceArgItem* value);
+gchar* publishing_rajce_live_api_request_Params2XmlString (PublishingRajceLiveApiRequest* self,
+ gboolean urlencode);
+static void publishing_rajce_live_api_request_WriteParam (xmlNode* node,
+ PublishingRajceArgItem* arg);
static void publishing_rajce_live_api_request_finalize (PublishingRajceLiveApiRequest * obj);
-enum {
- PUBLISHING_RAJCE_TRANSACTION_DUMMY_PROPERTY
-};
PublishingRajceTransaction* publishing_rajce_transaction_new (PublishingRajceSession* session);
-PublishingRajceTransaction* publishing_rajce_transaction_construct (GType object_type, PublishingRajceSession* session);
-enum {
- PUBLISHING_RAJCE_SESSION_LOGIN_TRANSACTION_DUMMY_PROPERTY
-};
-enum {
- PUBLISHING_RAJCE_GET_ALBUMS_TRANSACTION_DUMMY_PROPERTY
-};
-static void _vala_array_add9 (PublishingRajceArgItem** * array, int* length, int* size, PublishingRajceArgItem* value);
-static void _vala_array_add10 (PublishingRajceArgItem** * array, int* length, int* size, PublishingRajceArgItem* value);
-static void _vala_array_add11 (PublishingRajceArgItem** * array, int* length, int* size, PublishingRajceArgItem* value);
-static void _vala_array_add12 (PublishingRajceArgItem** * array, int* length, int* size, PublishingRajceArgItem* value);
-static void _vala_array_add13 (PublishingRajceArgItem** * array, int* length, int* size, PublishingRajceArgItem* value);
-enum {
- PUBLISHING_RAJCE_CREATE_ALBUM_TRANSACTION_DUMMY_PROPERTY
-};
-enum {
- PUBLISHING_RAJCE_OPEN_ALBUM_TRANSACTION_DUMMY_PROPERTY
-};
-enum {
- PUBLISHING_RAJCE_GET_ALBUM_URL_TRANSACTION_DUMMY_PROPERTY
-};
-enum {
- PUBLISHING_RAJCE_CLOSE_ALBUM_TRANSACTION_DUMMY_PROPERTY
-};
+PublishingRajceTransaction* publishing_rajce_transaction_construct (GType object_type,
+ PublishingRajceSession* session);
+static void _vala_array_add9 (PublishingRajceArgItem** * array,
+ int* length,
+ int* size,
+ PublishingRajceArgItem* value);
+static void _vala_array_add10 (PublishingRajceArgItem** * array,
+ int* length,
+ int* size,
+ PublishingRajceArgItem* value);
+static void _vala_array_add11 (PublishingRajceArgItem** * array,
+ int* length,
+ int* size,
+ PublishingRajceArgItem* value);
+static void _vala_array_add12 (PublishingRajceArgItem** * array,
+ int* length,
+ int* size,
+ PublishingRajceArgItem* value);
+static void _vala_array_add13 (PublishingRajceArgItem** * array,
+ int* length,
+ int* size,
+ PublishingRajceArgItem* value);
GType publishing_rajce_get_categories_transaction_get_type (void) G_GNUC_CONST;
-enum {
- PUBLISHING_RAJCE_GET_CATEGORIES_TRANSACTION_DUMMY_PROPERTY
-};
-PublishingRajceGetCategoriesTransaction* publishing_rajce_get_categories_transaction_new (PublishingRajceSession* session, const gchar* url);
-PublishingRajceGetCategoriesTransaction* publishing_rajce_get_categories_transaction_construct (GType object_type, PublishingRajceSession* session, const gchar* url);
+PublishingRajceGetCategoriesTransaction* publishing_rajce_get_categories_transaction_new (PublishingRajceSession* session,
+ const gchar* url);
+PublishingRajceGetCategoriesTransaction* publishing_rajce_get_categories_transaction_construct (GType object_type,
+ PublishingRajceSession* session,
+ const gchar* url);
#define PUBLISHING_RAJCE_ADD_PHOTO_TRANSACTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_RAJCE_TYPE_ADD_PHOTO_TRANSACTION, PublishingRajceAddPhotoTransactionPrivate))
-enum {
- PUBLISHING_RAJCE_ADD_PHOTO_TRANSACTION_DUMMY_PROPERTY
-};
static void _g_free0_ (gpointer var);
static void publishing_rajce_add_photo_transaction_finalize (PublishingRESTSupportTransaction * 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);
-
-
-RajceService* rajce_service_construct (GType object_type, GFile* resource_directory) {
+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);
+
+
+RajceService*
+rajce_service_construct (GType object_type,
+ GFile* resource_directory)
+{
RajceService * self = NULL;
GdkPixbuf** _tmp0_;
gint _tmp0__length1;
@@ -917,7 +1154,7 @@ RajceService* rajce_service_construct (GType object_type, GFile* resource_direct
_tmp0__length1 = rajce_service_icon_pixbuf_set_length1;
#line 15 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (_tmp0_ == NULL) {
-#line 921 "RajcePublishing.c"
+#line 1158 "RajcePublishing.c"
gint _tmp1_;
GdkPixbuf** _tmp2_;
#line 16 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -930,44 +1167,43 @@ RajceService* rajce_service_construct (GType object_type, GFile* resource_direct
rajce_service_icon_pixbuf_set_length1 = _tmp1_;
#line 16 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_rajce_service_icon_pixbuf_set_size_ = rajce_service_icon_pixbuf_set_length1;
-#line 934 "RajcePublishing.c"
+#line 1171 "RajcePublishing.c"
}
#line 13 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return self;
-#line 938 "RajcePublishing.c"
+#line 1175 "RajcePublishing.c"
}
-RajceService* rajce_service_new (GFile* resource_directory) {
+RajceService*
+rajce_service_new (GFile* resource_directory)
+{
#line 13 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return rajce_service_construct (TYPE_RAJCE_SERVICE, resource_directory);
-#line 945 "RajcePublishing.c"
+#line 1184 "RajcePublishing.c"
}
-static gint rajce_service_real_get_pluggable_interface (SpitPluggable* base, gint min_host_interface, gint max_host_interface) {
+static gint
+rajce_service_real_get_pluggable_interface (SpitPluggable* base,
+ gint min_host_interface,
+ gint max_host_interface)
+{
RajceService * self;
gint result = 0;
- gint _tmp0_;
- gint _tmp1_;
- gint _tmp2_;
#line 21 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAJCE_SERVICE, RajceService);
#line 23 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp0_ = min_host_interface;
-#line 23 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp1_ = max_host_interface;
-#line 23 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp2_ = spit_negotiate_interfaces (_tmp0_, _tmp1_, SPIT_PUBLISHING_CURRENT_INTERFACE);
-#line 23 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- result = _tmp2_;
+ result = spit_negotiate_interfaces (min_host_interface, max_host_interface, SPIT_PUBLISHING_CURRENT_INTERFACE);
#line 23 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return result;
-#line 967 "RajcePublishing.c"
+#line 1201 "RajcePublishing.c"
}
-static const gchar* rajce_service_real_get_id (SpitPluggable* base) {
+static const gchar*
+rajce_service_real_get_id (SpitPluggable* base)
+{
RajceService * self;
const gchar* result = NULL;
#line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -976,11 +1212,13 @@ static const gchar* rajce_service_real_get_id (SpitPluggable* base) {
result = "org.yorba.shotwell.publishing.rajce";
#line 29 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return result;
-#line 980 "RajcePublishing.c"
+#line 1216 "RajcePublishing.c"
}
-static const gchar* rajce_service_real_get_pluggable_name (SpitPluggable* base) {
+static const gchar*
+rajce_service_real_get_pluggable_name (SpitPluggable* base)
+{
RajceService * self;
const gchar* result = NULL;
#line 32 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -989,39 +1227,47 @@ static const gchar* rajce_service_real_get_pluggable_name (SpitPluggable* base)
result = "Rajce";
#line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return result;
-#line 993 "RajcePublishing.c"
+#line 1231 "RajcePublishing.c"
}
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
#line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return self ? g_object_ref (self) : NULL;
-#line 1000 "RajcePublishing.c"
+#line 1240 "RajcePublishing.c"
}
-static GdkPixbuf** _vala_array_dup4 (GdkPixbuf** self, int length) {
+static GdkPixbuf**
+_vala_array_dup4 (GdkPixbuf** self,
+ int length)
+{
GdkPixbuf** result;
int i;
#line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
result = g_new0 (GdkPixbuf*, length + 1);
#line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
for (i = 0; i < length; i++) {
-#line 1011 "RajcePublishing.c"
+#line 1254 "RajcePublishing.c"
GdkPixbuf* _tmp0_;
#line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_tmp0_ = _g_object_ref0 (self[i]);
#line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
result[i] = _tmp0_;
-#line 1017 "RajcePublishing.c"
+#line 1260 "RajcePublishing.c"
}
#line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return result;
-#line 1021 "RajcePublishing.c"
+#line 1264 "RajcePublishing.c"
}
-static void rajce_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info) {
+static void
+rajce_service_real_get_info (SpitPluggable* base,
+ SpitPluggableInfo* info)
+{
RajceService * self;
gchar* _tmp0_;
gchar* _tmp1_;
@@ -1096,32 +1342,34 @@ static void rajce_service_real_get_info (SpitPluggable* base, SpitPluggableInfo*
(*info).icons = _tmp8_;
#line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
(*info).icons_length1 = _tmp8__length1;
-#line 1100 "RajcePublishing.c"
+#line 1346 "RajcePublishing.c"
}
-static SpitPublishingPublisher* rajce_service_real_create_publisher (SpitPublishingService* base, SpitPublishingPluginHost* host) {
+static SpitPublishingPublisher*
+rajce_service_real_create_publisher (SpitPublishingService* base,
+ SpitPublishingPluginHost* host)
+{
RajceService * self;
SpitPublishingPublisher* result = NULL;
- SpitPublishingPluginHost* _tmp0_;
- PublishingRajceRajcePublisher* _tmp1_;
+ PublishingRajceRajcePublisher* _tmp0_;
#line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAJCE_SERVICE, RajceService);
#line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL);
#line 52 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp0_ = host;
+ _tmp0_ = publishing_rajce_rajce_publisher_new (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_SERVICE, SpitPublishingService), host);
#line 52 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp1_ = publishing_rajce_rajce_publisher_new (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_SERVICE, SpitPublishingService), _tmp0_);
-#line 52 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher);
+ result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher);
#line 52 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return result;
-#line 1121 "RajcePublishing.c"
+#line 1367 "RajcePublishing.c"
}
-static SpitPublishingPublisherMediaType rajce_service_real_get_supported_media (SpitPublishingService* base) {
+static SpitPublishingPublisherMediaType
+rajce_service_real_get_supported_media (SpitPublishingService* base)
+{
RajceService * self;
SpitPublishingPublisherMediaType result = 0;
#line 55 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -1130,28 +1378,35 @@ static SpitPublishingPublisherMediaType rajce_service_real_get_supported_media (
result = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO;
#line 57 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return result;
-#line 1134 "RajcePublishing.c"
+#line 1382 "RajcePublishing.c"
}
-static void rajce_service_real_activation (SpitPluggable* base, gboolean enabled) {
+static void
+rajce_service_real_activation (SpitPluggable* base,
+ gboolean enabled)
+{
RajceService * self;
#line 60 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAJCE_SERVICE, RajceService);
-#line 1142 "RajcePublishing.c"
+#line 1393 "RajcePublishing.c"
}
-static void rajce_service_class_init (RajceServiceClass * klass) {
+static void
+rajce_service_class_init (RajceServiceClass * klass)
+{
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
rajce_service_parent_class = g_type_class_peek_parent (klass);
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
G_OBJECT_CLASS (klass)->finalize = rajce_service_finalize;
-#line 1151 "RajcePublishing.c"
+#line 1404 "RajcePublishing.c"
}
-static void rajce_service_spit_pluggable_interface_init (SpitPluggableIface * iface) {
+static void
+rajce_service_spit_pluggable_interface_init (SpitPluggableIface * iface)
+{
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
rajce_service_spit_pluggable_parent_iface = g_type_interface_peek_parent (iface);
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -1164,36 +1419,44 @@ static void rajce_service_spit_pluggable_interface_init (SpitPluggableIface * if
iface->get_info = (void (*) (SpitPluggable *, SpitPluggableInfo*)) rajce_service_real_get_info;
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
iface->activation = (void (*) (SpitPluggable *, gboolean)) rajce_service_real_activation;
-#line 1168 "RajcePublishing.c"
+#line 1423 "RajcePublishing.c"
}
-static void rajce_service_spit_publishing_service_interface_init (SpitPublishingServiceIface * iface) {
+static void
+rajce_service_spit_publishing_service_interface_init (SpitPublishingServiceIface * iface)
+{
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
rajce_service_spit_publishing_service_parent_iface = g_type_interface_peek_parent (iface);
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
iface->create_publisher = (SpitPublishingPublisher* (*) (SpitPublishingService *, SpitPublishingPluginHost*)) rajce_service_real_create_publisher;
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
iface->get_supported_media = (SpitPublishingPublisherMediaType (*) (SpitPublishingService *)) rajce_service_real_get_supported_media;
-#line 1179 "RajcePublishing.c"
+#line 1436 "RajcePublishing.c"
}
-static void rajce_service_instance_init (RajceService * self) {
+static void
+rajce_service_instance_init (RajceService * self)
+{
}
-static void rajce_service_finalize (GObject * obj) {
+static void
+rajce_service_finalize (GObject * obj)
+{
RajceService * self;
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_RAJCE_SERVICE, RajceService);
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
G_OBJECT_CLASS (rajce_service_parent_class)->finalize (obj);
-#line 1193 "RajcePublishing.c"
+#line 1454 "RajcePublishing.c"
}
-GType rajce_service_get_type (void) {
+GType
+rajce_service_get_type (void)
+{
static volatile gsize rajce_service_type_id__volatile = 0;
if (g_once_init_enter (&rajce_service_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (RajceServiceClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) rajce_service_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (RajceService), 0, (GInstanceInitFunc) rajce_service_instance_init, NULL };
@@ -1209,16 +1472,17 @@ GType rajce_service_get_type (void) {
}
-PublishingRajceRajcePublisher* publishing_rajce_rajce_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host) {
+PublishingRajceRajcePublisher*
+publishing_rajce_rajce_publisher_construct (GType object_type,
+ SpitPublishingService* service,
+ SpitPublishingPluginHost* host)
+{
PublishingRajceRajcePublisher * self = NULL;
SpitPublishingService* _tmp0_;
- SpitPublishingService* _tmp1_;
- SpitPublishingPluginHost* _tmp2_;
- SpitPublishingPluginHost* _tmp3_;
- PublishingRajceSession* _tmp4_;
- SpitPublishingPluginHost* _tmp5_;
- gint _tmp6_;
- SpitPublishingPublishable** _tmp7_;
+ SpitPublishingPluginHost* _tmp1_;
+ PublishingRajceSession* _tmp2_;
+ gint _tmp3_;
+ SpitPublishingPublishable** _tmp4_;
#line 84 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_val_if_fail (SPIT_PUBLISHING_IS_SERVICE (service), NULL);
#line 84 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -1228,86 +1492,82 @@ PublishingRajceRajcePublisher* publishing_rajce_rajce_publisher_construct (GType
#line 86 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_debug ("RajcePublishing.vala:86: RajcePublisher created.");
#line 87 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp0_ = service;
-#line 87 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp1_ = _g_object_ref0 (_tmp0_);
+ _tmp0_ = _g_object_ref0 (service);
#line 87 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_object_unref0 (self->priv->service);
#line 87 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- self->priv->service = _tmp1_;
+ self->priv->service = _tmp0_;
#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp2_ = host;
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp3_ = _g_object_ref0 (_tmp2_);
+ _tmp1_ = _g_object_ref0 (host);
#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_object_unref0 (self->priv->host);
#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- self->priv->host = _tmp3_;
+ self->priv->host = _tmp1_;
#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp4_ = publishing_rajce_session_new ();
+ _tmp2_ = publishing_rajce_session_new ();
#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_publishing_rest_support_session_unref0 (self->priv->session);
#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- self->priv->session = _tmp4_;
-#line 91 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp5_ = host;
+ self->priv->session = _tmp2_;
#line 91 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp7_ = spit_publishing_plugin_host_get_publishables (_tmp5_, &_tmp6_);
-#line 1257 "RajcePublishing.c"
+ _tmp4_ = spit_publishing_plugin_host_get_publishables (host, &_tmp3_);
+#line 1515 "RajcePublishing.c"
{
SpitPublishingPublishable** p_collection = NULL;
gint p_collection_length1 = 0;
gint _p_collection_size_ = 0;
gint p_it = 0;
#line 91 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- p_collection = _tmp7_;
+ p_collection = _tmp4_;
#line 91 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- p_collection_length1 = _tmp6_;
+ p_collection_length1 = _tmp3_;
#line 91 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- for (p_it = 0; p_it < _tmp6_; p_it = p_it + 1) {
-#line 1269 "RajcePublishing.c"
- SpitPublishingPublishable* _tmp8_;
+ for (p_it = 0; p_it < _tmp3_; p_it = p_it + 1) {
+#line 1527 "RajcePublishing.c"
+ SpitPublishingPublishable* _tmp5_;
SpitPublishingPublishable* p = NULL;
#line 91 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp8_ = _g_object_ref0 (p_collection[p_it]);
+ _tmp5_ = _g_object_ref0 (p_collection[p_it]);
#line 91 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- p = _tmp8_;
-#line 1276 "RajcePublishing.c"
+ p = _tmp5_;
+#line 1534 "RajcePublishing.c"
{
- SpitPublishingPublisherMediaType _tmp9_;
- SpitPublishingPublishable* _tmp10_;
- SpitPublishingPublisherMediaType _tmp11_;
-#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp9_ = self->priv->media_type;
+ SpitPublishingPublisherMediaType _tmp6_;
+ SpitPublishingPublishable* _tmp7_;
#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp10_ = p;
+ _tmp6_ = self->priv->media_type;
#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp11_ = spit_publishing_publishable_get_media_type (_tmp10_);
+ _tmp7_ = p;
#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- self->priv->media_type = _tmp9_ | _tmp11_;
+ self->priv->media_type = _tmp6_ | spit_publishing_publishable_get_media_type (_tmp7_);
#line 91 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_object_unref0 (p);
-#line 1291 "RajcePublishing.c"
+#line 1546 "RajcePublishing.c"
}
}
#line 91 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
p_collection = (_vala_array_free (p_collection, p_collection_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 1296 "RajcePublishing.c"
+#line 1551 "RajcePublishing.c"
}
#line 84 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return self;
-#line 1300 "RajcePublishing.c"
+#line 1555 "RajcePublishing.c"
}
-PublishingRajceRajcePublisher* publishing_rajce_rajce_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host) {
+PublishingRajceRajcePublisher*
+publishing_rajce_rajce_publisher_new (SpitPublishingService* service,
+ SpitPublishingPluginHost* host)
+{
#line 84 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return publishing_rajce_rajce_publisher_construct (PUBLISHING_RAJCE_TYPE_RAJCE_PUBLISHER, service, host);
-#line 1307 "RajcePublishing.c"
+#line 1565 "RajcePublishing.c"
}
-static gchar* publishing_rajce_rajce_publisher_get_rajce_url (PublishingRajceRajcePublisher* self) {
+static gchar*
+publishing_rajce_rajce_publisher_get_rajce_url (PublishingRajceRajcePublisher* self)
+{
gchar* result = NULL;
gchar* _tmp0_;
#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -1318,11 +1578,13 @@ static gchar* publishing_rajce_rajce_publisher_get_rajce_url (PublishingRajceRaj
result = _tmp0_;
#line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return result;
-#line 1322 "RajcePublishing.c"
+#line 1582 "RajcePublishing.c"
}
-static SpitPublishingService* publishing_rajce_rajce_publisher_real_get_service (SpitPublishingPublisher* base) {
+static SpitPublishingService*
+publishing_rajce_rajce_publisher_real_get_service (SpitPublishingPublisher* base)
+{
PublishingRajceRajcePublisher * self;
SpitPublishingService* result = NULL;
SpitPublishingService* _tmp0_;
@@ -1337,11 +1599,13 @@ static SpitPublishingService* publishing_rajce_rajce_publisher_real_get_service
result = _tmp1_;
#line 102 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return result;
-#line 1341 "RajcePublishing.c"
+#line 1603 "RajcePublishing.c"
}
-SpitPublishingPluginHost* publishing_rajce_rajce_publisher_get_host (PublishingRajceRajcePublisher* self) {
+SpitPublishingPluginHost*
+publishing_rajce_rajce_publisher_get_host (PublishingRajceRajcePublisher* self)
+{
SpitPublishingPluginHost* result = NULL;
SpitPublishingPluginHost* _tmp0_;
SpitPublishingPluginHost* _tmp1_;
@@ -1355,11 +1619,13 @@ SpitPublishingPluginHost* publishing_rajce_rajce_publisher_get_host (PublishingR
result = _tmp1_;
#line 103 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return result;
-#line 1359 "RajcePublishing.c"
+#line 1623 "RajcePublishing.c"
}
-static gboolean publishing_rajce_rajce_publisher_real_is_running (SpitPublishingPublisher* base) {
+static gboolean
+publishing_rajce_rajce_publisher_real_is_running (SpitPublishingPublisher* base)
+{
PublishingRajceRajcePublisher * self;
gboolean result = FALSE;
gboolean _tmp0_;
@@ -1371,11 +1637,13 @@ static gboolean publishing_rajce_rajce_publisher_real_is_running (SpitPublishing
result = _tmp0_;
#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return result;
-#line 1375 "RajcePublishing.c"
+#line 1641 "RajcePublishing.c"
}
-static gboolean* _bool_dup (gboolean* self) {
+static gboolean*
+_bool_dup (gboolean* self)
+{
gboolean* dup;
#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
dup = g_new0 (gboolean, 1);
@@ -1383,109 +1651,107 @@ static gboolean* _bool_dup (gboolean* self) {
memcpy (dup, self, sizeof (gboolean));
#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return dup;
-#line 1387 "RajcePublishing.c"
+#line 1655 "RajcePublishing.c"
}
-static gpointer __bool_dup0 (gpointer self) {
+static gpointer
+__bool_dup0 (gpointer self)
+{
#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return self ? _bool_dup (self) : NULL;
-#line 1394 "RajcePublishing.c"
+#line 1664 "RajcePublishing.c"
}
-static void publishing_rajce_rajce_publisher_real_start (SpitPublishingPublisher* base) {
+static void
+publishing_rajce_rajce_publisher_real_start (SpitPublishingPublisher* base)
+{
PublishingRajceRajcePublisher * self;
- gboolean _tmp0_;
- PublishingRajceSession* _tmp1_;
- gboolean _tmp2_;
+ PublishingRajceSession* _tmp0_;
#line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_RAJCE_TYPE_RAJCE_PUBLISHER, PublishingRajceRajcePublisher);
#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- if (_tmp0_) {
+ if (spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return;
-#line 1411 "RajcePublishing.c"
+#line 1679 "RajcePublishing.c"
}
#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_debug ("RajcePublishing.vala:111: RajcePublisher: start");
#line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
self->priv->running = TRUE;
#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp1_ = self->priv->session;
-#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp2_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
+ _tmp0_ = self->priv->session;
#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- if (_tmp2_) {
+ if (publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession))) {
#line 116 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_debug ("RajcePublishing.vala:116: RajcePublisher: session is authenticated.");
#line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_rajce_publisher_do_fetch_albums (self);
-#line 1427 "RajcePublishing.c"
+#line 1693 "RajcePublishing.c"
} else {
gchar* persistent_username = NULL;
- gchar* _tmp3_;
+ gchar* _tmp1_;
gchar* persistent_token = NULL;
- gchar* _tmp4_;
+ gchar* _tmp2_;
gboolean* persistent_remember = NULL;
- gboolean _tmp5_;
- gboolean* _tmp6_;
- gboolean _tmp7_ = FALSE;
- const gchar* _tmp8_;
+ gboolean _tmp3_;
+ gboolean* _tmp4_;
+ gboolean _tmp5_ = FALSE;
+ const gchar* _tmp6_;
#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_debug ("RajcePublishing.vala:121: RajcePublisher: session is not authenticated" \
".");
#line 122 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp3_ = publishing_rajce_rajce_publisher_get_username (self);
+ _tmp1_ = publishing_rajce_rajce_publisher_get_username (self);
#line 122 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- persistent_username = _tmp3_;
+ persistent_username = _tmp1_;
#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp4_ = publishing_rajce_rajce_publisher_get_token (self);
+ _tmp2_ = publishing_rajce_rajce_publisher_get_token (self);
#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- persistent_token = _tmp4_;
+ persistent_token = _tmp2_;
#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp5_ = publishing_rajce_rajce_publisher_get_remember (self);
+ _tmp3_ = publishing_rajce_rajce_publisher_get_remember (self);
#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp6_ = __bool_dup0 (&_tmp5_);
+ _tmp4_ = __bool_dup0 (&_tmp3_);
#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- persistent_remember = _tmp6_;
+ persistent_remember = _tmp4_;
#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp8_ = persistent_username;
+ _tmp6_ = persistent_username;
#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- if (_tmp8_ != NULL) {
-#line 1458 "RajcePublishing.c"
- const gchar* _tmp9_;
+ if (_tmp6_ != NULL) {
+#line 1724 "RajcePublishing.c"
+ const gchar* _tmp7_;
#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp9_ = persistent_token;
+ _tmp7_ = persistent_token;
#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp7_ = _tmp9_ != NULL;
-#line 1464 "RajcePublishing.c"
+ _tmp5_ = _tmp7_ != NULL;
+#line 1730 "RajcePublishing.c"
} else {
#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp7_ = FALSE;
-#line 1468 "RajcePublishing.c"
+ _tmp5_ = FALSE;
+#line 1734 "RajcePublishing.c"
}
#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- if (_tmp7_) {
-#line 1472 "RajcePublishing.c"
- const gchar* _tmp10_;
- const gchar* _tmp11_;
- gboolean* _tmp12_;
+ if (_tmp5_) {
+#line 1738 "RajcePublishing.c"
+ const gchar* _tmp8_;
+ const gchar* _tmp9_;
+ gboolean* _tmp10_;
#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp10_ = persistent_username;
+ _tmp8_ = persistent_username;
#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp11_ = persistent_token;
+ _tmp9_ = persistent_token;
#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp12_ = persistent_remember;
+ _tmp10_ = persistent_remember;
#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- publishing_rajce_rajce_publisher_do_network_login (self, _tmp10_, _tmp11_, *_tmp12_);
-#line 1484 "RajcePublishing.c"
+ publishing_rajce_rajce_publisher_do_network_login (self, _tmp8_, _tmp9_, *_tmp10_);
+#line 1750 "RajcePublishing.c"
} else {
#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_rajce_publisher_do_show_authentication_pane (self, PUBLISHING_RAJCE_AUTHENTICATION_PANE_MODE_INTRO);
-#line 1488 "RajcePublishing.c"
+#line 1754 "RajcePublishing.c"
}
#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_free0 (persistent_remember);
@@ -1493,12 +1759,14 @@ static void publishing_rajce_rajce_publisher_real_start (SpitPublishingPublisher
_g_free0 (persistent_token);
#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_free0 (persistent_username);
-#line 1496 "RajcePublishing.c"
+#line 1762 "RajcePublishing.c"
}
}
-static void publishing_rajce_rajce_publisher_real_stop (SpitPublishingPublisher* base) {
+static void
+publishing_rajce_rajce_publisher_real_stop (SpitPublishingPublisher* base)
+{
PublishingRajceRajcePublisher * self;
#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_RAJCE_TYPE_RAJCE_PUBLISHER, PublishingRajceRajcePublisher);
@@ -1506,11 +1774,13 @@ static void publishing_rajce_rajce_publisher_real_stop (SpitPublishingPublisher*
g_debug ("RajcePublishing.vala:134: RajcePublisher: stop");
#line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
self->priv->running = FALSE;
-#line 1509 "RajcePublishing.c"
+#line 1777 "RajcePublishing.c"
}
-gchar* publishing_rajce_rajce_publisher_get_url (PublishingRajceRajcePublisher* self) {
+gchar*
+publishing_rajce_rajce_publisher_get_url (PublishingRajceRajcePublisher* self)
+{
gchar* result = NULL;
gchar* _tmp0_;
#line 140 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -1521,11 +1791,13 @@ gchar* publishing_rajce_rajce_publisher_get_url (PublishingRajceRajcePublisher*
result = _tmp0_;
#line 140 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return result;
-#line 1524 "RajcePublishing.c"
+#line 1794 "RajcePublishing.c"
}
-gchar* publishing_rajce_rajce_publisher_get_username (PublishingRajceRajcePublisher* self) {
+gchar*
+publishing_rajce_rajce_publisher_get_username (PublishingRajceRajcePublisher* self)
+{
gchar* result = NULL;
SpitPublishingPluginHost* _tmp0_;
gchar* _tmp1_;
@@ -1539,13 +1811,15 @@ gchar* publishing_rajce_rajce_publisher_get_username (PublishingRajceRajcePublis
result = _tmp1_;
#line 141 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return result;
-#line 1542 "RajcePublishing.c"
+#line 1814 "RajcePublishing.c"
}
-static void publishing_rajce_rajce_publisher_set_username (PublishingRajceRajcePublisher* self, const gchar* username) {
+static void
+publishing_rajce_rajce_publisher_set_username (PublishingRajceRajcePublisher* self,
+ const gchar* username)
+{
SpitPublishingPluginHost* _tmp0_;
- const gchar* _tmp1_;
#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self));
#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -1553,14 +1827,14 @@ static void publishing_rajce_rajce_publisher_set_username (PublishingRajceRajceP
#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_tmp0_ = self->priv->host;
#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp1_ = username;
-#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "username", _tmp1_);
-#line 1559 "RajcePublishing.c"
+ spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "username", username);
+#line 1831 "RajcePublishing.c"
}
-gchar* publishing_rajce_rajce_publisher_get_token (PublishingRajceRajcePublisher* self) {
+gchar*
+publishing_rajce_rajce_publisher_get_token (PublishingRajceRajcePublisher* self)
+{
gchar* result = NULL;
SpitPublishingPluginHost* _tmp0_;
gchar* _tmp1_;
@@ -1574,143 +1848,148 @@ gchar* publishing_rajce_rajce_publisher_get_token (PublishingRajceRajcePublisher
result = _tmp1_;
#line 143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return result;
-#line 1577 "RajcePublishing.c"
+#line 1851 "RajcePublishing.c"
}
-static void publishing_rajce_rajce_publisher_set_token (PublishingRajceRajcePublisher* self, const gchar* token) {
+static void
+publishing_rajce_rajce_publisher_set_token (PublishingRajceRajcePublisher* self,
+ const gchar* token)
+{
SpitPublishingPluginHost* _tmp0_;
- const gchar* _tmp1_;
#line 144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self));
#line 144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_tmp0_ = self->priv->host;
#line 144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp1_ = token;
-#line 144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "token", _tmp1_);
-#line 1592 "RajcePublishing.c"
+ spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "token", token);
+#line 1866 "RajcePublishing.c"
}
-gboolean publishing_rajce_rajce_publisher_get_remember (PublishingRajceRajcePublisher* self) {
+gboolean
+publishing_rajce_rajce_publisher_get_remember (PublishingRajceRajcePublisher* self)
+{
gboolean result = FALSE;
SpitPublishingPluginHost* _tmp0_;
- gboolean _tmp1_;
#line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_val_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self), FALSE);
#line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_tmp0_ = self->priv->host;
#line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp1_ = spit_host_interface_get_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "remember", FALSE);
-#line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- result = _tmp1_;
+ result = spit_host_interface_get_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "remember", FALSE);
#line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return result;
-#line 1610 "RajcePublishing.c"
+#line 1883 "RajcePublishing.c"
}
-static void publishing_rajce_rajce_publisher_set_remember (PublishingRajceRajcePublisher* self, gboolean remember) {
+static void
+publishing_rajce_rajce_publisher_set_remember (PublishingRajceRajcePublisher* self,
+ gboolean remember)
+{
SpitPublishingPluginHost* _tmp0_;
- gboolean _tmp1_;
#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self));
#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_tmp0_ = self->priv->host;
#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp1_ = remember;
-#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "remember", _tmp1_);
-#line 1625 "RajcePublishing.c"
+ spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "remember", remember);
+#line 1898 "RajcePublishing.c"
}
-gboolean publishing_rajce_rajce_publisher_get_hide_album (PublishingRajceRajcePublisher* self) {
+gboolean
+publishing_rajce_rajce_publisher_get_hide_album (PublishingRajceRajcePublisher* self)
+{
gboolean result = FALSE;
SpitPublishingPluginHost* _tmp0_;
- gboolean _tmp1_;
#line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_val_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self), FALSE);
#line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_tmp0_ = self->priv->host;
#line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp1_ = spit_host_interface_get_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "hide-album", FALSE);
-#line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- result = _tmp1_;
+ result = spit_host_interface_get_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "hide-album", FALSE);
#line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return result;
-#line 1643 "RajcePublishing.c"
+#line 1915 "RajcePublishing.c"
}
-void publishing_rajce_rajce_publisher_set_hide_album (PublishingRajceRajcePublisher* self, gboolean hide_album) {
+void
+publishing_rajce_rajce_publisher_set_hide_album (PublishingRajceRajcePublisher* self,
+ gboolean hide_album)
+{
SpitPublishingPluginHost* _tmp0_;
- gboolean _tmp1_;
#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self));
#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_tmp0_ = self->priv->host;
#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp1_ = hide_album;
-#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "hide-album", _tmp1_);
-#line 1658 "RajcePublishing.c"
+ spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "hide-album", hide_album);
+#line 1930 "RajcePublishing.c"
}
-gboolean publishing_rajce_rajce_publisher_get_show_album (PublishingRajceRajcePublisher* self) {
+gboolean
+publishing_rajce_rajce_publisher_get_show_album (PublishingRajceRajcePublisher* self)
+{
gboolean result = FALSE;
SpitPublishingPluginHost* _tmp0_;
- gboolean _tmp1_;
#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_val_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self), FALSE);
#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_tmp0_ = self->priv->host;
#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp1_ = spit_host_interface_get_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "show-album", TRUE);
-#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- result = _tmp1_;
+ result = spit_host_interface_get_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "show-album", TRUE);
#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return result;
-#line 1676 "RajcePublishing.c"
+#line 1947 "RajcePublishing.c"
}
-void publishing_rajce_rajce_publisher_set_show_album (PublishingRajceRajcePublisher* self, gboolean show_album) {
+void
+publishing_rajce_rajce_publisher_set_show_album (PublishingRajceRajcePublisher* self,
+ gboolean show_album)
+{
SpitPublishingPluginHost* _tmp0_;
- gboolean _tmp1_;
#line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self));
#line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_tmp0_ = self->priv->host;
#line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp1_ = show_album;
-#line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "show-album", _tmp1_);
-#line 1691 "RajcePublishing.c"
+ spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "show-album", show_album);
+#line 1962 "RajcePublishing.c"
}
/**
* Action that shows the authentication pane.
*/
-static void _publishing_rajce_rajce_publisher_on_authentication_pane_login_clicked_publishing_rajce_authentication_pane_login (PublishingRajceAuthenticationPane* _sender, const gchar* user, const gchar* token, gboolean remember, gpointer self) {
+static void
+_publishing_rajce_rajce_publisher_on_authentication_pane_login_clicked_publishing_rajce_authentication_pane_login (PublishingRajceAuthenticationPane* _sender,
+ const gchar* user,
+ const gchar* token,
+ gboolean remember,
+ gpointer self)
+{
#line 167 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_rajce_publisher_on_authentication_pane_login_clicked ((PublishingRajceRajcePublisher*) self, user, token, remember);
-#line 1701 "RajcePublishing.c"
+#line 1978 "RajcePublishing.c"
}
-static void publishing_rajce_rajce_publisher_do_show_authentication_pane (PublishingRajceRajcePublisher* self, PublishingRajceAuthenticationPaneMode mode) {
+static void
+publishing_rajce_rajce_publisher_do_show_authentication_pane (PublishingRajceRajcePublisher* self,
+ PublishingRajceAuthenticationPaneMode mode)
+{
SpitPublishingPluginHost* _tmp0_;
PublishingRajceAuthenticationPane* authentication_pane = NULL;
- PublishingRajceAuthenticationPaneMode _tmp1_;
- PublishingRajceAuthenticationPane* _tmp2_;
+ PublishingRajceAuthenticationPane* _tmp1_;
+ SpitPublishingPluginHost* _tmp2_;
SpitPublishingPluginHost* _tmp3_;
- SpitPublishingPluginHost* _tmp4_;
+ GtkWidget* _tmp4_;
GtkWidget* _tmp5_;
- GtkWidget* _tmp6_;
#line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self));
#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -1720,41 +1999,41 @@ static void publishing_rajce_rajce_publisher_do_show_authentication_pane (Publis
#line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
spit_publishing_plugin_host_set_service_locked (_tmp0_, FALSE);
#line 166 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp1_ = mode;
+ _tmp1_ = publishing_rajce_authentication_pane_new (self, mode);
#line 166 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp2_ = publishing_rajce_authentication_pane_new (self, _tmp1_);
-#line 166 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- authentication_pane = _tmp2_;
+ authentication_pane = _tmp1_;
#line 167 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_signal_connect_object (authentication_pane, "login", (GCallback) _publishing_rajce_rajce_publisher_on_authentication_pane_login_clicked_publishing_rajce_authentication_pane_login, self, 0);
#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp3_ = self->priv->host;
+ _tmp2_ = self->priv->host;
#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- spit_publishing_plugin_host_install_dialog_pane (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (authentication_pane, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CLOSE);
+ spit_publishing_plugin_host_install_dialog_pane (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (authentication_pane, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CLOSE);
#line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp4_ = self->priv->host;
+ _tmp3_ = self->priv->host;
#line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp5_ = publishing_rajce_authentication_pane_get_default_widget (authentication_pane);
+ _tmp4_ = publishing_rajce_authentication_pane_get_default_widget (authentication_pane);
#line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp6_ = _tmp5_;
+ _tmp5_ = _tmp4_;
#line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- spit_publishing_plugin_host_set_dialog_default_widget (_tmp4_, _tmp6_);
+ spit_publishing_plugin_host_set_dialog_default_widget (_tmp3_, _tmp5_);
#line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _g_object_unref0 (_tmp6_);
+ _g_object_unref0 (_tmp5_);
#line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_object_unref0 (authentication_pane);
-#line 1746 "RajcePublishing.c"
+#line 2023 "RajcePublishing.c"
}
/**
* Event triggered when the login button in the authentication panel is clicked.
*/
-static void publishing_rajce_rajce_publisher_on_authentication_pane_login_clicked (PublishingRajceRajcePublisher* self, const gchar* username, const gchar* token, gboolean remember) {
+static void
+publishing_rajce_rajce_publisher_on_authentication_pane_login_clicked (PublishingRajceRajcePublisher* self,
+ const gchar* username,
+ const gchar* token,
+ gboolean remember)
+{
gboolean _tmp0_;
- const gchar* _tmp1_;
- const gchar* _tmp2_;
- gboolean _tmp3_;
#line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self));
#line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -1769,52 +2048,53 @@ static void publishing_rajce_rajce_publisher_on_authentication_pane_login_clicke
if (!_tmp0_) {
#line 179 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return;
-#line 1772 "RajcePublishing.c"
+#line 2051 "RajcePublishing.c"
}
#line 180 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp1_ = username;
-#line 180 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp2_ = token;
-#line 180 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp3_ = remember;
-#line 180 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- publishing_rajce_rajce_publisher_do_network_login (self, _tmp1_, _tmp2_, _tmp3_);
-#line 1782 "RajcePublishing.c"
+ publishing_rajce_rajce_publisher_do_network_login (self, username, token, remember);
+#line 2055 "RajcePublishing.c"
}
/**
* Action to perform a network login to a Rajce service.
*/
-static void _publishing_rajce_rajce_publisher_on_login_network_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
+static void
+_publishing_rajce_rajce_publisher_on_login_network_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+ GError* err,
+ gpointer self)
+{
#line 195 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_rajce_publisher_on_login_network_error ((PublishingRajceRajcePublisher*) self, _sender, err);
-#line 1792 "RajcePublishing.c"
+#line 2069 "RajcePublishing.c"
}
-static void _publishing_rajce_rajce_publisher_on_login_network_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
+static void
+_publishing_rajce_rajce_publisher_on_login_network_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+ gpointer self)
+{
#line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_rajce_publisher_on_login_network_complete ((PublishingRajceRajcePublisher*) self, _sender);
-#line 1799 "RajcePublishing.c"
+#line 2079 "RajcePublishing.c"
}
-static void publishing_rajce_rajce_publisher_do_network_login (PublishingRajceRajcePublisher* self, const gchar* username, const gchar* token, gboolean remember) {
+static void
+publishing_rajce_rajce_publisher_do_network_login (PublishingRajceRajcePublisher* self,
+ const gchar* username,
+ const gchar* token,
+ gboolean remember)
+{
SpitPublishingPluginHost* _tmp0_;
SpitPublishingPluginHost* _tmp1_;
- gboolean _tmp2_;
- const gchar* _tmp3_;
- const gchar* _tmp4_ = NULL;
- gboolean _tmp5_;
+ const gchar* _tmp2_ = NULL;
PublishingRajceSessionLoginTransaction* login_trans = NULL;
- PublishingRajceSession* _tmp7_;
- gchar* _tmp8_;
- gchar* _tmp9_;
- const gchar* _tmp10_;
- const gchar* _tmp11_;
- PublishingRajceSessionLoginTransaction* _tmp12_;
- PublishingRajceSessionLoginTransaction* _tmp13_;
+ PublishingRajceSession* _tmp3_;
+ gchar* _tmp4_;
+ gchar* _tmp5_;
+ PublishingRajceSessionLoginTransaction* _tmp6_;
+ PublishingRajceSessionLoginTransaction* _tmp7_;
GError * _inner_error_ = NULL;
#line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self));
@@ -1833,54 +2113,40 @@ static void publishing_rajce_rajce_publisher_do_network_login (PublishingRajceRa
#line 190 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
spit_publishing_plugin_host_install_login_wait_pane (_tmp1_);
#line 191 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp2_ = remember;
-#line 191 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- publishing_rajce_rajce_publisher_set_remember (self, _tmp2_);
-#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp3_ = username;
+ publishing_rajce_rajce_publisher_set_remember (self, remember);
#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- publishing_rajce_rajce_publisher_set_username (self, _tmp3_);
+ publishing_rajce_rajce_publisher_set_username (self, username);
#line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp5_ = remember;
-#line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- if (_tmp5_) {
-#line 1847 "RajcePublishing.c"
- const gchar* _tmp6_;
+ if (remember) {
#line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp6_ = token;
-#line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp4_ = _tmp6_;
-#line 1853 "RajcePublishing.c"
+ _tmp2_ = token;
+#line 2123 "RajcePublishing.c"
} else {
#line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp4_ = NULL;
-#line 1857 "RajcePublishing.c"
+ _tmp2_ = NULL;
+#line 2127 "RajcePublishing.c"
}
#line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- publishing_rajce_rajce_publisher_set_token (self, _tmp4_);
-#line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp7_ = self->priv->session;
-#line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp8_ = publishing_rajce_rajce_publisher_get_url (self);
+ publishing_rajce_rajce_publisher_set_token (self, _tmp2_);
#line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp9_ = _tmp8_;
+ _tmp3_ = self->priv->session;
#line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp10_ = username;
+ _tmp4_ = publishing_rajce_rajce_publisher_get_url (self);
#line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp11_ = token;
+ _tmp5_ = _tmp4_;
#line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp12_ = publishing_rajce_session_login_transaction_new (_tmp7_, _tmp9_, _tmp10_, _tmp11_);
+ _tmp6_ = publishing_rajce_session_login_transaction_new (_tmp3_, _tmp5_, username, token);
#line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp13_ = _tmp12_;
+ _tmp7_ = _tmp6_;
#line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _g_free0 (_tmp9_);
+ _g_free0 (_tmp5_);
#line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- login_trans = _tmp13_;
+ login_trans = _tmp7_;
#line 195 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (login_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_rajce_rajce_publisher_on_login_network_error_publishing_rest_support_transaction_network_error, self, 0);
#line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (login_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_rajce_rajce_publisher_on_login_network_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 1883 "RajcePublishing.c"
+#line 2149 "RajcePublishing.c"
{
#line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (login_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
@@ -1888,7 +2154,7 @@ static void publishing_rajce_rajce_publisher_do_network_login (PublishingRajceRa
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 1891 "RajcePublishing.c"
+#line 2157 "RajcePublishing.c"
goto __catch16_spit_publishing_publishing_error;
}
#line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -1899,14 +2165,14 @@ static void publishing_rajce_rajce_publisher_do_network_login (PublishingRajceRa
g_clear_error (&_inner_error_);
#line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return;
-#line 1902 "RajcePublishing.c"
+#line 2168 "RajcePublishing.c"
}
}
goto __finally16;
__catch16_spit_publishing_publishing_error:
{
GError* err = NULL;
- GError* _tmp14_;
+ GError* _tmp8_;
#line 197 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
err = _inner_error_;
#line 197 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -1914,12 +2180,12 @@ static void publishing_rajce_rajce_publisher_do_network_login (PublishingRajceRa
#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_debug ("RajcePublishing.vala:203: ERROR: do_network_login");
#line 204 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp14_ = err;
+ _tmp8_ = err;
#line 204 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- publishing_rajce_rajce_publisher_do_show_error (self, _tmp14_);
+ publishing_rajce_rajce_publisher_do_show_error (self, _tmp8_);
#line 197 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_error_free0 (err);
-#line 1922 "RajcePublishing.c"
+#line 2188 "RajcePublishing.c"
}
__finally16:
#line 197 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -1932,31 +2198,35 @@ static void publishing_rajce_rajce_publisher_do_network_login (PublishingRajceRa
g_clear_error (&_inner_error_);
#line 197 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return;
-#line 1935 "RajcePublishing.c"
+#line 2201 "RajcePublishing.c"
}
#line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_publishing_rest_support_transaction_unref0 (login_trans);
-#line 1939 "RajcePublishing.c"
+#line 2205 "RajcePublishing.c"
}
/**
* Event triggered when the network login action is complete and successful.
*/
-static gchar* _publishing_rajce_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response (PublishingRESTSupportXmlDocument* doc, gpointer self) {
+static gchar*
+_publishing_rajce_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response (PublishingRESTSupportXmlDocument* doc,
+ gpointer self)
+{
gchar* result;
result = publishing_rajce_transaction_validate_xml (doc);
#line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return result;
-#line 1951 "RajcePublishing.c"
+#line 2220 "RajcePublishing.c"
}
-static void publishing_rajce_rajce_publisher_on_login_network_complete (PublishingRajceRajcePublisher* self, PublishingRESTSupportTransaction* txn) {
- PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_rajce_rajce_publisher_on_login_network_complete (PublishingRajceRajcePublisher* self,
+ PublishingRESTSupportTransaction* txn)
+{
+ guint _tmp0_;
guint _tmp1_;
- PublishingRESTSupportTransaction* _tmp2_;
- guint _tmp3_;
GError * _inner_error_ = NULL;
#line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self));
@@ -1965,93 +2235,83 @@ static void publishing_rajce_rajce_publisher_on_login_network_complete (Publishi
#line 213 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_debug ("RajcePublishing.vala:213: EVENT: on_login_network_complete");
#line 214 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp0_ = txn;
+ g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
#line 214 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 214 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_login_network_complete_publishing_rest_support_transaction_completed, self);
-#line 215 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp2_ = txn;
+ g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_login_network_complete_publishing_rest_support_transaction_completed, self);
#line 215 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
+ g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
#line 215 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_login_network_error_publishing_rest_support_transaction_network_error, self);
-#line 1979 "RajcePublishing.c"
+ g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_login_network_error_publishing_rest_support_transaction_network_error, self);
+#line 2245 "RajcePublishing.c"
{
PublishingRESTSupportXmlDocument* doc = NULL;
- PublishingRESTSupportTransaction* _tmp4_;
- gchar* _tmp5_;
- gchar* _tmp6_;
- PublishingRESTSupportXmlDocument* _tmp7_;
- PublishingRESTSupportXmlDocument* _tmp8_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
+ PublishingRESTSupportXmlDocument* _tmp4_;
+ PublishingRESTSupportXmlDocument* _tmp5_;
xmlNode* response = NULL;
- PublishingRESTSupportXmlDocument* _tmp9_;
- xmlNode* _tmp10_;
+ PublishingRESTSupportXmlDocument* _tmp6_;
+ xmlNode* _tmp7_;
xmlNode* sessionToken = NULL;
+ PublishingRESTSupportXmlDocument* _tmp8_;
+ xmlNode* _tmp9_;
+ xmlNode* _tmp10_;
+ xmlNode* maxWidth = NULL;
PublishingRESTSupportXmlDocument* _tmp11_;
xmlNode* _tmp12_;
xmlNode* _tmp13_;
- xmlNode* maxWidth = NULL;
+ xmlNode* maxHeight = NULL;
PublishingRESTSupportXmlDocument* _tmp14_;
xmlNode* _tmp15_;
xmlNode* _tmp16_;
- xmlNode* maxHeight = NULL;
+ xmlNode* quality = NULL;
PublishingRESTSupportXmlDocument* _tmp17_;
xmlNode* _tmp18_;
xmlNode* _tmp19_;
- xmlNode* quality = NULL;
+ xmlNode* nick = NULL;
PublishingRESTSupportXmlDocument* _tmp20_;
xmlNode* _tmp21_;
xmlNode* _tmp22_;
- xmlNode* nick = NULL;
- PublishingRESTSupportXmlDocument* _tmp23_;
- xmlNode* _tmp24_;
- xmlNode* _tmp25_;
gint maxW = 0;
- xmlNode* _tmp26_;
- gchar* _tmp27_;
+ xmlNode* _tmp23_;
+ gchar* _tmp24_;
+ gchar* _tmp25_;
+ gint _tmp26_;
+ gint maxH = 0;
+ xmlNode* _tmp27_;
gchar* _tmp28_;
- gint _tmp29_;
+ gchar* _tmp29_;
gint _tmp30_;
- gint maxH = 0;
- xmlNode* _tmp31_;
- gchar* _tmp32_;
- gchar* _tmp33_;
- gint _tmp34_;
- gint _tmp35_;
- gint _tmp36_;
- gint _tmp37_;
- PublishingRajceSession* _tmp39_;
- xmlNode* _tmp40_;
- gchar* _tmp41_;
- gchar* _tmp42_;
- xmlNode* _tmp43_;
+ gint _tmp31_;
+ gint _tmp32_;
+ PublishingRajceSession* _tmp34_;
+ xmlNode* _tmp35_;
+ gchar* _tmp36_;
+ gchar* _tmp37_;
+ xmlNode* _tmp38_;
+ gchar* _tmp39_;
+ gchar* _tmp40_;
+ gint _tmp41_;
+ xmlNode* _tmp42_;
+ gchar* _tmp43_;
gchar* _tmp44_;
- gchar* _tmp45_;
- gint _tmp46_;
- xmlNode* _tmp47_;
- gchar* _tmp48_;
- gchar* _tmp49_;
- gint _tmp50_;
#line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp4_ = txn;
+ _tmp2_ = publishing_rest_support_transaction_get_response (txn);
#line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp5_ = publishing_rest_support_transaction_get_response (_tmp4_);
+ _tmp3_ = _tmp2_;
#line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp6_ = _tmp5_;
+ _tmp4_ = publishing_rest_support_xml_document_parse_string (_tmp3_, _publishing_rajce_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response, NULL, &_inner_error_);
#line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp7_ = publishing_rest_support_xml_document_parse_string (_tmp6_, _publishing_rajce_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response, NULL, &_inner_error_);
+ _tmp5_ = _tmp4_;
#line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp8_ = _tmp7_;
+ _g_free0 (_tmp3_);
#line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _g_free0 (_tmp6_);
-#line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- doc = _tmp8_;
+ doc = _tmp5_;
#line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2054 "RajcePublishing.c"
+#line 2314 "RajcePublishing.c"
goto __catch17_spit_publishing_publishing_error;
}
#line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -2060,29 +2320,29 @@ static void publishing_rajce_rajce_publisher_on_login_network_complete (Publishi
g_clear_error (&_inner_error_);
#line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return;
-#line 2063 "RajcePublishing.c"
+#line 2323 "RajcePublishing.c"
}
#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp9_ = doc;
+ _tmp6_ = doc;
#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp10_ = publishing_rest_support_xml_document_get_root_node (_tmp9_);
+ _tmp7_ = publishing_rest_support_xml_document_get_root_node (_tmp6_);
#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- response = _tmp10_;
+ response = _tmp7_;
#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp11_ = doc;
+ _tmp8_ = doc;
#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp12_ = response;
+ _tmp9_ = response;
#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp13_ = publishing_rest_support_xml_document_get_named_child (_tmp11_, _tmp12_, "sessionToken", &_inner_error_);
+ _tmp10_ = publishing_rest_support_xml_document_get_named_child (_tmp8_, _tmp9_, "sessionToken", &_inner_error_);
#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- sessionToken = _tmp13_;
+ sessionToken = _tmp10_;
#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_publishing_rest_support_xml_document_unref0 (doc);
#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2085 "RajcePublishing.c"
+#line 2345 "RajcePublishing.c"
goto __catch17_spit_publishing_publishing_error;
}
#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -2093,23 +2353,23 @@ static void publishing_rajce_rajce_publisher_on_login_network_complete (Publishi
g_clear_error (&_inner_error_);
#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return;
-#line 2096 "RajcePublishing.c"
+#line 2356 "RajcePublishing.c"
}
#line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp14_ = doc;
+ _tmp11_ = doc;
#line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp15_ = response;
+ _tmp12_ = response;
#line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp16_ = publishing_rest_support_xml_document_get_named_child (_tmp14_, _tmp15_, "maxWidth", &_inner_error_);
+ _tmp13_ = publishing_rest_support_xml_document_get_named_child (_tmp11_, _tmp12_, "maxWidth", &_inner_error_);
#line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- maxWidth = _tmp16_;
+ maxWidth = _tmp13_;
#line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_publishing_rest_support_xml_document_unref0 (doc);
#line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2112 "RajcePublishing.c"
+#line 2372 "RajcePublishing.c"
goto __catch17_spit_publishing_publishing_error;
}
#line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -2120,23 +2380,23 @@ static void publishing_rajce_rajce_publisher_on_login_network_complete (Publishi
g_clear_error (&_inner_error_);
#line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return;
-#line 2123 "RajcePublishing.c"
+#line 2383 "RajcePublishing.c"
}
#line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp17_ = doc;
+ _tmp14_ = doc;
#line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp18_ = response;
+ _tmp15_ = response;
#line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp19_ = publishing_rest_support_xml_document_get_named_child (_tmp17_, _tmp18_, "maxHeight", &_inner_error_);
+ _tmp16_ = publishing_rest_support_xml_document_get_named_child (_tmp14_, _tmp15_, "maxHeight", &_inner_error_);
#line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- maxHeight = _tmp19_;
+ maxHeight = _tmp16_;
#line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_publishing_rest_support_xml_document_unref0 (doc);
#line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2139 "RajcePublishing.c"
+#line 2399 "RajcePublishing.c"
goto __catch17_spit_publishing_publishing_error;
}
#line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -2147,23 +2407,23 @@ static void publishing_rajce_rajce_publisher_on_login_network_complete (Publishi
g_clear_error (&_inner_error_);
#line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return;
-#line 2150 "RajcePublishing.c"
+#line 2410 "RajcePublishing.c"
}
#line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp20_ = doc;
+ _tmp17_ = doc;
#line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp21_ = response;
+ _tmp18_ = response;
#line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp22_ = publishing_rest_support_xml_document_get_named_child (_tmp20_, _tmp21_, "quality", &_inner_error_);
+ _tmp19_ = publishing_rest_support_xml_document_get_named_child (_tmp17_, _tmp18_, "quality", &_inner_error_);
#line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- quality = _tmp22_;
+ quality = _tmp19_;
#line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_publishing_rest_support_xml_document_unref0 (doc);
#line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2166 "RajcePublishing.c"
+#line 2426 "RajcePublishing.c"
goto __catch17_spit_publishing_publishing_error;
}
#line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -2174,23 +2434,23 @@ static void publishing_rajce_rajce_publisher_on_login_network_complete (Publishi
g_clear_error (&_inner_error_);
#line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return;
-#line 2177 "RajcePublishing.c"
+#line 2437 "RajcePublishing.c"
}
#line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp23_ = doc;
+ _tmp20_ = doc;
#line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp24_ = response;
+ _tmp21_ = response;
#line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp25_ = publishing_rest_support_xml_document_get_named_child (_tmp23_, _tmp24_, "nick", &_inner_error_);
+ _tmp22_ = publishing_rest_support_xml_document_get_named_child (_tmp20_, _tmp21_, "nick", &_inner_error_);
#line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- nick = _tmp25_;
+ nick = _tmp22_;
#line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_publishing_rest_support_xml_document_unref0 (doc);
#line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2193 "RajcePublishing.c"
+#line 2453 "RajcePublishing.c"
goto __catch17_spit_publishing_publishing_error;
}
#line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -2201,131 +2461,122 @@ static void publishing_rajce_rajce_publisher_on_login_network_complete (Publishi
g_clear_error (&_inner_error_);
#line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return;
-#line 2204 "RajcePublishing.c"
+#line 2464 "RajcePublishing.c"
}
#line 226 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp26_ = maxWidth;
+ _tmp23_ = maxWidth;
#line 226 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp27_ = (gchar*) xmlNodeGetContent (_tmp26_);
+ _tmp24_ = (gchar*) xmlNodeGetContent (_tmp23_);
#line 226 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp28_ = _tmp27_;
+ _tmp25_ = _tmp24_;
#line 226 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp29_ = atoi (_tmp28_);
+ _tmp26_ = atoi (_tmp25_);
#line 226 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp30_ = _tmp29_;
+ _g_free0 (_tmp25_);
#line 226 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _g_free0 (_tmp28_);
-#line 226 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- maxW = _tmp30_;
-#line 227 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp31_ = maxHeight;
+ maxW = _tmp26_;
#line 227 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp32_ = (gchar*) xmlNodeGetContent (_tmp31_);
+ _tmp27_ = maxHeight;
#line 227 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp33_ = _tmp32_;
+ _tmp28_ = (gchar*) xmlNodeGetContent (_tmp27_);
#line 227 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp34_ = atoi (_tmp33_);
+ _tmp29_ = _tmp28_;
#line 227 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp35_ = _tmp34_;
+ _tmp30_ = atoi (_tmp29_);
#line 227 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _g_free0 (_tmp33_);
+ _g_free0 (_tmp29_);
#line 227 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- maxH = _tmp35_;
+ maxH = _tmp30_;
#line 228 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp36_ = maxW;
+ _tmp31_ = maxW;
#line 228 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp37_ = maxH;
+ _tmp32_ = maxH;
#line 228 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- if (_tmp36_ > _tmp37_) {
-#line 2240 "RajcePublishing.c"
- gint _tmp38_;
+ if (_tmp31_ > _tmp32_) {
+#line 2496 "RajcePublishing.c"
+ gint _tmp33_;
#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp38_ = maxW;
+ _tmp33_ = maxW;
#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- maxH = _tmp38_;
-#line 2246 "RajcePublishing.c"
+ maxH = _tmp33_;
+#line 2502 "RajcePublishing.c"
}
#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp39_ = self->priv->session;
+ _tmp34_ = self->priv->session;
#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp40_ = sessionToken;
+ _tmp35_ = sessionToken;
#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp41_ = (gchar*) xmlNodeGetContent (_tmp40_);
+ _tmp36_ = (gchar*) xmlNodeGetContent (_tmp35_);
#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp42_ = _tmp41_;
+ _tmp37_ = _tmp36_;
#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp43_ = nick;
+ _tmp38_ = nick;
#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp44_ = (gchar*) xmlNodeGetContent (_tmp43_);
+ _tmp39_ = (gchar*) xmlNodeGetContent (_tmp38_);
#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp45_ = _tmp44_;
-#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp46_ = maxH;
+ _tmp40_ = _tmp39_;
#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp47_ = quality;
+ _tmp41_ = maxH;
#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp48_ = (gchar*) xmlNodeGetContent (_tmp47_);
+ _tmp42_ = quality;
#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp49_ = _tmp48_;
+ _tmp43_ = (gchar*) xmlNodeGetContent (_tmp42_);
#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp50_ = atoi (_tmp49_);
+ _tmp44_ = _tmp43_;
#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- publishing_rajce_session_authenticate (_tmp39_, _tmp42_, _tmp45_, 0, _tmp46_, _tmp50_);
+ publishing_rajce_session_authenticate (_tmp34_, _tmp37_, _tmp40_, 0, _tmp41_, atoi (_tmp44_));
#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _g_free0 (_tmp49_);
+ _g_free0 (_tmp44_);
#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _g_free0 (_tmp45_);
+ _g_free0 (_tmp40_);
#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _g_free0 (_tmp42_);
+ _g_free0 (_tmp37_);
#line 217 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_publishing_rest_support_xml_document_unref0 (doc);
-#line 2282 "RajcePublishing.c"
+#line 2536 "RajcePublishing.c"
}
goto __finally17;
__catch17_spit_publishing_publishing_error:
{
GError* err = NULL;
gint code_int = 0;
- GError* _tmp51_;
- const gchar* _tmp52_;
- gint _tmp53_;
- gint _tmp54_;
+ GError* _tmp45_;
+ const gchar* _tmp46_;
+ gint _tmp47_;
#line 217 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
err = _inner_error_;
#line 217 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_inner_error_ = NULL;
#line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp51_ = err;
-#line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp52_ = _tmp51_->message;
+ _tmp45_ = err;
#line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp53_ = atoi (_tmp52_);
+ _tmp46_ = _tmp45_->message;
#line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- code_int = _tmp53_;
+ code_int = atoi (_tmp46_);
#line 237 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp54_ = code_int;
+ _tmp47_ = code_int;
#line 237 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- if (_tmp54_ == 999) {
+ if (_tmp47_ == 999) {
#line 239 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_debug ("RajcePublishing.vala:239: ERROR: on_login_network_complete, code 999");
#line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_rajce_publisher_do_show_authentication_pane (self, PUBLISHING_RAJCE_AUTHENTICATION_PANE_MODE_FAILED_RETRY_USER);
-#line 2313 "RajcePublishing.c"
+#line 2564 "RajcePublishing.c"
} else {
- GError* _tmp55_;
+ GError* _tmp48_;
#line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_debug ("RajcePublishing.vala:244: ERROR: on_login_network_complete");
#line 245 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp55_ = err;
+ _tmp48_ = err;
#line 245 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- publishing_rajce_rajce_publisher_do_show_error (self, _tmp55_);
-#line 2322 "RajcePublishing.c"
+ publishing_rajce_rajce_publisher_do_show_error (self, _tmp48_);
+#line 2573 "RajcePublishing.c"
}
#line 247 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_error_free0 (err);
#line 247 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return;
-#line 2328 "RajcePublishing.c"
+#line 2579 "RajcePublishing.c"
}
__finally17:
#line 217 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -2336,22 +2587,24 @@ static void publishing_rajce_rajce_publisher_on_login_network_complete (Publishi
g_clear_error (&_inner_error_);
#line 217 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return;
-#line 2339 "RajcePublishing.c"
+#line 2590 "RajcePublishing.c"
}
#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_rajce_publisher_do_fetch_albums (self);
-#line 2343 "RajcePublishing.c"
+#line 2594 "RajcePublishing.c"
}
/**
* Event triggered when a network login action fails due to a network error.
*/
-static void publishing_rajce_rajce_publisher_on_login_network_error (PublishingRajceRajcePublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) {
- PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_rajce_rajce_publisher_on_login_network_error (PublishingRajceRajcePublisher* self,
+ PublishingRESTSupportTransaction* bad_txn,
+ GError* err)
+{
+ guint _tmp0_;
guint _tmp1_;
- PublishingRESTSupportTransaction* _tmp2_;
- guint _tmp3_;
#line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self));
#line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -2359,41 +2612,46 @@ static void publishing_rajce_rajce_publisher_on_login_network_error (PublishingR
#line 257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_debug ("RajcePublishing.vala:257: EVENT: on_login_network_error");
#line 258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp0_ = bad_txn;
-#line 258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
+ g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
#line 258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_login_network_complete_publishing_rest_support_transaction_completed, self);
+ g_signal_handlers_disconnect_matched (bad_txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_login_network_complete_publishing_rest_support_transaction_completed, self);
#line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp2_ = bad_txn;
+ g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
#line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_login_network_error_publishing_rest_support_transaction_network_error, self);
+ g_signal_handlers_disconnect_matched (bad_txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_login_network_error_publishing_rest_support_transaction_network_error, self);
#line 260 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_rajce_publisher_do_show_authentication_pane (self, PUBLISHING_RAJCE_AUTHENTICATION_PANE_MODE_FAILED_RETRY_USER);
-#line 2375 "RajcePublishing.c"
+#line 2624 "RajcePublishing.c"
}
/**
* Action that fetches all user albums from the Rajce.
*/
-static void _publishing_rajce_rajce_publisher_on_albums_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
+static void
+_publishing_rajce_rajce_publisher_on_albums_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+ GError* err,
+ gpointer self)
+{
#line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_rajce_publisher_on_albums_fetch_error ((PublishingRajceRajcePublisher*) self, _sender, err);
-#line 2385 "RajcePublishing.c"
+#line 2638 "RajcePublishing.c"
}
-static void _publishing_rajce_rajce_publisher_on_albums_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
+static void
+_publishing_rajce_rajce_publisher_on_albums_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+ gpointer self)
+{
#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_rajce_publisher_on_albums_fetch_complete ((PublishingRajceRajcePublisher*) self, _sender);
-#line 2392 "RajcePublishing.c"
+#line 2648 "RajcePublishing.c"
}
-static void publishing_rajce_rajce_publisher_do_fetch_albums (PublishingRajceRajcePublisher* self) {
+static void
+publishing_rajce_rajce_publisher_do_fetch_albums (PublishingRajceRajcePublisher* self)
+{
SpitPublishingPluginHost* _tmp0_;
SpitPublishingPluginHost* _tmp1_;
PublishingRajceGetAlbumsTransaction* get_albums_trans = NULL;
@@ -2433,7 +2691,7 @@ static void publishing_rajce_rajce_publisher_do_fetch_albums (PublishingRajceRaj
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (get_albums_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_rajce_rajce_publisher_on_albums_fetch_error_publishing_rest_support_transaction_network_error, self, 0);
#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (get_albums_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_rajce_rajce_publisher_on_albums_fetch_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 2436 "RajcePublishing.c"
+#line 2694 "RajcePublishing.c"
{
#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (get_albums_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
@@ -2441,7 +2699,7 @@ static void publishing_rajce_rajce_publisher_do_fetch_albums (PublishingRajceRaj
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2444 "RajcePublishing.c"
+#line 2702 "RajcePublishing.c"
goto __catch18_spit_publishing_publishing_error;
}
#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -2452,7 +2710,7 @@ static void publishing_rajce_rajce_publisher_do_fetch_albums (PublishingRajceRaj
g_clear_error (&_inner_error_);
#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return;
-#line 2455 "RajcePublishing.c"
+#line 2713 "RajcePublishing.c"
}
}
goto __finally18;
@@ -2472,7 +2730,7 @@ static void publishing_rajce_rajce_publisher_do_fetch_albums (PublishingRajceRaj
publishing_rajce_rajce_publisher_do_show_error (self, _tmp7_);
#line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_error_free0 (err);
-#line 2475 "RajcePublishing.c"
+#line 2733 "RajcePublishing.c"
}
__finally18:
#line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -2485,38 +2743,42 @@ static void publishing_rajce_rajce_publisher_do_fetch_albums (PublishingRajceRaj
g_clear_error (&_inner_error_);
#line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return;
-#line 2488 "RajcePublishing.c"
+#line 2746 "RajcePublishing.c"
}
#line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_publishing_rest_support_transaction_unref0 (get_albums_trans);
-#line 2492 "RajcePublishing.c"
+#line 2750 "RajcePublishing.c"
}
/**
* Event triggered when the fetch albums action completes successfully.
*/
-static gint _publishing_rajce_album_compare_albums_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self) {
+static gint
+_publishing_rajce_album_compare_albums_gcompare_data_func (gconstpointer a,
+ gconstpointer b,
+ gpointer self)
+{
gint result;
result = publishing_rajce_album_compare_albums ((PublishingRajceAlbum*) a, (PublishingRajceAlbum*) b);
#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return result;
-#line 2504 "RajcePublishing.c"
+#line 2766 "RajcePublishing.c"
}
-static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (PublishingRajceRajcePublisher* self, PublishingRESTSupportTransaction* txn) {
- PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_rajce_rajce_publisher_on_albums_fetch_complete (PublishingRajceRajcePublisher* self,
+ PublishingRESTSupportTransaction* txn)
+{
+ guint _tmp0_;
guint _tmp1_;
- PublishingRESTSupportTransaction* _tmp2_;
- guint _tmp3_;
- PublishingRESTSupportTransaction* _tmp4_;
- gchar* _tmp5_;
- gchar* _tmp6_;
- PublishingRajceAlbum** _tmp7_;
- gint _tmp7__length1;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
+ PublishingRajceAlbum** _tmp4_;
+ gint _tmp4__length1;
GeeArrayList* list = NULL;
- GeeArrayList* _tmp8_;
+ GeeArrayList* _tmp5_;
GError * _inner_error_ = NULL;
#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self));
@@ -2525,33 +2787,27 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin
#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_debug ("RajcePublishing.vala:292: EVENT: on_albums_fetch_complete");
#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp0_ = txn;
+ g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_albums_fetch_complete_publishing_rest_support_transaction_completed, self);
-#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp2_ = txn;
+ g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_albums_fetch_complete_publishing_rest_support_transaction_completed, self);
#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
+ g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_albums_fetch_error_publishing_rest_support_transaction_network_error, self);
+ g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_albums_fetch_error_publishing_rest_support_transaction_network_error, self);
#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp4_ = txn;
+ _tmp2_ = publishing_rest_support_transaction_get_response (txn);
#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp5_ = publishing_rest_support_transaction_get_response (_tmp4_);
-#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp6_ = _tmp5_;
+ _tmp3_ = _tmp2_;
#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_debug ("RajcePublishing.vala:295: RajcePlugin: list of albums: %s", _tmp6_);
+ g_debug ("RajcePublishing.vala:295: RajcePlugin: list of albums: %s", _tmp3_);
#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _g_free0 (_tmp6_);
+ _g_free0 (_tmp3_);
#line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp7_ = self->priv->albums;
+ _tmp4_ = self->priv->albums;
#line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp7__length1 = self->priv->albums_length1;
+ _tmp4__length1 = self->priv->albums_length1;
#line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- if (_tmp7_ != NULL) {
+ if (_tmp4_ != NULL) {
#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
self->priv->albums = (_vala_array_free (self->priv->albums, self->priv->albums_length1, (GDestroyNotify) publishing_rajce_album_unref), NULL);
#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -2560,58 +2816,55 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin
self->priv->albums_length1 = 0;
#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
self->priv->_albums_size_ = self->priv->albums_length1;
-#line 2563 "RajcePublishing.c"
+#line 2819 "RajcePublishing.c"
}
#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp8_ = gee_array_list_new (PUBLISHING_RAJCE_TYPE_ALBUM, (GBoxedCopyFunc) publishing_rajce_album_ref, (GDestroyNotify) publishing_rajce_album_unref, NULL, NULL, NULL);
+ _tmp5_ = gee_array_list_new (PUBLISHING_RAJCE_TYPE_ALBUM, (GBoxedCopyFunc) publishing_rajce_album_ref, (GDestroyNotify) publishing_rajce_album_unref, NULL, NULL, NULL);
#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- list = _tmp8_;
-#line 2569 "RajcePublishing.c"
+ list = _tmp5_;
+#line 2825 "RajcePublishing.c"
{
PublishingRESTSupportXmlDocument* doc = NULL;
- PublishingRESTSupportTransaction* _tmp9_;
- gchar* _tmp10_;
- gchar* _tmp11_;
- PublishingRESTSupportXmlDocument* _tmp12_;
- PublishingRESTSupportXmlDocument* _tmp13_;
+ gchar* _tmp6_;
+ gchar* _tmp7_;
+ PublishingRESTSupportXmlDocument* _tmp8_;
+ PublishingRESTSupportXmlDocument* _tmp9_;
xmlNode* response = NULL;
- PublishingRESTSupportXmlDocument* _tmp14_;
- xmlNode* _tmp15_;
+ PublishingRESTSupportXmlDocument* _tmp10_;
+ xmlNode* _tmp11_;
xmlNode* sessionToken = NULL;
- PublishingRESTSupportXmlDocument* _tmp16_;
- xmlNode* _tmp17_;
- xmlNode* _tmp18_;
+ PublishingRESTSupportXmlDocument* _tmp12_;
+ xmlNode* _tmp13_;
+ xmlNode* _tmp14_;
xmlNode* nodealbums = NULL;
- PublishingRESTSupportXmlDocument* _tmp19_;
- xmlNode* _tmp20_;
- xmlNode* _tmp21_;
- GeeArrayList* _tmp96_;
- GeeArrayList* _tmp97_;
- gint _tmp98_;
- gpointer* _tmp99_;
- PublishingRajceSession* _tmp100_;
- xmlNode* _tmp101_;
- gchar* _tmp102_;
- gchar* _tmp103_;
-#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp9_ = txn;
+ PublishingRESTSupportXmlDocument* _tmp15_;
+ xmlNode* _tmp16_;
+ xmlNode* _tmp17_;
+ GeeArrayList* _tmp88_;
+ GeeArrayList* _tmp89_;
+ gint _tmp90_;
+ gpointer* _tmp91_;
+ PublishingRajceSession* _tmp92_;
+ xmlNode* _tmp93_;
+ gchar* _tmp94_;
+ gchar* _tmp95_;
#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp10_ = publishing_rest_support_transaction_get_response (_tmp9_);
+ _tmp6_ = publishing_rest_support_transaction_get_response (txn);
#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp11_ = _tmp10_;
+ _tmp7_ = _tmp6_;
#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp12_ = publishing_rest_support_xml_document_parse_string (_tmp11_, _publishing_rajce_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response, NULL, &_inner_error_);
+ _tmp8_ = publishing_rest_support_xml_document_parse_string (_tmp7_, _publishing_rajce_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response, NULL, &_inner_error_);
#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp13_ = _tmp12_;
+ _tmp9_ = _tmp8_;
#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _g_free0 (_tmp11_);
+ _g_free0 (_tmp7_);
#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- doc = _tmp13_;
+ doc = _tmp9_;
#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2614 "RajcePublishing.c"
+#line 2867 "RajcePublishing.c"
goto __catch19_spit_publishing_publishing_error;
}
#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -2622,29 +2875,29 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin
g_clear_error (&_inner_error_);
#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return;
-#line 2625 "RajcePublishing.c"
+#line 2878 "RajcePublishing.c"
}
#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp14_ = doc;
+ _tmp10_ = doc;
#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp15_ = publishing_rest_support_xml_document_get_root_node (_tmp14_);
+ _tmp11_ = publishing_rest_support_xml_document_get_root_node (_tmp10_);
#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- response = _tmp15_;
+ response = _tmp11_;
#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp16_ = doc;
+ _tmp12_ = doc;
#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp17_ = response;
+ _tmp13_ = response;
#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp18_ = publishing_rest_support_xml_document_get_named_child (_tmp16_, _tmp17_, "sessionToken", &_inner_error_);
+ _tmp14_ = publishing_rest_support_xml_document_get_named_child (_tmp12_, _tmp13_, "sessionToken", &_inner_error_);
#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- sessionToken = _tmp18_;
+ sessionToken = _tmp14_;
#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_publishing_rest_support_xml_document_unref0 (doc);
#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2647 "RajcePublishing.c"
+#line 2900 "RajcePublishing.c"
goto __catch19_spit_publishing_publishing_error;
}
#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -2657,23 +2910,23 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin
g_clear_error (&_inner_error_);
#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return;
-#line 2660 "RajcePublishing.c"
+#line 2913 "RajcePublishing.c"
}
#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp19_ = doc;
+ _tmp15_ = doc;
#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp20_ = response;
+ _tmp16_ = response;
#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp21_ = publishing_rest_support_xml_document_get_named_child (_tmp19_, _tmp20_, "albums", &_inner_error_);
+ _tmp17_ = publishing_rest_support_xml_document_get_named_child (_tmp15_, _tmp16_, "albums", &_inner_error_);
#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- nodealbums = _tmp21_;
+ nodealbums = _tmp17_;
#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_publishing_rest_support_xml_document_unref0 (doc);
#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2676 "RajcePublishing.c"
+#line 2929 "RajcePublishing.c"
goto __catch19_spit_publishing_publishing_error;
}
#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -2686,156 +2939,150 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin
g_clear_error (&_inner_error_);
#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return;
-#line 2689 "RajcePublishing.c"
+#line 2942 "RajcePublishing.c"
}
{
xmlNode* album = NULL;
- xmlNode* _tmp22_;
- xmlNode* _tmp23_;
+ xmlNode* _tmp18_;
+ xmlNode* _tmp19_;
#line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp22_ = nodealbums;
+ _tmp18_ = nodealbums;
#line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp23_ = _tmp22_->children;
+ _tmp19_ = _tmp18_->children;
#line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- album = _tmp23_;
-#line 2701 "RajcePublishing.c"
+ album = _tmp19_;
+#line 2954 "RajcePublishing.c"
{
- gboolean _tmp24_ = FALSE;
+ gboolean _tmp20_ = FALSE;
#line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp24_ = TRUE;
+ _tmp20_ = TRUE;
#line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
while (TRUE) {
-#line 2708 "RajcePublishing.c"
- xmlNode* _tmp27_;
+#line 2961 "RajcePublishing.c"
+ xmlNode* _tmp23_;
gint id = 0;
- xmlNode* _tmp28_;
- gchar* _tmp29_;
- gchar* _tmp30_;
- gint _tmp31_;
- gint _tmp32_;
+ xmlNode* _tmp24_;
+ gchar* _tmp25_;
+ gchar* _tmp26_;
+ gint _tmp27_;
+ xmlNode* _tmp28_ = NULL;
+ PublishingRESTSupportXmlDocument* _tmp29_;
+ xmlNode* _tmp30_;
+ xmlNode* _tmp31_;
+ gchar* albumName = NULL;
+ gchar* _tmp32_;
xmlNode* _tmp33_ = NULL;
PublishingRESTSupportXmlDocument* _tmp34_;
xmlNode* _tmp35_;
xmlNode* _tmp36_;
- gchar* albumName = NULL;
+ gchar* url = NULL;
gchar* _tmp37_;
xmlNode* _tmp38_ = NULL;
PublishingRESTSupportXmlDocument* _tmp39_;
xmlNode* _tmp40_;
xmlNode* _tmp41_;
- gchar* url = NULL;
+ gchar* thumbUrl = NULL;
gchar* _tmp42_;
xmlNode* _tmp43_ = NULL;
PublishingRESTSupportXmlDocument* _tmp44_;
xmlNode* _tmp45_;
xmlNode* _tmp46_;
- gchar* thumbUrl = NULL;
+ gchar* createDate = NULL;
gchar* _tmp47_;
xmlNode* _tmp48_ = NULL;
PublishingRESTSupportXmlDocument* _tmp49_;
xmlNode* _tmp50_;
xmlNode* _tmp51_;
- gchar* createDate = NULL;
+ gchar* updateDate = NULL;
gchar* _tmp52_;
- xmlNode* _tmp53_ = NULL;
- PublishingRESTSupportXmlDocument* _tmp54_;
- xmlNode* _tmp55_;
+ gboolean _tmp53_ = FALSE;
+ xmlNode* _tmp54_ = NULL;
+ PublishingRESTSupportXmlDocument* _tmp55_;
xmlNode* _tmp56_;
- gchar* updateDate = NULL;
- gchar* _tmp57_;
- gboolean _tmp58_ = FALSE;
- xmlNode* _tmp59_ = NULL;
- PublishingRESTSupportXmlDocument* _tmp60_;
- xmlNode* _tmp61_;
- xmlNode* _tmp62_;
- gchar* _tmp63_;
- gchar* _tmp64_;
- gint _tmp65_;
- gboolean _tmp66_;
+ xmlNode* _tmp57_;
+ gchar* _tmp58_;
+ gchar* _tmp59_;
+ gboolean _tmp60_;
gboolean hidden = FALSE;
- gboolean _tmp67_ = FALSE;
- xmlNode* _tmp68_ = NULL;
- PublishingRESTSupportXmlDocument* _tmp69_;
- xmlNode* _tmp70_;
- xmlNode* _tmp71_;
- gchar* _tmp72_;
- gchar* _tmp73_;
- gint _tmp74_;
- gboolean _tmp75_;
+ gboolean _tmp61_ = FALSE;
+ xmlNode* _tmp62_ = NULL;
+ PublishingRESTSupportXmlDocument* _tmp63_;
+ xmlNode* _tmp64_;
+ xmlNode* _tmp65_;
+ gchar* _tmp66_;
+ gchar* _tmp67_;
+ gboolean _tmp68_;
gboolean secure = FALSE;
- xmlNode* _tmp76_ = NULL;
- PublishingRESTSupportXmlDocument* _tmp77_;
- xmlNode* _tmp78_;
- xmlNode* _tmp79_;
+ xmlNode* _tmp69_ = NULL;
+ PublishingRESTSupportXmlDocument* _tmp70_;
+ xmlNode* _tmp71_;
+ xmlNode* _tmp72_;
gint photoCount = 0;
- gchar* _tmp80_;
- gchar* _tmp81_;
- gint _tmp82_;
- gint _tmp83_;
- GeeArrayList* _tmp84_;
+ gchar* _tmp73_;
+ gchar* _tmp74_;
+ gint _tmp75_;
+ GeeArrayList* _tmp76_;
+ gint _tmp77_;
+ const gchar* _tmp78_;
+ const gchar* _tmp79_;
+ const gchar* _tmp80_;
+ const gchar* _tmp81_;
+ const gchar* _tmp82_;
+ gboolean _tmp83_;
+ gboolean _tmp84_;
gint _tmp85_;
- const gchar* _tmp86_;
- const gchar* _tmp87_;
- const gchar* _tmp88_;
- const gchar* _tmp89_;
- const gchar* _tmp90_;
- gboolean _tmp91_;
- gboolean _tmp92_;
- gint _tmp93_;
- PublishingRajceAlbum* _tmp94_;
- PublishingRajceAlbum* _tmp95_;
+ PublishingRajceAlbum* _tmp86_;
+ PublishingRajceAlbum* _tmp87_;
#line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- if (!_tmp24_) {
-#line 2789 "RajcePublishing.c"
- xmlNode* _tmp25_;
- xmlNode* _tmp26_;
+ if (!_tmp20_) {
+#line 3038 "RajcePublishing.c"
+ xmlNode* _tmp21_;
+ xmlNode* _tmp22_;
#line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp25_ = album;
+ _tmp21_ = album;
#line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp26_ = _tmp25_->next;
+ _tmp22_ = _tmp21_->next;
#line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- album = _tmp26_;
-#line 2798 "RajcePublishing.c"
+ album = _tmp22_;
+#line 3047 "RajcePublishing.c"
}
#line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp24_ = FALSE;
+ _tmp20_ = FALSE;
#line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp27_ = album;
+ _tmp23_ = album;
#line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- if (!(_tmp27_ != NULL)) {
+ if (!(_tmp23_ != NULL)) {
#line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
break;
-#line 2808 "RajcePublishing.c"
+#line 3057 "RajcePublishing.c"
}
#line 309 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp28_ = album;
-#line 309 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp29_ = (gchar*) xmlGetProp (_tmp28_, (xmlChar*) "id");
+ _tmp24_ = album;
#line 309 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp30_ = _tmp29_;
+ _tmp25_ = (gchar*) xmlGetProp (_tmp24_, (xmlChar*) "id");
#line 309 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp31_ = atoi (_tmp30_);
+ _tmp26_ = _tmp25_;
#line 309 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp32_ = _tmp31_;
+ _tmp27_ = atoi (_tmp26_);
#line 309 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _g_free0 (_tmp30_);
+ _g_free0 (_tmp26_);
#line 309 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- id = _tmp32_;
+ id = _tmp27_;
#line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp34_ = doc;
+ _tmp29_ = doc;
#line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp35_ = album;
+ _tmp30_ = album;
#line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp36_ = publishing_rest_support_xml_document_get_named_child (_tmp34_, _tmp35_, "albumName", &_inner_error_);
+ _tmp31_ = publishing_rest_support_xml_document_get_named_child (_tmp29_, _tmp30_, "albumName", &_inner_error_);
#line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp33_ = _tmp36_;
+ _tmp28_ = _tmp31_;
#line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_publishing_rest_support_xml_document_unref0 (doc);
#line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2838 "RajcePublishing.c"
+#line 3085 "RajcePublishing.c"
goto __catch19_spit_publishing_publishing_error;
}
#line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -2848,20 +3095,20 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin
g_clear_error (&_inner_error_);
#line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return;
-#line 2851 "RajcePublishing.c"
+#line 3098 "RajcePublishing.c"
}
#line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp37_ = (gchar*) xmlNodeGetContent (_tmp33_);
+ _tmp32_ = (gchar*) xmlNodeGetContent (_tmp28_);
#line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- albumName = _tmp37_;
+ albumName = _tmp32_;
#line 311 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp39_ = doc;
+ _tmp34_ = doc;
#line 311 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp40_ = album;
+ _tmp35_ = album;
#line 311 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp41_ = publishing_rest_support_xml_document_get_named_child (_tmp39_, _tmp40_, "url", &_inner_error_);
+ _tmp36_ = publishing_rest_support_xml_document_get_named_child (_tmp34_, _tmp35_, "url", &_inner_error_);
#line 311 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp38_ = _tmp41_;
+ _tmp33_ = _tmp36_;
#line 311 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 311 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -2870,7 +3117,7 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin
_publishing_rest_support_xml_document_unref0 (doc);
#line 311 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2873 "RajcePublishing.c"
+#line 3120 "RajcePublishing.c"
goto __catch19_spit_publishing_publishing_error;
}
#line 311 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -2885,20 +3132,20 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin
g_clear_error (&_inner_error_);
#line 311 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return;
-#line 2888 "RajcePublishing.c"
+#line 3135 "RajcePublishing.c"
}
#line 311 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp42_ = (gchar*) xmlNodeGetContent (_tmp38_);
+ _tmp37_ = (gchar*) xmlNodeGetContent (_tmp33_);
#line 311 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- url = _tmp42_;
+ url = _tmp37_;
#line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp44_ = doc;
+ _tmp39_ = doc;
#line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp45_ = album;
+ _tmp40_ = album;
#line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp46_ = publishing_rest_support_xml_document_get_named_child (_tmp44_, _tmp45_, "thumbUrl", &_inner_error_);
+ _tmp41_ = publishing_rest_support_xml_document_get_named_child (_tmp39_, _tmp40_, "thumbUrl", &_inner_error_);
#line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp43_ = _tmp46_;
+ _tmp38_ = _tmp41_;
#line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -2909,7 +3156,7 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin
_publishing_rest_support_xml_document_unref0 (doc);
#line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2912 "RajcePublishing.c"
+#line 3159 "RajcePublishing.c"
goto __catch19_spit_publishing_publishing_error;
}
#line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -2926,20 +3173,20 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin
g_clear_error (&_inner_error_);
#line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return;
-#line 2929 "RajcePublishing.c"
+#line 3176 "RajcePublishing.c"
}
#line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp47_ = (gchar*) xmlNodeGetContent (_tmp43_);
+ _tmp42_ = (gchar*) xmlNodeGetContent (_tmp38_);
#line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- thumbUrl = _tmp47_;
+ thumbUrl = _tmp42_;
#line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp49_ = doc;
+ _tmp44_ = doc;
#line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp50_ = album;
+ _tmp45_ = album;
#line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp51_ = publishing_rest_support_xml_document_get_named_child (_tmp49_, _tmp50_, "createDate", &_inner_error_);
+ _tmp46_ = publishing_rest_support_xml_document_get_named_child (_tmp44_, _tmp45_, "createDate", &_inner_error_);
#line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp48_ = _tmp51_;
+ _tmp43_ = _tmp46_;
#line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -2952,7 +3199,7 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin
_publishing_rest_support_xml_document_unref0 (doc);
#line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2955 "RajcePublishing.c"
+#line 3202 "RajcePublishing.c"
goto __catch19_spit_publishing_publishing_error;
}
#line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -2971,20 +3218,20 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin
g_clear_error (&_inner_error_);
#line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return;
-#line 2974 "RajcePublishing.c"
+#line 3221 "RajcePublishing.c"
}
#line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp52_ = (gchar*) xmlNodeGetContent (_tmp48_);
+ _tmp47_ = (gchar*) xmlNodeGetContent (_tmp43_);
#line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- createDate = _tmp52_;
+ createDate = _tmp47_;
#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp54_ = doc;
+ _tmp49_ = doc;
#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp55_ = album;
+ _tmp50_ = album;
#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp56_ = publishing_rest_support_xml_document_get_named_child (_tmp54_, _tmp55_, "updateDate", &_inner_error_);
+ _tmp51_ = publishing_rest_support_xml_document_get_named_child (_tmp49_, _tmp50_, "updateDate", &_inner_error_);
#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp53_ = _tmp56_;
+ _tmp48_ = _tmp51_;
#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -2999,7 +3246,7 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin
_publishing_rest_support_xml_document_unref0 (doc);
#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3002 "RajcePublishing.c"
+#line 3249 "RajcePublishing.c"
goto __catch19_spit_publishing_publishing_error;
}
#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -3020,20 +3267,20 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin
g_clear_error (&_inner_error_);
#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return;
-#line 3023 "RajcePublishing.c"
+#line 3270 "RajcePublishing.c"
}
#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp57_ = (gchar*) xmlNodeGetContent (_tmp53_);
+ _tmp52_ = (gchar*) xmlNodeGetContent (_tmp48_);
#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- updateDate = _tmp57_;
+ updateDate = _tmp52_;
#line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp60_ = doc;
+ _tmp55_ = doc;
#line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp61_ = album;
+ _tmp56_ = album;
#line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp62_ = publishing_rest_support_xml_document_get_named_child (_tmp60_, _tmp61_, "hidden", &_inner_error_);
+ _tmp57_ = publishing_rest_support_xml_document_get_named_child (_tmp55_, _tmp56_, "hidden", &_inner_error_);
#line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp59_ = _tmp62_;
+ _tmp54_ = _tmp57_;
#line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -3050,7 +3297,7 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin
_publishing_rest_support_xml_document_unref0 (doc);
#line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3053 "RajcePublishing.c"
+#line 3300 "RajcePublishing.c"
goto __catch19_spit_publishing_publishing_error;
}
#line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -3073,38 +3320,36 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin
g_clear_error (&_inner_error_);
#line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return;
-#line 3076 "RajcePublishing.c"
+#line 3323 "RajcePublishing.c"
}
#line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp63_ = (gchar*) xmlNodeGetContent (_tmp59_);
+ _tmp58_ = (gchar*) xmlNodeGetContent (_tmp54_);
#line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp64_ = _tmp63_;
+ _tmp59_ = _tmp58_;
#line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp65_ = atoi (_tmp64_);
+ _tmp60_ = atoi (_tmp59_) > 0;
#line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp66_ = _tmp65_ > 0;
+ _g_free0 (_tmp59_);
#line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _g_free0 (_tmp64_);
+ if (_tmp60_) {
#line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- if (_tmp66_) {
-#line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp58_ = TRUE;
-#line 3092 "RajcePublishing.c"
+ _tmp53_ = TRUE;
+#line 3337 "RajcePublishing.c"
} else {
#line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp58_ = FALSE;
-#line 3096 "RajcePublishing.c"
+ _tmp53_ = FALSE;
+#line 3341 "RajcePublishing.c"
}
#line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- hidden = _tmp58_;
+ hidden = _tmp53_;
#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp69_ = doc;
+ _tmp63_ = doc;
#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp70_ = album;
+ _tmp64_ = album;
#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp71_ = publishing_rest_support_xml_document_get_named_child (_tmp69_, _tmp70_, "secure", &_inner_error_);
+ _tmp65_ = publishing_rest_support_xml_document_get_named_child (_tmp63_, _tmp64_, "secure", &_inner_error_);
#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp68_ = _tmp71_;
+ _tmp62_ = _tmp65_;
#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -3121,7 +3366,7 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin
_publishing_rest_support_xml_document_unref0 (doc);
#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3124 "RajcePublishing.c"
+#line 3369 "RajcePublishing.c"
goto __catch19_spit_publishing_publishing_error;
}
#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -3144,38 +3389,36 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin
g_clear_error (&_inner_error_);
#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return;
-#line 3147 "RajcePublishing.c"
+#line 3392 "RajcePublishing.c"
}
#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp72_ = (gchar*) xmlNodeGetContent (_tmp68_);
-#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp73_ = _tmp72_;
+ _tmp66_ = (gchar*) xmlNodeGetContent (_tmp62_);
#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp74_ = atoi (_tmp73_);
+ _tmp67_ = _tmp66_;
#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp75_ = _tmp74_ > 0;
+ _tmp68_ = atoi (_tmp67_) > 0;
#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _g_free0 (_tmp73_);
+ _g_free0 (_tmp67_);
#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- if (_tmp75_) {
+ if (_tmp68_) {
#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp67_ = TRUE;
-#line 3163 "RajcePublishing.c"
+ _tmp61_ = TRUE;
+#line 3406 "RajcePublishing.c"
} else {
#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp67_ = FALSE;
-#line 3167 "RajcePublishing.c"
+ _tmp61_ = FALSE;
+#line 3410 "RajcePublishing.c"
}
#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- secure = _tmp67_;
+ secure = _tmp61_;
#line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp77_ = doc;
+ _tmp70_ = doc;
#line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp78_ = album;
+ _tmp71_ = album;
#line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp79_ = publishing_rest_support_xml_document_get_named_child (_tmp77_, _tmp78_, "photoCount", &_inner_error_);
+ _tmp72_ = publishing_rest_support_xml_document_get_named_child (_tmp70_, _tmp71_, "photoCount", &_inner_error_);
#line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp76_ = _tmp79_;
+ _tmp69_ = _tmp72_;
#line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -3192,7 +3435,7 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin
_publishing_rest_support_xml_document_unref0 (doc);
#line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3195 "RajcePublishing.c"
+#line 3438 "RajcePublishing.c"
goto __catch19_spit_publishing_publishing_error;
}
#line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -3215,48 +3458,46 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin
g_clear_error (&_inner_error_);
#line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return;
-#line 3218 "RajcePublishing.c"
+#line 3461 "RajcePublishing.c"
}
#line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp80_ = (gchar*) xmlNodeGetContent (_tmp76_);
+ _tmp73_ = (gchar*) xmlNodeGetContent (_tmp69_);
#line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp81_ = _tmp80_;
+ _tmp74_ = _tmp73_;
#line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp82_ = atoi (_tmp81_);
+ _tmp75_ = atoi (_tmp74_);
#line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp83_ = _tmp82_;
+ _g_free0 (_tmp74_);
#line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _g_free0 (_tmp81_);
-#line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- photoCount = _tmp83_;
+ photoCount = _tmp75_;
#line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp84_ = list;
+ _tmp76_ = list;
#line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp85_ = id;
+ _tmp77_ = id;
#line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp86_ = albumName;
+ _tmp78_ = albumName;
#line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp87_ = url;
+ _tmp79_ = url;
#line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp88_ = thumbUrl;
+ _tmp80_ = thumbUrl;
#line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp89_ = createDate;
+ _tmp81_ = createDate;
#line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp90_ = updateDate;
+ _tmp82_ = updateDate;
#line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp91_ = hidden;
+ _tmp83_ = hidden;
#line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp92_ = secure;
+ _tmp84_ = secure;
#line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp93_ = photoCount;
+ _tmp85_ = photoCount;
#line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp94_ = publishing_rajce_album_new (_tmp85_, _tmp86_, _tmp87_, _tmp88_, _tmp89_, _tmp90_, _tmp91_, _tmp92_, _tmp93_);
+ _tmp86_ = publishing_rajce_album_new (_tmp77_, _tmp78_, _tmp79_, _tmp80_, _tmp81_, _tmp82_, _tmp83_, _tmp84_, _tmp85_);
#line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp95_ = _tmp94_;
+ _tmp87_ = _tmp86_;
#line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- gee_abstract_list_insert (G_TYPE_CHECK_INSTANCE_CAST (_tmp84_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0, _tmp95_);
+ gee_abstract_list_insert (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0, _tmp87_);
#line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _publishing_rajce_album_unref0 (_tmp95_);
+ _publishing_rajce_album_unref0 (_tmp87_);
#line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_free0 (updateDate);
#line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -3267,47 +3508,47 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin
_g_free0 (url);
#line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_free0 (albumName);
-#line 3270 "RajcePublishing.c"
+#line 3511 "RajcePublishing.c"
}
}
}
#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp96_ = list;
+ _tmp88_ = list;
#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- gee_list_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp96_, GEE_TYPE_LIST, GeeList), _publishing_rajce_album_compare_albums_gcompare_data_func, NULL, NULL);
+ gee_list_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp88_, GEE_TYPE_LIST, GeeList), _publishing_rajce_album_compare_albums_gcompare_data_func, NULL, NULL);
#line 321 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp97_ = list;
+ _tmp89_ = list;
#line 321 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp99_ = gee_collection_to_array (G_TYPE_CHECK_INSTANCE_CAST (_tmp97_, GEE_TYPE_COLLECTION, GeeCollection), &_tmp98_);
+ _tmp91_ = gee_collection_to_array (G_TYPE_CHECK_INSTANCE_CAST (_tmp89_, GEE_TYPE_COLLECTION, GeeCollection), &_tmp90_);
#line 321 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
self->priv->albums = (_vala_array_free (self->priv->albums, self->priv->albums_length1, (GDestroyNotify) publishing_rajce_album_unref), NULL);
#line 321 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- self->priv->albums = _tmp99_;
+ self->priv->albums = _tmp91_;
#line 321 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- self->priv->albums_length1 = _tmp98_;
+ self->priv->albums_length1 = _tmp90_;
#line 321 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
self->priv->_albums_size_ = self->priv->albums_length1;
#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp100_ = self->priv->session;
+ _tmp92_ = self->priv->session;
#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp101_ = sessionToken;
+ _tmp93_ = sessionToken;
#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp102_ = (gchar*) xmlNodeGetContent (_tmp101_);
+ _tmp94_ = (gchar*) xmlNodeGetContent (_tmp93_);
#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp103_ = _tmp102_;
+ _tmp95_ = _tmp94_;
#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- publishing_rajce_session_set_usertoken (_tmp100_, _tmp103_);
+ publishing_rajce_session_set_usertoken (_tmp92_, _tmp95_);
#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _g_free0 (_tmp103_);
+ _g_free0 (_tmp95_);
#line 301 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_publishing_rest_support_xml_document_unref0 (doc);
-#line 3304 "RajcePublishing.c"
+#line 3545 "RajcePublishing.c"
}
goto __finally19;
__catch19_spit_publishing_publishing_error:
{
GError* err = NULL;
- GError* _tmp104_;
+ GError* _tmp96_;
#line 301 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
err = _inner_error_;
#line 301 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -3315,16 +3556,16 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin
#line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_debug ("RajcePublishing.vala:326: ERROR: on_albums_fetch_complete");
#line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp104_ = err;
+ _tmp96_ = err;
#line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- publishing_rajce_rajce_publisher_do_show_error (self, _tmp104_);
+ publishing_rajce_rajce_publisher_do_show_error (self, _tmp96_);
#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_error_free0 (err);
#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_object_unref0 (list);
#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return;
-#line 3327 "RajcePublishing.c"
+#line 3568 "RajcePublishing.c"
}
__finally19:
#line 301 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -3337,26 +3578,26 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_complete (Publishin
g_clear_error (&_inner_error_);
#line 301 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return;
-#line 3340 "RajcePublishing.c"
+#line 3581 "RajcePublishing.c"
}
#line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_rajce_publisher_do_show_publishing_options_pane (self);
#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_object_unref0 (list);
-#line 3346 "RajcePublishing.c"
+#line 3587 "RajcePublishing.c"
}
/**
* Event triggered when the fetch albums transaction fails due to a network error.
*/
-static void publishing_rajce_rajce_publisher_on_albums_fetch_error (PublishingRajceRajcePublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) {
- PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_rajce_rajce_publisher_on_albums_fetch_error (PublishingRajceRajcePublisher* self,
+ PublishingRESTSupportTransaction* bad_txn,
+ GError* err)
+{
+ guint _tmp0_;
guint _tmp1_;
- PublishingRESTSupportTransaction* _tmp2_;
- guint _tmp3_;
- PublishingRESTSupportTransaction* _tmp4_;
- GError* _tmp5_;
#line 336 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self));
#line 336 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -3364,45 +3605,46 @@ static void publishing_rajce_rajce_publisher_on_albums_fetch_error (PublishingRa
#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_debug ("RajcePublishing.vala:338: EVENT: on_albums_fetch_error");
#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp0_ = bad_txn;
+ g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_albums_fetch_complete_publishing_rest_support_transaction_completed, self);
-#line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp2_ = bad_txn;
+ g_signal_handlers_disconnect_matched (bad_txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_albums_fetch_complete_publishing_rest_support_transaction_completed, self);
#line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
+ g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
#line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_albums_fetch_error_publishing_rest_support_transaction_network_error, self);
+ g_signal_handlers_disconnect_matched (bad_txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_albums_fetch_error_publishing_rest_support_transaction_network_error, self);
#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp4_ = bad_txn;
-#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp5_ = err;
-#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- publishing_rajce_rajce_publisher_on_network_error (self, _tmp4_, _tmp5_);
-#line 3384 "RajcePublishing.c"
+ publishing_rajce_rajce_publisher_on_network_error (self, bad_txn, err);
+#line 3617 "RajcePublishing.c"
}
/**
* Action that shows the publishing options pane.
*/
-static void _publishing_rajce_rajce_publisher_on_publishing_options_pane_logout_clicked_publishing_rajce_publishing_options_pane_logout (PublishingRajcePublishingOptionsPane* _sender, gpointer self) {
+static void
+_publishing_rajce_rajce_publisher_on_publishing_options_pane_logout_clicked_publishing_rajce_publishing_options_pane_logout (PublishingRajcePublishingOptionsPane* _sender,
+ gpointer self)
+{
#line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_rajce_publisher_on_publishing_options_pane_logout_clicked ((PublishingRajceRajcePublisher*) self);
-#line 3394 "RajcePublishing.c"
+#line 3630 "RajcePublishing.c"
}
-static void _publishing_rajce_rajce_publisher_on_publishing_options_pane_publish_clicked_publishing_rajce_publishing_options_pane_publish (PublishingRajcePublishingOptionsPane* _sender, PublishingRajcePublishingParameters* parameters, gpointer self) {
+static void
+_publishing_rajce_rajce_publisher_on_publishing_options_pane_publish_clicked_publishing_rajce_publishing_options_pane_publish (PublishingRajcePublishingOptionsPane* _sender,
+ PublishingRajcePublishingParameters* parameters,
+ gpointer self)
+{
#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_rajce_publisher_on_publishing_options_pane_publish_clicked ((PublishingRajceRajcePublisher*) self, parameters);
-#line 3401 "RajcePublishing.c"
+#line 3641 "RajcePublishing.c"
}
-static void publishing_rajce_rajce_publisher_do_show_publishing_options_pane (PublishingRajceRajcePublisher* self) {
+static void
+publishing_rajce_rajce_publisher_do_show_publishing_options_pane (PublishingRajceRajcePublisher* self)
+{
SpitPublishingPluginHost* _tmp0_;
PublishingRajcePublishingOptionsPane* opts_pane = NULL;
PublishingRajceSession* _tmp1_;
@@ -3462,14 +3704,16 @@ static void publishing_rajce_rajce_publisher_do_show_publishing_options_pane (Pu
_g_object_unref0 (_tmp10_);
#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_object_unref0 (opts_pane);
-#line 3465 "RajcePublishing.c"
+#line 3707 "RajcePublishing.c"
}
/**
* Event triggered when the user clicks logout in the publishing options pane.
*/
-static void publishing_rajce_rajce_publisher_on_publishing_options_pane_logout_clicked (PublishingRajceRajcePublisher* self) {
+static void
+publishing_rajce_rajce_publisher_on_publishing_options_pane_logout_clicked (PublishingRajceRajcePublisher* self)
+{
PublishingRajceSession* _tmp0_;
#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self));
@@ -3482,7 +3726,7 @@ static void publishing_rajce_rajce_publisher_on_publishing_options_pane_logout_c
publishing_rajce_session_deauthenticate (_tmp0_);
#line 365 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_rajce_publisher_do_show_authentication_pane (self, PUBLISHING_RAJCE_AUTHENTICATION_PANE_MODE_INTRO);
-#line 3484 "RajcePublishing.c"
+#line 3728 "RajcePublishing.c"
}
@@ -3491,16 +3735,20 @@ static void publishing_rajce_rajce_publisher_on_publishing_options_pane_logout_c
*
* @param parameters the publishing parameters
*/
-static gpointer _publishing_rajce_publishing_parameters_ref0 (gpointer self) {
+static gpointer
+_publishing_rajce_publishing_parameters_ref0 (gpointer self)
+{
#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return self ? publishing_rajce_publishing_parameters_ref (self) : NULL;
-#line 3496 "RajcePublishing.c"
+#line 3742 "RajcePublishing.c"
}
-static void publishing_rajce_rajce_publisher_on_publishing_options_pane_publish_clicked (PublishingRajceRajcePublisher* self, PublishingRajcePublishingParameters* parameters) {
+static void
+publishing_rajce_rajce_publisher_on_publishing_options_pane_publish_clicked (PublishingRajceRajcePublisher* self,
+ PublishingRajcePublishingParameters* parameters)
+{
PublishingRajcePublishingParameters* _tmp0_;
- PublishingRajcePublishingParameters* _tmp1_;
#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self));
#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -3509,76 +3757,93 @@ static void publishing_rajce_rajce_publisher_on_publishing_options_pane_publish_
g_debug ("RajcePublishing.vala:375: EVENT: on_publishing_options_pane_publish_cl" \
"icked");
#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp0_ = parameters;
-#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp1_ = _publishing_rajce_publishing_parameters_ref0 (_tmp0_);
+ _tmp0_ = _publishing_rajce_publishing_parameters_ref0 (parameters);
#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_publishing_rajce_publishing_parameters_unref0 (self->priv->parameters);
#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- self->priv->parameters = _tmp1_;
+ self->priv->parameters = _tmp0_;
#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_rajce_publisher_do_begin_upload (self);
-#line 3519 "RajcePublishing.c"
+#line 3765 "RajcePublishing.c"
}
/**
* Begin upload action: open existing album or create a new one
*/
-static gboolean _int_equal (const gint * s1, const gint * s2) {
+static gboolean
+_int_equal (const gint * s1,
+ const gint * s2)
+{
#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (s1 == s2) {
#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return TRUE;
-#line 3531 "RajcePublishing.c"
+#line 3780 "RajcePublishing.c"
}
#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (s1 == NULL) {
#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return FALSE;
-#line 3537 "RajcePublishing.c"
+#line 3786 "RajcePublishing.c"
}
#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (s2 == NULL) {
#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return FALSE;
-#line 3543 "RajcePublishing.c"
+#line 3792 "RajcePublishing.c"
}
#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return (*s1) == (*s2);
-#line 3547 "RajcePublishing.c"
+#line 3796 "RajcePublishing.c"
}
-static void _publishing_rajce_rajce_publisher_on_create_album_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
+static void
+_publishing_rajce_rajce_publisher_on_create_album_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+ GError* err,
+ gpointer self)
+{
#line 391 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_rajce_publisher_on_create_album_error ((PublishingRajceRajcePublisher*) self, _sender, err);
-#line 3554 "RajcePublishing.c"
+#line 3807 "RajcePublishing.c"
}
-static void _publishing_rajce_rajce_publisher_on_create_album_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
+static void
+_publishing_rajce_rajce_publisher_on_create_album_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+ gpointer self)
+{
#line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_rajce_publisher_on_create_album_complete ((PublishingRajceRajcePublisher*) self, _sender);
-#line 3561 "RajcePublishing.c"
+#line 3817 "RajcePublishing.c"
}
-static void _publishing_rajce_rajce_publisher_on_open_album_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
+static void
+_publishing_rajce_rajce_publisher_on_open_album_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+ GError* err,
+ gpointer self)
+{
#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_rajce_publisher_on_open_album_error ((PublishingRajceRajcePublisher*) self, _sender, err);
-#line 3568 "RajcePublishing.c"
+#line 3828 "RajcePublishing.c"
}
-static void _publishing_rajce_rajce_publisher_on_open_album_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
+static void
+_publishing_rajce_rajce_publisher_on_open_album_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+ gpointer self)
+{
#line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_rajce_publisher_on_open_album_complete ((PublishingRajceRajcePublisher*) self, _sender);
-#line 3575 "RajcePublishing.c"
+#line 3838 "RajcePublishing.c"
}
-static void publishing_rajce_rajce_publisher_do_begin_upload (PublishingRajceRajcePublisher* self) {
+static void
+publishing_rajce_rajce_publisher_do_begin_upload (PublishingRajceRajcePublisher* self)
+{
SpitPublishingPluginHost* _tmp0_;
PublishingRajcePublishingParameters* _tmp1_;
gint* _tmp2_;
@@ -3598,7 +3863,7 @@ static void publishing_rajce_rajce_publisher_do_begin_upload (PublishingRajceRaj
_tmp3_ = 0;
#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (_int_equal (_tmp2_, &_tmp3_) == TRUE) {
-#line 3599 "RajcePublishing.c"
+#line 3864 "RajcePublishing.c"
PublishingRajceCreateAlbumTransaction* create_album_trans = NULL;
PublishingRajceSession* _tmp4_;
gchar* _tmp5_;
@@ -3643,7 +3908,7 @@ static void publishing_rajce_rajce_publisher_do_begin_upload (PublishingRajceRaj
_tmp14_ = create_album_trans;
#line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_rajce_rajce_publisher_on_create_album_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 3644 "RajcePublishing.c"
+#line 3909 "RajcePublishing.c"
{
PublishingRajceCreateAlbumTransaction* _tmp15_;
#line 395 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -3654,7 +3919,7 @@ static void publishing_rajce_rajce_publisher_do_begin_upload (PublishingRajceRaj
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 395 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3655 "RajcePublishing.c"
+#line 3920 "RajcePublishing.c"
goto __catch20_spit_publishing_publishing_error;
}
#line 395 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -3665,7 +3930,7 @@ static void publishing_rajce_rajce_publisher_do_begin_upload (PublishingRajceRaj
g_clear_error (&_inner_error_);
#line 395 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return;
-#line 3666 "RajcePublishing.c"
+#line 3931 "RajcePublishing.c"
}
}
goto __finally20;
@@ -3685,7 +3950,7 @@ static void publishing_rajce_rajce_publisher_do_begin_upload (PublishingRajceRaj
publishing_rajce_rajce_publisher_do_show_error (self, _tmp16_);
#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_error_free0 (err);
-#line 3686 "RajcePublishing.c"
+#line 3951 "RajcePublishing.c"
}
__finally20:
#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -3698,11 +3963,11 @@ static void publishing_rajce_rajce_publisher_do_begin_upload (PublishingRajceRaj
g_clear_error (&_inner_error_);
#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return;
-#line 3699 "RajcePublishing.c"
+#line 3964 "RajcePublishing.c"
}
#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_publishing_rest_support_transaction_unref0 (create_album_trans);
-#line 3703 "RajcePublishing.c"
+#line 3968 "RajcePublishing.c"
} else {
PublishingRajceOpenAlbumTransaction* open_album_trans = NULL;
PublishingRajceSession* _tmp17_;
@@ -3742,7 +4007,7 @@ static void publishing_rajce_rajce_publisher_do_begin_upload (PublishingRajceRaj
_tmp25_ = open_album_trans;
#line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_rajce_rajce_publisher_on_open_album_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 3743 "RajcePublishing.c"
+#line 4008 "RajcePublishing.c"
{
PublishingRajceOpenAlbumTransaction* _tmp26_;
#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -3753,7 +4018,7 @@ static void publishing_rajce_rajce_publisher_do_begin_upload (PublishingRajceRaj
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3754 "RajcePublishing.c"
+#line 4019 "RajcePublishing.c"
goto __catch21_spit_publishing_publishing_error;
}
#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -3764,7 +4029,7 @@ static void publishing_rajce_rajce_publisher_do_begin_upload (PublishingRajceRaj
g_clear_error (&_inner_error_);
#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return;
-#line 3765 "RajcePublishing.c"
+#line 4030 "RajcePublishing.c"
}
}
goto __finally21;
@@ -3784,7 +4049,7 @@ static void publishing_rajce_rajce_publisher_do_begin_upload (PublishingRajceRaj
publishing_rajce_rajce_publisher_do_show_error (self, _tmp27_);
#line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_error_free0 (err);
-#line 3785 "RajcePublishing.c"
+#line 4050 "RajcePublishing.c"
}
__finally21:
#line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -3797,11 +4062,11 @@ static void publishing_rajce_rajce_publisher_do_begin_upload (PublishingRajceRaj
g_clear_error (&_inner_error_);
#line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return;
-#line 3798 "RajcePublishing.c"
+#line 4063 "RajcePublishing.c"
}
#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_publishing_rest_support_transaction_unref0 (open_album_trans);
-#line 3802 "RajcePublishing.c"
+#line 4067 "RajcePublishing.c"
}
}
@@ -3809,7 +4074,9 @@ static void publishing_rajce_rajce_publisher_do_begin_upload (PublishingRajceRaj
/**
* Event triggered when the create album completes successfully.
*/
-static gint* _int_dup (gint* self) {
+static gint*
+_int_dup (gint* self)
+{
gint* dup;
#line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
dup = g_new0 (gint, 1);
@@ -3817,25 +4084,27 @@ static gint* _int_dup (gint* self) {
memcpy (dup, self, sizeof (gint));
#line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return dup;
-#line 3818 "RajcePublishing.c"
+#line 4085 "RajcePublishing.c"
}
-static gpointer __int_dup0 (gpointer self) {
+static gpointer
+__int_dup0 (gpointer self)
+{
#line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return self ? _int_dup (self) : NULL;
-#line 3825 "RajcePublishing.c"
+#line 4094 "RajcePublishing.c"
}
-static void publishing_rajce_rajce_publisher_on_create_album_complete (PublishingRajceRajcePublisher* self, PublishingRESTSupportTransaction* txn) {
- PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_rajce_rajce_publisher_on_create_album_complete (PublishingRajceRajcePublisher* self,
+ PublishingRESTSupportTransaction* txn)
+{
+ guint _tmp0_;
guint _tmp1_;
- PublishingRESTSupportTransaction* _tmp2_;
- guint _tmp3_;
- PublishingRESTSupportTransaction* _tmp4_;
- gchar* _tmp5_;
- gchar* _tmp6_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
GError * _inner_error_ = NULL;
#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self));
@@ -3844,82 +4113,73 @@ static void publishing_rajce_rajce_publisher_on_create_album_complete (Publishin
#line 427 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_debug ("RajcePublishing.vala:427: EVENT: on_create_album_complete");
#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp0_ = txn;
+ g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_create_album_complete_publishing_rest_support_transaction_completed, self);
-#line 429 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp2_ = txn;
+ g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_create_album_complete_publishing_rest_support_transaction_completed, self);
#line 429 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
+ g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
#line 429 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_create_album_error_publishing_rest_support_transaction_network_error, self);
+ g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_create_album_error_publishing_rest_support_transaction_network_error, self);
#line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp4_ = txn;
+ _tmp2_ = publishing_rest_support_transaction_get_response (txn);
#line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp5_ = publishing_rest_support_transaction_get_response (_tmp4_);
-#line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp6_ = _tmp5_;
+ _tmp3_ = _tmp2_;
#line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_debug ("RajcePublishing.vala:430: RajcePlugin: create album: %s", _tmp6_);
+ g_debug ("RajcePublishing.vala:430: RajcePlugin: create album: %s", _tmp3_);
#line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _g_free0 (_tmp6_);
-#line 3866 "RajcePublishing.c"
+ _g_free0 (_tmp3_);
+#line 4129 "RajcePublishing.c"
{
PublishingRESTSupportXmlDocument* doc = NULL;
- PublishingRESTSupportTransaction* _tmp7_;
- gchar* _tmp8_;
- gchar* _tmp9_;
- PublishingRESTSupportXmlDocument* _tmp10_;
- PublishingRESTSupportXmlDocument* _tmp11_;
+ gchar* _tmp4_;
+ gchar* _tmp5_;
+ PublishingRESTSupportXmlDocument* _tmp6_;
+ PublishingRESTSupportXmlDocument* _tmp7_;
xmlNode* response = NULL;
- PublishingRESTSupportXmlDocument* _tmp12_;
+ PublishingRESTSupportXmlDocument* _tmp8_;
+ xmlNode* _tmp9_;
+ xmlNode* _tmp10_ = NULL;
+ PublishingRESTSupportXmlDocument* _tmp11_;
+ xmlNode* _tmp12_;
xmlNode* _tmp13_;
- xmlNode* _tmp14_ = NULL;
- PublishingRESTSupportXmlDocument* _tmp15_;
- xmlNode* _tmp16_;
- xmlNode* _tmp17_;
gchar* sessionToken = NULL;
- gchar* _tmp18_;
- xmlNode* _tmp19_ = NULL;
- PublishingRESTSupportXmlDocument* _tmp20_;
- xmlNode* _tmp21_;
- xmlNode* _tmp22_;
+ gchar* _tmp14_;
+ xmlNode* _tmp15_ = NULL;
+ PublishingRESTSupportXmlDocument* _tmp16_;
+ xmlNode* _tmp17_;
+ xmlNode* _tmp18_;
gchar* albumToken = NULL;
- gchar* _tmp23_;
- xmlNode* _tmp24_ = NULL;
- PublishingRESTSupportXmlDocument* _tmp25_;
- xmlNode* _tmp26_;
- xmlNode* _tmp27_;
- PublishingRajcePublishingParameters* _tmp28_;
- gchar* _tmp29_;
- gchar* _tmp30_;
- gint _tmp31_;
- gint* _tmp32_;
- PublishingRajceSession* _tmp33_;
- const gchar* _tmp34_;
- PublishingRajceSession* _tmp35_;
- const gchar* _tmp36_;
-#line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp7_ = txn;
+ gchar* _tmp19_;
+ xmlNode* _tmp20_ = NULL;
+ PublishingRESTSupportXmlDocument* _tmp21_;
+ xmlNode* _tmp22_;
+ xmlNode* _tmp23_;
+ PublishingRajcePublishingParameters* _tmp24_;
+ gchar* _tmp25_;
+ gchar* _tmp26_;
+ gint _tmp27_;
+ gint* _tmp28_;
+ PublishingRajceSession* _tmp29_;
+ const gchar* _tmp30_;
+ PublishingRajceSession* _tmp31_;
+ const gchar* _tmp32_;
#line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp8_ = publishing_rest_support_transaction_get_response (_tmp7_);
+ _tmp4_ = publishing_rest_support_transaction_get_response (txn);
#line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp9_ = _tmp8_;
+ _tmp5_ = _tmp4_;
#line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp10_ = publishing_rest_support_xml_document_parse_string (_tmp9_, _publishing_rajce_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response, NULL, &_inner_error_);
+ _tmp6_ = publishing_rest_support_xml_document_parse_string (_tmp5_, _publishing_rajce_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response, NULL, &_inner_error_);
#line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp11_ = _tmp10_;
+ _tmp7_ = _tmp6_;
#line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _g_free0 (_tmp9_);
+ _g_free0 (_tmp5_);
#line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- doc = _tmp11_;
+ doc = _tmp7_;
#line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3920 "RajcePublishing.c"
+#line 4180 "RajcePublishing.c"
goto __catch22_spit_publishing_publishing_error;
}
#line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -3928,29 +4188,29 @@ static void publishing_rajce_rajce_publisher_on_create_album_complete (Publishin
g_clear_error (&_inner_error_);
#line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return;
-#line 3929 "RajcePublishing.c"
+#line 4189 "RajcePublishing.c"
}
#line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp12_ = doc;
+ _tmp8_ = doc;
#line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp13_ = publishing_rest_support_xml_document_get_root_node (_tmp12_);
+ _tmp9_ = publishing_rest_support_xml_document_get_root_node (_tmp8_);
#line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- response = _tmp13_;
+ response = _tmp9_;
#line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp15_ = doc;
+ _tmp11_ = doc;
#line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp16_ = response;
+ _tmp12_ = response;
#line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp17_ = publishing_rest_support_xml_document_get_named_child (_tmp15_, _tmp16_, "sessionToken", &_inner_error_);
+ _tmp13_ = publishing_rest_support_xml_document_get_named_child (_tmp11_, _tmp12_, "sessionToken", &_inner_error_);
#line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp14_ = _tmp17_;
+ _tmp10_ = _tmp13_;
#line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_publishing_rest_support_xml_document_unref0 (doc);
#line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3951 "RajcePublishing.c"
+#line 4211 "RajcePublishing.c"
goto __catch22_spit_publishing_publishing_error;
}
#line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -3961,20 +4221,20 @@ static void publishing_rajce_rajce_publisher_on_create_album_complete (Publishin
g_clear_error (&_inner_error_);
#line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return;
-#line 3962 "RajcePublishing.c"
+#line 4222 "RajcePublishing.c"
}
#line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp18_ = (gchar*) xmlNodeGetContent (_tmp14_);
+ _tmp14_ = (gchar*) xmlNodeGetContent (_tmp10_);
#line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- sessionToken = _tmp18_;
+ sessionToken = _tmp14_;
#line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp20_ = doc;
+ _tmp16_ = doc;
#line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp21_ = response;
+ _tmp17_ = response;
#line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp22_ = publishing_rest_support_xml_document_get_named_child (_tmp20_, _tmp21_, "albumToken", &_inner_error_);
+ _tmp18_ = publishing_rest_support_xml_document_get_named_child (_tmp16_, _tmp17_, "albumToken", &_inner_error_);
#line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp19_ = _tmp22_;
+ _tmp15_ = _tmp18_;
#line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -3983,7 +4243,7 @@ static void publishing_rajce_rajce_publisher_on_create_album_complete (Publishin
_publishing_rest_support_xml_document_unref0 (doc);
#line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3984 "RajcePublishing.c"
+#line 4244 "RajcePublishing.c"
goto __catch22_spit_publishing_publishing_error;
}
#line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -3996,20 +4256,20 @@ static void publishing_rajce_rajce_publisher_on_create_album_complete (Publishin
g_clear_error (&_inner_error_);
#line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return;
-#line 3997 "RajcePublishing.c"
+#line 4257 "RajcePublishing.c"
}
#line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp23_ = (gchar*) xmlNodeGetContent (_tmp19_);
+ _tmp19_ = (gchar*) xmlNodeGetContent (_tmp15_);
#line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- albumToken = _tmp23_;
+ albumToken = _tmp19_;
#line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp25_ = doc;
+ _tmp21_ = doc;
#line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp26_ = response;
+ _tmp22_ = response;
#line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp27_ = publishing_rest_support_xml_document_get_named_child (_tmp25_, _tmp26_, "albumID", &_inner_error_);
+ _tmp23_ = publishing_rest_support_xml_document_get_named_child (_tmp21_, _tmp22_, "albumID", &_inner_error_);
#line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp24_ = _tmp27_;
+ _tmp20_ = _tmp23_;
#line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -4020,7 +4280,7 @@ static void publishing_rajce_rajce_publisher_on_create_album_complete (Publishin
_publishing_rest_support_xml_document_unref0 (doc);
#line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4021 "RajcePublishing.c"
+#line 4281 "RajcePublishing.c"
goto __catch22_spit_publishing_publishing_error;
}
#line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -4035,49 +4295,49 @@ static void publishing_rajce_rajce_publisher_on_create_album_complete (Publishin
g_clear_error (&_inner_error_);
#line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return;
-#line 4036 "RajcePublishing.c"
+#line 4296 "RajcePublishing.c"
}
#line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp28_ = self->priv->parameters;
+ _tmp24_ = self->priv->parameters;
#line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp29_ = (gchar*) xmlNodeGetContent (_tmp24_);
+ _tmp25_ = (gchar*) xmlNodeGetContent (_tmp20_);
#line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp30_ = _tmp29_;
+ _tmp26_ = _tmp25_;
#line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp31_ = atoi (_tmp30_);
+ _tmp27_ = atoi (_tmp26_);
#line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp32_ = __int_dup0 (&_tmp31_);
+ _tmp28_ = __int_dup0 (&_tmp27_);
#line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _g_free0 (_tmp28_->album_id);
+ _g_free0 (_tmp24_->album_id);
#line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp28_->album_id = _tmp32_;
+ _tmp24_->album_id = _tmp28_;
#line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _g_free0 (_tmp30_);
+ _g_free0 (_tmp26_);
#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp33_ = self->priv->session;
+ _tmp29_ = self->priv->session;
#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp34_ = sessionToken;
+ _tmp30_ = sessionToken;
#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- publishing_rajce_session_set_usertoken (_tmp33_, _tmp34_);
+ publishing_rajce_session_set_usertoken (_tmp29_, _tmp30_);
#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp35_ = self->priv->session;
+ _tmp31_ = self->priv->session;
#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp36_ = albumToken;
+ _tmp32_ = albumToken;
#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- publishing_rajce_session_set_albumtoken (_tmp35_, _tmp36_);
+ publishing_rajce_session_set_albumtoken (_tmp31_, _tmp32_);
#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_free0 (albumToken);
#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_free0 (sessionToken);
#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_publishing_rest_support_xml_document_unref0 (doc);
-#line 4072 "RajcePublishing.c"
+#line 4332 "RajcePublishing.c"
}
goto __finally22;
__catch22_spit_publishing_publishing_error:
{
GError* err = NULL;
- GError* _tmp37_;
+ GError* _tmp33_;
#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
err = _inner_error_;
#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -4085,14 +4345,14 @@ static void publishing_rajce_rajce_publisher_on_create_album_complete (Publishin
#line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_debug ("RajcePublishing.vala:443: ERROR: on_create_album_complete");
#line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp37_ = err;
+ _tmp33_ = err;
#line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- publishing_rajce_rajce_publisher_do_show_error (self, _tmp37_);
+ publishing_rajce_rajce_publisher_do_show_error (self, _tmp33_);
#line 445 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_error_free0 (err);
#line 445 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return;
-#line 4093 "RajcePublishing.c"
+#line 4353 "RajcePublishing.c"
}
__finally22:
#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -4103,24 +4363,24 @@ static void publishing_rajce_rajce_publisher_on_create_album_complete (Publishin
g_clear_error (&_inner_error_);
#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return;
-#line 4104 "RajcePublishing.c"
+#line 4364 "RajcePublishing.c"
}
#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_rajce_publisher_do_upload_photos (self);
-#line 4108 "RajcePublishing.c"
+#line 4368 "RajcePublishing.c"
}
/**
* Event triggered when the create album transaction fails due to a network error.
*/
-static void publishing_rajce_rajce_publisher_on_create_album_error (PublishingRajceRajcePublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) {
- PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_rajce_rajce_publisher_on_create_album_error (PublishingRajceRajcePublisher* self,
+ PublishingRESTSupportTransaction* bad_txn,
+ GError* err)
+{
+ guint _tmp0_;
guint _tmp1_;
- PublishingRESTSupportTransaction* _tmp2_;
- guint _tmp3_;
- PublishingRESTSupportTransaction* _tmp4_;
- GError* _tmp5_;
#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self));
#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -4128,38 +4388,30 @@ static void publishing_rajce_rajce_publisher_on_create_album_error (PublishingRa
#line 455 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_debug ("RajcePublishing.vala:455: EVENT: on_create_album_error");
#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp0_ = bad_txn;
+ g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_create_album_complete_publishing_rest_support_transaction_completed, self);
-#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp2_ = bad_txn;
+ g_signal_handlers_disconnect_matched (bad_txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_create_album_complete_publishing_rest_support_transaction_completed, self);
#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
+ g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_create_album_error_publishing_rest_support_transaction_network_error, self);
-#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp4_ = bad_txn;
-#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp5_ = err;
+ g_signal_handlers_disconnect_matched (bad_txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_create_album_error_publishing_rest_support_transaction_network_error, self);
#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- publishing_rajce_rajce_publisher_on_network_error (self, _tmp4_, _tmp5_);
-#line 4146 "RajcePublishing.c"
+ publishing_rajce_rajce_publisher_on_network_error (self, bad_txn, err);
+#line 4398 "RajcePublishing.c"
}
/**
* Event triggered when the open album completes successfully.
*/
-static void publishing_rajce_rajce_publisher_on_open_album_complete (PublishingRajceRajcePublisher* self, PublishingRESTSupportTransaction* txn) {
- PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_rajce_rajce_publisher_on_open_album_complete (PublishingRajceRajcePublisher* self,
+ PublishingRESTSupportTransaction* txn)
+{
+ guint _tmp0_;
guint _tmp1_;
- PublishingRESTSupportTransaction* _tmp2_;
- guint _tmp3_;
- PublishingRESTSupportTransaction* _tmp4_;
- gchar* _tmp5_;
- gchar* _tmp6_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
GError * _inner_error_ = NULL;
#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self));
@@ -4168,73 +4420,64 @@ static void publishing_rajce_rajce_publisher_on_open_album_complete (PublishingR
#line 466 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_debug ("RajcePublishing.vala:466: EVENT: on_open_album_complete");
#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp0_ = txn;
+ g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_open_album_complete_publishing_rest_support_transaction_completed, self);
-#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp2_ = txn;
+ g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_open_album_complete_publishing_rest_support_transaction_completed, self);
#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
+ g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_open_album_error_publishing_rest_support_transaction_network_error, self);
+ g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_open_album_error_publishing_rest_support_transaction_network_error, self);
#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp4_ = txn;
+ _tmp2_ = publishing_rest_support_transaction_get_response (txn);
#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp5_ = publishing_rest_support_transaction_get_response (_tmp4_);
-#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp6_ = _tmp5_;
+ _tmp3_ = _tmp2_;
#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_debug ("RajcePublishing.vala:469: RajcePlugin: open album: %s", _tmp6_);
+ g_debug ("RajcePublishing.vala:469: RajcePlugin: open album: %s", _tmp3_);
#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _g_free0 (_tmp6_);
-#line 4190 "RajcePublishing.c"
+ _g_free0 (_tmp3_);
+#line 4436 "RajcePublishing.c"
{
PublishingRESTSupportXmlDocument* doc = NULL;
- PublishingRESTSupportTransaction* _tmp7_;
- gchar* _tmp8_;
- gchar* _tmp9_;
- PublishingRESTSupportXmlDocument* _tmp10_;
- PublishingRESTSupportXmlDocument* _tmp11_;
+ gchar* _tmp4_;
+ gchar* _tmp5_;
+ PublishingRESTSupportXmlDocument* _tmp6_;
+ PublishingRESTSupportXmlDocument* _tmp7_;
xmlNode* response = NULL;
- PublishingRESTSupportXmlDocument* _tmp12_;
+ PublishingRESTSupportXmlDocument* _tmp8_;
+ xmlNode* _tmp9_;
+ xmlNode* _tmp10_ = NULL;
+ PublishingRESTSupportXmlDocument* _tmp11_;
+ xmlNode* _tmp12_;
xmlNode* _tmp13_;
- xmlNode* _tmp14_ = NULL;
- PublishingRESTSupportXmlDocument* _tmp15_;
- xmlNode* _tmp16_;
- xmlNode* _tmp17_;
gchar* sessionToken = NULL;
- gchar* _tmp18_;
- xmlNode* _tmp19_ = NULL;
- PublishingRESTSupportXmlDocument* _tmp20_;
- xmlNode* _tmp21_;
- xmlNode* _tmp22_;
+ gchar* _tmp14_;
+ xmlNode* _tmp15_ = NULL;
+ PublishingRESTSupportXmlDocument* _tmp16_;
+ xmlNode* _tmp17_;
+ xmlNode* _tmp18_;
gchar* albumToken = NULL;
- gchar* _tmp23_;
- PublishingRajceSession* _tmp24_;
- const gchar* _tmp25_;
- PublishingRajceSession* _tmp26_;
- const gchar* _tmp27_;
-#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp7_ = txn;
+ gchar* _tmp19_;
+ PublishingRajceSession* _tmp20_;
+ const gchar* _tmp21_;
+ PublishingRajceSession* _tmp22_;
+ const gchar* _tmp23_;
#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp8_ = publishing_rest_support_transaction_get_response (_tmp7_);
+ _tmp4_ = publishing_rest_support_transaction_get_response (txn);
#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp9_ = _tmp8_;
+ _tmp5_ = _tmp4_;
#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp10_ = publishing_rest_support_xml_document_parse_string (_tmp9_, _publishing_rajce_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response, NULL, &_inner_error_);
+ _tmp6_ = publishing_rest_support_xml_document_parse_string (_tmp5_, _publishing_rajce_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response, NULL, &_inner_error_);
#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp11_ = _tmp10_;
+ _tmp7_ = _tmp6_;
#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _g_free0 (_tmp9_);
+ _g_free0 (_tmp5_);
#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- doc = _tmp11_;
+ doc = _tmp7_;
#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4235 "RajcePublishing.c"
+#line 4478 "RajcePublishing.c"
goto __catch23_spit_publishing_publishing_error;
}
#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -4243,29 +4486,29 @@ static void publishing_rajce_rajce_publisher_on_open_album_complete (PublishingR
g_clear_error (&_inner_error_);
#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return;
-#line 4244 "RajcePublishing.c"
+#line 4487 "RajcePublishing.c"
}
#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp12_ = doc;
+ _tmp8_ = doc;
#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp13_ = publishing_rest_support_xml_document_get_root_node (_tmp12_);
+ _tmp9_ = publishing_rest_support_xml_document_get_root_node (_tmp8_);
#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- response = _tmp13_;
+ response = _tmp9_;
#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp15_ = doc;
+ _tmp11_ = doc;
#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp16_ = response;
+ _tmp12_ = response;
#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp17_ = publishing_rest_support_xml_document_get_named_child (_tmp15_, _tmp16_, "sessionToken", &_inner_error_);
+ _tmp13_ = publishing_rest_support_xml_document_get_named_child (_tmp11_, _tmp12_, "sessionToken", &_inner_error_);
#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp14_ = _tmp17_;
+ _tmp10_ = _tmp13_;
#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_publishing_rest_support_xml_document_unref0 (doc);
#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4266 "RajcePublishing.c"
+#line 4509 "RajcePublishing.c"
goto __catch23_spit_publishing_publishing_error;
}
#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -4276,20 +4519,20 @@ static void publishing_rajce_rajce_publisher_on_open_album_complete (PublishingR
g_clear_error (&_inner_error_);
#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return;
-#line 4277 "RajcePublishing.c"
+#line 4520 "RajcePublishing.c"
}
#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp18_ = (gchar*) xmlNodeGetContent (_tmp14_);
+ _tmp14_ = (gchar*) xmlNodeGetContent (_tmp10_);
#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- sessionToken = _tmp18_;
+ sessionToken = _tmp14_;
#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp20_ = doc;
+ _tmp16_ = doc;
#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp21_ = response;
+ _tmp17_ = response;
#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp22_ = publishing_rest_support_xml_document_get_named_child (_tmp20_, _tmp21_, "albumToken", &_inner_error_);
+ _tmp18_ = publishing_rest_support_xml_document_get_named_child (_tmp16_, _tmp17_, "albumToken", &_inner_error_);
#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp19_ = _tmp22_;
+ _tmp15_ = _tmp18_;
#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -4298,7 +4541,7 @@ static void publishing_rajce_rajce_publisher_on_open_album_complete (PublishingR
_publishing_rest_support_xml_document_unref0 (doc);
#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4299 "RajcePublishing.c"
+#line 4542 "RajcePublishing.c"
goto __catch23_spit_publishing_publishing_error;
}
#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -4311,37 +4554,37 @@ static void publishing_rajce_rajce_publisher_on_open_album_complete (PublishingR
g_clear_error (&_inner_error_);
#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return;
-#line 4312 "RajcePublishing.c"
+#line 4555 "RajcePublishing.c"
}
#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp23_ = (gchar*) xmlNodeGetContent (_tmp19_);
+ _tmp19_ = (gchar*) xmlNodeGetContent (_tmp15_);
#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- albumToken = _tmp23_;
+ albumToken = _tmp19_;
#line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp24_ = self->priv->session;
+ _tmp20_ = self->priv->session;
#line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp25_ = sessionToken;
+ _tmp21_ = sessionToken;
#line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- publishing_rajce_session_set_usertoken (_tmp24_, _tmp25_);
+ publishing_rajce_session_set_usertoken (_tmp20_, _tmp21_);
#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp26_ = self->priv->session;
+ _tmp22_ = self->priv->session;
#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp27_ = albumToken;
+ _tmp23_ = albumToken;
#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- publishing_rajce_session_set_albumtoken (_tmp26_, _tmp27_);
+ publishing_rajce_session_set_albumtoken (_tmp22_, _tmp23_);
#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_free0 (albumToken);
#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_free0 (sessionToken);
#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_publishing_rest_support_xml_document_unref0 (doc);
-#line 4336 "RajcePublishing.c"
+#line 4579 "RajcePublishing.c"
}
goto __finally23;
__catch23_spit_publishing_publishing_error:
{
GError* err = NULL;
- GError* _tmp28_;
+ GError* _tmp24_;
#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
err = _inner_error_;
#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -4349,14 +4592,14 @@ static void publishing_rajce_rajce_publisher_on_open_album_complete (PublishingR
#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_debug ("RajcePublishing.vala:481: ERROR: on_open_album_complete");
#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp28_ = err;
+ _tmp24_ = err;
#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- publishing_rajce_rajce_publisher_do_show_error (self, _tmp28_);
+ publishing_rajce_rajce_publisher_do_show_error (self, _tmp24_);
#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_error_free0 (err);
#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return;
-#line 4357 "RajcePublishing.c"
+#line 4600 "RajcePublishing.c"
}
__finally23:
#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -4367,24 +4610,24 @@ static void publishing_rajce_rajce_publisher_on_open_album_complete (PublishingR
g_clear_error (&_inner_error_);
#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return;
-#line 4368 "RajcePublishing.c"
+#line 4611 "RajcePublishing.c"
}
#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_rajce_publisher_do_upload_photos (self);
-#line 4372 "RajcePublishing.c"
+#line 4615 "RajcePublishing.c"
}
/**
* Event triggered when the open album transaction fails due to a network error.
*/
-static void publishing_rajce_rajce_publisher_on_open_album_error (PublishingRajceRajcePublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) {
- PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_rajce_rajce_publisher_on_open_album_error (PublishingRajceRajcePublisher* self,
+ PublishingRESTSupportTransaction* bad_txn,
+ GError* err)
+{
+ guint _tmp0_;
guint _tmp1_;
- PublishingRESTSupportTransaction* _tmp2_;
- guint _tmp3_;
- PublishingRESTSupportTransaction* _tmp4_;
- GError* _tmp5_;
#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self));
#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -4392,71 +4635,76 @@ static void publishing_rajce_rajce_publisher_on_open_album_error (PublishingRajc
#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_debug ("RajcePublishing.vala:493: EVENT: on_open_album_error");
#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp0_ = bad_txn;
-#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
+ g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_open_album_complete_publishing_rest_support_transaction_completed, self);
+ g_signal_handlers_disconnect_matched (bad_txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_open_album_complete_publishing_rest_support_transaction_completed, self);
#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp2_ = bad_txn;
+ g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_open_album_error_publishing_rest_support_transaction_network_error, self);
-#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp4_ = bad_txn;
+ g_signal_handlers_disconnect_matched (bad_txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_open_album_error_publishing_rest_support_transaction_network_error, self);
#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp5_ = err;
-#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- publishing_rajce_rajce_publisher_on_network_error (self, _tmp4_, _tmp5_);
-#line 4410 "RajcePublishing.c"
+ publishing_rajce_rajce_publisher_on_network_error (self, bad_txn, err);
+#line 4645 "RajcePublishing.c"
}
/**
* Upload photos: the key part of the plugin
*/
-static void _publishing_rajce_rajce_publisher_on_upload_photos_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender, gint num_photos_published, gpointer self) {
+static void
+_publishing_rajce_rajce_publisher_on_upload_photos_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender,
+ gint num_photos_published,
+ gpointer self)
+{
#line 509 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_rajce_publisher_on_upload_photos_complete ((PublishingRajceRajcePublisher*) self, _sender, num_photos_published);
-#line 4420 "RajcePublishing.c"
+#line 4659 "RajcePublishing.c"
}
-static void _publishing_rajce_rajce_publisher_on_upload_photos_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender, GError* err, gpointer self) {
+static void
+_publishing_rajce_rajce_publisher_on_upload_photos_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender,
+ GError* err,
+ gpointer self)
+{
#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_rajce_publisher_on_upload_photos_error ((PublishingRajceRajcePublisher*) self, _sender, err);
-#line 4427 "RajcePublishing.c"
+#line 4670 "RajcePublishing.c"
}
-static void _publishing_rajce_rajce_publisher_on_upload_photos_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self) {
+static void
+_publishing_rajce_rajce_publisher_on_upload_photos_status_updated_spit_publishing_progress_callback (gint file_number,
+ gdouble fraction_complete,
+ gpointer self)
+{
#line 511 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_rajce_publisher_on_upload_photos_status_updated ((PublishingRajceRajcePublisher*) self, file_number, fraction_complete);
-#line 4434 "RajcePublishing.c"
+#line 4681 "RajcePublishing.c"
}
-static void publishing_rajce_rajce_publisher_do_upload_photos (PublishingRajceRajcePublisher* self) {
+static void
+publishing_rajce_rajce_publisher_do_upload_photos (PublishingRajceRajcePublisher* self)
+{
SpitPublishingPluginHost* _tmp0_;
PublishingRajceSession* _tmp1_;
- gint _tmp2_;
- void* _tmp3_;
- GDestroyNotify _tmp4_;
- SpitPublishingProgressCallback _tmp5_;
+ void* _tmp2_;
+ GDestroyNotify _tmp3_;
+ SpitPublishingProgressCallback _tmp4_;
SpitPublishingPublishable** publishables = NULL;
- SpitPublishingPluginHost* _tmp6_;
- gint _tmp7_;
- SpitPublishingPublishable** _tmp8_;
+ SpitPublishingPluginHost* _tmp5_;
+ gint _tmp6_;
+ SpitPublishingPublishable** _tmp7_;
gint publishables_length1;
gint _publishables_size_;
PublishingRajceUploader* uploader = NULL;
- PublishingRajceSession* _tmp9_;
+ PublishingRajceSession* _tmp8_;
+ gchar* _tmp9_;
gchar* _tmp10_;
- gchar* _tmp11_;
- PublishingRajcePublishingParameters* _tmp12_;
+ PublishingRajcePublishingParameters* _tmp11_;
+ PublishingRajceUploader* _tmp12_;
PublishingRajceUploader* _tmp13_;
- PublishingRajceUploader* _tmp14_;
#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self));
#line 504 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -4466,9 +4714,7 @@ static void publishing_rajce_rajce_publisher_do_upload_photos (PublishingRajceRa
#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_tmp1_ = self->priv->session;
#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp2_ = publishing_rajce_session_get_maxsize (_tmp1_);
-#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp5_ = spit_publishing_plugin_host_serialize_publishables (_tmp0_, _tmp2_, FALSE, &_tmp3_, &_tmp4_);
+ _tmp4_ = spit_publishing_plugin_host_serialize_publishables (_tmp0_, publishing_rajce_session_get_maxsize (_tmp1_), FALSE, &_tmp2_, &_tmp3_);
#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
(self->priv->progress_reporter_target_destroy_notify == NULL) ? NULL : (self->priv->progress_reporter_target_destroy_notify (self->priv->progress_reporter_target), NULL);
#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -4478,37 +4724,37 @@ static void publishing_rajce_rajce_publisher_do_upload_photos (PublishingRajceRa
#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
self->priv->progress_reporter_target_destroy_notify = NULL;
#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- self->priv->progress_reporter = _tmp5_;
+ self->priv->progress_reporter = _tmp4_;
#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- self->priv->progress_reporter_target = _tmp3_;
+ self->priv->progress_reporter_target = _tmp2_;
#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- self->priv->progress_reporter_target_destroy_notify = _tmp4_;
+ self->priv->progress_reporter_target_destroy_notify = _tmp3_;
#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp6_ = self->priv->host;
+ _tmp5_ = self->priv->host;
#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp8_ = spit_publishing_plugin_host_get_publishables (_tmp6_, &_tmp7_);
+ _tmp7_ = spit_publishing_plugin_host_get_publishables (_tmp5_, &_tmp6_);
#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- publishables = _tmp8_;
+ publishables = _tmp7_;
#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- publishables_length1 = _tmp7_;
+ publishables_length1 = _tmp6_;
#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_publishables_size_ = publishables_length1;
#line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp9_ = self->priv->session;
+ _tmp8_ = self->priv->session;
#line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp10_ = publishing_rajce_rajce_publisher_get_url (self);
+ _tmp9_ = publishing_rajce_rajce_publisher_get_url (self);
#line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp11_ = _tmp10_;
+ _tmp10_ = _tmp9_;
#line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp12_ = self->priv->parameters;
+ _tmp11_ = self->priv->parameters;
#line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp13_ = publishing_rajce_uploader_new (_tmp9_, _tmp11_, publishables, publishables_length1, _tmp12_);
+ _tmp12_ = publishing_rajce_uploader_new (_tmp8_, _tmp10_, publishables, publishables_length1, _tmp11_);
#line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp14_ = _tmp13_;
+ _tmp13_ = _tmp12_;
#line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _g_free0 (_tmp11_);
+ _g_free0 (_tmp10_);
#line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- uploader = _tmp14_;
+ uploader = _tmp13_;
#line 509 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (uploader, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), "upload-complete", (GCallback) _publishing_rajce_rajce_publisher_on_upload_photos_complete_publishing_rest_support_batch_uploader_upload_complete, self, 0);
#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -4519,7 +4765,7 @@ static void publishing_rajce_rajce_publisher_do_upload_photos (PublishingRajceRa
_publishing_rest_support_batch_uploader_unref0 (uploader);
#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishables = (_vala_array_free (publishables, publishables_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 4520 "RajcePublishing.c"
+#line 4766 "RajcePublishing.c"
}
@@ -4527,11 +4773,13 @@ static void publishing_rajce_rajce_publisher_do_upload_photos (PublishingRajceRa
* Event triggered when the batch uploader reports that at least one of the
* network transactions encapsulating uploads has completed successfully
*/
-static void publishing_rajce_rajce_publisher_on_upload_photos_complete (PublishingRajceRajcePublisher* self, PublishingRESTSupportBatchUploader* uploader, gint num_published) {
- PublishingRESTSupportBatchUploader* _tmp0_;
+static void
+publishing_rajce_rajce_publisher_on_upload_photos_complete (PublishingRajceRajcePublisher* self,
+ PublishingRESTSupportBatchUploader* uploader,
+ gint num_published)
+{
+ guint _tmp0_;
guint _tmp1_;
- PublishingRESTSupportBatchUploader* _tmp2_;
- guint _tmp3_;
#line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self));
#line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -4539,20 +4787,16 @@ static void publishing_rajce_rajce_publisher_on_upload_photos_complete (Publishi
#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_debug ("RajcePublishing.vala:520: EVENT: on_upload_photos_complete");
#line 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp0_ = uploader;
-#line 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp1_, NULL, FALSE);
+ g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp0_, NULL, FALSE);
#line 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_upload_photos_complete_publishing_rest_support_batch_uploader_upload_complete, self);
+ g_signal_handlers_disconnect_matched (uploader, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_upload_photos_complete_publishing_rest_support_batch_uploader_upload_complete, self);
#line 522 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp2_ = uploader;
+ g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp1_, NULL, FALSE);
#line 522 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp3_, NULL, FALSE);
-#line 522 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_upload_photos_error_publishing_rest_support_batch_uploader_upload_error, self);
+ g_signal_handlers_disconnect_matched (uploader, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_upload_photos_error_publishing_rest_support_batch_uploader_upload_error, self);
#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_rajce_publisher_do_end_upload (self);
-#line 4553 "RajcePublishing.c"
+#line 4797 "RajcePublishing.c"
}
@@ -4560,12 +4804,13 @@ static void publishing_rajce_rajce_publisher_on_upload_photos_complete (Publishi
* Event triggered when the batch uploader reports that at least one of the
* network transactions encapsulating uploads has caused a network error
*/
-static void publishing_rajce_rajce_publisher_on_upload_photos_error (PublishingRajceRajcePublisher* self, PublishingRESTSupportBatchUploader* uploader, GError* err) {
- PublishingRESTSupportBatchUploader* _tmp0_;
+static void
+publishing_rajce_rajce_publisher_on_upload_photos_error (PublishingRajceRajcePublisher* self,
+ PublishingRESTSupportBatchUploader* uploader,
+ GError* err)
+{
+ guint _tmp0_;
guint _tmp1_;
- PublishingRESTSupportBatchUploader* _tmp2_;
- guint _tmp3_;
- GError* _tmp4_;
#line 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self));
#line 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -4573,85 +4818,70 @@ static void publishing_rajce_rajce_publisher_on_upload_photos_error (PublishingR
#line 534 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_debug ("RajcePublishing.vala:534: EVENT: on_upload_photos_error");
#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp0_ = uploader;
-#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp1_, NULL, FALSE);
+ g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp0_, NULL, FALSE);
#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_upload_photos_complete_publishing_rest_support_batch_uploader_upload_complete, self);
+ g_signal_handlers_disconnect_matched (uploader, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_upload_photos_complete_publishing_rest_support_batch_uploader_upload_complete, self);
#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp2_ = uploader;
+ g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp1_, NULL, FALSE);
#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp3_, NULL, FALSE);
-#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_upload_photos_error_publishing_rest_support_batch_uploader_upload_error, self);
-#line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp4_ = err;
+ g_signal_handlers_disconnect_matched (uploader, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_upload_photos_error_publishing_rest_support_batch_uploader_upload_error, self);
#line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- publishing_rajce_rajce_publisher_do_show_error (self, _tmp4_);
-#line 4589 "RajcePublishing.c"
+ publishing_rajce_rajce_publisher_do_show_error (self, err);
+#line 4828 "RajcePublishing.c"
}
/**
* Event triggered when upload progresses and the status needs to be updated.
*/
-static void publishing_rajce_rajce_publisher_on_upload_photos_status_updated (PublishingRajceRajcePublisher* self, gint file_number, gdouble completed_fraction) {
- gboolean _tmp0_;
+static void
+publishing_rajce_rajce_publisher_on_upload_photos_status_updated (PublishingRajceRajcePublisher* self,
+ gint file_number,
+ gdouble completed_fraction)
+{
#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self));
#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- if (_tmp0_) {
-#line 4604 "RajcePublishing.c"
- gdouble _tmp1_;
- SpitPublishingProgressCallback _tmp2_;
- void* _tmp2__target;
- SpitPublishingProgressCallback _tmp3_;
- void* _tmp3__target;
- gint _tmp4_;
- gdouble _tmp5_;
-#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp1_ = completed_fraction;
+ if (spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
+#line 4844 "RajcePublishing.c"
+ SpitPublishingProgressCallback _tmp0_;
+ void* _tmp0__target;
+ SpitPublishingProgressCallback _tmp1_;
+ void* _tmp1__target;
#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_debug ("RajcePublishing.vala:547: EVENT: uploader reports upload %.2f percent " \
-"complete.", 100.0 * _tmp1_);
+"complete.", 100.0 * completed_fraction);
#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp2_ = self->priv->progress_reporter;
+ _tmp0_ = self->priv->progress_reporter;
#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp2__target = self->priv->progress_reporter_target;
+ _tmp0__target = self->priv->progress_reporter_target;
#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _vala_assert (_tmp2_ != NULL, "progress_reporter != null");
-#line 549 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp3_ = self->priv->progress_reporter;
+ _vala_assert (_tmp0_ != NULL, "progress_reporter != null");
#line 549 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp3__target = self->priv->progress_reporter_target;
+ _tmp1_ = self->priv->progress_reporter;
#line 549 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp4_ = file_number;
+ _tmp1__target = self->priv->progress_reporter_target;
#line 549 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp5_ = completed_fraction;
-#line 549 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp3_ (_tmp4_, _tmp5_, _tmp3__target);
-#line 4632 "RajcePublishing.c"
+ _tmp1_ (file_number, completed_fraction, _tmp1__target);
+#line 4863 "RajcePublishing.c"
}
}
-static void publishing_rajce_rajce_publisher_do_end_upload (PublishingRajceRajcePublisher* self) {
- gboolean _tmp0_;
+static void
+publishing_rajce_rajce_publisher_do_end_upload (PublishingRajceRajcePublisher* self)
+{
#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self));
#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp0_ = publishing_rajce_rajce_publisher_get_show_album (self);
-#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- if (_tmp0_) {
+ if (publishing_rajce_rajce_publisher_get_show_album (self)) {
#line 557 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_rajce_publisher_do_get_album_url (self);
-#line 4647 "RajcePublishing.c"
+#line 4877 "RajcePublishing.c"
} else {
#line 561 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_rajce_publisher_do_close_album (self);
-#line 4651 "RajcePublishing.c"
+#line 4881 "RajcePublishing.c"
}
}
@@ -4659,21 +4889,30 @@ static void publishing_rajce_rajce_publisher_do_end_upload (PublishingRajceRajce
/**
* End upload action: get album url
*/
-static void _publishing_rajce_rajce_publisher_on_get_album_url_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
+static void
+_publishing_rajce_rajce_publisher_on_get_album_url_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+ GError* err,
+ gpointer self)
+{
#line 573 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_rajce_publisher_on_get_album_url_error ((PublishingRajceRajcePublisher*) self, _sender, err);
-#line 4662 "RajcePublishing.c"
+#line 4896 "RajcePublishing.c"
}
-static void _publishing_rajce_rajce_publisher_on_get_album_url_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
+static void
+_publishing_rajce_rajce_publisher_on_get_album_url_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+ gpointer self)
+{
#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_rajce_publisher_on_get_album_url_complete ((PublishingRajceRajcePublisher*) self, _sender);
-#line 4669 "RajcePublishing.c"
+#line 4906 "RajcePublishing.c"
}
-static void publishing_rajce_rajce_publisher_do_get_album_url (PublishingRajceRajcePublisher* self) {
+static void
+publishing_rajce_rajce_publisher_do_get_album_url (PublishingRajceRajcePublisher* self)
+{
SpitPublishingPluginHost* _tmp0_;
PublishingRajceGetAlbumUrlTransaction* get_album_url_trans = NULL;
PublishingRajceSession* _tmp1_;
@@ -4708,7 +4947,7 @@ static void publishing_rajce_rajce_publisher_do_get_album_url (PublishingRajceRa
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (get_album_url_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_rajce_rajce_publisher_on_get_album_url_error_publishing_rest_support_transaction_network_error, self, 0);
#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (get_album_url_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_rajce_rajce_publisher_on_get_album_url_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 4708 "RajcePublishing.c"
+#line 4947 "RajcePublishing.c"
{
#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (get_album_url_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
@@ -4716,7 +4955,7 @@ static void publishing_rajce_rajce_publisher_do_get_album_url (PublishingRajceRa
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4716 "RajcePublishing.c"
+#line 4955 "RajcePublishing.c"
goto __catch24_spit_publishing_publishing_error;
}
#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -4727,7 +4966,7 @@ static void publishing_rajce_rajce_publisher_do_get_album_url (PublishingRajceRa
g_clear_error (&_inner_error_);
#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return;
-#line 4727 "RajcePublishing.c"
+#line 4966 "RajcePublishing.c"
}
}
goto __finally24;
@@ -4747,7 +4986,7 @@ static void publishing_rajce_rajce_publisher_do_get_album_url (PublishingRajceRa
publishing_rajce_rajce_publisher_do_show_error (self, _tmp6_);
#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_error_free0 (err);
-#line 4747 "RajcePublishing.c"
+#line 4986 "RajcePublishing.c"
}
__finally24:
#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -4760,25 +4999,25 @@ static void publishing_rajce_rajce_publisher_do_get_album_url (PublishingRajceRa
g_clear_error (&_inner_error_);
#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return;
-#line 4760 "RajcePublishing.c"
+#line 4999 "RajcePublishing.c"
}
#line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_publishing_rest_support_transaction_unref0 (get_album_url_trans);
-#line 4764 "RajcePublishing.c"
+#line 5003 "RajcePublishing.c"
}
/**
* Event triggered when the get album url completes successfully.
*/
-static void publishing_rajce_rajce_publisher_on_get_album_url_complete (PublishingRajceRajcePublisher* self, PublishingRESTSupportTransaction* txn) {
- PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_rajce_rajce_publisher_on_get_album_url_complete (PublishingRajceRajcePublisher* self,
+ PublishingRESTSupportTransaction* txn)
+{
+ guint _tmp0_;
guint _tmp1_;
- PublishingRESTSupportTransaction* _tmp2_;
- guint _tmp3_;
- PublishingRESTSupportTransaction* _tmp4_;
- gchar* _tmp5_;
- gchar* _tmp6_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
GError * _inner_error_ = NULL;
#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self));
@@ -4787,73 +5026,64 @@ static void publishing_rajce_rajce_publisher_on_get_album_url_complete (Publishi
#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_debug ("RajcePublishing.vala:591: EVENT: on_get_album_url_complete");
#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp0_ = txn;
+ g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_get_album_url_complete_publishing_rest_support_transaction_completed, self);
-#line 593 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp2_ = txn;
+ g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_get_album_url_complete_publishing_rest_support_transaction_completed, self);
#line 593 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
+ g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
#line 593 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_get_album_url_error_publishing_rest_support_transaction_network_error, self);
-#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp4_ = txn;
+ g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_get_album_url_error_publishing_rest_support_transaction_network_error, self);
#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp5_ = publishing_rest_support_transaction_get_response (_tmp4_);
+ _tmp2_ = publishing_rest_support_transaction_get_response (txn);
#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp6_ = _tmp5_;
+ _tmp3_ = _tmp2_;
#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_debug ("RajcePublishing.vala:594: RajcePlugin: get album url: %s", _tmp6_);
+ g_debug ("RajcePublishing.vala:594: RajcePlugin: get album url: %s", _tmp3_);
#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _g_free0 (_tmp6_);
-#line 4808 "RajcePublishing.c"
+ _g_free0 (_tmp3_);
+#line 5041 "RajcePublishing.c"
{
PublishingRESTSupportXmlDocument* doc = NULL;
- PublishingRESTSupportTransaction* _tmp7_;
- gchar* _tmp8_;
- gchar* _tmp9_;
- PublishingRESTSupportXmlDocument* _tmp10_;
- PublishingRESTSupportXmlDocument* _tmp11_;
+ gchar* _tmp4_;
+ gchar* _tmp5_;
+ PublishingRESTSupportXmlDocument* _tmp6_;
+ PublishingRESTSupportXmlDocument* _tmp7_;
xmlNode* response = NULL;
- PublishingRESTSupportXmlDocument* _tmp12_;
+ PublishingRESTSupportXmlDocument* _tmp8_;
+ xmlNode* _tmp9_;
+ xmlNode* _tmp10_ = NULL;
+ PublishingRESTSupportXmlDocument* _tmp11_;
+ xmlNode* _tmp12_;
xmlNode* _tmp13_;
- xmlNode* _tmp14_ = NULL;
- PublishingRESTSupportXmlDocument* _tmp15_;
- xmlNode* _tmp16_;
- xmlNode* _tmp17_;
gchar* sessionToken = NULL;
- gchar* _tmp18_;
- xmlNode* _tmp19_ = NULL;
- PublishingRESTSupportXmlDocument* _tmp20_;
- xmlNode* _tmp21_;
- xmlNode* _tmp22_;
+ gchar* _tmp14_;
+ xmlNode* _tmp15_ = NULL;
+ PublishingRESTSupportXmlDocument* _tmp16_;
+ xmlNode* _tmp17_;
+ xmlNode* _tmp18_;
gchar* url = NULL;
- gchar* _tmp23_;
- PublishingRajceSession* _tmp24_;
- const gchar* _tmp25_;
- PublishingRajceSession* _tmp26_;
- const gchar* _tmp27_;
-#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp7_ = txn;
+ gchar* _tmp19_;
+ PublishingRajceSession* _tmp20_;
+ const gchar* _tmp21_;
+ PublishingRajceSession* _tmp22_;
+ const gchar* _tmp23_;
#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp8_ = publishing_rest_support_transaction_get_response (_tmp7_);
+ _tmp4_ = publishing_rest_support_transaction_get_response (txn);
#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp9_ = _tmp8_;
+ _tmp5_ = _tmp4_;
#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp10_ = publishing_rest_support_xml_document_parse_string (_tmp9_, _publishing_rajce_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response, NULL, &_inner_error_);
+ _tmp6_ = publishing_rest_support_xml_document_parse_string (_tmp5_, _publishing_rajce_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response, NULL, &_inner_error_);
#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp11_ = _tmp10_;
+ _tmp7_ = _tmp6_;
#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _g_free0 (_tmp9_);
+ _g_free0 (_tmp5_);
#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- doc = _tmp11_;
+ doc = _tmp7_;
#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4853 "RajcePublishing.c"
+#line 5083 "RajcePublishing.c"
goto __catch25_spit_publishing_publishing_error;
}
#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -4862,29 +5092,29 @@ static void publishing_rajce_rajce_publisher_on_get_album_url_complete (Publishi
g_clear_error (&_inner_error_);
#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return;
-#line 4862 "RajcePublishing.c"
+#line 5092 "RajcePublishing.c"
}
#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp12_ = doc;
+ _tmp8_ = doc;
#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp13_ = publishing_rest_support_xml_document_get_root_node (_tmp12_);
+ _tmp9_ = publishing_rest_support_xml_document_get_root_node (_tmp8_);
#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- response = _tmp13_;
+ response = _tmp9_;
#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp15_ = doc;
+ _tmp11_ = doc;
#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp16_ = response;
+ _tmp12_ = response;
#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp17_ = publishing_rest_support_xml_document_get_named_child (_tmp15_, _tmp16_, "sessionToken", &_inner_error_);
+ _tmp13_ = publishing_rest_support_xml_document_get_named_child (_tmp11_, _tmp12_, "sessionToken", &_inner_error_);
#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp14_ = _tmp17_;
+ _tmp10_ = _tmp13_;
#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_publishing_rest_support_xml_document_unref0 (doc);
#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4884 "RajcePublishing.c"
+#line 5114 "RajcePublishing.c"
goto __catch25_spit_publishing_publishing_error;
}
#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -4895,20 +5125,20 @@ static void publishing_rajce_rajce_publisher_on_get_album_url_complete (Publishi
g_clear_error (&_inner_error_);
#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return;
-#line 4895 "RajcePublishing.c"
+#line 5125 "RajcePublishing.c"
}
#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp18_ = (gchar*) xmlNodeGetContent (_tmp14_);
+ _tmp14_ = (gchar*) xmlNodeGetContent (_tmp10_);
#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- sessionToken = _tmp18_;
+ sessionToken = _tmp14_;
#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp20_ = doc;
+ _tmp16_ = doc;
#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp21_ = response;
+ _tmp17_ = response;
#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp22_ = publishing_rest_support_xml_document_get_named_child (_tmp20_, _tmp21_, "url", &_inner_error_);
+ _tmp18_ = publishing_rest_support_xml_document_get_named_child (_tmp16_, _tmp17_, "url", &_inner_error_);
#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp19_ = _tmp22_;
+ _tmp15_ = _tmp18_;
#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -4917,7 +5147,7 @@ static void publishing_rajce_rajce_publisher_on_get_album_url_complete (Publishi
_publishing_rest_support_xml_document_unref0 (doc);
#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4917 "RajcePublishing.c"
+#line 5147 "RajcePublishing.c"
goto __catch25_spit_publishing_publishing_error;
}
#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -4930,31 +5160,31 @@ static void publishing_rajce_rajce_publisher_on_get_album_url_complete (Publishi
g_clear_error (&_inner_error_);
#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return;
-#line 4930 "RajcePublishing.c"
+#line 5160 "RajcePublishing.c"
}
#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp23_ = (gchar*) xmlNodeGetContent (_tmp19_);
+ _tmp19_ = (gchar*) xmlNodeGetContent (_tmp15_);
#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- url = _tmp23_;
+ url = _tmp19_;
#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp24_ = self->priv->session;
+ _tmp20_ = self->priv->session;
#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp25_ = sessionToken;
+ _tmp21_ = sessionToken;
#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- publishing_rajce_session_set_usertoken (_tmp24_, _tmp25_);
+ publishing_rajce_session_set_usertoken (_tmp20_, _tmp21_);
#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp26_ = self->priv->session;
+ _tmp22_ = self->priv->session;
#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp27_ = url;
+ _tmp23_ = url;
#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- publishing_rajce_session_set_albumticket (_tmp26_, _tmp27_);
+ publishing_rajce_session_set_albumticket (_tmp22_, _tmp23_);
#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_free0 (url);
#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_free0 (sessionToken);
#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_publishing_rest_support_xml_document_unref0 (doc);
-#line 4954 "RajcePublishing.c"
+#line 5184 "RajcePublishing.c"
}
goto __finally25;
__catch25_spit_publishing_publishing_error:
@@ -4968,7 +5198,7 @@ static void publishing_rajce_rajce_publisher_on_get_album_url_complete (Publishi
g_debug ("RajcePublishing.vala:606: ERROR: on_get_album_url_complete");
#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_error_free0 (err);
-#line 4968 "RajcePublishing.c"
+#line 5198 "RajcePublishing.c"
}
__finally25:
#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -4979,22 +5209,24 @@ static void publishing_rajce_rajce_publisher_on_get_album_url_complete (Publishi
g_clear_error (&_inner_error_);
#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return;
-#line 4979 "RajcePublishing.c"
+#line 5209 "RajcePublishing.c"
}
#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_rajce_publisher_do_close_album (self);
-#line 4983 "RajcePublishing.c"
+#line 5213 "RajcePublishing.c"
}
/**
* Event triggered when the get album url transaction fails due to a network error.
*/
-static void publishing_rajce_rajce_publisher_on_get_album_url_error (PublishingRajceRajcePublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) {
- PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_rajce_rajce_publisher_on_get_album_url_error (PublishingRajceRajcePublisher* self,
+ PublishingRESTSupportTransaction* bad_txn,
+ GError* err)
+{
+ guint _tmp0_;
guint _tmp1_;
- PublishingRESTSupportTransaction* _tmp2_;
- guint _tmp3_;
#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self));
#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -5002,41 +5234,46 @@ static void publishing_rajce_rajce_publisher_on_get_album_url_error (PublishingR
#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_debug ("RajcePublishing.vala:619: EVENT: on_get_album_url_error");
#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp0_ = bad_txn;
-#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
+ g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_get_album_url_complete_publishing_rest_support_transaction_completed, self);
+ g_signal_handlers_disconnect_matched (bad_txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_get_album_url_complete_publishing_rest_support_transaction_completed, self);
#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp2_ = bad_txn;
+ g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_get_album_url_error_publishing_rest_support_transaction_network_error, self);
+ g_signal_handlers_disconnect_matched (bad_txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_get_album_url_error_publishing_rest_support_transaction_network_error, self);
#line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_rajce_publisher_do_close_album (self);
-#line 5015 "RajcePublishing.c"
+#line 5243 "RajcePublishing.c"
}
/**
* End upload action: close album
*/
-static void _publishing_rajce_rajce_publisher_on_close_album_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
+static void
+_publishing_rajce_rajce_publisher_on_close_album_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+ GError* err,
+ gpointer self)
+{
#line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_rajce_publisher_on_close_album_error ((PublishingRajceRajcePublisher*) self, _sender, err);
-#line 5025 "RajcePublishing.c"
+#line 5257 "RajcePublishing.c"
}
-static void _publishing_rajce_rajce_publisher_on_close_album_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
+static void
+_publishing_rajce_rajce_publisher_on_close_album_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+ gpointer self)
+{
#line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_rajce_publisher_on_close_album_complete ((PublishingRajceRajcePublisher*) self, _sender);
-#line 5032 "RajcePublishing.c"
+#line 5267 "RajcePublishing.c"
}
-static void publishing_rajce_rajce_publisher_do_close_album (PublishingRajceRajcePublisher* self) {
+static void
+publishing_rajce_rajce_publisher_do_close_album (PublishingRajceRajcePublisher* self)
+{
SpitPublishingPluginHost* _tmp0_;
PublishingRajceCloseAlbumTransaction* close_album_trans = NULL;
PublishingRajceSession* _tmp1_;
@@ -5071,7 +5308,7 @@ static void publishing_rajce_rajce_publisher_do_close_album (PublishingRajceRajc
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (close_album_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_rajce_rajce_publisher_on_close_album_error_publishing_rest_support_transaction_network_error, self, 0);
#line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (close_album_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_rajce_rajce_publisher_on_close_album_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 5071 "RajcePublishing.c"
+#line 5308 "RajcePublishing.c"
{
#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (close_album_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
@@ -5079,7 +5316,7 @@ static void publishing_rajce_rajce_publisher_do_close_album (PublishingRajceRajc
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 5079 "RajcePublishing.c"
+#line 5316 "RajcePublishing.c"
goto __catch26_spit_publishing_publishing_error;
}
#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -5090,7 +5327,7 @@ static void publishing_rajce_rajce_publisher_do_close_album (PublishingRajceRajc
g_clear_error (&_inner_error_);
#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return;
-#line 5090 "RajcePublishing.c"
+#line 5327 "RajcePublishing.c"
}
}
goto __finally26;
@@ -5110,7 +5347,7 @@ static void publishing_rajce_rajce_publisher_do_close_album (PublishingRajceRajc
publishing_rajce_rajce_publisher_do_show_error (self, _tmp6_);
#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_error_free0 (err);
-#line 5110 "RajcePublishing.c"
+#line 5347 "RajcePublishing.c"
}
__finally26:
#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -5123,25 +5360,25 @@ static void publishing_rajce_rajce_publisher_do_close_album (PublishingRajceRajc
g_clear_error (&_inner_error_);
#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return;
-#line 5123 "RajcePublishing.c"
+#line 5360 "RajcePublishing.c"
}
#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_publishing_rest_support_transaction_unref0 (close_album_trans);
-#line 5127 "RajcePublishing.c"
+#line 5364 "RajcePublishing.c"
}
/**
* Event triggered when the close album completes successfully.
*/
-static void publishing_rajce_rajce_publisher_on_close_album_complete (PublishingRajceRajcePublisher* self, PublishingRESTSupportTransaction* txn) {
- PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_rajce_rajce_publisher_on_close_album_complete (PublishingRajceRajcePublisher* self,
+ PublishingRESTSupportTransaction* txn)
+{
+ guint _tmp0_;
guint _tmp1_;
- PublishingRESTSupportTransaction* _tmp2_;
- guint _tmp3_;
- PublishingRESTSupportTransaction* _tmp4_;
- gchar* _tmp5_;
- gchar* _tmp6_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
GError * _inner_error_ = NULL;
#line 652 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self));
@@ -5150,66 +5387,57 @@ static void publishing_rajce_rajce_publisher_on_close_album_complete (Publishing
#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_debug ("RajcePublishing.vala:654: EVENT: on_close_album_complete");
#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp0_ = txn;
-#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
+ g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_close_album_complete_publishing_rest_support_transaction_completed, self);
+ g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_close_album_complete_publishing_rest_support_transaction_completed, self);
#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp2_ = txn;
+ g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_close_album_error_publishing_rest_support_transaction_network_error, self);
-#line 657 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp4_ = txn;
+ g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_close_album_error_publishing_rest_support_transaction_network_error, self);
#line 657 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp5_ = publishing_rest_support_transaction_get_response (_tmp4_);
+ _tmp2_ = publishing_rest_support_transaction_get_response (txn);
#line 657 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp6_ = _tmp5_;
+ _tmp3_ = _tmp2_;
#line 657 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_debug ("RajcePublishing.vala:657: RajcePlugin: close album: %s", _tmp6_);
+ g_debug ("RajcePublishing.vala:657: RajcePlugin: close album: %s", _tmp3_);
#line 657 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _g_free0 (_tmp6_);
-#line 5171 "RajcePublishing.c"
+ _g_free0 (_tmp3_);
+#line 5402 "RajcePublishing.c"
{
PublishingRESTSupportXmlDocument* doc = NULL;
- PublishingRESTSupportTransaction* _tmp7_;
- gchar* _tmp8_;
- gchar* _tmp9_;
- PublishingRESTSupportXmlDocument* _tmp10_;
- PublishingRESTSupportXmlDocument* _tmp11_;
+ gchar* _tmp4_;
+ gchar* _tmp5_;
+ PublishingRESTSupportXmlDocument* _tmp6_;
+ PublishingRESTSupportXmlDocument* _tmp7_;
xmlNode* response = NULL;
- PublishingRESTSupportXmlDocument* _tmp12_;
+ PublishingRESTSupportXmlDocument* _tmp8_;
+ xmlNode* _tmp9_;
+ xmlNode* _tmp10_ = NULL;
+ PublishingRESTSupportXmlDocument* _tmp11_;
+ xmlNode* _tmp12_;
xmlNode* _tmp13_;
- xmlNode* _tmp14_ = NULL;
- PublishingRESTSupportXmlDocument* _tmp15_;
- xmlNode* _tmp16_;
- xmlNode* _tmp17_;
gchar* sessionToken = NULL;
- gchar* _tmp18_;
- PublishingRajceSession* _tmp19_;
- const gchar* _tmp20_;
- PublishingRajceSession* _tmp21_;
-#line 660 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp7_ = txn;
+ gchar* _tmp14_;
+ PublishingRajceSession* _tmp15_;
+ const gchar* _tmp16_;
+ PublishingRajceSession* _tmp17_;
#line 660 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp8_ = publishing_rest_support_transaction_get_response (_tmp7_);
+ _tmp4_ = publishing_rest_support_transaction_get_response (txn);
#line 660 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp9_ = _tmp8_;
+ _tmp5_ = _tmp4_;
#line 660 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp10_ = publishing_rest_support_xml_document_parse_string (_tmp9_, _publishing_rajce_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response, NULL, &_inner_error_);
+ _tmp6_ = publishing_rest_support_xml_document_parse_string (_tmp5_, _publishing_rajce_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response, NULL, &_inner_error_);
#line 660 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp11_ = _tmp10_;
+ _tmp7_ = _tmp6_;
#line 660 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _g_free0 (_tmp9_);
+ _g_free0 (_tmp5_);
#line 660 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- doc = _tmp11_;
+ doc = _tmp7_;
#line 660 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 660 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 5209 "RajcePublishing.c"
+#line 5437 "RajcePublishing.c"
goto __catch27_spit_publishing_publishing_error;
}
#line 660 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -5218,29 +5446,29 @@ static void publishing_rajce_rajce_publisher_on_close_album_complete (Publishing
g_clear_error (&_inner_error_);
#line 660 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return;
-#line 5218 "RajcePublishing.c"
+#line 5446 "RajcePublishing.c"
}
#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp12_ = doc;
+ _tmp8_ = doc;
#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp13_ = publishing_rest_support_xml_document_get_root_node (_tmp12_);
+ _tmp9_ = publishing_rest_support_xml_document_get_root_node (_tmp8_);
#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- response = _tmp13_;
+ response = _tmp9_;
#line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp15_ = doc;
+ _tmp11_ = doc;
#line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp16_ = response;
+ _tmp12_ = response;
#line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp17_ = publishing_rest_support_xml_document_get_named_child (_tmp15_, _tmp16_, "sessionToken", &_inner_error_);
+ _tmp13_ = publishing_rest_support_xml_document_get_named_child (_tmp11_, _tmp12_, "sessionToken", &_inner_error_);
#line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp14_ = _tmp17_;
+ _tmp10_ = _tmp13_;
#line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_publishing_rest_support_xml_document_unref0 (doc);
#line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 5240 "RajcePublishing.c"
+#line 5468 "RajcePublishing.c"
goto __catch27_spit_publishing_publishing_error;
}
#line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -5251,33 +5479,33 @@ static void publishing_rajce_rajce_publisher_on_close_album_complete (Publishing
g_clear_error (&_inner_error_);
#line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return;
-#line 5251 "RajcePublishing.c"
+#line 5479 "RajcePublishing.c"
}
#line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp18_ = (gchar*) xmlNodeGetContent (_tmp14_);
+ _tmp14_ = (gchar*) xmlNodeGetContent (_tmp10_);
#line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- sessionToken = _tmp18_;
+ sessionToken = _tmp14_;
#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp19_ = self->priv->session;
+ _tmp15_ = self->priv->session;
#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp20_ = sessionToken;
+ _tmp16_ = sessionToken;
#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- publishing_rajce_session_set_usertoken (_tmp19_, _tmp20_);
+ publishing_rajce_session_set_usertoken (_tmp15_, _tmp16_);
#line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp21_ = self->priv->session;
+ _tmp17_ = self->priv->session;
#line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- publishing_rajce_session_set_albumtoken (_tmp21_, NULL);
+ publishing_rajce_session_set_albumtoken (_tmp17_, NULL);
#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_free0 (sessionToken);
#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_publishing_rest_support_xml_document_unref0 (doc);
-#line 5271 "RajcePublishing.c"
+#line 5499 "RajcePublishing.c"
}
goto __finally27;
__catch27_spit_publishing_publishing_error:
{
GError* err = NULL;
- GError* _tmp22_;
+ GError* _tmp18_;
#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
err = _inner_error_;
#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -5285,14 +5513,14 @@ static void publishing_rajce_rajce_publisher_on_close_album_complete (Publishing
#line 668 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_debug ("RajcePublishing.vala:668: ERROR: on_close_album_complete");
#line 669 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp22_ = err;
+ _tmp18_ = err;
#line 669 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- publishing_rajce_rajce_publisher_do_show_error (self, _tmp22_);
+ publishing_rajce_rajce_publisher_do_show_error (self, _tmp18_);
#line 670 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_error_free0 (err);
#line 670 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return;
-#line 5292 "RajcePublishing.c"
+#line 5520 "RajcePublishing.c"
}
__finally27:
#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -5303,22 +5531,24 @@ static void publishing_rajce_rajce_publisher_on_close_album_complete (Publishing
g_clear_error (&_inner_error_);
#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return;
-#line 5303 "RajcePublishing.c"
+#line 5531 "RajcePublishing.c"
}
#line 672 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_rajce_publisher_do_show_success_pane (self);
-#line 5307 "RajcePublishing.c"
+#line 5535 "RajcePublishing.c"
}
/**
* Event triggered when the close album transaction fails due to a network error.
*/
-static void publishing_rajce_rajce_publisher_on_close_album_error (PublishingRajceRajcePublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) {
- PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_rajce_rajce_publisher_on_close_album_error (PublishingRajceRajcePublisher* self,
+ PublishingRESTSupportTransaction* bad_txn,
+ GError* err)
+{
+ guint _tmp0_;
guint _tmp1_;
- PublishingRESTSupportTransaction* _tmp2_;
- guint _tmp3_;
#line 678 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self));
#line 678 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -5326,90 +5556,85 @@ static void publishing_rajce_rajce_publisher_on_close_album_error (PublishingRaj
#line 680 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_debug ("RajcePublishing.vala:680: EVENT: on_close_album_error");
#line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp0_ = bad_txn;
-#line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
+ g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
#line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_close_album_complete_publishing_rest_support_transaction_completed, self);
+ g_signal_handlers_disconnect_matched (bad_txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_close_album_complete_publishing_rest_support_transaction_completed, self);
#line 682 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp2_ = bad_txn;
+ g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
#line 682 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 682 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_close_album_error_publishing_rest_support_transaction_network_error, self);
+ g_signal_handlers_disconnect_matched (bad_txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_rajce_rajce_publisher_on_close_album_error_publishing_rest_support_transaction_network_error, self);
#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_rajce_publisher_do_show_success_pane (self);
-#line 5339 "RajcePublishing.c"
+#line 5565 "RajcePublishing.c"
}
/**
* Action to display the success pane in the publishing dialog.
*/
-static void publishing_rajce_rajce_publisher_do_show_success_pane (PublishingRajceRajcePublisher* self) {
+static void
+publishing_rajce_rajce_publisher_do_show_success_pane (PublishingRajceRajcePublisher* self)
+{
gboolean _tmp0_ = FALSE;
- gboolean _tmp1_;
+ SpitPublishingPluginHost* _tmp9_;
SpitPublishingPluginHost* _tmp10_;
- SpitPublishingPluginHost* _tmp11_;
GError * _inner_error_ = NULL;
#line 692 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self));
#line 694 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_debug ("RajcePublishing.vala:694: ACTION: installing success pane");
#line 695 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp1_ = publishing_rajce_rajce_publisher_get_show_album (self);
-#line 695 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- if (_tmp1_) {
-#line 5360 "RajcePublishing.c"
- PublishingRajceSession* _tmp2_;
+ if (publishing_rajce_rajce_publisher_get_show_album (self)) {
+#line 5585 "RajcePublishing.c"
+ PublishingRajceSession* _tmp1_;
+ gchar* _tmp2_;
gchar* _tmp3_;
- gchar* _tmp4_;
#line 695 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp2_ = self->priv->session;
+ _tmp1_ = self->priv->session;
#line 695 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp3_ = publishing_rajce_session_get_albumticket (_tmp2_);
+ _tmp2_ = publishing_rajce_session_get_albumticket (_tmp1_);
#line 695 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp4_ = _tmp3_;
+ _tmp3_ = _tmp2_;
#line 695 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp0_ = _tmp4_ != NULL;
+ _tmp0_ = _tmp3_ != NULL;
#line 695 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _g_free0 (_tmp4_);
-#line 5374 "RajcePublishing.c"
+ _g_free0 (_tmp3_);
+#line 5599 "RajcePublishing.c"
} else {
#line 695 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_tmp0_ = FALSE;
-#line 5378 "RajcePublishing.c"
+#line 5603 "RajcePublishing.c"
}
#line 695 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (_tmp0_) {
-#line 5382 "RajcePublishing.c"
+#line 5607 "RajcePublishing.c"
{
- PublishingRajceSession* _tmp5_;
+ PublishingRajceSession* _tmp4_;
+ gchar* _tmp5_;
gchar* _tmp6_;
gchar* _tmp7_;
gchar* _tmp8_;
- gchar* _tmp9_;
#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp5_ = self->priv->session;
+ _tmp4_ = self->priv->session;
#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp6_ = publishing_rajce_session_get_albumticket (_tmp5_);
+ _tmp5_ = publishing_rajce_session_get_albumticket (_tmp4_);
#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp7_ = _tmp6_;
+ _tmp6_ = _tmp5_;
#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp8_ = g_strconcat ("xdg-open ", _tmp7_, NULL);
+ _tmp7_ = g_strconcat ("xdg-open ", _tmp6_, NULL);
#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp9_ = _tmp8_;
+ _tmp8_ = _tmp7_;
#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_spawn_command_line_async (_tmp9_, &_inner_error_);
+ g_spawn_command_line_async (_tmp8_, &_inner_error_);
#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _g_free0 (_tmp9_);
+ _g_free0 (_tmp8_);
#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _g_free0 (_tmp7_);
+ _g_free0 (_tmp6_);
#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (_inner_error_->domain == G_SPAWN_ERROR) {
-#line 5409 "RajcePublishing.c"
+#line 5634 "RajcePublishing.c"
goto __catch28_g_spawn_error;
}
#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -5418,7 +5643,7 @@ static void publishing_rajce_rajce_publisher_do_show_success_pane (PublishingRaj
g_clear_error (&_inner_error_);
#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return;
-#line 5418 "RajcePublishing.c"
+#line 5643 "RajcePublishing.c"
}
}
goto __finally28;
@@ -5431,7 +5656,7 @@ static void publishing_rajce_rajce_publisher_do_show_success_pane (PublishingRaj
_inner_error_ = NULL;
#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_error_free0 (e);
-#line 5431 "RajcePublishing.c"
+#line 5656 "RajcePublishing.c"
}
__finally28:
#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -5442,26 +5667,29 @@ static void publishing_rajce_rajce_publisher_do_show_success_pane (PublishingRaj
g_clear_error (&_inner_error_);
#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return;
-#line 5442 "RajcePublishing.c"
+#line 5667 "RajcePublishing.c"
}
}
#line 705 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp10_ = self->priv->host;
+ _tmp9_ = self->priv->host;
#line 705 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- spit_publishing_plugin_host_set_service_locked (_tmp10_, FALSE);
+ spit_publishing_plugin_host_set_service_locked (_tmp9_, FALSE);
#line 706 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp11_ = self->priv->host;
+ _tmp10_ = self->priv->host;
#line 706 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- spit_publishing_plugin_host_install_success_pane (_tmp11_);
-#line 5453 "RajcePublishing.c"
+ spit_publishing_plugin_host_install_success_pane (_tmp10_);
+#line 5678 "RajcePublishing.c"
}
/**
* Helper event to handle network errors.
*/
-static void publishing_rajce_rajce_publisher_on_network_error (PublishingRajceRajcePublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) {
- GError* _tmp0_;
+static void
+publishing_rajce_rajce_publisher_on_network_error (PublishingRajceRajcePublisher* self,
+ PublishingRESTSupportTransaction* bad_txn,
+ GError* err)
+{
#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self));
#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -5469,25 +5697,24 @@ static void publishing_rajce_rajce_publisher_on_network_error (PublishingRajceRa
#line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_debug ("RajcePublishing.vala:714: EVENT: on_network_error");
#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp0_ = err;
-#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- publishing_rajce_rajce_publisher_do_show_error (self, _tmp0_);
-#line 5472 "RajcePublishing.c"
+ publishing_rajce_rajce_publisher_do_show_error (self, err);
+#line 5698 "RajcePublishing.c"
}
/**
* Action to display an error to the user.
*/
-static void publishing_rajce_rajce_publisher_do_show_error (PublishingRajceRajcePublisher* self, GError* e) {
+static void
+publishing_rajce_rajce_publisher_do_show_error (PublishingRajceRajcePublisher* self,
+ GError* e)
+{
gchar* error_type = NULL;
gchar* _tmp0_;
- GError* _tmp1_;
- const gchar* _tmp14_;
- GError* _tmp15_;
- const gchar* _tmp16_;
- gchar* _tmp17_;
- gchar* _tmp18_;
+ const gchar* _tmp7_;
+ const gchar* _tmp8_;
+ gchar* _tmp9_;
+ gchar* _tmp10_;
#line 721 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self));
#line 723 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -5497,106 +5724,86 @@ static void publishing_rajce_rajce_publisher_do_show_error (PublishingRajceRajce
#line 724 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
error_type = _tmp0_;
#line 725 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp1_ = e;
-#line 725 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- if (g_error_matches (_tmp1_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_NO_ANSWER)) {
+ if (g_error_matches (e, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_NO_ANSWER)) {
#line 727 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_rajce_publisher_do_show_authentication_pane (self, PUBLISHING_RAJCE_AUTHENTICATION_PANE_MODE_FAILED_RETRY_USER);
#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_free0 (error_type);
#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return;
-#line 5506 "RajcePublishing.c"
+#line 5731 "RajcePublishing.c"
} else {
- GError* _tmp2_;
-#line 729 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp2_ = e;
#line 729 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- if (g_error_matches (_tmp2_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_COMMUNICATION_FAILED)) {
-#line 5513 "RajcePublishing.c"
- gchar* _tmp3_;
+ if (g_error_matches (e, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_COMMUNICATION_FAILED)) {
+#line 5735 "RajcePublishing.c"
+ gchar* _tmp1_;
#line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp3_ = g_strdup ("COMMUNICATION_FAILED");
+ _tmp1_ = g_strdup ("COMMUNICATION_FAILED");
#line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_free0 (error_type);
#line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- error_type = _tmp3_;
-#line 5521 "RajcePublishing.c"
+ error_type = _tmp1_;
+#line 5743 "RajcePublishing.c"
} else {
- GError* _tmp4_;
#line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp4_ = e;
-#line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- if (g_error_matches (_tmp4_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_PROTOCOL_ERROR)) {
-#line 5528 "RajcePublishing.c"
- gchar* _tmp5_;
+ if (g_error_matches (e, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_PROTOCOL_ERROR)) {
+#line 5747 "RajcePublishing.c"
+ gchar* _tmp2_;
#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp5_ = g_strdup ("PROTOCOL_ERROR");
+ _tmp2_ = g_strdup ("PROTOCOL_ERROR");
#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_free0 (error_type);
#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- error_type = _tmp5_;
-#line 5536 "RajcePublishing.c"
+ error_type = _tmp2_;
+#line 5755 "RajcePublishing.c"
} else {
- GError* _tmp6_;
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp6_ = e;
#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- if (g_error_matches (_tmp6_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_SERVICE_ERROR)) {
-#line 5543 "RajcePublishing.c"
- gchar* _tmp7_;
+ if (g_error_matches (e, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_SERVICE_ERROR)) {
+#line 5759 "RajcePublishing.c"
+ gchar* _tmp3_;
#line 734 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp7_ = g_strdup ("SERVICE_ERROR");
+ _tmp3_ = g_strdup ("SERVICE_ERROR");
#line 734 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_free0 (error_type);
#line 734 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- error_type = _tmp7_;
-#line 5551 "RajcePublishing.c"
+ error_type = _tmp3_;
+#line 5767 "RajcePublishing.c"
} else {
- GError* _tmp8_;
#line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp8_ = e;
-#line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- if (g_error_matches (_tmp8_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE)) {
-#line 5558 "RajcePublishing.c"
- gchar* _tmp9_;
+ if (g_error_matches (e, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE)) {
+#line 5771 "RajcePublishing.c"
+ gchar* _tmp4_;
#line 736 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp9_ = g_strdup ("MALFORMED_RESPONSE");
+ _tmp4_ = g_strdup ("MALFORMED_RESPONSE");
#line 736 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_free0 (error_type);
#line 736 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- error_type = _tmp9_;
-#line 5566 "RajcePublishing.c"
+ error_type = _tmp4_;
+#line 5779 "RajcePublishing.c"
} else {
- GError* _tmp10_;
-#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp10_ = e;
#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- if (g_error_matches (_tmp10_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR)) {
-#line 5573 "RajcePublishing.c"
- gchar* _tmp11_;
+ if (g_error_matches (e, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR)) {
+#line 5783 "RajcePublishing.c"
+ gchar* _tmp5_;
#line 738 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp11_ = g_strdup ("LOCAL_FILE_ERROR");
+ _tmp5_ = g_strdup ("LOCAL_FILE_ERROR");
#line 738 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_free0 (error_type);
#line 738 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- error_type = _tmp11_;
-#line 5581 "RajcePublishing.c"
+ error_type = _tmp5_;
+#line 5791 "RajcePublishing.c"
} else {
- GError* _tmp12_;
#line 739 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp12_ = e;
-#line 739 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- if (g_error_matches (_tmp12_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_EXPIRED_SESSION)) {
-#line 5588 "RajcePublishing.c"
- gchar* _tmp13_;
+ if (g_error_matches (e, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_EXPIRED_SESSION)) {
+#line 5795 "RajcePublishing.c"
+ gchar* _tmp6_;
#line 740 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp13_ = g_strdup ("EXPIRED_SESSION");
+ _tmp6_ = g_strdup ("EXPIRED_SESSION");
#line 740 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_free0 (error_type);
#line 740 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- error_type = _tmp13_;
-#line 5596 "RajcePublishing.c"
+ error_type = _tmp6_;
+#line 5803 "RajcePublishing.c"
}
}
}
@@ -5605,33 +5812,33 @@ static void publishing_rajce_rajce_publisher_do_show_error (PublishingRajceRajce
}
}
#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp14_ = error_type;
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp15_ = e;
+ _tmp7_ = error_type;
#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp16_ = _tmp15_->message;
+ _tmp8_ = e->message;
#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp17_ = g_strdup_printf ("Unhandled error: type=%s; message='%s'", _tmp14_, _tmp16_);
+ _tmp9_ = g_strdup_printf ("Unhandled error: type=%s; message='%s'", _tmp7_, _tmp8_);
#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp18_ = _tmp17_;
+ _tmp10_ = _tmp9_;
#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_debug ("RajcePublishing.vala:743: %s", _tmp18_);
+ g_debug ("RajcePublishing.vala:743: %s", _tmp10_);
#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _g_free0 (_tmp18_);
+ _g_free0 (_tmp10_);
#line 744 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_rajce_publisher_do_show_error_message (self, _ ("An error message occurred when publishing to Rajce. Please try again."));
#line 721 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_free0 (error_type);
-#line 5622 "RajcePublishing.c"
+#line 5827 "RajcePublishing.c"
}
/**
* Action to display an error message to the user.
*/
-static void publishing_rajce_rajce_publisher_do_show_error_message (PublishingRajceRajcePublisher* self, const gchar* message) {
+static void
+publishing_rajce_rajce_publisher_do_show_error_message (PublishingRajceRajcePublisher* self,
+ const gchar* message)
+{
SpitPublishingPluginHost* _tmp0_;
- const gchar* _tmp1_;
#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (self));
#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -5641,25 +5848,27 @@ static void publishing_rajce_rajce_publisher_do_show_error_message (PublishingRa
#line 753 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_tmp0_ = self->priv->host;
#line 753 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp1_ = message;
-#line 753 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- spit_publishing_plugin_host_install_static_message_pane (_tmp0_, _tmp1_, SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CLOSE);
-#line 5644 "RajcePublishing.c"
+ spit_publishing_plugin_host_install_static_message_pane (_tmp0_, message, SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CLOSE);
+#line 5849 "RajcePublishing.c"
}
-static void publishing_rajce_rajce_publisher_class_init (PublishingRajceRajcePublisherClass * klass) {
+static void
+publishing_rajce_rajce_publisher_class_init (PublishingRajceRajcePublisherClass * klass)
+{
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_rajce_publisher_parent_class = g_type_class_peek_parent (klass);
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_type_class_add_private (klass, sizeof (PublishingRajceRajcePublisherPrivate));
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
G_OBJECT_CLASS (klass)->finalize = publishing_rajce_rajce_publisher_finalize;
-#line 5655 "RajcePublishing.c"
+#line 5862 "RajcePublishing.c"
}
-static void publishing_rajce_rajce_publisher_spit_publishing_publisher_interface_init (SpitPublishingPublisherIface * iface) {
+static void
+publishing_rajce_rajce_publisher_spit_publishing_publisher_interface_init (SpitPublishingPublisherIface * iface)
+{
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_rajce_publisher_spit_publishing_publisher_parent_iface = g_type_interface_peek_parent (iface);
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -5670,11 +5879,13 @@ static void publishing_rajce_rajce_publisher_spit_publishing_publisher_interface
iface->start = (void (*) (SpitPublishingPublisher *)) publishing_rajce_rajce_publisher_real_start;
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
iface->stop = (void (*) (SpitPublishingPublisher *)) publishing_rajce_rajce_publisher_real_stop;
-#line 5670 "RajcePublishing.c"
+#line 5879 "RajcePublishing.c"
}
-static void publishing_rajce_rajce_publisher_instance_init (PublishingRajceRajcePublisher * self) {
+static void
+publishing_rajce_rajce_publisher_instance_init (PublishingRajceRajcePublisher * self)
+{
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
self->priv = PUBLISHING_RAJCE_RAJCE_PUBLISHER_GET_PRIVATE (self);
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -5699,11 +5910,13 @@ static void publishing_rajce_rajce_publisher_instance_init (PublishingRajceRajce
self->priv->parameters = NULL;
#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
self->priv->media_type = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_NONE;
-#line 5699 "RajcePublishing.c"
+#line 5910 "RajcePublishing.c"
}
-static void publishing_rajce_rajce_publisher_finalize (GObject * obj) {
+static void
+publishing_rajce_rajce_publisher_finalize (GObject * obj)
+{
PublishingRajceRajcePublisher * self;
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_RAJCE_TYPE_RAJCE_PUBLISHER, PublishingRajceRajcePublisher);
@@ -5727,11 +5940,13 @@ static void publishing_rajce_rajce_publisher_finalize (GObject * obj) {
_publishing_rajce_publishing_parameters_unref0 (self->priv->parameters);
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
G_OBJECT_CLASS (publishing_rajce_rajce_publisher_parent_class)->finalize (obj);
-#line 5727 "RajcePublishing.c"
+#line 5940 "RajcePublishing.c"
}
-GType publishing_rajce_rajce_publisher_get_type (void) {
+GType
+publishing_rajce_rajce_publisher_get_type (void)
+{
static volatile gsize publishing_rajce_rajce_publisher_type_id__volatile = 0;
if (g_once_init_enter (&publishing_rajce_rajce_publisher_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingRajceRajcePublisherClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_rajce_rajce_publisher_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingRajceRajcePublisher), 0, (GInstanceInitFunc) publishing_rajce_rajce_publisher_instance_init, NULL };
@@ -5745,22 +5960,24 @@ GType publishing_rajce_rajce_publisher_get_type (void) {
}
-PublishingRajceAlbum* publishing_rajce_album_construct (GType object_type, gint id, const gchar* albumName, const gchar* url, const gchar* thumbUrl, const gchar* createDate, const gchar* updateDate, gboolean hidden, gboolean secure, gint photoCount) {
+PublishingRajceAlbum*
+publishing_rajce_album_construct (GType object_type,
+ gint id,
+ const gchar* albumName,
+ const gchar* url,
+ const gchar* thumbUrl,
+ const gchar* createDate,
+ const gchar* updateDate,
+ gboolean hidden,
+ gboolean secure,
+ gint photoCount)
+{
PublishingRajceAlbum* self = NULL;
- gint _tmp0_;
- const gchar* _tmp1_;
+ gchar* _tmp0_;
+ gchar* _tmp1_;
gchar* _tmp2_;
- const gchar* _tmp3_;
+ gchar* _tmp3_;
gchar* _tmp4_;
- const gchar* _tmp5_;
- gchar* _tmp6_;
- const gchar* _tmp7_;
- gchar* _tmp8_;
- const gchar* _tmp9_;
- gchar* _tmp10_;
- gboolean _tmp11_;
- gboolean _tmp12_;
- gint _tmp13_;
#line 771 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_val_if_fail (albumName != NULL, NULL);
#line 771 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -5774,102 +5991,87 @@ PublishingRajceAlbum* publishing_rajce_album_construct (GType object_type, gint
#line 771 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
self = (PublishingRajceAlbum*) g_type_create_instance (object_type);
#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp0_ = id;
-#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- self->id = _tmp0_;
-#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp1_ = albumName;
+ self->id = id;
#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp2_ = g_strdup (_tmp1_);
+ _tmp0_ = g_strdup (albumName);
#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_free0 (self->albumName);
#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- self->albumName = _tmp2_;
-#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp3_ = url;
+ self->albumName = _tmp0_;
#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp4_ = g_strdup (_tmp3_);
+ _tmp1_ = g_strdup (url);
#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_free0 (self->url);
#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- self->url = _tmp4_;
+ self->url = _tmp1_;
#line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp5_ = thumbUrl;
-#line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp6_ = g_strdup (_tmp5_);
+ _tmp2_ = g_strdup (thumbUrl);
#line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_free0 (self->thumbUrl);
#line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- self->thumbUrl = _tmp6_;
-#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp7_ = createDate;
+ self->thumbUrl = _tmp2_;
#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp8_ = g_strdup (_tmp7_);
+ _tmp3_ = g_strdup (createDate);
#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_free0 (self->createDate);
#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- self->createDate = _tmp8_;
+ self->createDate = _tmp3_;
#line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp9_ = updateDate;
-#line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp10_ = g_strdup (_tmp9_);
+ _tmp4_ = g_strdup (updateDate);
#line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_free0 (self->updateDate);
#line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- self->updateDate = _tmp10_;
-#line 779 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp11_ = hidden;
+ self->updateDate = _tmp4_;
#line 779 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- self->hidden = _tmp11_;
-#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp12_ = secure;
+ self->hidden = hidden;
#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- self->secure = _tmp12_;
+ self->secure = secure;
#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp13_ = photoCount;
-#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- self->photoCount = _tmp13_;
+ self->photoCount = photoCount;
#line 771 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return self;
-#line 5831 "RajcePublishing.c"
+#line 6030 "RajcePublishing.c"
}
-PublishingRajceAlbum* publishing_rajce_album_new (gint id, const gchar* albumName, const gchar* url, const gchar* thumbUrl, const gchar* createDate, const gchar* updateDate, gboolean hidden, gboolean secure, gint photoCount) {
+PublishingRajceAlbum*
+publishing_rajce_album_new (gint id,
+ const gchar* albumName,
+ const gchar* url,
+ const gchar* thumbUrl,
+ const gchar* createDate,
+ const gchar* updateDate,
+ gboolean hidden,
+ gboolean secure,
+ gint photoCount)
+{
#line 771 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return publishing_rajce_album_construct (PUBLISHING_RAJCE_TYPE_ALBUM, id, albumName, url, thumbUrl, createDate, updateDate, hidden, secure, photoCount);
-#line 5838 "RajcePublishing.c"
+#line 6047 "RajcePublishing.c"
}
-gint publishing_rajce_album_compare_albums (PublishingRajceAlbum* a, PublishingRajceAlbum* b) {
+gint
+publishing_rajce_album_compare_albums (PublishingRajceAlbum* a,
+ PublishingRajceAlbum* b)
+{
gint result = 0;
gboolean _tmp0_ = FALSE;
- PublishingRajceAlbum* _tmp1_;
- PublishingRajceAlbum* _tmp9_;
- const gchar* _tmp10_;
- PublishingRajceAlbum* _tmp11_;
- const gchar* _tmp12_;
- gint _tmp13_;
+ const gchar* _tmp3_;
+ const gchar* _tmp4_;
#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_val_if_fail ((a == NULL) || PUBLISHING_RAJCE_IS_ALBUM (a), 0);
#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_val_if_fail ((b == NULL) || PUBLISHING_RAJCE_IS_ALBUM (b), 0);
#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp1_ = a;
-#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- if (_tmp1_ == NULL) {
-#line 5859 "RajcePublishing.c"
- PublishingRajceAlbum* _tmp2_;
-#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp2_ = b;
+ if (a == NULL) {
#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp0_ = _tmp2_ == NULL;
-#line 5865 "RajcePublishing.c"
+ _tmp0_ = b == NULL;
+#line 6067 "RajcePublishing.c"
} else {
#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_tmp0_ = FALSE;
-#line 5869 "RajcePublishing.c"
+#line 6071 "RajcePublishing.c"
}
#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (_tmp0_) {
@@ -5877,178 +6079,183 @@ gint publishing_rajce_album_compare_albums (PublishingRajceAlbum* a, PublishingR
result = 0;
#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return result;
-#line 5877 "RajcePublishing.c"
+#line 6079 "RajcePublishing.c"
} else {
- gboolean _tmp3_ = FALSE;
- PublishingRajceAlbum* _tmp4_;
-#line 789 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp4_ = a;
+ gboolean _tmp1_ = FALSE;
#line 789 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- if (_tmp4_ == NULL) {
-#line 5885 "RajcePublishing.c"
- PublishingRajceAlbum* _tmp5_;
+ if (a == NULL) {
#line 789 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp5_ = b;
-#line 789 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp3_ = _tmp5_ != NULL;
-#line 5891 "RajcePublishing.c"
+ _tmp1_ = b != NULL;
+#line 6086 "RajcePublishing.c"
} else {
#line 789 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp3_ = FALSE;
-#line 5895 "RajcePublishing.c"
+ _tmp1_ = FALSE;
+#line 6090 "RajcePublishing.c"
}
#line 789 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- if (_tmp3_) {
+ if (_tmp1_) {
#line 791 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
result = 1;
#line 791 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return result;
-#line 5903 "RajcePublishing.c"
+#line 6098 "RajcePublishing.c"
} else {
- gboolean _tmp6_ = FALSE;
- PublishingRajceAlbum* _tmp7_;
-#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp7_ = a;
+ gboolean _tmp2_ = FALSE;
#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- if (_tmp7_ != NULL) {
-#line 5911 "RajcePublishing.c"
- PublishingRajceAlbum* _tmp8_;
+ if (a != NULL) {
#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp8_ = b;
-#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp6_ = _tmp8_ == NULL;
-#line 5917 "RajcePublishing.c"
+ _tmp2_ = b == NULL;
+#line 6105 "RajcePublishing.c"
} else {
#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp6_ = FALSE;
-#line 5921 "RajcePublishing.c"
+ _tmp2_ = FALSE;
+#line 6109 "RajcePublishing.c"
}
#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- if (_tmp6_) {
+ if (_tmp2_) {
#line 795 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
result = -1;
#line 795 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return result;
-#line 5929 "RajcePublishing.c"
+#line 6117 "RajcePublishing.c"
}
}
}
#line 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp9_ = b;
-#line 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp10_ = _tmp9_->updateDate;
-#line 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp11_ = a;
-#line 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp12_ = _tmp11_->updateDate;
+ _tmp3_ = b->updateDate;
#line 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp13_ = g_ascii_strcasecmp (_tmp10_, _tmp12_);
+ _tmp4_ = a->updateDate;
#line 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- result = _tmp13_;
+ result = g_ascii_strcasecmp (_tmp3_, _tmp4_);
#line 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return result;
-#line 5947 "RajcePublishing.c"
+#line 6129 "RajcePublishing.c"
}
-static void publishing_rajce_value_album_init (GValue* value) {
+static void
+publishing_rajce_value_album_init (GValue* value)
+{
#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
value->data[0].v_pointer = NULL;
-#line 5954 "RajcePublishing.c"
+#line 6138 "RajcePublishing.c"
}
-static void publishing_rajce_value_album_free_value (GValue* value) {
+static void
+publishing_rajce_value_album_free_value (GValue* value)
+{
#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (value->data[0].v_pointer) {
#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_album_unref (value->data[0].v_pointer);
-#line 5963 "RajcePublishing.c"
+#line 6149 "RajcePublishing.c"
}
}
-static void publishing_rajce_value_album_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+publishing_rajce_value_album_copy_value (const GValue* src_value,
+ GValue* dest_value)
+{
#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (src_value->data[0].v_pointer) {
#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
dest_value->data[0].v_pointer = publishing_rajce_album_ref (src_value->data[0].v_pointer);
-#line 5973 "RajcePublishing.c"
+#line 6162 "RajcePublishing.c"
} else {
#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
dest_value->data[0].v_pointer = NULL;
-#line 5977 "RajcePublishing.c"
+#line 6166 "RajcePublishing.c"
}
}
-static gpointer publishing_rajce_value_album_peek_pointer (const GValue* value) {
+static gpointer
+publishing_rajce_value_album_peek_pointer (const GValue* value)
+{
#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return value->data[0].v_pointer;
-#line 5985 "RajcePublishing.c"
+#line 6176 "RajcePublishing.c"
}
-static gchar* publishing_rajce_value_album_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_rajce_value_album_collect_value (GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (collect_values[0].v_pointer) {
-#line 5992 "RajcePublishing.c"
+#line 6188 "RajcePublishing.c"
PublishingRajceAlbum * object;
object = collect_values[0].v_pointer;
#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (object->parent_instance.g_class == NULL) {
#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 5999 "RajcePublishing.c"
+#line 6195 "RajcePublishing.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 6003 "RajcePublishing.c"
+#line 6199 "RajcePublishing.c"
}
#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
value->data[0].v_pointer = publishing_rajce_album_ref (object);
-#line 6007 "RajcePublishing.c"
+#line 6203 "RajcePublishing.c"
} else {
#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
value->data[0].v_pointer = NULL;
-#line 6011 "RajcePublishing.c"
+#line 6207 "RajcePublishing.c"
}
#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return NULL;
-#line 6015 "RajcePublishing.c"
+#line 6211 "RajcePublishing.c"
}
-static gchar* publishing_rajce_value_album_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_rajce_value_album_lcopy_value (const GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
PublishingRajceAlbum ** object_p;
object_p = collect_values[0].v_pointer;
#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (!object_p) {
#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 6026 "RajcePublishing.c"
+#line 6227 "RajcePublishing.c"
}
#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (!value->data[0].v_pointer) {
#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
*object_p = NULL;
-#line 6032 "RajcePublishing.c"
+#line 6233 "RajcePublishing.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
*object_p = value->data[0].v_pointer;
-#line 6036 "RajcePublishing.c"
+#line 6237 "RajcePublishing.c"
} else {
#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
*object_p = publishing_rajce_album_ref (value->data[0].v_pointer);
-#line 6040 "RajcePublishing.c"
+#line 6241 "RajcePublishing.c"
}
#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return NULL;
-#line 6044 "RajcePublishing.c"
+#line 6245 "RajcePublishing.c"
}
-GParamSpec* publishing_rajce_param_spec_album (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+publishing_rajce_param_spec_album (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags)
+{
PublishingRajceParamSpecAlbum* spec;
#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_RAJCE_TYPE_ALBUM), NULL);
@@ -6058,20 +6265,25 @@ GParamSpec* publishing_rajce_param_spec_album (const gchar* name, const gchar* n
G_PARAM_SPEC (spec)->value_type = object_type;
#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return G_PARAM_SPEC (spec);
-#line 6058 "RajcePublishing.c"
+#line 6265 "RajcePublishing.c"
}
-gpointer publishing_rajce_value_get_album (const GValue* value) {
+gpointer
+publishing_rajce_value_get_album (const GValue* value)
+{
#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_RAJCE_TYPE_ALBUM), NULL);
#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return value->data[0].v_pointer;
-#line 6067 "RajcePublishing.c"
+#line 6276 "RajcePublishing.c"
}
-void publishing_rajce_value_set_album (GValue* value, gpointer v_object) {
+void
+publishing_rajce_value_set_album (GValue* value,
+ gpointer v_object)
+{
PublishingRajceAlbum * old;
#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_RAJCE_TYPE_ALBUM));
@@ -6087,22 +6299,25 @@ void publishing_rajce_value_set_album (GValue* value, gpointer v_object) {
value->data[0].v_pointer = v_object;
#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_album_ref (value->data[0].v_pointer);
-#line 6087 "RajcePublishing.c"
+#line 6299 "RajcePublishing.c"
} else {
#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
value->data[0].v_pointer = NULL;
-#line 6091 "RajcePublishing.c"
+#line 6303 "RajcePublishing.c"
}
#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (old) {
#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_album_unref (old);
-#line 6097 "RajcePublishing.c"
+#line 6309 "RajcePublishing.c"
}
}
-void publishing_rajce_value_take_album (GValue* value, gpointer v_object) {
+void
+publishing_rajce_value_take_album (GValue* value,
+ gpointer v_object)
+{
PublishingRajceAlbum * old;
#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_RAJCE_TYPE_ALBUM));
@@ -6116,38 +6331,44 @@ void publishing_rajce_value_take_album (GValue* value, gpointer v_object) {
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
value->data[0].v_pointer = v_object;
-#line 6116 "RajcePublishing.c"
+#line 6331 "RajcePublishing.c"
} else {
#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
value->data[0].v_pointer = NULL;
-#line 6120 "RajcePublishing.c"
+#line 6335 "RajcePublishing.c"
}
#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (old) {
#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_album_unref (old);
-#line 6126 "RajcePublishing.c"
+#line 6341 "RajcePublishing.c"
}
}
-static void publishing_rajce_album_class_init (PublishingRajceAlbumClass * klass) {
+static void
+publishing_rajce_album_class_init (PublishingRajceAlbumClass * klass)
+{
#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_album_parent_class = g_type_class_peek_parent (klass);
#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
((PublishingRajceAlbumClass *) klass)->finalize = publishing_rajce_album_finalize;
-#line 6136 "RajcePublishing.c"
+#line 6353 "RajcePublishing.c"
}
-static void publishing_rajce_album_instance_init (PublishingRajceAlbum * self) {
+static void
+publishing_rajce_album_instance_init (PublishingRajceAlbum * self)
+{
#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
self->ref_count = 1;
-#line 6143 "RajcePublishing.c"
+#line 6362 "RajcePublishing.c"
}
-static void publishing_rajce_album_finalize (PublishingRajceAlbum * obj) {
+static void
+publishing_rajce_album_finalize (PublishingRajceAlbum * obj)
+{
PublishingRajceAlbum * self;
#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_RAJCE_TYPE_ALBUM, PublishingRajceAlbum);
@@ -6163,11 +6384,13 @@ static void publishing_rajce_album_finalize (PublishingRajceAlbum * obj) {
_g_free0 (self->createDate);
#line 766 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_free0 (self->updateDate);
-#line 6163 "RajcePublishing.c"
+#line 6384 "RajcePublishing.c"
}
-GType publishing_rajce_album_get_type (void) {
+GType
+publishing_rajce_album_get_type (void)
+{
static volatile gsize publishing_rajce_album_type_id__volatile = 0;
if (g_once_init_enter (&publishing_rajce_album_type_id__volatile)) {
static const GTypeValueTable g_define_type_value_table = { publishing_rajce_value_album_init, publishing_rajce_value_album_free_value, publishing_rajce_value_album_copy_value, publishing_rajce_value_album_peek_pointer, "p", publishing_rajce_value_album_collect_value, "p", publishing_rajce_value_album_lcopy_value };
@@ -6181,18 +6404,22 @@ GType publishing_rajce_album_get_type (void) {
}
-gpointer publishing_rajce_album_ref (gpointer instance) {
+gpointer
+publishing_rajce_album_ref (gpointer instance)
+{
PublishingRajceAlbum * self;
self = instance;
#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_atomic_int_inc (&self->ref_count);
#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return instance;
-#line 6188 "RajcePublishing.c"
+#line 6413 "RajcePublishing.c"
}
-void publishing_rajce_album_unref (gpointer instance) {
+void
+publishing_rajce_album_unref (gpointer instance)
+{
PublishingRajceAlbum * self;
self = instance;
#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -6201,20 +6428,22 @@ void publishing_rajce_album_unref (gpointer instance) {
PUBLISHING_RAJCE_ALBUM_GET_CLASS (self)->finalize (self);
#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 6201 "RajcePublishing.c"
+#line 6428 "RajcePublishing.c"
}
}
-PublishingRajceUploader* publishing_rajce_uploader_construct (GType object_type, PublishingRajceSession* session, const gchar* url, SpitPublishingPublishable** publishables, int publishables_length1, PublishingRajcePublishingParameters* parameters) {
+PublishingRajceUploader*
+publishing_rajce_uploader_construct (GType object_type,
+ PublishingRajceSession* session,
+ const gchar* url,
+ SpitPublishingPublishable** publishables,
+ int publishables_length1,
+ PublishingRajcePublishingParameters* parameters)
+{
PublishingRajceUploader* self = NULL;
- PublishingRajceSession* _tmp0_;
- SpitPublishingPublishable** _tmp1_;
- gint _tmp1__length1;
- PublishingRajcePublishingParameters* _tmp2_;
- PublishingRajcePublishingParameters* _tmp3_;
- const gchar* _tmp4_;
- gchar* _tmp5_;
+ PublishingRajcePublishingParameters* _tmp0_;
+ gchar* _tmp1_;
#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_val_if_fail (PUBLISHING_RAJCE_IS_SESSION (session), NULL);
#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -6222,52 +6451,50 @@ PublishingRajceUploader* publishing_rajce_uploader_construct (GType object_type,
#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_val_if_fail (PUBLISHING_RAJCE_IS_PUBLISHING_PARAMETERS (parameters), NULL);
#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp0_ = session;
-#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp1_ = publishables;
-#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp1__length1 = publishables_length1;
-#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- self = (PublishingRajceUploader*) publishing_rest_support_batch_uploader_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, _tmp1__length1);
+ self = (PublishingRajceUploader*) publishing_rest_support_batch_uploader_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), publishables, publishables_length1);
#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp2_ = parameters;
-#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp3_ = _publishing_rajce_publishing_parameters_ref0 (_tmp2_);
+ _tmp0_ = _publishing_rajce_publishing_parameters_ref0 (parameters);
#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_publishing_rajce_publishing_parameters_unref0 (self->priv->parameters);
#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- self->priv->parameters = _tmp3_;
-#line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp4_ = url;
+ self->priv->parameters = _tmp0_;
#line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp5_ = g_strdup (_tmp4_);
+ _tmp1_ = g_strdup (url);
#line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_free0 (self->priv->url);
#line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- self->priv->url = _tmp5_;
+ self->priv->url = _tmp1_;
#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return self;
-#line 6247 "RajcePublishing.c"
+#line 6466 "RajcePublishing.c"
}
-PublishingRajceUploader* publishing_rajce_uploader_new (PublishingRajceSession* session, const gchar* url, SpitPublishingPublishable** publishables, int publishables_length1, PublishingRajcePublishingParameters* parameters) {
+PublishingRajceUploader*
+publishing_rajce_uploader_new (PublishingRajceSession* session,
+ const gchar* url,
+ SpitPublishingPublishable** publishables,
+ int publishables_length1,
+ PublishingRajcePublishingParameters* parameters)
+{
#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return publishing_rajce_uploader_construct (PUBLISHING_RAJCE_TYPE_UPLOADER, session, url, publishables, publishables_length1, parameters);
-#line 6254 "RajcePublishing.c"
+#line 6479 "RajcePublishing.c"
}
-static PublishingRESTSupportTransaction* publishing_rajce_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base, SpitPublishingPublishable* publishable) {
+static PublishingRESTSupportTransaction*
+publishing_rajce_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base,
+ SpitPublishingPublishable* publishable)
+{
PublishingRajceUploader * self;
PublishingRESTSupportTransaction* result = NULL;
PublishingRESTSupportSession* _tmp0_;
PublishingRajceSession* _tmp1_;
const gchar* _tmp2_;
PublishingRajcePublishingParameters* _tmp3_;
- SpitPublishingPublishable* _tmp4_;
- PublishingRajceAddPhotoTransaction* _tmp5_;
- PublishingRESTSupportTransaction* _tmp6_;
+ PublishingRajceAddPhotoTransaction* _tmp4_;
+ PublishingRESTSupportTransaction* _tmp5_;
#line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_RAJCE_TYPE_UPLOADER, PublishingRajceUploader);
#line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -6281,22 +6508,22 @@ static PublishingRESTSupportTransaction* publishing_rajce_uploader_real_create_t
#line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_tmp3_ = self->priv->parameters;
#line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp4_ = publishable;
-#line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp5_ = publishing_rajce_add_photo_transaction_new (_tmp1_, _tmp2_, _tmp3_, _tmp4_);
+ _tmp4_ = publishing_rajce_add_photo_transaction_new (_tmp1_, _tmp2_, _tmp3_, publishable);
#line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction);
+ _tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction);
#line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_publishing_rest_support_session_unref0 (_tmp1_);
#line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- result = _tmp6_;
+ result = _tmp5_;
#line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return result;
-#line 6292 "RajcePublishing.c"
+#line 6517 "RajcePublishing.c"
}
-static void publishing_rajce_uploader_class_init (PublishingRajceUploaderClass * klass) {
+static void
+publishing_rajce_uploader_class_init (PublishingRajceUploaderClass * klass)
+{
#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_uploader_parent_class = g_type_class_peek_parent (klass);
#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -6305,18 +6532,22 @@ static void publishing_rajce_uploader_class_init (PublishingRajceUploaderClass *
g_type_class_add_private (klass, sizeof (PublishingRajceUploaderPrivate));
#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = (PublishingRESTSupportTransaction* (*) (PublishingRESTSupportBatchUploader *, SpitPublishingPublishable*)) publishing_rajce_uploader_real_create_transaction;
-#line 6305 "RajcePublishing.c"
+#line 6532 "RajcePublishing.c"
}
-static void publishing_rajce_uploader_instance_init (PublishingRajceUploader * self) {
+static void
+publishing_rajce_uploader_instance_init (PublishingRajceUploader * self)
+{
#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
self->priv = PUBLISHING_RAJCE_UPLOADER_GET_PRIVATE (self);
-#line 6312 "RajcePublishing.c"
+#line 6541 "RajcePublishing.c"
}
-static void publishing_rajce_uploader_finalize (PublishingRESTSupportBatchUploader * obj) {
+static void
+publishing_rajce_uploader_finalize (PublishingRESTSupportBatchUploader * obj)
+{
PublishingRajceUploader * self;
#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_RAJCE_TYPE_UPLOADER, PublishingRajceUploader);
@@ -6326,11 +6557,13 @@ static void publishing_rajce_uploader_finalize (PublishingRESTSupportBatchUpload
_g_free0 (self->priv->url);
#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_CLASS (publishing_rajce_uploader_parent_class)->finalize (obj);
-#line 6326 "RajcePublishing.c"
+#line 6557 "RajcePublishing.c"
}
-GType publishing_rajce_uploader_get_type (void) {
+GType
+publishing_rajce_uploader_get_type (void)
+{
static volatile gsize publishing_rajce_uploader_type_id__volatile = 0;
if (g_once_init_enter (&publishing_rajce_uploader_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingRajceUploaderClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_rajce_uploader_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingRajceUploader), 0, (GInstanceInitFunc) publishing_rajce_uploader_instance_init, NULL };
@@ -6342,7 +6575,9 @@ GType publishing_rajce_uploader_get_type (void) {
}
-GType publishing_rajce_authentication_pane_mode_get_type (void) {
+GType
+publishing_rajce_authentication_pane_mode_get_type (void)
+{
static volatile gsize publishing_rajce_authentication_pane_mode_type_id__volatile = 0;
if (g_once_init_enter (&publishing_rajce_authentication_pane_mode_type_id__volatile)) {
static const GEnumValue values[] = {{PUBLISHING_RAJCE_AUTHENTICATION_PANE_MODE_INTRO, "PUBLISHING_RAJCE_AUTHENTICATION_PANE_MODE_INTRO", "intro"}, {PUBLISHING_RAJCE_AUTHENTICATION_PANE_MODE_FAILED_RETRY_USER, "PUBLISHING_RAJCE_AUTHENTICATION_PANE_MODE_FAILED_RETRY_USER", "failed-retry-user"}, {0, NULL, NULL}};
@@ -6354,28 +6589,41 @@ GType publishing_rajce_authentication_pane_mode_get_type (void) {
}
-static void _publishing_rajce_authentication_pane_on_user_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
+static void
+_publishing_rajce_authentication_pane_on_user_changed_gtk_editable_changed (GtkEditable* _sender,
+ gpointer self)
+{
#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_authentication_pane_on_user_changed ((PublishingRajceAuthenticationPane*) self);
-#line 6357 "RajcePublishing.c"
+#line 6595 "RajcePublishing.c"
}
-static void _publishing_rajce_authentication_pane_on_password_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
+static void
+_publishing_rajce_authentication_pane_on_password_changed_gtk_editable_changed (GtkEditable* _sender,
+ gpointer self)
+{
#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_authentication_pane_on_password_changed ((PublishingRajceAuthenticationPane*) self);
-#line 6364 "RajcePublishing.c"
+#line 6605 "RajcePublishing.c"
}
-static void _publishing_rajce_authentication_pane_on_login_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+_publishing_rajce_authentication_pane_on_login_button_clicked_gtk_button_clicked (GtkButton* _sender,
+ gpointer self)
+{
#line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_authentication_pane_on_login_button_clicked ((PublishingRajceAuthenticationPane*) self);
-#line 6371 "RajcePublishing.c"
+#line 6615 "RajcePublishing.c"
}
-PublishingRajceAuthenticationPane* publishing_rajce_authentication_pane_construct (GType object_type, PublishingRajceRajcePublisher* publisher, PublishingRajceAuthenticationPaneMode mode) {
+PublishingRajceAuthenticationPane*
+publishing_rajce_authentication_pane_construct (GType object_type,
+ PublishingRajceRajcePublisher* publisher,
+ PublishingRajceAuthenticationPaneMode mode)
+{
PublishingRajceAuthenticationPane * self = NULL;
GtkBox* _tmp0_;
GError * _inner_error_ = NULL;
@@ -6391,7 +6639,7 @@ PublishingRajceAuthenticationPane* publishing_rajce_authentication_pane_construc
_g_object_unref0 (self->priv->pane_widget);
#line 848 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
self->priv->pane_widget = _tmp0_;
-#line 6391 "RajcePublishing.c"
+#line 6639 "RajcePublishing.c"
{
GtkBuilder* _tmp1_;
GtkBuilder* _tmp2_;
@@ -6404,55 +6652,49 @@ PublishingRajceAuthenticationPane* publishing_rajce_authentication_pane_construc
GtkBuilder* _tmp7_;
GObject* _tmp8_;
GtkLabel* _tmp9_;
- PublishingRajceAuthenticationPaneMode _tmp10_;
- GtkBuilder* _tmp17_;
- GObject* _tmp18_;
- GtkEntry* _tmp19_;
+ GtkBuilder* _tmp16_;
+ GObject* _tmp17_;
+ GtkEntry* _tmp18_;
gchar* persistent_username = NULL;
- PublishingRajceRajcePublisher* _tmp20_;
- gchar* _tmp21_;
- const gchar* _tmp22_;
- GtkBuilder* _tmp25_;
- GObject* _tmp26_;
- GtkEntry* _tmp27_;
+ gchar* _tmp19_;
+ const gchar* _tmp20_;
+ GtkBuilder* _tmp23_;
+ GObject* _tmp24_;
+ GtkEntry* _tmp25_;
gchar* persistent_token = NULL;
- PublishingRajceRajcePublisher* _tmp28_;
- gchar* _tmp29_;
- const gchar* _tmp30_;
- GtkBuilder* _tmp33_;
- GObject* _tmp34_;
- GtkCheckButton* _tmp35_;
- GtkCheckButton* _tmp36_;
- PublishingRajceRajcePublisher* _tmp37_;
- gboolean _tmp38_;
- GtkBuilder* _tmp39_;
- GObject* _tmp40_;
- GtkButton* _tmp41_;
+ gchar* _tmp26_;
+ const gchar* _tmp27_;
+ GtkBuilder* _tmp30_;
+ GObject* _tmp31_;
+ GtkCheckButton* _tmp32_;
+ GtkCheckButton* _tmp33_;
+ GtkBuilder* _tmp34_;
+ GObject* _tmp35_;
+ GtkButton* _tmp36_;
GtkLabel* label2 = NULL;
- GtkBuilder* _tmp42_;
- GObject* _tmp43_;
- GtkLabel* _tmp44_;
+ GtkBuilder* _tmp37_;
+ GObject* _tmp38_;
+ GtkLabel* _tmp39_;
GtkLabel* label3 = NULL;
- GtkBuilder* _tmp45_;
- GObject* _tmp46_;
- GtkLabel* _tmp47_;
- GtkLabel* _tmp48_;
- GtkLabel* _tmp49_;
- GtkCheckButton* _tmp50_;
- GtkButton* _tmp51_;
- GtkEntry* _tmp52_;
- GtkEntry* _tmp53_;
- GtkButton* _tmp54_;
+ GtkBuilder* _tmp40_;
+ GObject* _tmp41_;
+ GtkLabel* _tmp42_;
+ GtkLabel* _tmp43_;
+ GtkLabel* _tmp44_;
+ GtkCheckButton* _tmp45_;
+ GtkButton* _tmp46_;
+ GtkEntry* _tmp47_;
+ GtkEntry* _tmp48_;
+ GtkButton* _tmp49_;
+ GtkBox* _tmp50_;
+ GtkContainer* _tmp51_;
+ GtkContainer* _tmp52_;
+ GtkBox* _tmp53_;
+ GtkBox* _tmp54_;
GtkBox* _tmp55_;
- GtkContainer* _tmp56_;
- GtkContainer* _tmp57_;
- GtkBox* _tmp58_;
- GtkBox* _tmp59_;
- GtkBox* _tmp60_;
- PublishingRajceRajcePublisher* _tmp61_;
- SpitPublishingPluginHost* _tmp62_;
- SpitPublishingPluginHost* _tmp63_;
- GtkButton* _tmp64_;
+ SpitPublishingPluginHost* _tmp56_;
+ SpitPublishingPluginHost* _tmp57_;
+ GtkButton* _tmp58_;
#line 851 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_tmp1_ = gtk_builder_new ();
#line 851 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -6465,7 +6707,7 @@ PublishingRajceAuthenticationPane* publishing_rajce_authentication_pane_construc
gtk_builder_add_from_resource (_tmp2_, PLUGIN_RESOURCE_PATH "/rajce_authentication_pane.ui", &_inner_error_);
#line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6465 "RajcePublishing.c"
+#line 6707 "RajcePublishing.c"
goto __catch29_g_error;
}
#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -6489,222 +6731,210 @@ PublishingRajceAuthenticationPane* publishing_rajce_authentication_pane_construc
#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
message_label = _tmp9_;
#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp10_ = mode;
-#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- switch (_tmp10_) {
+ switch (mode) {
#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
case PUBLISHING_RAJCE_AUTHENTICATION_PANE_MODE_INTRO:
-#line 6494 "RajcePublishing.c"
+#line 6734 "RajcePublishing.c"
{
- GtkLabel* _tmp11_;
- const gchar* _tmp12_;
+ GtkLabel* _tmp10_;
+ const gchar* _tmp11_;
#line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp11_ = message_label;
+ _tmp10_ = message_label;
#line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp12_ = publishing_rajce_authentication_pane_INTRO_MESSAGE;
+ _tmp11_ = publishing_rajce_authentication_pane_INTRO_MESSAGE;
#line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- gtk_label_set_text (_tmp11_, _tmp12_);
+ gtk_label_set_text (_tmp10_, _tmp11_);
#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
break;
-#line 6506 "RajcePublishing.c"
+#line 6746 "RajcePublishing.c"
}
#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
case PUBLISHING_RAJCE_AUTHENTICATION_PANE_MODE_FAILED_RETRY_USER:
-#line 6510 "RajcePublishing.c"
+#line 6750 "RajcePublishing.c"
{
- GtkLabel* _tmp13_;
- const gchar* _tmp14_;
+ GtkLabel* _tmp12_;
+ const gchar* _tmp13_;
+ gchar* _tmp14_;
gchar* _tmp15_;
- gchar* _tmp16_;
#line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp13_ = message_label;
+ _tmp12_ = message_label;
#line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp14_ = publishing_rajce_authentication_pane_FAILED_RETRY_USER_MESSAGE;
+ _tmp13_ = publishing_rajce_authentication_pane_FAILED_RETRY_USER_MESSAGE;
#line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp15_ = g_strdup_printf ("<b>%s</b>\n\n%s", _ ("Invalid User Email or Password"), _tmp14_);
+ _tmp14_ = g_strdup_printf ("<b>%s</b>\n\n%s", _ ("Invalid User Email or Password"), _tmp13_);
#line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp16_ = _tmp15_;
+ _tmp15_ = _tmp14_;
#line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- gtk_label_set_markup (_tmp13_, _tmp16_);
+ gtk_label_set_markup (_tmp12_, _tmp15_);
#line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _g_free0 (_tmp16_);
+ _g_free0 (_tmp15_);
#line 866 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
break;
-#line 6530 "RajcePublishing.c"
+#line 6770 "RajcePublishing.c"
}
default:
#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
break;
-#line 6535 "RajcePublishing.c"
+#line 6775 "RajcePublishing.c"
}
#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp17_ = self->priv->builder;
+ _tmp16_ = self->priv->builder;
#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp18_ = gtk_builder_get_object (_tmp17_, "username_entry");
+ _tmp17_ = gtk_builder_get_object (_tmp16_, "username_entry");
#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp19_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp18_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp18_) : NULL);
+ _tmp18_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp17_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp17_) : NULL);
#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_object_unref0 (self->priv->username_entry);
#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- self->priv->username_entry = _tmp19_;
-#line 869 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp20_ = publisher;
+ self->priv->username_entry = _tmp18_;
#line 869 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp21_ = publishing_rajce_rajce_publisher_get_username (_tmp20_);
+ _tmp19_ = publishing_rajce_rajce_publisher_get_username (publisher);
#line 869 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- persistent_username = _tmp21_;
+ persistent_username = _tmp19_;
#line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp22_ = persistent_username;
+ _tmp20_ = persistent_username;
#line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- if (_tmp22_ != NULL) {
-#line 6557 "RajcePublishing.c"
- GtkEntry* _tmp23_;
- const gchar* _tmp24_;
+ if (_tmp20_ != NULL) {
+#line 6795 "RajcePublishing.c"
+ GtkEntry* _tmp21_;
+ const gchar* _tmp22_;
#line 872 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp23_ = self->priv->username_entry;
+ _tmp21_ = self->priv->username_entry;
#line 872 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp24_ = persistent_username;
+ _tmp22_ = persistent_username;
#line 872 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- gtk_entry_set_text (_tmp23_, _tmp24_);
-#line 6566 "RajcePublishing.c"
+ gtk_entry_set_text (_tmp21_, _tmp22_);
+#line 6804 "RajcePublishing.c"
}
#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp25_ = self->priv->builder;
+ _tmp23_ = self->priv->builder;
#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp26_ = gtk_builder_get_object (_tmp25_, "password_entry");
+ _tmp24_ = gtk_builder_get_object (_tmp23_, "password_entry");
#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp27_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp26_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp26_) : NULL);
+ _tmp25_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp24_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp24_) : NULL);
#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_object_unref0 (self->priv->password_entry);
#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- self->priv->password_entry = _tmp27_;
-#line 875 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp28_ = publisher;
+ self->priv->password_entry = _tmp25_;
#line 875 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp29_ = publishing_rajce_rajce_publisher_get_token (_tmp28_);
+ _tmp26_ = publishing_rajce_rajce_publisher_get_token (publisher);
#line 875 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- persistent_token = _tmp29_;
+ persistent_token = _tmp26_;
#line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp30_ = persistent_token;
+ _tmp27_ = persistent_token;
#line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- if (_tmp30_ != NULL) {
-#line 6588 "RajcePublishing.c"
- GtkEntry* _tmp31_;
- const gchar* _tmp32_;
+ if (_tmp27_ != NULL) {
+#line 6824 "RajcePublishing.c"
+ GtkEntry* _tmp28_;
+ const gchar* _tmp29_;
#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp31_ = self->priv->password_entry;
+ _tmp28_ = self->priv->password_entry;
#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp32_ = persistent_token;
+ _tmp29_ = persistent_token;
#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- gtk_entry_set_text (_tmp31_, _tmp32_);
+ gtk_entry_set_text (_tmp28_, _tmp29_);
#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
self->priv->crypt = FALSE;
-#line 6599 "RajcePublishing.c"
+#line 6835 "RajcePublishing.c"
} else {
#line 883 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
self->priv->crypt = TRUE;
-#line 6603 "RajcePublishing.c"
+#line 6839 "RajcePublishing.c"
}
#line 885 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp33_ = self->priv->builder;
+ _tmp30_ = self->priv->builder;
#line 885 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp34_ = gtk_builder_get_object (_tmp33_, "remember_checkbutton");
+ _tmp31_ = gtk_builder_get_object (_tmp30_, "remember_checkbutton");
#line 885 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp35_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp34_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp34_) : NULL);
+ _tmp32_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp31_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp31_) : NULL);
#line 885 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_object_unref0 (self->priv->remember_checkbutton);
#line 885 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- self->priv->remember_checkbutton = _tmp35_;
+ self->priv->remember_checkbutton = _tmp32_;
#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp36_ = self->priv->remember_checkbutton;
+ _tmp33_ = self->priv->remember_checkbutton;
#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp37_ = publisher;
-#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp38_ = publishing_rajce_rajce_publisher_get_remember (_tmp37_);
-#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp38_);
+ gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_toggle_button_get_type (), GtkToggleButton), publishing_rajce_rajce_publisher_get_remember (publisher));
#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp39_ = self->priv->builder;
+ _tmp34_ = self->priv->builder;
#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp40_ = gtk_builder_get_object (_tmp39_, "login_button");
+ _tmp35_ = gtk_builder_get_object (_tmp34_, "login_button");
#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp41_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp40_, gtk_button_get_type ()) ? ((GtkButton*) _tmp40_) : NULL);
+ _tmp36_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp35_, gtk_button_get_type ()) ? ((GtkButton*) _tmp35_) : NULL);
#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_object_unref0 (self->priv->login_button);
#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- self->priv->login_button = _tmp41_;
+ self->priv->login_button = _tmp36_;
#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp42_ = self->priv->builder;
+ _tmp37_ = self->priv->builder;
#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp43_ = gtk_builder_get_object (_tmp42_, "label2");
+ _tmp38_ = gtk_builder_get_object (_tmp37_, "label2");
#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp44_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp43_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp43_) : NULL);
+ _tmp39_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp38_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp38_) : NULL);
#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- label2 = _tmp44_;
+ label2 = _tmp39_;
#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp45_ = self->priv->builder;
+ _tmp40_ = self->priv->builder;
#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp46_ = gtk_builder_get_object (_tmp45_, "label3");
+ _tmp41_ = gtk_builder_get_object (_tmp40_, "label3");
#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp47_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp46_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp46_) : NULL);
+ _tmp42_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp41_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp41_) : NULL);
#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- label3 = _tmp47_;
+ label3 = _tmp42_;
#line 892 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp48_ = label2;
+ _tmp43_ = label2;
#line 892 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- gtk_label_set_label (_tmp48_, _ ("_Email address"));
+ gtk_label_set_label (_tmp43_, _ ("_Email address"));
#line 893 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp49_ = label3;
+ _tmp44_ = label3;
#line 893 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- gtk_label_set_label (_tmp49_, _ ("_Password"));
+ gtk_label_set_label (_tmp44_, _ ("_Password"));
#line 894 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp50_ = self->priv->remember_checkbutton;
+ _tmp45_ = self->priv->remember_checkbutton;
#line 894 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_button_get_type (), GtkButton), _ ("_Remember"));
+ gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_button_get_type (), GtkButton), _ ("_Remember"));
#line 895 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp51_ = self->priv->login_button;
+ _tmp46_ = self->priv->login_button;
#line 895 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- gtk_button_set_label (_tmp51_, _ ("Log in"));
+ gtk_button_set_label (_tmp46_, _ ("Log in"));
#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp52_ = self->priv->username_entry;
+ _tmp47_ = self->priv->username_entry;
#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_rajce_authentication_pane_on_user_changed_gtk_editable_changed, self, 0);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, gtk_editable_get_type (), GtkEditable), "changed", (GCallback) _publishing_rajce_authentication_pane_on_user_changed_gtk_editable_changed, self, 0);
#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp53_ = self->priv->password_entry;
+ _tmp48_ = self->priv->password_entry;
#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_rajce_authentication_pane_on_password_changed_gtk_editable_changed, self, 0);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_editable_get_type (), GtkEditable), "changed", (GCallback) _publishing_rajce_authentication_pane_on_password_changed_gtk_editable_changed, self, 0);
#line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp54_ = self->priv->login_button;
+ _tmp49_ = self->priv->login_button;
#line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_signal_connect_object (_tmp54_, "clicked", (GCallback) _publishing_rajce_authentication_pane_on_login_button_clicked_gtk_button_clicked, self, 0);
+ g_signal_connect_object (_tmp49_, "clicked", (GCallback) _publishing_rajce_authentication_pane_on_login_button_clicked_gtk_button_clicked, self, 0);
#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp55_ = content;
+ _tmp50_ = content;
#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp56_ = gtk_widget_get_parent (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, gtk_widget_get_type (), GtkWidget));
+ _tmp51_ = gtk_widget_get_parent (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_widget_get_type (), GtkWidget));
#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp57_ = _tmp56_;
+ _tmp52_ = _tmp51_;
#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp58_ = content;
+ _tmp53_ = content;
#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- gtk_container_remove (_tmp57_, G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_widget_get_type (), GtkWidget));
+ gtk_container_remove (_tmp52_, G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, gtk_widget_get_type (), GtkWidget));
#line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp59_ = self->priv->pane_widget;
+ _tmp54_ = self->priv->pane_widget;
#line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp60_ = content;
+ _tmp55_ = content;
#line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, gtk_widget_get_type (), GtkWidget));
-#line 902 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp61_ = publisher;
+ gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, gtk_widget_get_type (), GtkWidget));
#line 902 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp62_ = publishing_rajce_rajce_publisher_get_host (_tmp61_);
+ _tmp56_ = publishing_rajce_rajce_publisher_get_host (publisher);
#line 902 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp63_ = _tmp62_;
+ _tmp57_ = _tmp56_;
#line 902 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp64_ = self->priv->login_button;
+ _tmp58_ = self->priv->login_button;
#line 902 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- spit_publishing_plugin_host_set_dialog_default_widget (_tmp63_, G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, gtk_widget_get_type (), GtkWidget));
+ spit_publishing_plugin_host_set_dialog_default_widget (_tmp57_, G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_widget_get_type (), GtkWidget));
#line 902 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _g_object_unref0 (_tmp63_);
+ _g_object_unref0 (_tmp57_);
#line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_object_unref0 (label3);
#line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -6717,27 +6947,27 @@ PublishingRajceAuthenticationPane* publishing_rajce_authentication_pane_construc
_g_object_unref0 (message_label);
#line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_object_unref0 (content);
-#line 6717 "RajcePublishing.c"
+#line 6947 "RajcePublishing.c"
}
goto __finally29;
__catch29_g_error:
{
GError* e = NULL;
- GError* _tmp65_;
- const gchar* _tmp66_;
+ GError* _tmp59_;
+ const gchar* _tmp60_;
#line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
e = _inner_error_;
#line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_inner_error_ = NULL;
#line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp65_ = e;
+ _tmp59_ = e;
#line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp66_ = _tmp65_->message;
+ _tmp60_ = _tmp59_->message;
#line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_warning ("RajcePublishing.vala:906: Could not load UI: %s", _tmp66_);
+ g_warning ("RajcePublishing.vala:906: Could not load UI: %s", _tmp60_);
#line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_error_free0 (e);
-#line 6737 "RajcePublishing.c"
+#line 6967 "RajcePublishing.c"
}
__finally29:
#line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -6748,22 +6978,27 @@ PublishingRajceAuthenticationPane* publishing_rajce_authentication_pane_construc
g_clear_error (&_inner_error_);
#line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return NULL;
-#line 6748 "RajcePublishing.c"
+#line 6978 "RajcePublishing.c"
}
#line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return self;
-#line 6752 "RajcePublishing.c"
+#line 6982 "RajcePublishing.c"
}
-PublishingRajceAuthenticationPane* publishing_rajce_authentication_pane_new (PublishingRajceRajcePublisher* publisher, PublishingRajceAuthenticationPaneMode mode) {
+PublishingRajceAuthenticationPane*
+publishing_rajce_authentication_pane_new (PublishingRajceRajcePublisher* publisher,
+ PublishingRajceAuthenticationPaneMode mode)
+{
#line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return publishing_rajce_authentication_pane_construct (PUBLISHING_RAJCE_TYPE_AUTHENTICATION_PANE, publisher, mode);
-#line 6759 "RajcePublishing.c"
+#line 6992 "RajcePublishing.c"
}
-GtkWidget* publishing_rajce_authentication_pane_get_default_widget (PublishingRajceAuthenticationPane* self) {
+GtkWidget*
+publishing_rajce_authentication_pane_get_default_widget (PublishingRajceAuthenticationPane* self)
+{
GtkWidget* result = NULL;
GtkButton* _tmp0_;
GtkWidget* _tmp1_;
@@ -6777,11 +7012,13 @@ GtkWidget* publishing_rajce_authentication_pane_get_default_widget (PublishingRa
result = _tmp1_;
#line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return result;
-#line 6777 "RajcePublishing.c"
+#line 7012 "RajcePublishing.c"
}
-static void publishing_rajce_authentication_pane_on_login_button_clicked (PublishingRajceAuthenticationPane* self) {
+static void
+publishing_rajce_authentication_pane_on_login_button_clicked (PublishingRajceAuthenticationPane* self)
+{
gchar* token = NULL;
GtkEntry* _tmp0_;
const gchar* _tmp1_;
@@ -6791,7 +7028,6 @@ static void publishing_rajce_authentication_pane_on_login_button_clicked (Publis
const gchar* _tmp7_;
const gchar* _tmp8_;
GtkCheckButton* _tmp9_;
- gboolean _tmp10_;
#line 915 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_if_fail (PUBLISHING_RAJCE_IS_AUTHENTICATION_PANE (self));
#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -6806,7 +7042,7 @@ static void publishing_rajce_authentication_pane_on_login_button_clicked (Publis
_tmp3_ = self->priv->crypt;
#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (_tmp3_) {
-#line 6806 "RajcePublishing.c"
+#line 7042 "RajcePublishing.c"
const gchar* _tmp4_;
gchar* _tmp5_;
#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -6817,7 +7053,7 @@ static void publishing_rajce_authentication_pane_on_login_button_clicked (Publis
_g_free0 (token);
#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
token = _tmp5_;
-#line 6817 "RajcePublishing.c"
+#line 7053 "RajcePublishing.c"
}
#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_tmp6_ = self->priv->username_entry;
@@ -6828,36 +7064,40 @@ static void publishing_rajce_authentication_pane_on_login_button_clicked (Publis
#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_tmp9_ = self->priv->remember_checkbutton;
#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp10_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_signal_emit (self, publishing_rajce_authentication_pane_signals[PUBLISHING_RAJCE_AUTHENTICATION_PANE_LOGIN_SIGNAL], 0, _tmp7_, _tmp8_, _tmp10_);
+ g_signal_emit (self, publishing_rajce_authentication_pane_signals[PUBLISHING_RAJCE_AUTHENTICATION_PANE_LOGIN_SIGNAL], 0, _tmp7_, _tmp8_, gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_toggle_button_get_type (), GtkToggleButton)));
#line 915 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_free0 (token);
-#line 6833 "RajcePublishing.c"
+#line 7067 "RajcePublishing.c"
}
-static void publishing_rajce_authentication_pane_on_user_changed (PublishingRajceAuthenticationPane* self) {
+static void
+publishing_rajce_authentication_pane_on_user_changed (PublishingRajceAuthenticationPane* self)
+{
#line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_if_fail (PUBLISHING_RAJCE_IS_AUTHENTICATION_PANE (self));
#line 927 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_authentication_pane_update_login_button_sensitivity (self);
-#line 6842 "RajcePublishing.c"
+#line 7078 "RajcePublishing.c"
}
-static void publishing_rajce_authentication_pane_on_password_changed (PublishingRajceAuthenticationPane* self) {
+static void
+publishing_rajce_authentication_pane_on_password_changed (PublishingRajceAuthenticationPane* self)
+{
#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_if_fail (PUBLISHING_RAJCE_IS_AUTHENTICATION_PANE (self));
#line 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
self->priv->crypt = TRUE;
#line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_authentication_pane_update_login_button_sensitivity (self);
-#line 6853 "RajcePublishing.c"
+#line 7091 "RajcePublishing.c"
}
-static void publishing_rajce_authentication_pane_update_login_button_sensitivity (PublishingRajceAuthenticationPane* self) {
+static void
+publishing_rajce_authentication_pane_update_login_button_sensitivity (PublishingRajceAuthenticationPane* self)
+{
gboolean _tmp0_ = FALSE;
GtkEntry* _tmp1_;
guint _tmp2_;
@@ -6873,7 +7113,7 @@ static void publishing_rajce_authentication_pane_update_login_button_sensitivity
_tmp3_ = _tmp2_;
#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (_tmp3_ > ((guint) 0)) {
-#line 6873 "RajcePublishing.c"
+#line 7113 "RajcePublishing.c"
GtkEntry* _tmp4_;
guint _tmp5_;
guint _tmp6_;
@@ -6885,21 +7125,23 @@ static void publishing_rajce_authentication_pane_update_login_button_sensitivity
_tmp6_ = _tmp5_;
#line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_tmp0_ = _tmp6_ > ((guint) 0);
-#line 6885 "RajcePublishing.c"
+#line 7125 "RajcePublishing.c"
} else {
#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_tmp0_ = FALSE;
-#line 6889 "RajcePublishing.c"
+#line 7129 "RajcePublishing.c"
}
#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_tmp7_ = self->priv->login_button;
#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), _tmp0_);
-#line 6895 "RajcePublishing.c"
+#line 7135 "RajcePublishing.c"
}
-static GtkWidget* publishing_rajce_authentication_pane_real_get_widget (SpitPublishingDialogPane* base) {
+static GtkWidget*
+publishing_rajce_authentication_pane_real_get_widget (SpitPublishingDialogPane* base)
+{
PublishingRajceAuthenticationPane * self;
GtkWidget* result = NULL;
GtkBox* _tmp0_;
@@ -6914,11 +7156,13 @@ static GtkWidget* publishing_rajce_authentication_pane_real_get_widget (SpitPubl
result = _tmp1_;
#line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return result;
-#line 6914 "RajcePublishing.c"
+#line 7156 "RajcePublishing.c"
}
-static SpitPublishingDialogPaneGeometryOptions publishing_rajce_authentication_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) {
+static SpitPublishingDialogPaneGeometryOptions
+publishing_rajce_authentication_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base)
+{
PublishingRajceAuthenticationPane * self;
SpitPublishingDialogPaneGeometryOptions result = 0;
#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -6927,11 +7171,13 @@ static SpitPublishingDialogPaneGeometryOptions publishing_rajce_authentication_p
result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
#line 949 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return result;
-#line 6927 "RajcePublishing.c"
+#line 7171 "RajcePublishing.c"
}
-static void publishing_rajce_authentication_pane_real_on_pane_installed (SpitPublishingDialogPane* base) {
+static void
+publishing_rajce_authentication_pane_real_on_pane_installed (SpitPublishingDialogPane* base)
+{
PublishingRajceAuthenticationPane * self;
GtkEntry* _tmp0_;
GtkEntry* _tmp1_;
@@ -6952,19 +7198,28 @@ static void publishing_rajce_authentication_pane_real_on_pane_installed (SpitPub
gtk_widget_set_can_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), TRUE);
#line 957 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_authentication_pane_update_login_button_sensitivity (self);
-#line 6952 "RajcePublishing.c"
+#line 7198 "RajcePublishing.c"
}
-static void publishing_rajce_authentication_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) {
+static void
+publishing_rajce_authentication_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base)
+{
PublishingRajceAuthenticationPane * self;
#line 959 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_RAJCE_TYPE_AUTHENTICATION_PANE, PublishingRajceAuthenticationPane);
-#line 6960 "RajcePublishing.c"
+#line 7208 "RajcePublishing.c"
}
-static void g_cclosure_user_marshal_VOID__STRING_STRING_BOOLEAN (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) {
+static void
+g_cclosure_user_marshal_VOID__STRING_STRING_BOOLEAN (GClosure * closure,
+ GValue * return_value,
+ guint n_param_values,
+ const GValue * param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data)
+{
typedef void (*GMarshalFunc_VOID__STRING_STRING_BOOLEAN) (gpointer data1, const char* arg_1, const char* arg_2, gboolean arg_3, gpointer data2);
register GMarshalFunc_VOID__STRING_STRING_BOOLEAN callback;
register GCClosure * cc;
@@ -6979,23 +7234,25 @@ static void g_cclosure_user_marshal_VOID__STRING_STRING_BOOLEAN (GClosure * clos
data1 = closure->data;
#line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
data2 = param_values->data[0].v_pointer;
-#line 6979 "RajcePublishing.c"
+#line 7234 "RajcePublishing.c"
} else {
#line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
data1 = param_values->data[0].v_pointer;
#line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
data2 = closure->data;
-#line 6985 "RajcePublishing.c"
+#line 7240 "RajcePublishing.c"
}
#line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
callback = (GMarshalFunc_VOID__STRING_STRING_BOOLEAN) (marshal_data ? marshal_data : cc->callback);
#line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
callback (data1, g_value_get_string (param_values + 1), g_value_get_string (param_values + 2), g_value_get_boolean (param_values + 3), data2);
-#line 6991 "RajcePublishing.c"
+#line 7246 "RajcePublishing.c"
}
-static void publishing_rajce_authentication_pane_class_init (PublishingRajceAuthenticationPaneClass * klass) {
+static void
+publishing_rajce_authentication_pane_class_init (PublishingRajceAuthenticationPaneClass * klass)
+{
gchar* _tmp0_;
gchar* _tmp1_;
#line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -7014,11 +7271,13 @@ static void publishing_rajce_authentication_pane_class_init (PublishingRajceAuth
_tmp1_ = g_strdup (_ ("Invalid email and/or password. Please try again"));
#line 834 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_authentication_pane_FAILED_RETRY_USER_MESSAGE = _tmp1_;
-#line 7014 "RajcePublishing.c"
+#line 7271 "RajcePublishing.c"
}
-static void publishing_rajce_authentication_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) {
+static void
+publishing_rajce_authentication_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface)
+{
#line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_authentication_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
#line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -7029,22 +7288,26 @@ static void publishing_rajce_authentication_pane_spit_publishing_dialog_pane_int
iface->on_pane_installed = (void (*) (SpitPublishingDialogPane *)) publishing_rajce_authentication_pane_real_on_pane_installed;
#line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
iface->on_pane_uninstalled = (void (*) (SpitPublishingDialogPane *)) publishing_rajce_authentication_pane_real_on_pane_uninstalled;
-#line 7029 "RajcePublishing.c"
+#line 7288 "RajcePublishing.c"
}
-static void publishing_rajce_authentication_pane_instance_init (PublishingRajceAuthenticationPane * self) {
+static void
+publishing_rajce_authentication_pane_instance_init (PublishingRajceAuthenticationPane * self)
+{
#line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
self->priv = PUBLISHING_RAJCE_AUTHENTICATION_PANE_GET_PRIVATE (self);
#line 836 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
self->priv->pane_widget = NULL;
#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
self->priv->crypt = TRUE;
-#line 7040 "RajcePublishing.c"
+#line 7301 "RajcePublishing.c"
}
-static void publishing_rajce_authentication_pane_finalize (GObject * obj) {
+static void
+publishing_rajce_authentication_pane_finalize (GObject * obj)
+{
PublishingRajceAuthenticationPane * self;
#line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_RAJCE_TYPE_AUTHENTICATION_PANE, PublishingRajceAuthenticationPane);
@@ -7062,7 +7325,7 @@ static void publishing_rajce_authentication_pane_finalize (GObject * obj) {
_g_object_unref0 (self->priv->login_button);
#line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
G_OBJECT_CLASS (publishing_rajce_authentication_pane_parent_class)->finalize (obj);
-#line 7062 "RajcePublishing.c"
+#line 7325 "RajcePublishing.c"
}
@@ -7070,7 +7333,9 @@ static void publishing_rajce_authentication_pane_finalize (GObject * obj) {
* The authentication pane used when asking service URL, user name and password
* from the user.
*/
-GType publishing_rajce_authentication_pane_get_type (void) {
+GType
+publishing_rajce_authentication_pane_get_type (void)
+{
static volatile gsize publishing_rajce_authentication_pane_type_id__volatile = 0;
if (g_once_init_enter (&publishing_rajce_authentication_pane_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingRajceAuthenticationPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_rajce_authentication_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingRajceAuthenticationPane), 0, (GInstanceInitFunc) publishing_rajce_authentication_pane_instance_init, NULL };
@@ -7084,80 +7349,102 @@ GType publishing_rajce_authentication_pane_get_type (void) {
}
-static gpointer _publishing_rajce_album_ref0 (gpointer self) {
+static gpointer
+_publishing_rajce_album_ref0 (gpointer self)
+{
#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return self ? publishing_rajce_album_ref (self) : NULL;
-#line 7087 "RajcePublishing.c"
+#line 7354 "RajcePublishing.c"
}
-static PublishingRajceAlbum** _vala_array_dup5 (PublishingRajceAlbum** self, int length) {
+static PublishingRajceAlbum**
+_vala_array_dup5 (PublishingRajceAlbum** self,
+ int length)
+{
PublishingRajceAlbum** result;
int i;
#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
result = g_new0 (PublishingRajceAlbum*, length + 1);
#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
for (i = 0; i < length; i++) {
-#line 7098 "RajcePublishing.c"
+#line 7368 "RajcePublishing.c"
PublishingRajceAlbum* _tmp0_;
#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_tmp0_ = _publishing_rajce_album_ref0 (self[i]);
#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
result[i] = _tmp0_;
-#line 7104 "RajcePublishing.c"
+#line 7374 "RajcePublishing.c"
}
#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return result;
-#line 7108 "RajcePublishing.c"
+#line 7378 "RajcePublishing.c"
}
-static void _publishing_rajce_publishing_options_pane_on_use_existing_radio_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+_publishing_rajce_publishing_options_pane_on_use_existing_radio_clicked_gtk_button_clicked (GtkButton* _sender,
+ gpointer self)
+{
#line 1021 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_publishing_options_pane_on_use_existing_radio_clicked ((PublishingRajcePublishingOptionsPane*) self);
-#line 7115 "RajcePublishing.c"
+#line 7388 "RajcePublishing.c"
}
-static void _publishing_rajce_publishing_options_pane_on_create_new_radio_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+_publishing_rajce_publishing_options_pane_on_create_new_radio_clicked_gtk_button_clicked (GtkButton* _sender,
+ gpointer self)
+{
#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_publishing_options_pane_on_create_new_radio_clicked ((PublishingRajcePublishingOptionsPane*) self);
-#line 7122 "RajcePublishing.c"
+#line 7398 "RajcePublishing.c"
}
-static void _publishing_rajce_publishing_options_pane_on_new_album_entry_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
+static void
+_publishing_rajce_publishing_options_pane_on_new_album_entry_changed_gtk_editable_changed (GtkEditable* _sender,
+ gpointer self)
+{
#line 1023 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_publishing_options_pane_on_new_album_entry_changed ((PublishingRajcePublishingOptionsPane*) self);
-#line 7129 "RajcePublishing.c"
+#line 7408 "RajcePublishing.c"
}
-static void _publishing_rajce_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+_publishing_rajce_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender,
+ gpointer self)
+{
#line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_publishing_options_pane_on_logout_clicked ((PublishingRajcePublishingOptionsPane*) self);
-#line 7136 "RajcePublishing.c"
+#line 7418 "RajcePublishing.c"
}
-static void _publishing_rajce_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+_publishing_rajce_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender,
+ gpointer self)
+{
#line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_publishing_options_pane_on_publish_clicked ((PublishingRajcePublishingOptionsPane*) self);
-#line 7143 "RajcePublishing.c"
+#line 7428 "RajcePublishing.c"
}
-PublishingRajcePublishingOptionsPane* publishing_rajce_publishing_options_pane_construct (GType object_type, PublishingRajceRajcePublisher* publisher, const gchar* username, PublishingRajceAlbum** albums, int albums_length1) {
+PublishingRajcePublishingOptionsPane*
+publishing_rajce_publishing_options_pane_construct (GType object_type,
+ PublishingRajceRajcePublisher* publisher,
+ const gchar* username,
+ PublishingRajceAlbum** albums,
+ int albums_length1)
+{
PublishingRajcePublishingOptionsPane * self = NULL;
- const gchar* _tmp0_;
- gchar* _tmp1_;
- PublishingRajceAlbum** _tmp2_;
- gint _tmp2__length1;
- PublishingRajceAlbum** _tmp3_;
- gint _tmp3__length1;
- PublishingRajceRajcePublisher* _tmp4_;
- PublishingRajceRajcePublisher* _tmp5_;
- GtkBox* _tmp6_;
+ gchar* _tmp0_;
+ PublishingRajceAlbum** _tmp1_;
+ gint _tmp1__length1;
+ PublishingRajceRajcePublisher* _tmp2_;
+ GtkBox* _tmp3_;
GError * _inner_error_ = NULL;
#line 985 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_val_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (publisher), NULL);
@@ -7166,331 +7453,308 @@ PublishingRajcePublishingOptionsPane* publishing_rajce_publishing_options_pane_c
#line 985 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
self = (PublishingRajcePublishingOptionsPane*) g_object_new (object_type, NULL);
#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp0_ = username;
-#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp1_ = g_strdup (_tmp0_);
+ _tmp0_ = g_strdup (username);
#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_free0 (self->priv->username);
#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- self->priv->username = _tmp1_;
-#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp2_ = albums;
+ self->priv->username = _tmp0_;
#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp2__length1 = albums_length1;
+ _tmp1_ = (albums != NULL) ? _vala_array_dup5 (albums, albums_length1) : ((gpointer) albums);
#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp3_ = (_tmp2_ != NULL) ? _vala_array_dup5 (_tmp2_, _tmp2__length1) : ((gpointer) _tmp2_);
-#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp3__length1 = _tmp2__length1;
+ _tmp1__length1 = albums_length1;
#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
self->priv->albums = (_vala_array_free (self->priv->albums, self->priv->albums_length1, (GDestroyNotify) publishing_rajce_album_unref), NULL);
#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- self->priv->albums = _tmp3_;
+ self->priv->albums = _tmp1_;
#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- self->priv->albums_length1 = _tmp3__length1;
+ self->priv->albums_length1 = _tmp1__length1;
#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
self->priv->_albums_size_ = self->priv->albums_length1;
#line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp4_ = publisher;
-#line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp5_ = _g_object_ref0 (_tmp4_);
+ _tmp2_ = _g_object_ref0 (publisher);
#line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_object_unref0 (self->priv->publisher);
#line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- self->priv->publisher = _tmp5_;
+ self->priv->publisher = _tmp2_;
#line 990 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp6_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+ _tmp3_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
#line 990 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_object_ref_sink (_tmp6_);
+ g_object_ref_sink (_tmp3_);
#line 990 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_object_unref0 (self->priv->pane_widget);
#line 990 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- self->priv->pane_widget = _tmp6_;
-#line 7205 "RajcePublishing.c"
+ self->priv->pane_widget = _tmp3_;
+#line 7484 "RajcePublishing.c"
{
+ GtkBuilder* _tmp4_;
+ GtkBuilder* _tmp5_;
+ GtkBuilder* _tmp6_;
GtkBuilder* _tmp7_;
- GtkBuilder* _tmp8_;
- GtkBuilder* _tmp9_;
+ GObject* _tmp8_;
+ GtkBox* _tmp9_;
GtkBuilder* _tmp10_;
GObject* _tmp11_;
- GtkBox* _tmp12_;
+ GtkLabel* _tmp12_;
GtkBuilder* _tmp13_;
GObject* _tmp14_;
GtkLabel* _tmp15_;
GtkBuilder* _tmp16_;
GObject* _tmp17_;
- GtkLabel* _tmp18_;
+ GtkRadioButton* _tmp18_;
GtkBuilder* _tmp19_;
GObject* _tmp20_;
- GtkRadioButton* _tmp21_;
+ GtkComboBoxText* _tmp21_;
GtkBuilder* _tmp22_;
GObject* _tmp23_;
- GtkComboBoxText* _tmp24_;
+ GtkRadioButton* _tmp24_;
GtkBuilder* _tmp25_;
GObject* _tmp26_;
- GtkRadioButton* _tmp27_;
+ GtkEntry* _tmp27_;
GtkBuilder* _tmp28_;
GObject* _tmp29_;
- GtkEntry* _tmp30_;
- GtkBuilder* _tmp31_;
- GObject* _tmp32_;
- GtkCheckButton* _tmp33_;
+ GtkCheckButton* _tmp30_;
+ GtkCheckButton* _tmp31_;
+ GtkBuilder* _tmp32_;
+ GObject* _tmp33_;
GtkCheckButton* _tmp34_;
GtkBuilder* _tmp35_;
GObject* _tmp36_;
- GtkCheckButton* _tmp37_;
+ GtkButton* _tmp37_;
GtkBuilder* _tmp38_;
GObject* _tmp39_;
GtkButton* _tmp40_;
- GtkBuilder* _tmp41_;
- GObject* _tmp42_;
- GtkButton* _tmp43_;
- GtkCheckButton* _tmp44_;
- PublishingRajceRajcePublisher* _tmp45_;
- gboolean _tmp46_;
- GtkCheckButton* _tmp47_;
- PublishingRajceRajcePublisher* _tmp48_;
- gboolean _tmp49_;
- GtkLabel* _tmp50_;
- const gchar* _tmp51_;
- gchar* _tmp52_;
- gchar* _tmp53_;
- GtkLabel* _tmp54_;
- GtkRadioButton* _tmp55_;
- GtkRadioButton* _tmp56_;
- GtkCheckButton* _tmp57_;
- GtkButton* _tmp58_;
- GtkButton* _tmp59_;
- GtkRadioButton* _tmp60_;
- GtkRadioButton* _tmp61_;
- GtkEntry* _tmp62_;
- GtkButton* _tmp63_;
- GtkButton* _tmp64_;
+ GtkCheckButton* _tmp41_;
+ GtkCheckButton* _tmp42_;
+ GtkLabel* _tmp43_;
+ gchar* _tmp44_;
+ gchar* _tmp45_;
+ GtkLabel* _tmp46_;
+ GtkRadioButton* _tmp47_;
+ GtkRadioButton* _tmp48_;
+ GtkCheckButton* _tmp49_;
+ GtkButton* _tmp50_;
+ GtkButton* _tmp51_;
+ GtkRadioButton* _tmp52_;
+ GtkRadioButton* _tmp53_;
+ GtkEntry* _tmp54_;
+ GtkButton* _tmp55_;
+ GtkButton* _tmp56_;
#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp7_ = gtk_builder_new ();
+ _tmp4_ = gtk_builder_new ();
#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_object_unref0 (self->priv->builder);
#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- self->priv->builder = _tmp7_;
+ self->priv->builder = _tmp4_;
#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp8_ = self->priv->builder;
+ _tmp5_ = self->priv->builder;
#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- gtk_builder_add_from_resource (_tmp8_, PLUGIN_RESOURCE_PATH "/rajce_publishing_options_pane.ui", &_inner_error_);
+ gtk_builder_add_from_resource (_tmp5_, PLUGIN_RESOURCE_PATH "/rajce_publishing_options_pane.ui", &_inner_error_);
#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7277 "RajcePublishing.c"
+#line 7551 "RajcePublishing.c"
goto __catch30_g_error;
}
#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp9_ = self->priv->builder;
+ _tmp6_ = self->priv->builder;
#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- gtk_builder_connect_signals (_tmp9_, NULL);
+ gtk_builder_connect_signals (_tmp6_, NULL);
#line 998 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp10_ = self->priv->builder;
+ _tmp7_ = self->priv->builder;
#line 998 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp11_ = gtk_builder_get_object (_tmp10_, "rajce_pane_widget");
+ _tmp8_ = gtk_builder_get_object (_tmp7_, "rajce_pane_widget");
#line 998 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp12_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_box_get_type (), GtkBox));
+ _tmp9_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_box_get_type (), GtkBox));
#line 998 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_object_unref0 (self->priv->pane_widget);
#line 998 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- self->priv->pane_widget = _tmp12_;
+ self->priv->pane_widget = _tmp9_;
#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp13_ = self->priv->builder;
+ _tmp10_ = self->priv->builder;
#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp14_ = gtk_builder_get_object (_tmp13_, "login_identity_label");
+ _tmp11_ = gtk_builder_get_object (_tmp10_, "login_identity_label");
#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp15_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_label_get_type (), GtkLabel));
+ _tmp12_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_label_get_type (), GtkLabel));
#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_object_unref0 (self->priv->login_identity_label);
#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- self->priv->login_identity_label = _tmp15_;
+ self->priv->login_identity_label = _tmp12_;
#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp16_ = self->priv->builder;
+ _tmp13_ = self->priv->builder;
#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp17_ = gtk_builder_get_object (_tmp16_, "publish_to_label");
+ _tmp14_ = gtk_builder_get_object (_tmp13_, "publish_to_label");
#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp18_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_label_get_type (), GtkLabel));
+ _tmp15_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_label_get_type (), GtkLabel));
#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_object_unref0 (self->priv->publish_to_label);
#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- self->priv->publish_to_label = _tmp18_;
+ self->priv->publish_to_label = _tmp15_;
#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp19_ = self->priv->builder;
+ _tmp16_ = self->priv->builder;
#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp20_ = gtk_builder_get_object (_tmp19_, "use_existing_radio");
+ _tmp17_ = gtk_builder_get_object (_tmp16_, "use_existing_radio");
#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp21_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_radio_button_get_type (), GtkRadioButton));
+ _tmp18_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_radio_button_get_type (), GtkRadioButton));
#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_object_unref0 (self->priv->use_existing_radio);
#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- self->priv->use_existing_radio = _tmp21_;
+ self->priv->use_existing_radio = _tmp18_;
#line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp22_ = self->priv->builder;
+ _tmp19_ = self->priv->builder;
#line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp23_ = gtk_builder_get_object (_tmp22_, "existing_albums_combo");
+ _tmp20_ = gtk_builder_get_object (_tmp19_, "existing_albums_combo");
#line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp24_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_combo_box_text_get_type (), GtkComboBoxText));
+ _tmp21_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_combo_box_text_get_type (), GtkComboBoxText));
#line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_object_unref0 (self->priv->existing_albums_combo);
#line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- self->priv->existing_albums_combo = _tmp24_;
+ self->priv->existing_albums_combo = _tmp21_;
#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp25_ = self->priv->builder;
+ _tmp22_ = self->priv->builder;
#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp26_ = gtk_builder_get_object (_tmp25_, "create_new_radio");
+ _tmp23_ = gtk_builder_get_object (_tmp22_, "create_new_radio");
#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp27_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_radio_button_get_type (), GtkRadioButton));
+ _tmp24_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_radio_button_get_type (), GtkRadioButton));
#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_object_unref0 (self->priv->create_new_radio);
#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- self->priv->create_new_radio = _tmp27_;
+ self->priv->create_new_radio = _tmp24_;
#line 1004 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp28_ = self->priv->builder;
+ _tmp25_ = self->priv->builder;
#line 1004 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp29_ = gtk_builder_get_object (_tmp28_, "new_album_entry");
+ _tmp26_ = gtk_builder_get_object (_tmp25_, "new_album_entry");
#line 1004 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp30_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_entry_get_type (), GtkEntry));
+ _tmp27_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_entry_get_type (), GtkEntry));
#line 1004 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_object_unref0 (self->priv->new_album_entry);
#line 1004 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- self->priv->new_album_entry = _tmp30_;
+ self->priv->new_album_entry = _tmp27_;
#line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp31_ = self->priv->builder;
+ _tmp28_ = self->priv->builder;
#line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp32_ = gtk_builder_get_object (_tmp31_, "hide_check");
+ _tmp29_ = gtk_builder_get_object (_tmp28_, "hide_check");
#line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp33_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_check_button_get_type (), GtkCheckButton));
+ _tmp30_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_check_button_get_type (), GtkCheckButton));
#line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_object_unref0 (self->priv->hide_check);
#line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- self->priv->hide_check = _tmp33_;
+ self->priv->hide_check = _tmp30_;
#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp34_ = self->priv->hide_check;
+ _tmp31_ = self->priv->hide_check;
#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_button_get_type (), GtkButton), _ ("_Hide album"));
+ gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_button_get_type (), GtkButton), _ ("_Hide album"));
#line 1007 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp35_ = self->priv->builder;
+ _tmp32_ = self->priv->builder;
#line 1007 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp36_ = gtk_builder_get_object (_tmp35_, "show_check");
+ _tmp33_ = gtk_builder_get_object (_tmp32_, "show_check");
#line 1007 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp37_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_check_button_get_type (), GtkCheckButton));
+ _tmp34_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_check_button_get_type (), GtkCheckButton));
#line 1007 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_object_unref0 (self->priv->show_check);
#line 1007 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- self->priv->show_check = _tmp37_;
+ self->priv->show_check = _tmp34_;
#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp38_ = self->priv->builder;
+ _tmp35_ = self->priv->builder;
#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp39_ = gtk_builder_get_object (_tmp38_, "publish_button");
+ _tmp36_ = gtk_builder_get_object (_tmp35_, "publish_button");
#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp40_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_button_get_type (), GtkButton));
+ _tmp37_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_button_get_type (), GtkButton));
#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_object_unref0 (self->priv->publish_button);
#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- self->priv->publish_button = _tmp40_;
+ self->priv->publish_button = _tmp37_;
#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp41_ = self->priv->builder;
+ _tmp38_ = self->priv->builder;
#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp42_ = gtk_builder_get_object (_tmp41_, "logout_button");
+ _tmp39_ = gtk_builder_get_object (_tmp38_, "logout_button");
#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp43_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_button_get_type (), GtkButton));
+ _tmp40_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_button_get_type (), GtkButton));
#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_object_unref0 (self->priv->logout_button);
#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- self->priv->logout_button = _tmp43_;
-#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp44_ = self->priv->hide_check;
+ self->priv->logout_button = _tmp40_;
#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp45_ = publisher;
+ _tmp41_ = self->priv->hide_check;
#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp46_ = publishing_rajce_rajce_publisher_get_hide_album (_tmp45_);
-#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp46_);
-#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp47_ = self->priv->show_check;
+ gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_toggle_button_get_type (), GtkToggleButton), publishing_rajce_rajce_publisher_get_hide_album (publisher));
#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp48_ = publisher;
+ _tmp42_ = self->priv->show_check;
#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp49_ = publishing_rajce_rajce_publisher_get_show_album (_tmp48_);
-#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp49_);
-#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp50_ = self->priv->login_identity_label;
+ gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_toggle_button_get_type (), GtkToggleButton), publishing_rajce_rajce_publisher_get_show_album (publisher));
#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp51_ = username;
+ _tmp43_ = self->priv->login_identity_label;
#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp52_ = g_strdup_printf (_ ("You are logged into Rajce as %s."), _tmp51_);
+ _tmp44_ = g_strdup_printf (_ ("You are logged into Rajce as %s."), username);
#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp53_ = _tmp52_;
+ _tmp45_ = _tmp44_;
#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- gtk_label_set_label (_tmp50_, _tmp53_);
+ gtk_label_set_label (_tmp43_, _tmp45_);
#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _g_free0 (_tmp53_);
+ _g_free0 (_tmp45_);
#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp54_ = self->priv->publish_to_label;
+ _tmp46_ = self->priv->publish_to_label;
#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- gtk_label_set_label (_tmp54_, _ ("Photos will appear in:"));
+ gtk_label_set_label (_tmp46_, _ ("Photos will appear in:"));
#line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp55_ = self->priv->use_existing_radio;
+ _tmp47_ = self->priv->use_existing_radio;
#line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, gtk_button_get_type (), GtkButton), _ ("An _existing album:"));
+ gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, gtk_button_get_type (), GtkButton), _ ("An _existing album:"));
#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp56_ = self->priv->create_new_radio;
+ _tmp48_ = self->priv->create_new_radio;
#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, gtk_button_get_type (), GtkButton), _ ("A _new album named:"));
+ gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_button_get_type (), GtkButton), _ ("A _new album named:"));
#line 1017 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp57_ = self->priv->show_check;
+ _tmp49_ = self->priv->show_check;
#line 1017 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, gtk_button_get_type (), GtkButton), _ ("Open target _album in browser"));
+ gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_button_get_type (), GtkButton), _ ("Open target _album in browser"));
#line 1018 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp58_ = self->priv->publish_button;
+ _tmp50_ = self->priv->publish_button;
#line 1018 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- gtk_button_set_label (_tmp58_, _ ("_Publish"));
+ gtk_button_set_label (_tmp50_, _ ("_Publish"));
#line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp59_ = self->priv->logout_button;
+ _tmp51_ = self->priv->logout_button;
#line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- gtk_button_set_label (_tmp59_, _ ("_Logout"));
+ gtk_button_set_label (_tmp51_, _ ("_Logout"));
#line 1021 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp60_ = self->priv->use_existing_radio;
+ _tmp52_ = self->priv->use_existing_radio;
#line 1021 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _publishing_rajce_publishing_options_pane_on_use_existing_radio_clicked_gtk_button_clicked, self, 0);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _publishing_rajce_publishing_options_pane_on_use_existing_radio_clicked_gtk_button_clicked, self, 0);
#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp61_ = self->priv->create_new_radio;
+ _tmp53_ = self->priv->create_new_radio;
#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _publishing_rajce_publishing_options_pane_on_create_new_radio_clicked_gtk_button_clicked, self, 0);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _publishing_rajce_publishing_options_pane_on_create_new_radio_clicked_gtk_button_clicked, self, 0);
#line 1023 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp62_ = self->priv->new_album_entry;
+ _tmp54_ = self->priv->new_album_entry;
#line 1023 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_rajce_publishing_options_pane_on_new_album_entry_changed_gtk_editable_changed, self, 0);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, gtk_editable_get_type (), GtkEditable), "changed", (GCallback) _publishing_rajce_publishing_options_pane_on_new_album_entry_changed_gtk_editable_changed, self, 0);
#line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp63_ = self->priv->logout_button;
+ _tmp55_ = self->priv->logout_button;
#line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_signal_connect_object (_tmp63_, "clicked", (GCallback) _publishing_rajce_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0);
+ g_signal_connect_object (_tmp55_, "clicked", (GCallback) _publishing_rajce_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0);
#line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp64_ = self->priv->publish_button;
+ _tmp56_ = self->priv->publish_button;
#line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_signal_connect_object (_tmp64_, "clicked", (GCallback) _publishing_rajce_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0);
-#line 7470 "RajcePublishing.c"
+ g_signal_connect_object (_tmp56_, "clicked", (GCallback) _publishing_rajce_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0);
+#line 7734 "RajcePublishing.c"
}
goto __finally30;
__catch30_g_error:
{
GError* e = NULL;
- GError* _tmp65_;
- const gchar* _tmp66_;
+ GError* _tmp57_;
+ const gchar* _tmp58_;
#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
e = _inner_error_;
#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_inner_error_ = NULL;
#line 1029 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp65_ = e;
+ _tmp57_ = e;
#line 1029 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp66_ = _tmp65_->message;
+ _tmp58_ = _tmp57_->message;
#line 1029 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_warning ("RajcePublishing.vala:1029: Could not load UI: %s", _tmp66_);
+ g_warning ("RajcePublishing.vala:1029: Could not load UI: %s", _tmp58_);
#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_error_free0 (e);
-#line 7490 "RajcePublishing.c"
+#line 7754 "RajcePublishing.c"
}
__finally30:
#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -7501,168 +7765,162 @@ PublishingRajcePublishingOptionsPane* publishing_rajce_publishing_options_pane_c
g_clear_error (&_inner_error_);
#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return NULL;
-#line 7501 "RajcePublishing.c"
+#line 7765 "RajcePublishing.c"
}
#line 985 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return self;
-#line 7505 "RajcePublishing.c"
+#line 7769 "RajcePublishing.c"
}
-PublishingRajcePublishingOptionsPane* publishing_rajce_publishing_options_pane_new (PublishingRajceRajcePublisher* publisher, const gchar* username, PublishingRajceAlbum** albums, int albums_length1) {
+PublishingRajcePublishingOptionsPane*
+publishing_rajce_publishing_options_pane_new (PublishingRajceRajcePublisher* publisher,
+ const gchar* username,
+ PublishingRajceAlbum** albums,
+ int albums_length1)
+{
#line 985 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return publishing_rajce_publishing_options_pane_construct (PUBLISHING_RAJCE_TYPE_PUBLISHING_OPTIONS_PANE, publisher, username, albums, albums_length1);
-#line 7512 "RajcePublishing.c"
+#line 7781 "RajcePublishing.c"
}
-static void publishing_rajce_publishing_options_pane_on_publish_clicked (PublishingRajcePublishingOptionsPane* self) {
+static void
+publishing_rajce_publishing_options_pane_on_publish_clicked (PublishingRajcePublishingOptionsPane* self)
+{
gboolean show_album = FALSE;
GtkCheckButton* _tmp0_;
- gboolean _tmp1_;
- PublishingRajceRajcePublisher* _tmp2_;
- gboolean _tmp3_;
- GtkRadioButton* _tmp4_;
- gboolean _tmp5_;
+ PublishingRajceRajcePublisher* _tmp1_;
+ gboolean _tmp2_;
+ GtkRadioButton* _tmp3_;
#line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_if_fail (PUBLISHING_RAJCE_IS_PUBLISHING_OPTIONS_PANE (self));
#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_tmp0_ = self->priv->show_check;
#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp1_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- show_album = _tmp1_;
+ show_album = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_button_get_type (), GtkToggleButton));
#line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp2_ = self->priv->publisher;
+ _tmp1_ = self->priv->publisher;
#line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp3_ = show_album;
+ _tmp2_ = show_album;
#line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- publishing_rajce_rajce_publisher_set_show_album (_tmp2_, _tmp3_);
-#line 1038 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp4_ = self->priv->create_new_radio;
+ publishing_rajce_rajce_publisher_set_show_album (_tmp1_, _tmp2_);
#line 1038 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp5_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_toggle_button_get_type (), GtkToggleButton));
+ _tmp3_ = self->priv->create_new_radio;
#line 1038 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- if (_tmp5_) {
-#line 7544 "RajcePublishing.c"
+ if (gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_toggle_button_get_type (), GtkToggleButton))) {
+#line 7809 "RajcePublishing.c"
gchar* album_name = NULL;
- GtkEntry* _tmp6_;
- const gchar* _tmp7_;
- gchar* _tmp8_;
+ GtkEntry* _tmp4_;
+ const gchar* _tmp5_;
+ gchar* _tmp6_;
gboolean hide_album = FALSE;
- GtkCheckButton* _tmp9_;
- gboolean _tmp10_;
- PublishingRajceRajcePublisher* _tmp11_;
- gboolean _tmp12_;
- const gchar* _tmp13_;
- gboolean _tmp14_;
- PublishingRajcePublishingParameters* _tmp15_;
- PublishingRajcePublishingParameters* _tmp16_;
+ GtkCheckButton* _tmp7_;
+ PublishingRajceRajcePublisher* _tmp8_;
+ gboolean _tmp9_;
+ const gchar* _tmp10_;
+ gboolean _tmp11_;
+ PublishingRajcePublishingParameters* _tmp12_;
+ PublishingRajcePublishingParameters* _tmp13_;
#line 1040 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp6_ = self->priv->new_album_entry;
+ _tmp4_ = self->priv->new_album_entry;
#line 1040 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp7_ = gtk_entry_get_text (_tmp6_);
+ _tmp5_ = gtk_entry_get_text (_tmp4_);
#line 1040 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp8_ = g_strdup (_tmp7_);
+ _tmp6_ = g_strdup (_tmp5_);
#line 1040 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- album_name = _tmp8_;
+ album_name = _tmp6_;
#line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp9_ = self->priv->hide_check;
+ _tmp7_ = self->priv->hide_check;
#line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp10_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- hide_album = _tmp10_;
+ hide_album = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_toggle_button_get_type (), GtkToggleButton));
#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp11_ = self->priv->publisher;
+ _tmp8_ = self->priv->publisher;
#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp12_ = hide_album;
+ _tmp9_ = hide_album;
#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- publishing_rajce_rajce_publisher_set_hide_album (_tmp11_, _tmp12_);
+ publishing_rajce_rajce_publisher_set_hide_album (_tmp8_, _tmp9_);
#line 1043 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp13_ = album_name;
+ _tmp10_ = album_name;
#line 1043 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp14_ = hide_album;
+ _tmp11_ = hide_album;
#line 1043 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp15_ = publishing_rajce_publishing_parameters_new_to_new_album (_tmp13_, _tmp14_);
+ _tmp12_ = publishing_rajce_publishing_parameters_new_to_new_album (_tmp10_, _tmp11_);
#line 1043 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp16_ = _tmp15_;
+ _tmp13_ = _tmp12_;
#line 1043 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_signal_emit (self, publishing_rajce_publishing_options_pane_signals[PUBLISHING_RAJCE_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0, _tmp16_);
+ g_signal_emit (self, publishing_rajce_publishing_options_pane_signals[PUBLISHING_RAJCE_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0, _tmp13_);
#line 1043 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _publishing_rajce_publishing_parameters_unref0 (_tmp16_);
+ _publishing_rajce_publishing_parameters_unref0 (_tmp13_);
#line 1038 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_free0 (album_name);
-#line 7592 "RajcePublishing.c"
+#line 7854 "RajcePublishing.c"
} else {
gint id = 0;
- PublishingRajceAlbum** _tmp17_;
- gint _tmp17__length1;
- GtkComboBoxText* _tmp18_;
- gint _tmp19_;
- PublishingRajceAlbum* _tmp20_;
- gint _tmp21_;
+ PublishingRajceAlbum** _tmp14_;
+ gint _tmp14__length1;
+ GtkComboBoxText* _tmp15_;
+ PublishingRajceAlbum* _tmp16_;
+ gint _tmp17_;
gchar* album_name = NULL;
- PublishingRajceAlbum** _tmp22_;
- gint _tmp22__length1;
- GtkComboBoxText* _tmp23_;
+ PublishingRajceAlbum** _tmp18_;
+ gint _tmp18__length1;
+ GtkComboBoxText* _tmp19_;
+ PublishingRajceAlbum* _tmp20_;
+ const gchar* _tmp21_;
+ gchar* _tmp22_;
+ const gchar* _tmp23_;
gint _tmp24_;
- PublishingRajceAlbum* _tmp25_;
- const gchar* _tmp26_;
- gchar* _tmp27_;
- const gchar* _tmp28_;
- gint _tmp29_;
- PublishingRajcePublishingParameters* _tmp30_;
- PublishingRajcePublishingParameters* _tmp31_;
+ PublishingRajcePublishingParameters* _tmp25_;
+ PublishingRajcePublishingParameters* _tmp26_;
#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp17_ = self->priv->albums;
+ _tmp14_ = self->priv->albums;
#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp17__length1 = self->priv->albums_length1;
+ _tmp14__length1 = self->priv->albums_length1;
#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp18_ = self->priv->existing_albums_combo;
+ _tmp15_ = self->priv->existing_albums_combo;
#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp19_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_combo_box_get_type (), GtkComboBox));
+ _tmp16_ = _tmp14_[gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_combo_box_get_type (), GtkComboBox))];
#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp20_ = _tmp17_[_tmp19_];
+ _tmp17_ = _tmp16_->id;
#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp21_ = _tmp20_->id;
-#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- id = _tmp21_;
-#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp22_ = self->priv->albums;
+ id = _tmp17_;
#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp22__length1 = self->priv->albums_length1;
+ _tmp18_ = self->priv->albums;
#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp23_ = self->priv->existing_albums_combo;
+ _tmp18__length1 = self->priv->albums_length1;
#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp24_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_combo_box_get_type (), GtkComboBox));
+ _tmp19_ = self->priv->existing_albums_combo;
#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp25_ = _tmp22_[_tmp24_];
+ _tmp20_ = _tmp18_[gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_combo_box_get_type (), GtkComboBox))];
#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp26_ = _tmp25_->albumName;
+ _tmp21_ = _tmp20_->albumName;
#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp27_ = g_strdup (_tmp26_);
+ _tmp22_ = g_strdup (_tmp21_);
#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- album_name = _tmp27_;
+ album_name = _tmp22_;
#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp28_ = album_name;
+ _tmp23_ = album_name;
#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp29_ = id;
+ _tmp24_ = id;
#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp30_ = publishing_rajce_publishing_parameters_new_to_existing_album (_tmp28_, _tmp29_);
+ _tmp25_ = publishing_rajce_publishing_parameters_new_to_existing_album (_tmp23_, _tmp24_);
#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp31_ = _tmp30_;
+ _tmp26_ = _tmp25_;
#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_signal_emit (self, publishing_rajce_publishing_options_pane_signals[PUBLISHING_RAJCE_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0, _tmp31_);
+ g_signal_emit (self, publishing_rajce_publishing_options_pane_signals[PUBLISHING_RAJCE_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0, _tmp26_);
#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _publishing_rajce_publishing_parameters_unref0 (_tmp31_);
+ _publishing_rajce_publishing_parameters_unref0 (_tmp26_);
#line 1038 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_free0 (album_name);
-#line 7657 "RajcePublishing.c"
+#line 7913 "RajcePublishing.c"
}
}
-static void publishing_rajce_publishing_options_pane_on_use_existing_radio_clicked (PublishingRajcePublishingOptionsPane* self) {
+static void
+publishing_rajce_publishing_options_pane_on_use_existing_radio_clicked (PublishingRajcePublishingOptionsPane* self)
+{
GtkComboBoxText* _tmp0_;
GtkEntry* _tmp1_;
GtkComboBoxText* _tmp2_;
@@ -7687,11 +7945,13 @@ static void publishing_rajce_publishing_options_pane_on_use_existing_radio_click
_tmp3_ = self->priv->hide_check;
#line 1059 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 7687 "RajcePublishing.c"
+#line 7945 "RajcePublishing.c"
}
-static void publishing_rajce_publishing_options_pane_on_create_new_radio_clicked (PublishingRajcePublishingOptionsPane* self) {
+static void
+publishing_rajce_publishing_options_pane_on_create_new_radio_clicked (PublishingRajcePublishingOptionsPane* self)
+{
GtkEntry* _tmp0_;
GtkComboBoxText* _tmp1_;
GtkEntry* _tmp2_;
@@ -7716,43 +7976,49 @@ static void publishing_rajce_publishing_options_pane_on_create_new_radio_clicked
_tmp3_ = self->priv->hide_check;
#line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 7716 "RajcePublishing.c"
+#line 7976 "RajcePublishing.c"
}
-static void publishing_rajce_publishing_options_pane_on_logout_clicked (PublishingRajcePublishingOptionsPane* self) {
+static void
+publishing_rajce_publishing_options_pane_on_logout_clicked (PublishingRajcePublishingOptionsPane* self)
+{
#line 1071 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_if_fail (PUBLISHING_RAJCE_IS_PUBLISHING_OPTIONS_PANE (self));
#line 1073 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_signal_emit (self, publishing_rajce_publishing_options_pane_signals[PUBLISHING_RAJCE_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL], 0);
-#line 7725 "RajcePublishing.c"
+#line 7987 "RajcePublishing.c"
}
-static gchar* string_strip (const gchar* self) {
+static gchar*
+string_strip (const gchar* self)
+{
gchar* result = NULL;
gchar* _result_ = NULL;
gchar* _tmp0_;
const gchar* _tmp1_;
-#line 1234 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1248 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1249 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp0_ = g_strdup (self);
-#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1249 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_result_ = _tmp0_;
-#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1250 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp1_ = _result_;
-#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1250 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_strstrip (_tmp1_);
-#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1251 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
result = _result_;
-#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1251 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 7748 "RajcePublishing.c"
+#line 8012 "RajcePublishing.c"
}
-static void publishing_rajce_publishing_options_pane_update_publish_button_sensitivity (PublishingRajcePublishingOptionsPane* self) {
+static void
+publishing_rajce_publishing_options_pane_update_publish_button_sensitivity (PublishingRajcePublishingOptionsPane* self)
+{
gchar* album_name = NULL;
GtkEntry* _tmp0_;
const gchar* _tmp1_;
@@ -7762,7 +8028,7 @@ static void publishing_rajce_publishing_options_pane_update_publish_button_sensi
gchar* _tmp5_;
gchar* _tmp6_;
gboolean _tmp7_;
- GtkButton* _tmp10_;
+ GtkButton* _tmp9_;
#line 1075 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_if_fail (PUBLISHING_RAJCE_IS_PUBLISHING_OPTIONS_PANE (self));
#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -7787,56 +8053,57 @@ static void publishing_rajce_publishing_options_pane_update_publish_button_sensi
if (_tmp7_) {
#line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_tmp3_ = TRUE;
-#line 7787 "RajcePublishing.c"
+#line 8053 "RajcePublishing.c"
} else {
GtkRadioButton* _tmp8_;
- gboolean _tmp9_;
#line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_tmp8_ = self->priv->create_new_radio;
#line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp9_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp3_ = !_tmp9_;
-#line 7797 "RajcePublishing.c"
+ _tmp3_ = !gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_toggle_button_get_type (), GtkToggleButton));
+#line 8060 "RajcePublishing.c"
}
#line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp10_ = self->priv->publish_button;
+ _tmp9_ = self->priv->publish_button;
#line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), _tmp3_);
+ gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), _tmp3_);
#line 1075 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_free0 (album_name);
-#line 7805 "RajcePublishing.c"
+#line 8068 "RajcePublishing.c"
}
-static void publishing_rajce_publishing_options_pane_on_new_album_entry_changed (PublishingRajcePublishingOptionsPane* self) {
+static void
+publishing_rajce_publishing_options_pane_on_new_album_entry_changed (PublishingRajcePublishingOptionsPane* self)
+{
#line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_if_fail (PUBLISHING_RAJCE_IS_PUBLISHING_OPTIONS_PANE (self));
#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_publishing_options_pane_update_publish_button_sensitivity (self);
-#line 7814 "RajcePublishing.c"
+#line 8079 "RajcePublishing.c"
}
-void publishing_rajce_publishing_options_pane_installed (PublishingRajcePublishingOptionsPane* self) {
+void
+publishing_rajce_publishing_options_pane_installed (PublishingRajcePublishingOptionsPane* self)
+{
PublishingRajceAlbum** _tmp9_;
gint _tmp9__length1;
GtkRadioButton* _tmp15_;
#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_if_fail (PUBLISHING_RAJCE_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 7824 "RajcePublishing.c"
+#line 8091 "RajcePublishing.c"
{
gint i = 0;
#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
i = 0;
-#line 7829 "RajcePublishing.c"
+#line 8096 "RajcePublishing.c"
{
gboolean _tmp0_ = FALSE;
#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_tmp0_ = TRUE;
#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
while (TRUE) {
-#line 7836 "RajcePublishing.c"
+#line 8103 "RajcePublishing.c"
gint _tmp2_;
PublishingRajceAlbum** _tmp3_;
gint _tmp3__length1;
@@ -7848,13 +8115,13 @@ void publishing_rajce_publishing_options_pane_installed (PublishingRajcePublishi
const gchar* _tmp8_;
#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (!_tmp0_) {
-#line 7848 "RajcePublishing.c"
+#line 8115 "RajcePublishing.c"
gint _tmp1_;
#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_tmp1_ = i;
#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
i = _tmp1_ + 1;
-#line 7854 "RajcePublishing.c"
+#line 8121 "RajcePublishing.c"
}
#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_tmp0_ = FALSE;
@@ -7868,7 +8135,7 @@ void publishing_rajce_publishing_options_pane_installed (PublishingRajcePublishi
if (!(_tmp2_ < _tmp3__length1)) {
#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
break;
-#line 7868 "RajcePublishing.c"
+#line 8135 "RajcePublishing.c"
}
#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_tmp4_ = self->priv->existing_albums_combo;
@@ -7884,7 +8151,7 @@ void publishing_rajce_publishing_options_pane_installed (PublishingRajcePublishi
_tmp8_ = _tmp7_->albumName;
#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
gtk_combo_box_text_append_text (_tmp4_, _tmp8_);
-#line 7884 "RajcePublishing.c"
+#line 8151 "RajcePublishing.c"
}
}
}
@@ -7894,7 +8161,7 @@ void publishing_rajce_publishing_options_pane_installed (PublishingRajcePublishi
_tmp9__length1 = self->priv->albums_length1;
#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (_tmp9__length1 == 0) {
-#line 7894 "RajcePublishing.c"
+#line 8161 "RajcePublishing.c"
GtkComboBoxText* _tmp10_;
GtkRadioButton* _tmp11_;
#line 1093 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -7905,7 +8172,7 @@ void publishing_rajce_publishing_options_pane_installed (PublishingRajcePublishi
_tmp11_ = self->priv->use_existing_radio;
#line 1094 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 7905 "RajcePublishing.c"
+#line 8172 "RajcePublishing.c"
} else {
GtkComboBoxText* _tmp12_;
GtkComboBoxText* _tmp13_;
@@ -7922,7 +8189,7 @@ void publishing_rajce_publishing_options_pane_installed (PublishingRajcePublishi
_tmp14_ = self->priv->use_existing_radio;
#line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 7922 "RajcePublishing.c"
+#line 8189 "RajcePublishing.c"
}
#line 1102 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_tmp15_ = self->priv->create_new_radio;
@@ -7930,34 +8197,38 @@ void publishing_rajce_publishing_options_pane_installed (PublishingRajcePublishi
gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
#line 1103 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_publishing_options_pane_on_create_new_radio_clicked (self);
-#line 7930 "RajcePublishing.c"
+#line 8197 "RajcePublishing.c"
}
-void publishing_rajce_publishing_options_pane_notify_publish (PublishingRajcePublishingOptionsPane* self, PublishingRajcePublishingParameters* parameters) {
- PublishingRajcePublishingParameters* _tmp0_;
+void
+publishing_rajce_publishing_options_pane_notify_publish (PublishingRajcePublishingOptionsPane* self,
+ PublishingRajcePublishingParameters* parameters)
+{
#line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_if_fail (PUBLISHING_RAJCE_IS_PUBLISHING_OPTIONS_PANE (self));
#line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_if_fail (PUBLISHING_RAJCE_IS_PUBLISHING_PARAMETERS (parameters));
#line 1108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp0_ = parameters;
-#line 1108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_signal_emit (self, publishing_rajce_publishing_options_pane_signals[PUBLISHING_RAJCE_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0, _tmp0_);
-#line 7944 "RajcePublishing.c"
+ g_signal_emit (self, publishing_rajce_publishing_options_pane_signals[PUBLISHING_RAJCE_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0, parameters);
+#line 8211 "RajcePublishing.c"
}
-void publishing_rajce_publishing_options_pane_notify_logout (PublishingRajcePublishingOptionsPane* self) {
+void
+publishing_rajce_publishing_options_pane_notify_logout (PublishingRajcePublishingOptionsPane* self)
+{
#line 1111 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_if_fail (PUBLISHING_RAJCE_IS_PUBLISHING_OPTIONS_PANE (self));
#line 1113 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_signal_emit (self, publishing_rajce_publishing_options_pane_signals[PUBLISHING_RAJCE_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL], 0);
-#line 7953 "RajcePublishing.c"
+#line 8222 "RajcePublishing.c"
}
-GtkWidget* publishing_rajce_publishing_options_pane_get_default_widget (PublishingRajcePublishingOptionsPane* self) {
+GtkWidget*
+publishing_rajce_publishing_options_pane_get_default_widget (PublishingRajcePublishingOptionsPane* self)
+{
GtkWidget* result = NULL;
GtkButton* _tmp0_;
GtkWidget* _tmp1_;
@@ -7971,11 +8242,13 @@ GtkWidget* publishing_rajce_publishing_options_pane_get_default_widget (Publishi
result = _tmp1_;
#line 1118 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return result;
-#line 7971 "RajcePublishing.c"
+#line 8242 "RajcePublishing.c"
}
-static GtkWidget* publishing_rajce_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base) {
+static GtkWidget*
+publishing_rajce_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base)
+{
PublishingRajcePublishingOptionsPane * self;
GtkWidget* result = NULL;
GtkBox* _tmp0_;
@@ -7990,11 +8263,13 @@ static GtkWidget* publishing_rajce_publishing_options_pane_real_get_widget (Spit
result = _tmp1_;
#line 1122 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return result;
-#line 7990 "RajcePublishing.c"
+#line 8263 "RajcePublishing.c"
}
-static SpitPublishingDialogPaneGeometryOptions publishing_rajce_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) {
+static SpitPublishingDialogPaneGeometryOptions
+publishing_rajce_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base)
+{
PublishingRajcePublishingOptionsPane * self;
SpitPublishingDialogPaneGeometryOptions result = 0;
#line 1125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -8003,25 +8278,34 @@ static SpitPublishingDialogPaneGeometryOptions publishing_rajce_publishing_optio
result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
#line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return result;
-#line 8003 "RajcePublishing.c"
+#line 8278 "RajcePublishing.c"
}
-static void _publishing_rajce_publishing_options_pane_notify_publish_publishing_rajce_publishing_options_pane_publish (PublishingRajcePublishingOptionsPane* _sender, PublishingRajcePublishingParameters* parameters, gpointer self) {
+static void
+_publishing_rajce_publishing_options_pane_notify_publish_publishing_rajce_publishing_options_pane_publish (PublishingRajcePublishingOptionsPane* _sender,
+ PublishingRajcePublishingParameters* parameters,
+ gpointer self)
+{
#line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_publishing_options_pane_notify_publish ((PublishingRajcePublishingOptionsPane*) self, parameters);
-#line 8010 "RajcePublishing.c"
+#line 8289 "RajcePublishing.c"
}
-static void _publishing_rajce_publishing_options_pane_notify_logout_publishing_rajce_publishing_options_pane_logout (PublishingRajcePublishingOptionsPane* _sender, gpointer self) {
+static void
+_publishing_rajce_publishing_options_pane_notify_logout_publishing_rajce_publishing_options_pane_logout (PublishingRajcePublishingOptionsPane* _sender,
+ gpointer self)
+{
#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_publishing_options_pane_notify_logout ((PublishingRajcePublishingOptionsPane*) self);
-#line 8017 "RajcePublishing.c"
+#line 8299 "RajcePublishing.c"
}
-static void publishing_rajce_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base) {
+static void
+publishing_rajce_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base)
+{
PublishingRajcePublishingOptionsPane * self;
#line 1130 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_RAJCE_TYPE_PUBLISHING_OPTIONS_PANE, PublishingRajcePublishingOptionsPane);
@@ -8031,11 +8315,13 @@ static void publishing_rajce_publishing_options_pane_real_on_pane_installed (Spi
g_signal_connect_object (self, "publish", (GCallback) _publishing_rajce_publishing_options_pane_notify_publish_publishing_rajce_publishing_options_pane_publish, self, 0);
#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_signal_connect_object (self, "logout", (GCallback) _publishing_rajce_publishing_options_pane_notify_logout_publishing_rajce_publishing_options_pane_logout, self, 0);
-#line 8031 "RajcePublishing.c"
+#line 8315 "RajcePublishing.c"
}
-static void publishing_rajce_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) {
+static void
+publishing_rajce_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base)
+{
PublishingRajcePublishingOptionsPane * self;
guint _tmp0_;
guint _tmp1_;
@@ -8049,11 +8335,18 @@ static void publishing_rajce_publishing_options_pane_real_on_pane_uninstalled (S
g_signal_parse_name ("logout", PUBLISHING_RAJCE_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp1_, NULL, FALSE);
#line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_signal_handlers_disconnect_matched (self, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_rajce_publishing_options_pane_notify_logout_publishing_rajce_publishing_options_pane_logout, self);
-#line 8049 "RajcePublishing.c"
+#line 8335 "RajcePublishing.c"
}
-static void g_cclosure_user_marshal_VOID__PUBLISHING_RAJCE_PUBLISHING_PARAMETERS (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) {
+static void
+g_cclosure_user_marshal_VOID__PUBLISHING_RAJCE_PUBLISHING_PARAMETERS (GClosure * closure,
+ GValue * return_value,
+ guint n_param_values,
+ const GValue * param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data)
+{
typedef void (*GMarshalFunc_VOID__PUBLISHING_RAJCE_PUBLISHING_PARAMETERS) (gpointer data1, gpointer arg_1, gpointer data2);
register GMarshalFunc_VOID__PUBLISHING_RAJCE_PUBLISHING_PARAMETERS callback;
register GCClosure * cc;
@@ -8068,23 +8361,25 @@ static void g_cclosure_user_marshal_VOID__PUBLISHING_RAJCE_PUBLISHING_PARAMETERS
data1 = closure->data;
#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
data2 = param_values->data[0].v_pointer;
-#line 8068 "RajcePublishing.c"
+#line 8361 "RajcePublishing.c"
} else {
#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
data1 = param_values->data[0].v_pointer;
#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
data2 = closure->data;
-#line 8074 "RajcePublishing.c"
+#line 8367 "RajcePublishing.c"
}
#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
callback = (GMarshalFunc_VOID__PUBLISHING_RAJCE_PUBLISHING_PARAMETERS) (marshal_data ? marshal_data : cc->callback);
#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
callback (data1, publishing_rajce_value_get_publishing_parameters (param_values + 1), data2);
-#line 8080 "RajcePublishing.c"
+#line 8373 "RajcePublishing.c"
}
-static void publishing_rajce_publishing_options_pane_class_init (PublishingRajcePublishingOptionsPaneClass * klass) {
+static void
+publishing_rajce_publishing_options_pane_class_init (PublishingRajcePublishingOptionsPaneClass * klass)
+{
#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_publishing_options_pane_parent_class = g_type_class_peek_parent (klass);
#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -8095,11 +8390,13 @@ static void publishing_rajce_publishing_options_pane_class_init (PublishingRajce
publishing_rajce_publishing_options_pane_signals[PUBLISHING_RAJCE_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL] = g_signal_new ("publish", PUBLISHING_RAJCE_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__PUBLISHING_RAJCE_PUBLISHING_PARAMETERS, G_TYPE_NONE, 1, PUBLISHING_RAJCE_TYPE_PUBLISHING_PARAMETERS);
#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_publishing_options_pane_signals[PUBLISHING_RAJCE_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL] = g_signal_new ("logout", PUBLISHING_RAJCE_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 8095 "RajcePublishing.c"
+#line 8390 "RajcePublishing.c"
}
-static void publishing_rajce_publishing_options_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) {
+static void
+publishing_rajce_publishing_options_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface)
+{
#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -8110,11 +8407,13 @@ static void publishing_rajce_publishing_options_pane_spit_publishing_dialog_pane
iface->on_pane_installed = (void (*) (SpitPublishingDialogPane *)) publishing_rajce_publishing_options_pane_real_on_pane_installed;
#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
iface->on_pane_uninstalled = (void (*) (SpitPublishingDialogPane *)) publishing_rajce_publishing_options_pane_real_on_pane_uninstalled;
-#line 8110 "RajcePublishing.c"
+#line 8407 "RajcePublishing.c"
}
-static void publishing_rajce_publishing_options_pane_instance_init (PublishingRajcePublishingOptionsPane * self) {
+static void
+publishing_rajce_publishing_options_pane_instance_init (PublishingRajcePublishingOptionsPane * self)
+{
#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
self->priv = PUBLISHING_RAJCE_PUBLISHING_OPTIONS_PANE_GET_PRIVATE (self);
#line 969 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -8141,11 +8440,13 @@ static void publishing_rajce_publishing_options_pane_instance_init (PublishingRa
self->priv->publish_button = NULL;
#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
self->priv->logout_button = NULL;
-#line 8141 "RajcePublishing.c"
+#line 8440 "RajcePublishing.c"
}
-static void publishing_rajce_publishing_options_pane_finalize (GObject * obj) {
+static void
+publishing_rajce_publishing_options_pane_finalize (GObject * obj)
+{
PublishingRajcePublishingOptionsPane * self;
#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_RAJCE_TYPE_PUBLISHING_OPTIONS_PANE, PublishingRajcePublishingOptionsPane);
@@ -8181,11 +8482,13 @@ static void publishing_rajce_publishing_options_pane_finalize (GObject * obj) {
_g_object_unref0 (self->priv->logout_button);
#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
G_OBJECT_CLASS (publishing_rajce_publishing_options_pane_parent_class)->finalize (obj);
-#line 8181 "RajcePublishing.c"
+#line 8482 "RajcePublishing.c"
}
-GType publishing_rajce_publishing_options_pane_get_type (void) {
+GType
+publishing_rajce_publishing_options_pane_get_type (void)
+{
static volatile gsize publishing_rajce_publishing_options_pane_type_id__volatile = 0;
if (g_once_init_enter (&publishing_rajce_publishing_options_pane_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingRajcePublishingOptionsPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_rajce_publishing_options_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingRajcePublishingOptionsPane), 0, (GInstanceInitFunc) publishing_rajce_publishing_options_pane_instance_init, NULL };
@@ -8199,213 +8502,244 @@ GType publishing_rajce_publishing_options_pane_get_type (void) {
}
-static PublishingRajcePublishingParameters* publishing_rajce_publishing_parameters_construct (GType object_type) {
+static PublishingRajcePublishingParameters*
+publishing_rajce_publishing_parameters_construct (GType object_type)
+{
PublishingRajcePublishingParameters* self = NULL;
#line 1150 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
self = (PublishingRajcePublishingParameters*) g_type_create_instance (object_type);
#line 1150 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return self;
-#line 8205 "RajcePublishing.c"
+#line 8510 "RajcePublishing.c"
}
-static PublishingRajcePublishingParameters* publishing_rajce_publishing_parameters_new (void) {
+static PublishingRajcePublishingParameters*
+publishing_rajce_publishing_parameters_new (void)
+{
#line 1150 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return publishing_rajce_publishing_parameters_construct (PUBLISHING_RAJCE_TYPE_PUBLISHING_PARAMETERS);
-#line 8212 "RajcePublishing.c"
+#line 8519 "RajcePublishing.c"
}
-PublishingRajcePublishingParameters* publishing_rajce_publishing_parameters_construct_to_new_album (GType object_type, const gchar* album_name, gboolean album_hidden) {
+PublishingRajcePublishingParameters*
+publishing_rajce_publishing_parameters_construct_to_new_album (GType object_type,
+ const gchar* album_name,
+ gboolean album_hidden)
+{
PublishingRajcePublishingParameters* self = NULL;
- const gchar* _tmp0_;
- gchar* _tmp1_;
- gboolean _tmp2_;
- gboolean* _tmp3_;
- gint _tmp4_;
- gint* _tmp5_;
+ gchar* _tmp0_;
+ gboolean* _tmp1_;
+ gint _tmp2_;
+ gint* _tmp3_;
#line 1153 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_val_if_fail (album_name != NULL, NULL);
#line 1153 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
self = (PublishingRajcePublishingParameters*) g_type_create_instance (object_type);
#line 1155 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp0_ = album_name;
-#line 1155 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp1_ = g_strdup (_tmp0_);
+ _tmp0_ = g_strdup (album_name);
#line 1155 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_free0 (self->album_name);
#line 1155 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- self->album_name = _tmp1_;
+ self->album_name = _tmp0_;
#line 1156 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp2_ = album_hidden;
-#line 1156 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp3_ = __bool_dup0 (&_tmp2_);
+ _tmp1_ = __bool_dup0 (&album_hidden);
#line 1156 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_free0 (self->album_hidden);
#line 1156 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- self->album_hidden = _tmp3_;
+ self->album_hidden = _tmp1_;
#line 1157 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp4_ = 0;
+ _tmp2_ = 0;
#line 1157 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp5_ = __int_dup0 (&_tmp4_);
+ _tmp3_ = __int_dup0 (&_tmp2_);
#line 1157 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_free0 (self->album_id);
#line 1157 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- self->album_id = _tmp5_;
+ self->album_id = _tmp3_;
#line 1153 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return self;
-#line 8254 "RajcePublishing.c"
+#line 8559 "RajcePublishing.c"
}
-PublishingRajcePublishingParameters* publishing_rajce_publishing_parameters_new_to_new_album (const gchar* album_name, gboolean album_hidden) {
+PublishingRajcePublishingParameters*
+publishing_rajce_publishing_parameters_new_to_new_album (const gchar* album_name,
+ gboolean album_hidden)
+{
#line 1153 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return publishing_rajce_publishing_parameters_construct_to_new_album (PUBLISHING_RAJCE_TYPE_PUBLISHING_PARAMETERS, album_name, album_hidden);
-#line 8261 "RajcePublishing.c"
+#line 8569 "RajcePublishing.c"
}
-PublishingRajcePublishingParameters* publishing_rajce_publishing_parameters_construct_to_existing_album (GType object_type, const gchar* album_name, gint album_id) {
+PublishingRajcePublishingParameters*
+publishing_rajce_publishing_parameters_construct_to_existing_album (GType object_type,
+ const gchar* album_name,
+ gint album_id)
+{
PublishingRajcePublishingParameters* self = NULL;
- const gchar* _tmp0_;
- gchar* _tmp1_;
- gint _tmp2_;
- gint* _tmp3_;
+ gchar* _tmp0_;
+ gint* _tmp1_;
#line 1159 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_val_if_fail (album_name != NULL, NULL);
#line 1159 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
self = (PublishingRajcePublishingParameters*) g_type_create_instance (object_type);
#line 1161 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp0_ = album_name;
-#line 1161 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp1_ = g_strdup (_tmp0_);
+ _tmp0_ = g_strdup (album_name);
#line 1161 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_free0 (self->album_name);
#line 1161 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- self->album_name = _tmp1_;
+ self->album_name = _tmp0_;
#line 1162 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_free0 (self->album_hidden);
#line 1162 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
self->album_hidden = NULL;
#line 1163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp2_ = album_id;
-#line 1163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp3_ = __int_dup0 (&_tmp2_);
+ _tmp1_ = __int_dup0 (&album_id);
#line 1163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_free0 (self->album_id);
#line 1163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- self->album_id = _tmp3_;
+ self->album_id = _tmp1_;
#line 1159 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return self;
-#line 8297 "RajcePublishing.c"
+#line 8603 "RajcePublishing.c"
}
-PublishingRajcePublishingParameters* publishing_rajce_publishing_parameters_new_to_existing_album (const gchar* album_name, gint album_id) {
+PublishingRajcePublishingParameters*
+publishing_rajce_publishing_parameters_new_to_existing_album (const gchar* album_name,
+ gint album_id)
+{
#line 1159 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return publishing_rajce_publishing_parameters_construct_to_existing_album (PUBLISHING_RAJCE_TYPE_PUBLISHING_PARAMETERS, album_name, album_id);
-#line 8304 "RajcePublishing.c"
+#line 8613 "RajcePublishing.c"
}
-static void publishing_rajce_value_publishing_parameters_init (GValue* value) {
+static void
+publishing_rajce_value_publishing_parameters_init (GValue* value)
+{
#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
value->data[0].v_pointer = NULL;
-#line 8311 "RajcePublishing.c"
+#line 8622 "RajcePublishing.c"
}
-static void publishing_rajce_value_publishing_parameters_free_value (GValue* value) {
+static void
+publishing_rajce_value_publishing_parameters_free_value (GValue* value)
+{
#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (value->data[0].v_pointer) {
#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_publishing_parameters_unref (value->data[0].v_pointer);
-#line 8320 "RajcePublishing.c"
+#line 8633 "RajcePublishing.c"
}
}
-static void publishing_rajce_value_publishing_parameters_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+publishing_rajce_value_publishing_parameters_copy_value (const GValue* src_value,
+ GValue* dest_value)
+{
#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (src_value->data[0].v_pointer) {
#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
dest_value->data[0].v_pointer = publishing_rajce_publishing_parameters_ref (src_value->data[0].v_pointer);
-#line 8330 "RajcePublishing.c"
+#line 8646 "RajcePublishing.c"
} else {
#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
dest_value->data[0].v_pointer = NULL;
-#line 8334 "RajcePublishing.c"
+#line 8650 "RajcePublishing.c"
}
}
-static gpointer publishing_rajce_value_publishing_parameters_peek_pointer (const GValue* value) {
+static gpointer
+publishing_rajce_value_publishing_parameters_peek_pointer (const GValue* value)
+{
#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return value->data[0].v_pointer;
-#line 8342 "RajcePublishing.c"
+#line 8660 "RajcePublishing.c"
}
-static gchar* publishing_rajce_value_publishing_parameters_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_rajce_value_publishing_parameters_collect_value (GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (collect_values[0].v_pointer) {
-#line 8349 "RajcePublishing.c"
+#line 8672 "RajcePublishing.c"
PublishingRajcePublishingParameters * object;
object = collect_values[0].v_pointer;
#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (object->parent_instance.g_class == NULL) {
#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 8356 "RajcePublishing.c"
+#line 8679 "RajcePublishing.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 8360 "RajcePublishing.c"
+#line 8683 "RajcePublishing.c"
}
#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
value->data[0].v_pointer = publishing_rajce_publishing_parameters_ref (object);
-#line 8364 "RajcePublishing.c"
+#line 8687 "RajcePublishing.c"
} else {
#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
value->data[0].v_pointer = NULL;
-#line 8368 "RajcePublishing.c"
+#line 8691 "RajcePublishing.c"
}
#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return NULL;
-#line 8372 "RajcePublishing.c"
+#line 8695 "RajcePublishing.c"
}
-static gchar* publishing_rajce_value_publishing_parameters_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_rajce_value_publishing_parameters_lcopy_value (const GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
PublishingRajcePublishingParameters ** object_p;
object_p = collect_values[0].v_pointer;
#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (!object_p) {
#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 8383 "RajcePublishing.c"
+#line 8711 "RajcePublishing.c"
}
#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (!value->data[0].v_pointer) {
#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
*object_p = NULL;
-#line 8389 "RajcePublishing.c"
+#line 8717 "RajcePublishing.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
*object_p = value->data[0].v_pointer;
-#line 8393 "RajcePublishing.c"
+#line 8721 "RajcePublishing.c"
} else {
#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
*object_p = publishing_rajce_publishing_parameters_ref (value->data[0].v_pointer);
-#line 8397 "RajcePublishing.c"
+#line 8725 "RajcePublishing.c"
}
#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return NULL;
-#line 8401 "RajcePublishing.c"
+#line 8729 "RajcePublishing.c"
}
-GParamSpec* publishing_rajce_param_spec_publishing_parameters (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+publishing_rajce_param_spec_publishing_parameters (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags)
+{
PublishingRajceParamSpecPublishingParameters* spec;
#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_RAJCE_TYPE_PUBLISHING_PARAMETERS), NULL);
@@ -8415,20 +8749,25 @@ GParamSpec* publishing_rajce_param_spec_publishing_parameters (const gchar* name
G_PARAM_SPEC (spec)->value_type = object_type;
#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return G_PARAM_SPEC (spec);
-#line 8415 "RajcePublishing.c"
+#line 8749 "RajcePublishing.c"
}
-gpointer publishing_rajce_value_get_publishing_parameters (const GValue* value) {
+gpointer
+publishing_rajce_value_get_publishing_parameters (const GValue* value)
+{
#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_RAJCE_TYPE_PUBLISHING_PARAMETERS), NULL);
#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return value->data[0].v_pointer;
-#line 8424 "RajcePublishing.c"
+#line 8760 "RajcePublishing.c"
}
-void publishing_rajce_value_set_publishing_parameters (GValue* value, gpointer v_object) {
+void
+publishing_rajce_value_set_publishing_parameters (GValue* value,
+ gpointer v_object)
+{
PublishingRajcePublishingParameters * old;
#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_RAJCE_TYPE_PUBLISHING_PARAMETERS));
@@ -8444,22 +8783,25 @@ void publishing_rajce_value_set_publishing_parameters (GValue* value, gpointer v
value->data[0].v_pointer = v_object;
#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_publishing_parameters_ref (value->data[0].v_pointer);
-#line 8444 "RajcePublishing.c"
+#line 8783 "RajcePublishing.c"
} else {
#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
value->data[0].v_pointer = NULL;
-#line 8448 "RajcePublishing.c"
+#line 8787 "RajcePublishing.c"
}
#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (old) {
#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_publishing_parameters_unref (old);
-#line 8454 "RajcePublishing.c"
+#line 8793 "RajcePublishing.c"
}
}
-void publishing_rajce_value_take_publishing_parameters (GValue* value, gpointer v_object) {
+void
+publishing_rajce_value_take_publishing_parameters (GValue* value,
+ gpointer v_object)
+{
PublishingRajcePublishingParameters * old;
#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_RAJCE_TYPE_PUBLISHING_PARAMETERS));
@@ -8473,38 +8815,44 @@ void publishing_rajce_value_take_publishing_parameters (GValue* value, gpointer
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
value->data[0].v_pointer = v_object;
-#line 8473 "RajcePublishing.c"
+#line 8815 "RajcePublishing.c"
} else {
#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
value->data[0].v_pointer = NULL;
-#line 8477 "RajcePublishing.c"
+#line 8819 "RajcePublishing.c"
}
#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (old) {
#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_publishing_parameters_unref (old);
-#line 8483 "RajcePublishing.c"
+#line 8825 "RajcePublishing.c"
}
}
-static void publishing_rajce_publishing_parameters_class_init (PublishingRajcePublishingParametersClass * klass) {
+static void
+publishing_rajce_publishing_parameters_class_init (PublishingRajcePublishingParametersClass * klass)
+{
#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_publishing_parameters_parent_class = g_type_class_peek_parent (klass);
#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
((PublishingRajcePublishingParametersClass *) klass)->finalize = publishing_rajce_publishing_parameters_finalize;
-#line 8493 "RajcePublishing.c"
+#line 8837 "RajcePublishing.c"
}
-static void publishing_rajce_publishing_parameters_instance_init (PublishingRajcePublishingParameters * self) {
+static void
+publishing_rajce_publishing_parameters_instance_init (PublishingRajcePublishingParameters * self)
+{
#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
self->ref_count = 1;
-#line 8500 "RajcePublishing.c"
+#line 8846 "RajcePublishing.c"
}
-static void publishing_rajce_publishing_parameters_finalize (PublishingRajcePublishingParameters * obj) {
+static void
+publishing_rajce_publishing_parameters_finalize (PublishingRajcePublishingParameters * obj)
+{
PublishingRajcePublishingParameters * self;
#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_RAJCE_TYPE_PUBLISHING_PARAMETERS, PublishingRajcePublishingParameters);
@@ -8516,11 +8864,13 @@ static void publishing_rajce_publishing_parameters_finalize (PublishingRajcePubl
_g_free0 (self->album_hidden);
#line 1148 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_free0 (self->album_id);
-#line 8516 "RajcePublishing.c"
+#line 8864 "RajcePublishing.c"
}
-GType publishing_rajce_publishing_parameters_get_type (void) {
+GType
+publishing_rajce_publishing_parameters_get_type (void)
+{
static volatile gsize publishing_rajce_publishing_parameters_type_id__volatile = 0;
if (g_once_init_enter (&publishing_rajce_publishing_parameters_type_id__volatile)) {
static const GTypeValueTable g_define_type_value_table = { publishing_rajce_value_publishing_parameters_init, publishing_rajce_value_publishing_parameters_free_value, publishing_rajce_value_publishing_parameters_copy_value, publishing_rajce_value_publishing_parameters_peek_pointer, "p", publishing_rajce_value_publishing_parameters_collect_value, "p", publishing_rajce_value_publishing_parameters_lcopy_value };
@@ -8534,18 +8884,22 @@ GType publishing_rajce_publishing_parameters_get_type (void) {
}
-gpointer publishing_rajce_publishing_parameters_ref (gpointer instance) {
+gpointer
+publishing_rajce_publishing_parameters_ref (gpointer instance)
+{
PublishingRajcePublishingParameters * self;
self = instance;
#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_atomic_int_inc (&self->ref_count);
#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return instance;
-#line 8541 "RajcePublishing.c"
+#line 8893 "RajcePublishing.c"
}
-void publishing_rajce_publishing_parameters_unref (gpointer instance) {
+void
+publishing_rajce_publishing_parameters_unref (gpointer instance)
+{
PublishingRajcePublishingParameters * self;
self = instance;
#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -8554,29 +8908,35 @@ void publishing_rajce_publishing_parameters_unref (gpointer instance) {
PUBLISHING_RAJCE_PUBLISHING_PARAMETERS_GET_CLASS (self)->finalize (self);
#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 8554 "RajcePublishing.c"
+#line 8908 "RajcePublishing.c"
}
}
-PublishingRajceSession* publishing_rajce_session_construct (GType object_type) {
+PublishingRajceSession*
+publishing_rajce_session_construct (GType object_type)
+{
PublishingRajceSession* self = NULL;
#line 1182 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
self = (PublishingRajceSession*) publishing_rest_support_session_construct (object_type, "");
#line 1180 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return self;
-#line 8565 "RajcePublishing.c"
+#line 8921 "RajcePublishing.c"
}
-PublishingRajceSession* publishing_rajce_session_new (void) {
+PublishingRajceSession*
+publishing_rajce_session_new (void)
+{
#line 1180 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return publishing_rajce_session_construct (PUBLISHING_RAJCE_TYPE_SESSION);
-#line 8572 "RajcePublishing.c"
+#line 8930 "RajcePublishing.c"
}
-static gboolean publishing_rajce_session_real_is_authenticated (PublishingRESTSupportSession* base) {
+static gboolean
+publishing_rajce_session_real_is_authenticated (PublishingRESTSupportSession* base)
+{
PublishingRajceSession * self;
gboolean result = FALSE;
gboolean _tmp0_ = FALSE;
@@ -8588,51 +8948,53 @@ static gboolean publishing_rajce_session_real_is_authenticated (PublishingRESTSu
_tmp2_ = self->priv->userid;
#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (_tmp2_ != NULL) {
-#line 8588 "RajcePublishing.c"
+#line 8948 "RajcePublishing.c"
const gchar* _tmp3_;
#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_tmp3_ = self->priv->usertoken;
#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_tmp1_ = _tmp3_ != NULL;
-#line 8594 "RajcePublishing.c"
+#line 8954 "RajcePublishing.c"
} else {
#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_tmp1_ = FALSE;
-#line 8598 "RajcePublishing.c"
+#line 8958 "RajcePublishing.c"
}
#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (_tmp1_) {
-#line 8602 "RajcePublishing.c"
+#line 8962 "RajcePublishing.c"
const gchar* _tmp4_;
#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_tmp4_ = self->priv->username;
#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_tmp0_ = _tmp4_ != NULL;
-#line 8608 "RajcePublishing.c"
+#line 8968 "RajcePublishing.c"
} else {
#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_tmp0_ = FALSE;
-#line 8612 "RajcePublishing.c"
+#line 8972 "RajcePublishing.c"
}
#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
result = _tmp0_;
#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return result;
-#line 8618 "RajcePublishing.c"
+#line 8978 "RajcePublishing.c"
}
-void publishing_rajce_session_authenticate (PublishingRajceSession* self, const gchar* token, const gchar* name, gint id, gint maxsize, gint quality) {
- const gchar* _tmp0_;
+void
+publishing_rajce_session_authenticate (PublishingRajceSession* self,
+ const gchar* token,
+ const gchar* name,
+ gint id,
+ gint maxsize,
+ gint quality)
+{
+ gchar* _tmp0_;
gchar* _tmp1_;
- const gchar* _tmp2_;
- gchar* _tmp3_;
- gint _tmp4_;
- gint* _tmp5_;
- gint _tmp6_;
- gint* _tmp7_;
- gint _tmp8_;
- gint* _tmp9_;
+ gint* _tmp2_;
+ gint* _tmp3_;
+ gint* _tmp4_;
#line 1190 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_if_fail (PUBLISHING_RAJCE_IS_SESSION (self));
#line 1190 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -8640,50 +9002,42 @@ void publishing_rajce_session_authenticate (PublishingRajceSession* self, const
#line 1190 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_if_fail (name != NULL);
#line 1192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp0_ = token;
-#line 1192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp1_ = g_strdup (_tmp0_);
+ _tmp0_ = g_strdup (token);
#line 1192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_free0 (self->priv->usertoken);
#line 1192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- self->priv->usertoken = _tmp1_;
+ self->priv->usertoken = _tmp0_;
#line 1193 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp2_ = name;
-#line 1193 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp3_ = g_strdup (_tmp2_);
+ _tmp1_ = g_strdup (name);
#line 1193 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_free0 (self->priv->username);
#line 1193 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- self->priv->username = _tmp3_;
-#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp4_ = id;
+ self->priv->username = _tmp1_;
#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp5_ = __int_dup0 (&_tmp4_);
+ _tmp2_ = __int_dup0 (&id);
#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_free0 (self->priv->userid);
#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- self->priv->userid = _tmp5_;
-#line 1195 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp6_ = maxsize;
+ self->priv->userid = _tmp2_;
#line 1195 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp7_ = __int_dup0 (&_tmp6_);
+ _tmp3_ = __int_dup0 (&maxsize);
#line 1195 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_free0 (self->priv->maxsize);
#line 1195 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- self->priv->maxsize = _tmp7_;
+ self->priv->maxsize = _tmp3_;
#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp8_ = quality;
-#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp9_ = __int_dup0 (&_tmp8_);
+ _tmp4_ = __int_dup0 (&quality);
#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_free0 (self->priv->quality);
#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- self->priv->quality = _tmp9_;
-#line 8679 "RajcePublishing.c"
+ self->priv->quality = _tmp4_;
+#line 9031 "RajcePublishing.c"
}
-void publishing_rajce_session_deauthenticate (PublishingRajceSession* self) {
+void
+publishing_rajce_session_deauthenticate (PublishingRajceSession* self)
+{
#line 1199 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_if_fail (PUBLISHING_RAJCE_IS_SESSION (self));
#line 1201 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -8714,62 +9068,64 @@ void publishing_rajce_session_deauthenticate (PublishingRajceSession* self) {
_g_free0 (self->priv->quality);
#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
self->priv->quality = NULL;
-#line 8714 "RajcePublishing.c"
+#line 9068 "RajcePublishing.c"
}
-void publishing_rajce_session_set_usertoken (PublishingRajceSession* self, const gchar* usertoken) {
- const gchar* _tmp0_;
- gchar* _tmp1_;
+void
+publishing_rajce_session_set_usertoken (PublishingRajceSession* self,
+ const gchar* usertoken)
+{
+ gchar* _tmp0_;
#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_if_fail (PUBLISHING_RAJCE_IS_SESSION (self));
#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp0_ = usertoken;
-#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp1_ = g_strdup (_tmp0_);
+ _tmp0_ = g_strdup (usertoken);
#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_free0 (self->priv->usertoken);
#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- self->priv->usertoken = _tmp1_;
-#line 8731 "RajcePublishing.c"
+ self->priv->usertoken = _tmp0_;
+#line 9085 "RajcePublishing.c"
}
-void publishing_rajce_session_set_albumtoken (PublishingRajceSession* self, const gchar* albumtoken) {
- const gchar* _tmp0_;
- gchar* _tmp1_;
+void
+publishing_rajce_session_set_albumtoken (PublishingRajceSession* self,
+ const gchar* albumtoken)
+{
+ gchar* _tmp0_;
#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_if_fail (PUBLISHING_RAJCE_IS_SESSION (self));
#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp0_ = albumtoken;
-#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp1_ = g_strdup (_tmp0_);
+ _tmp0_ = g_strdup (albumtoken);
#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_free0 (self->priv->albumtoken);
#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- self->priv->albumtoken = _tmp1_;
-#line 8748 "RajcePublishing.c"
+ self->priv->albumtoken = _tmp0_;
+#line 9102 "RajcePublishing.c"
}
-void publishing_rajce_session_set_albumticket (PublishingRajceSession* self, const gchar* albumticket) {
- const gchar* _tmp0_;
- gchar* _tmp1_;
+void
+publishing_rajce_session_set_albumticket (PublishingRajceSession* self,
+ const gchar* albumticket)
+{
+ gchar* _tmp0_;
#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_if_fail (PUBLISHING_RAJCE_IS_SESSION (self));
#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp0_ = albumticket;
-#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp1_ = g_strdup (_tmp0_);
+ _tmp0_ = g_strdup (albumticket);
#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_free0 (self->priv->albumticket);
#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- self->priv->albumticket = _tmp1_;
-#line 8765 "RajcePublishing.c"
+ self->priv->albumticket = _tmp0_;
+#line 9119 "RajcePublishing.c"
}
-gchar* publishing_rajce_session_get_usertoken (PublishingRajceSession* self) {
+gchar*
+publishing_rajce_session_get_usertoken (PublishingRajceSession* self)
+{
gchar* result = NULL;
const gchar* _tmp0_;
gchar* _tmp1_;
@@ -8783,11 +9139,13 @@ gchar* publishing_rajce_session_get_usertoken (PublishingRajceSession* self) {
result = _tmp1_;
#line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return result;
-#line 8783 "RajcePublishing.c"
+#line 9139 "RajcePublishing.c"
}
-gchar* publishing_rajce_session_get_albumtoken (PublishingRajceSession* self) {
+gchar*
+publishing_rajce_session_get_albumtoken (PublishingRajceSession* self)
+{
gchar* result = NULL;
const gchar* _tmp0_;
gchar* _tmp1_;
@@ -8801,11 +9159,13 @@ gchar* publishing_rajce_session_get_albumtoken (PublishingRajceSession* self) {
result = _tmp1_;
#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return result;
-#line 8801 "RajcePublishing.c"
+#line 9159 "RajcePublishing.c"
}
-gchar* publishing_rajce_session_get_albumticket (PublishingRajceSession* self) {
+gchar*
+publishing_rajce_session_get_albumticket (PublishingRajceSession* self)
+{
gchar* result = NULL;
const gchar* _tmp0_;
gchar* _tmp1_;
@@ -8819,11 +9179,13 @@ gchar* publishing_rajce_session_get_albumticket (PublishingRajceSession* self) {
result = _tmp1_;
#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return result;
-#line 8819 "RajcePublishing.c"
+#line 9179 "RajcePublishing.c"
}
-gchar* publishing_rajce_session_get_username (PublishingRajceSession* self) {
+gchar*
+publishing_rajce_session_get_username (PublishingRajceSession* self)
+{
gchar* result = NULL;
const gchar* _tmp0_;
gchar* _tmp1_;
@@ -8837,11 +9199,13 @@ gchar* publishing_rajce_session_get_username (PublishingRajceSession* self) {
result = _tmp1_;
#line 1217 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return result;
-#line 8837 "RajcePublishing.c"
+#line 9199 "RajcePublishing.c"
}
-gint publishing_rajce_session_get_maxsize (PublishingRajceSession* self) {
+gint
+publishing_rajce_session_get_maxsize (PublishingRajceSession* self)
+{
gint result = 0;
gint* _tmp0_;
#line 1219 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -8852,11 +9216,13 @@ gint publishing_rajce_session_get_maxsize (PublishingRajceSession* self) {
result = *_tmp0_;
#line 1219 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return result;
-#line 8852 "RajcePublishing.c"
+#line 9216 "RajcePublishing.c"
}
-static void publishing_rajce_session_class_init (PublishingRajceSessionClass * klass) {
+static void
+publishing_rajce_session_class_init (PublishingRajceSessionClass * klass)
+{
#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_session_parent_class = g_type_class_peek_parent (klass);
#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -8865,11 +9231,13 @@ static void publishing_rajce_session_class_init (PublishingRajceSessionClass * k
g_type_class_add_private (klass, sizeof (PublishingRajceSessionPrivate));
#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*) (PublishingRESTSupportSession *)) publishing_rajce_session_real_is_authenticated;
-#line 8865 "RajcePublishing.c"
+#line 9231 "RajcePublishing.c"
}
-static void publishing_rajce_session_instance_init (PublishingRajceSession * self) {
+static void
+publishing_rajce_session_instance_init (PublishingRajceSession * self)
+{
#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
self->priv = PUBLISHING_RAJCE_SESSION_GET_PRIVATE (self);
#line 1172 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -8886,11 +9254,13 @@ static void publishing_rajce_session_instance_init (PublishingRajceSession * sel
self->priv->maxsize = NULL;
#line 1178 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
self->priv->quality = NULL;
-#line 8886 "RajcePublishing.c"
+#line 9254 "RajcePublishing.c"
}
-static void publishing_rajce_session_finalize (PublishingRESTSupportSession * obj) {
+static void
+publishing_rajce_session_finalize (PublishingRESTSupportSession * obj)
+{
PublishingRajceSession * self;
#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_RAJCE_TYPE_SESSION, PublishingRajceSession);
@@ -8910,14 +9280,16 @@ static void publishing_rajce_session_finalize (PublishingRESTSupportSession * ob
_g_free0 (self->priv->quality);
#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
PUBLISHING_REST_SUPPORT_SESSION_CLASS (publishing_rajce_session_parent_class)->finalize (obj);
-#line 8910 "RajcePublishing.c"
+#line 9280 "RajcePublishing.c"
}
/**
* Session class that keeps track of the credentials
*/
-GType publishing_rajce_session_get_type (void) {
+GType
+publishing_rajce_session_get_type (void)
+{
static volatile gsize publishing_rajce_session_type_id__volatile = 0;
if (g_once_init_enter (&publishing_rajce_session_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingRajceSessionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_rajce_session_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingRajceSession), 0, (GInstanceInitFunc) publishing_rajce_session_instance_init, NULL };
@@ -8929,83 +9301,93 @@ GType publishing_rajce_session_get_type (void) {
}
-static gpointer _publishing_rajce_arg_item_ref0 (gpointer self) {
+static gpointer
+_publishing_rajce_arg_item_ref0 (gpointer self)
+{
#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return self ? publishing_rajce_arg_item_ref (self) : NULL;
-#line 8932 "RajcePublishing.c"
+#line 9306 "RajcePublishing.c"
}
-PublishingRajceArgItem* publishing_rajce_arg_item_construct (GType object_type, const gchar* k, const gchar* v) {
+PublishingRajceArgItem*
+publishing_rajce_arg_item_construct (GType object_type,
+ const gchar* k,
+ const gchar* v)
+{
PublishingRajceArgItem* self = NULL;
- const gchar* _tmp0_;
+ gchar* _tmp0_;
gchar* _tmp1_;
- const gchar* _tmp2_;
- gchar* _tmp3_;
- PublishingRajceArgItem** _tmp4_;
+ PublishingRajceArgItem** _tmp2_;
#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
self = (PublishingRajceArgItem*) g_type_create_instance (object_type);
#line 1231 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp0_ = k;
-#line 1231 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp1_ = g_strdup (_tmp0_);
+ _tmp0_ = g_strdup (k);
#line 1231 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_free0 (self->key);
#line 1231 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- self->key = _tmp1_;
-#line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp2_ = v;
+ self->key = _tmp0_;
#line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp3_ = g_strdup (_tmp2_);
+ _tmp1_ = g_strdup (v);
#line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_free0 (self->val);
#line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- self->val = _tmp3_;
+ self->val = _tmp1_;
#line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp4_ = g_new0 (PublishingRajceArgItem*, 0 + 1);
+ _tmp2_ = g_new0 (PublishingRajceArgItem*, 0 + 1);
#line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
self->children = (_vala_array_free (self->children, self->children_length1, (GDestroyNotify) publishing_rajce_arg_item_unref), NULL);
#line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- self->children = _tmp4_;
+ self->children = _tmp2_;
#line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
self->children_length1 = 0;
#line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
self->_children_size_ = self->children_length1;
#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return self;
-#line 8973 "RajcePublishing.c"
+#line 9345 "RajcePublishing.c"
}
-PublishingRajceArgItem* publishing_rajce_arg_item_new (const gchar* k, const gchar* v) {
+PublishingRajceArgItem*
+publishing_rajce_arg_item_new (const gchar* k,
+ const gchar* v)
+{
#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return publishing_rajce_arg_item_construct (PUBLISHING_RAJCE_TYPE_ARG_ITEM, k, v);
-#line 8980 "RajcePublishing.c"
+#line 9355 "RajcePublishing.c"
}
-static void _vala_array_add6 (PublishingRajceArgItem** * array, int* length, int* size, PublishingRajceArgItem* value) {
+static void
+_vala_array_add6 (PublishingRajceArgItem** * array,
+ int* length,
+ int* size,
+ PublishingRajceArgItem* value)
+{
#line 1237 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if ((*length) == (*size)) {
#line 1237 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 1237 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
*array = g_renew (PublishingRajceArgItem*, *array, (*size) + 1);
-#line 8991 "RajcePublishing.c"
+#line 9371 "RajcePublishing.c"
}
#line 1237 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
(*array)[(*length)++] = value;
#line 1237 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
(*array)[*length] = NULL;
-#line 8997 "RajcePublishing.c"
+#line 9377 "RajcePublishing.c"
}
-void publishing_rajce_arg_item_AddChild (PublishingRajceArgItem* self, PublishingRajceArgItem* child) {
+void
+publishing_rajce_arg_item_AddChild (PublishingRajceArgItem* self,
+ PublishingRajceArgItem* child)
+{
PublishingRajceArgItem** _tmp0_;
gint _tmp0__length1;
PublishingRajceArgItem* _tmp1_;
- PublishingRajceArgItem* _tmp2_;
#line 1235 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_if_fail (PUBLISHING_RAJCE_IS_ARG_ITEM (self));
#line 1235 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -9015,157 +9397,178 @@ void publishing_rajce_arg_item_AddChild (PublishingRajceArgItem* self, Publishin
#line 1237 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_tmp0__length1 = self->children_length1;
#line 1237 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp1_ = child;
-#line 1237 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp2_ = _publishing_rajce_arg_item_ref0 (_tmp1_);
+ _tmp1_ = _publishing_rajce_arg_item_ref0 (child);
#line 1237 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _vala_array_add6 (&self->children, &self->children_length1, &self->_children_size_, _tmp2_);
-#line 9020 "RajcePublishing.c"
+ _vala_array_add6 (&self->children, &self->children_length1, &self->_children_size_, _tmp1_);
+#line 9400 "RajcePublishing.c"
}
-void publishing_rajce_arg_item_AddChildren (PublishingRajceArgItem* self, PublishingRajceArgItem** newchildren, int newchildren_length1) {
- PublishingRajceArgItem** _tmp0_;
- gint _tmp0__length1;
+void
+publishing_rajce_arg_item_AddChildren (PublishingRajceArgItem* self,
+ PublishingRajceArgItem** newchildren,
+ int newchildren_length1)
+{
#line 1239 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_if_fail (PUBLISHING_RAJCE_IS_ARG_ITEM (self));
-#line 1241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp0_ = newchildren;
-#line 1241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp0__length1 = newchildren_length1;
-#line 9033 "RajcePublishing.c"
+#line 9411 "RajcePublishing.c"
{
PublishingRajceArgItem** child_collection = NULL;
gint child_collection_length1 = 0;
gint _child_collection_size_ = 0;
gint child_it = 0;
#line 1241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- child_collection = _tmp0_;
+ child_collection = newchildren;
#line 1241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- child_collection_length1 = _tmp0__length1;
+ child_collection_length1 = newchildren_length1;
#line 1241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- for (child_it = 0; child_it < _tmp0__length1; child_it = child_it + 1) {
-#line 9045 "RajcePublishing.c"
- PublishingRajceArgItem* _tmp1_;
+ for (child_it = 0; child_it < newchildren_length1; child_it = child_it + 1) {
+#line 9423 "RajcePublishing.c"
+ PublishingRajceArgItem* _tmp0_;
PublishingRajceArgItem* child = NULL;
#line 1241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp1_ = _publishing_rajce_arg_item_ref0 (child_collection[child_it]);
+ _tmp0_ = _publishing_rajce_arg_item_ref0 (child_collection[child_it]);
#line 1241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- child = _tmp1_;
-#line 9052 "RajcePublishing.c"
+ child = _tmp0_;
+#line 9430 "RajcePublishing.c"
{
- PublishingRajceArgItem* _tmp2_;
+ PublishingRajceArgItem* _tmp1_;
#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp2_ = child;
+ _tmp1_ = child;
#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- publishing_rajce_arg_item_AddChild (self, _tmp2_);
+ publishing_rajce_arg_item_AddChild (self, _tmp1_);
#line 1241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_publishing_rajce_arg_item_unref0 (child);
-#line 9061 "RajcePublishing.c"
+#line 9439 "RajcePublishing.c"
}
}
}
}
-static void publishing_rajce_value_arg_item_init (GValue* value) {
+static void
+publishing_rajce_value_arg_item_init (GValue* value)
+{
#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
value->data[0].v_pointer = NULL;
-#line 9071 "RajcePublishing.c"
+#line 9451 "RajcePublishing.c"
}
-static void publishing_rajce_value_arg_item_free_value (GValue* value) {
+static void
+publishing_rajce_value_arg_item_free_value (GValue* value)
+{
#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (value->data[0].v_pointer) {
#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_arg_item_unref (value->data[0].v_pointer);
-#line 9080 "RajcePublishing.c"
+#line 9462 "RajcePublishing.c"
}
}
-static void publishing_rajce_value_arg_item_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+publishing_rajce_value_arg_item_copy_value (const GValue* src_value,
+ GValue* dest_value)
+{
#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (src_value->data[0].v_pointer) {
#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
dest_value->data[0].v_pointer = publishing_rajce_arg_item_ref (src_value->data[0].v_pointer);
-#line 9090 "RajcePublishing.c"
+#line 9475 "RajcePublishing.c"
} else {
#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
dest_value->data[0].v_pointer = NULL;
-#line 9094 "RajcePublishing.c"
+#line 9479 "RajcePublishing.c"
}
}
-static gpointer publishing_rajce_value_arg_item_peek_pointer (const GValue* value) {
+static gpointer
+publishing_rajce_value_arg_item_peek_pointer (const GValue* value)
+{
#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return value->data[0].v_pointer;
-#line 9102 "RajcePublishing.c"
+#line 9489 "RajcePublishing.c"
}
-static gchar* publishing_rajce_value_arg_item_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_rajce_value_arg_item_collect_value (GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (collect_values[0].v_pointer) {
-#line 9109 "RajcePublishing.c"
+#line 9501 "RajcePublishing.c"
PublishingRajceArgItem * object;
object = collect_values[0].v_pointer;
#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (object->parent_instance.g_class == NULL) {
#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 9116 "RajcePublishing.c"
+#line 9508 "RajcePublishing.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 9120 "RajcePublishing.c"
+#line 9512 "RajcePublishing.c"
}
#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
value->data[0].v_pointer = publishing_rajce_arg_item_ref (object);
-#line 9124 "RajcePublishing.c"
+#line 9516 "RajcePublishing.c"
} else {
#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
value->data[0].v_pointer = NULL;
-#line 9128 "RajcePublishing.c"
+#line 9520 "RajcePublishing.c"
}
#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return NULL;
-#line 9132 "RajcePublishing.c"
+#line 9524 "RajcePublishing.c"
}
-static gchar* publishing_rajce_value_arg_item_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_rajce_value_arg_item_lcopy_value (const GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
PublishingRajceArgItem ** object_p;
object_p = collect_values[0].v_pointer;
#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (!object_p) {
#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 9143 "RajcePublishing.c"
+#line 9540 "RajcePublishing.c"
}
#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (!value->data[0].v_pointer) {
#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
*object_p = NULL;
-#line 9149 "RajcePublishing.c"
+#line 9546 "RajcePublishing.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
*object_p = value->data[0].v_pointer;
-#line 9153 "RajcePublishing.c"
+#line 9550 "RajcePublishing.c"
} else {
#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
*object_p = publishing_rajce_arg_item_ref (value->data[0].v_pointer);
-#line 9157 "RajcePublishing.c"
+#line 9554 "RajcePublishing.c"
}
#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return NULL;
-#line 9161 "RajcePublishing.c"
+#line 9558 "RajcePublishing.c"
}
-GParamSpec* publishing_rajce_param_spec_arg_item (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+publishing_rajce_param_spec_arg_item (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags)
+{
PublishingRajceParamSpecArgItem* spec;
#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_RAJCE_TYPE_ARG_ITEM), NULL);
@@ -9175,20 +9578,25 @@ GParamSpec* publishing_rajce_param_spec_arg_item (const gchar* name, const gchar
G_PARAM_SPEC (spec)->value_type = object_type;
#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return G_PARAM_SPEC (spec);
-#line 9175 "RajcePublishing.c"
+#line 9578 "RajcePublishing.c"
}
-gpointer publishing_rajce_value_get_arg_item (const GValue* value) {
+gpointer
+publishing_rajce_value_get_arg_item (const GValue* value)
+{
#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_RAJCE_TYPE_ARG_ITEM), NULL);
#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return value->data[0].v_pointer;
-#line 9184 "RajcePublishing.c"
+#line 9589 "RajcePublishing.c"
}
-void publishing_rajce_value_set_arg_item (GValue* value, gpointer v_object) {
+void
+publishing_rajce_value_set_arg_item (GValue* value,
+ gpointer v_object)
+{
PublishingRajceArgItem * old;
#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_RAJCE_TYPE_ARG_ITEM));
@@ -9204,22 +9612,25 @@ void publishing_rajce_value_set_arg_item (GValue* value, gpointer v_object) {
value->data[0].v_pointer = v_object;
#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_arg_item_ref (value->data[0].v_pointer);
-#line 9204 "RajcePublishing.c"
+#line 9612 "RajcePublishing.c"
} else {
#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
value->data[0].v_pointer = NULL;
-#line 9208 "RajcePublishing.c"
+#line 9616 "RajcePublishing.c"
}
#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (old) {
#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_arg_item_unref (old);
-#line 9214 "RajcePublishing.c"
+#line 9622 "RajcePublishing.c"
}
}
-void publishing_rajce_value_take_arg_item (GValue* value, gpointer v_object) {
+void
+publishing_rajce_value_take_arg_item (GValue* value,
+ gpointer v_object)
+{
PublishingRajceArgItem * old;
#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_RAJCE_TYPE_ARG_ITEM));
@@ -9233,38 +9644,44 @@ void publishing_rajce_value_take_arg_item (GValue* value, gpointer v_object) {
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
value->data[0].v_pointer = v_object;
-#line 9233 "RajcePublishing.c"
+#line 9644 "RajcePublishing.c"
} else {
#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
value->data[0].v_pointer = NULL;
-#line 9237 "RajcePublishing.c"
+#line 9648 "RajcePublishing.c"
}
#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (old) {
#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_arg_item_unref (old);
-#line 9243 "RajcePublishing.c"
+#line 9654 "RajcePublishing.c"
}
}
-static void publishing_rajce_arg_item_class_init (PublishingRajceArgItemClass * klass) {
+static void
+publishing_rajce_arg_item_class_init (PublishingRajceArgItemClass * klass)
+{
#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_arg_item_parent_class = g_type_class_peek_parent (klass);
#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
((PublishingRajceArgItemClass *) klass)->finalize = publishing_rajce_arg_item_finalize;
-#line 9253 "RajcePublishing.c"
+#line 9666 "RajcePublishing.c"
}
-static void publishing_rajce_arg_item_instance_init (PublishingRajceArgItem * self) {
+static void
+publishing_rajce_arg_item_instance_init (PublishingRajceArgItem * self)
+{
#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
self->ref_count = 1;
-#line 9260 "RajcePublishing.c"
+#line 9675 "RajcePublishing.c"
}
-static void publishing_rajce_arg_item_finalize (PublishingRajceArgItem * obj) {
+static void
+publishing_rajce_arg_item_finalize (PublishingRajceArgItem * obj)
+{
PublishingRajceArgItem * self;
PublishingRajceArgItem** _tmp0_;
gint _tmp0__length1;
@@ -9276,7 +9693,7 @@ static void publishing_rajce_arg_item_finalize (PublishingRajceArgItem * obj) {
_tmp0_ = self->children;
#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_tmp0__length1 = self->children_length1;
-#line 9276 "RajcePublishing.c"
+#line 9693 "RajcePublishing.c"
{
PublishingRajceArgItem** child_collection = NULL;
gint child_collection_length1 = 0;
@@ -9288,14 +9705,14 @@ static void publishing_rajce_arg_item_finalize (PublishingRajceArgItem * obj) {
child_collection_length1 = _tmp0__length1;
#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
for (child_it = 0; child_it < _tmp0__length1; child_it = child_it + 1) {
-#line 9288 "RajcePublishing.c"
+#line 9705 "RajcePublishing.c"
PublishingRajceArgItem* _tmp1_;
PublishingRajceArgItem* child = NULL;
#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_tmp1_ = _publishing_rajce_arg_item_ref0 (child_collection[child_it]);
#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
child = _tmp1_;
-#line 9295 "RajcePublishing.c"
+#line 9712 "RajcePublishing.c"
{
#line 1250 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_publishing_rajce_arg_item_unref0 (child);
@@ -9303,7 +9720,7 @@ static void publishing_rajce_arg_item_finalize (PublishingRajceArgItem * obj) {
child = NULL;
#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_publishing_rajce_arg_item_unref0 (child);
-#line 9303 "RajcePublishing.c"
+#line 9720 "RajcePublishing.c"
}
}
}
@@ -9313,11 +9730,13 @@ static void publishing_rajce_arg_item_finalize (PublishingRajceArgItem * obj) {
_g_free0 (self->val);
#line 1227 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
self->children = (_vala_array_free (self->children, self->children_length1, (GDestroyNotify) publishing_rajce_arg_item_unref), NULL);
-#line 9313 "RajcePublishing.c"
+#line 9730 "RajcePublishing.c"
}
-GType publishing_rajce_arg_item_get_type (void) {
+GType
+publishing_rajce_arg_item_get_type (void)
+{
static volatile gsize publishing_rajce_arg_item_type_id__volatile = 0;
if (g_once_init_enter (&publishing_rajce_arg_item_type_id__volatile)) {
static const GTypeValueTable g_define_type_value_table = { publishing_rajce_value_arg_item_init, publishing_rajce_value_arg_item_free_value, publishing_rajce_value_arg_item_copy_value, publishing_rajce_value_arg_item_peek_pointer, "p", publishing_rajce_value_arg_item_collect_value, "p", publishing_rajce_value_arg_item_lcopy_value };
@@ -9331,18 +9750,22 @@ GType publishing_rajce_arg_item_get_type (void) {
}
-gpointer publishing_rajce_arg_item_ref (gpointer instance) {
+gpointer
+publishing_rajce_arg_item_ref (gpointer instance)
+{
PublishingRajceArgItem * self;
self = instance;
#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_atomic_int_inc (&self->ref_count);
#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return instance;
-#line 9338 "RajcePublishing.c"
+#line 9759 "RajcePublishing.c"
}
-void publishing_rajce_arg_item_unref (gpointer instance) {
+void
+publishing_rajce_arg_item_unref (gpointer instance)
+{
PublishingRajceArgItem * self;
self = instance;
#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -9351,16 +9774,18 @@ void publishing_rajce_arg_item_unref (gpointer instance) {
PUBLISHING_RAJCE_ARG_ITEM_GET_CLASS (self)->finalize (self);
#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 9351 "RajcePublishing.c"
+#line 9774 "RajcePublishing.c"
}
}
-PublishingRajceLiveApiRequest* publishing_rajce_live_api_request_construct (GType object_type, const gchar* cmd) {
+PublishingRajceLiveApiRequest*
+publishing_rajce_live_api_request_construct (GType object_type,
+ const gchar* cmd)
+{
PublishingRajceLiveApiRequest* self = NULL;
PublishingRajceArgItem** _tmp0_;
- const gchar* _tmp1_;
- gchar* _tmp2_;
+ gchar* _tmp1_;
#line 1262 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_val_if_fail (cmd != NULL, NULL);
#line 1262 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -9376,49 +9801,56 @@ PublishingRajceLiveApiRequest* publishing_rajce_live_api_request_construct (GTyp
#line 1264 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
self->priv->__params_size_ = self->priv->_params_length1;
#line 1265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp1_ = cmd;
-#line 1265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp2_ = g_strdup (_tmp1_);
+ _tmp1_ = g_strdup (cmd);
#line 1265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_free0 (self->priv->_cmd);
#line 1265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- self->priv->_cmd = _tmp2_;
+ self->priv->_cmd = _tmp1_;
#line 1262 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return self;
-#line 9385 "RajcePublishing.c"
+#line 9808 "RajcePublishing.c"
}
-PublishingRajceLiveApiRequest* publishing_rajce_live_api_request_new (const gchar* cmd) {
+PublishingRajceLiveApiRequest*
+publishing_rajce_live_api_request_new (const gchar* cmd)
+{
#line 1262 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return publishing_rajce_live_api_request_construct (PUBLISHING_RAJCE_TYPE_LIVE_API_REQUEST, cmd);
-#line 9392 "RajcePublishing.c"
+#line 9817 "RajcePublishing.c"
}
-static void _vala_array_add7 (PublishingRajceArgItem** * array, int* length, int* size, PublishingRajceArgItem* value) {
+static void
+_vala_array_add7 (PublishingRajceArgItem** * array,
+ int* length,
+ int* size,
+ PublishingRajceArgItem* value)
+{
#line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if ((*length) == (*size)) {
#line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
*array = g_renew (PublishingRajceArgItem*, *array, (*size) + 1);
-#line 9403 "RajcePublishing.c"
+#line 9833 "RajcePublishing.c"
}
#line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
(*array)[(*length)++] = value;
#line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
(*array)[*length] = NULL;
-#line 9409 "RajcePublishing.c"
+#line 9839 "RajcePublishing.c"
}
-void publishing_rajce_live_api_request_AddParam (PublishingRajceLiveApiRequest* self, const gchar* name, const gchar* val) {
+void
+publishing_rajce_live_api_request_AddParam (PublishingRajceLiveApiRequest* self,
+ const gchar* name,
+ const gchar* val)
+{
PublishingRajceArgItem** _tmp0_;
gint _tmp0__length1;
- const gchar* _tmp1_;
- const gchar* _tmp2_;
- PublishingRajceArgItem* _tmp3_;
+ PublishingRajceArgItem* _tmp1_;
#line 1270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_if_fail (PUBLISHING_RAJCE_IS_LIVE_API_REQUEST (self));
#line 1270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -9430,127 +9862,123 @@ void publishing_rajce_live_api_request_AddParam (PublishingRajceLiveApiRequest*
#line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_tmp0__length1 = self->priv->_params_length1;
#line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp1_ = name;
-#line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp2_ = val;
-#line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp3_ = publishing_rajce_arg_item_new (_tmp1_, _tmp2_);
+ _tmp1_ = publishing_rajce_arg_item_new (name, val);
#line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _vala_array_add7 (&self->priv->_params, &self->priv->_params_length1, &self->priv->__params_size_, _tmp3_);
-#line 9437 "RajcePublishing.c"
+ _vala_array_add7 (&self->priv->_params, &self->priv->_params_length1, &self->priv->__params_size_, _tmp1_);
+#line 9865 "RajcePublishing.c"
}
-void publishing_rajce_live_api_request_AddParamBool (PublishingRajceLiveApiRequest* self, const gchar* name, gboolean val) {
+void
+publishing_rajce_live_api_request_AddParamBool (PublishingRajceLiveApiRequest* self,
+ const gchar* name,
+ gboolean val)
+{
const gchar* _tmp0_ = NULL;
- gboolean _tmp1_;
- const gchar* _tmp2_;
#line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_if_fail (PUBLISHING_RAJCE_IS_LIVE_API_REQUEST (self));
#line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_if_fail (name != NULL);
#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp1_ = val;
-#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- if (_tmp1_) {
+ if (val) {
#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_tmp0_ = "1";
-#line 9455 "RajcePublishing.c"
+#line 9883 "RajcePublishing.c"
} else {
#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_tmp0_ = "0";
-#line 9459 "RajcePublishing.c"
+#line 9887 "RajcePublishing.c"
}
#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp2_ = name;
-#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- publishing_rajce_live_api_request_AddParam (self, _tmp2_, _tmp0_);
-#line 9465 "RajcePublishing.c"
+ publishing_rajce_live_api_request_AddParam (self, name, _tmp0_);
+#line 9891 "RajcePublishing.c"
}
-void publishing_rajce_live_api_request_AddParamInt (PublishingRajceLiveApiRequest* self, const gchar* name, gint val) {
- const gchar* _tmp0_;
- gint _tmp1_;
- gchar* _tmp2_;
- gchar* _tmp3_;
+void
+publishing_rajce_live_api_request_AddParamInt (PublishingRajceLiveApiRequest* self,
+ const gchar* name,
+ gint val)
+{
+ gchar* _tmp0_;
+ gchar* _tmp1_;
#line 1284 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_if_fail (PUBLISHING_RAJCE_IS_LIVE_API_REQUEST (self));
#line 1284 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_if_fail (name != NULL);
#line 1286 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp0_ = name;
+ _tmp0_ = g_strdup_printf ("%i", val);
#line 1286 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp1_ = val;
+ _tmp1_ = _tmp0_;
#line 1286 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp2_ = g_strdup_printf ("%i", _tmp1_);
+ publishing_rajce_live_api_request_AddParam (self, name, _tmp1_);
#line 1286 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp3_ = _tmp2_;
-#line 1286 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- publishing_rajce_live_api_request_AddParam (self, _tmp0_, _tmp3_);
-#line 1286 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _g_free0 (_tmp3_);
-#line 9490 "RajcePublishing.c"
+ _g_free0 (_tmp1_);
+#line 9914 "RajcePublishing.c"
}
-static void _vala_array_add8 (PublishingRajceArgItem** * array, int* length, int* size, PublishingRajceArgItem* value) {
+static void
+_vala_array_add8 (PublishingRajceArgItem** * array,
+ int* length,
+ int* size,
+ PublishingRajceArgItem* value)
+{
#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if ((*length) == (*size)) {
#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
*array = g_renew (PublishingRajceArgItem*, *array, (*size) + 1);
-#line 9501 "RajcePublishing.c"
+#line 9930 "RajcePublishing.c"
}
#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
(*array)[(*length)++] = value;
#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
(*array)[*length] = NULL;
-#line 9507 "RajcePublishing.c"
+#line 9936 "RajcePublishing.c"
}
-void publishing_rajce_live_api_request_AddParamNode (PublishingRajceLiveApiRequest* self, const gchar* name, PublishingRajceArgItem** val, int val_length1) {
+void
+publishing_rajce_live_api_request_AddParamNode (PublishingRajceLiveApiRequest* self,
+ const gchar* name,
+ PublishingRajceArgItem** val,
+ int val_length1)
+{
PublishingRajceArgItem* newItem = NULL;
- const gchar* _tmp0_;
- PublishingRajceArgItem* _tmp1_;
- PublishingRajceArgItem** _tmp2_;
- gint _tmp2__length1;
- PublishingRajceArgItem** _tmp3_;
- gint _tmp3__length1;
- PublishingRajceArgItem* _tmp4_;
+ PublishingRajceArgItem* _tmp0_;
+ PublishingRajceArgItem** _tmp1_;
+ gint _tmp1__length1;
+ PublishingRajceArgItem* _tmp2_;
#line 1298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_if_fail (PUBLISHING_RAJCE_IS_LIVE_API_REQUEST (self));
#line 1298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_if_fail (name != NULL);
#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp0_ = name;
-#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp1_ = publishing_rajce_arg_item_new (_tmp0_, NULL);
+ _tmp0_ = publishing_rajce_arg_item_new (name, NULL);
#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- newItem = _tmp1_;
-#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp2_ = val;
+ newItem = _tmp0_;
#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp2__length1 = val_length1;
-#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- publishing_rajce_arg_item_AddChildren (newItem, _tmp2_, _tmp2__length1);
+ publishing_rajce_arg_item_AddChildren (newItem, val, val_length1);
#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp3_ = self->priv->_params;
+ _tmp1_ = self->priv->_params;
#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp3__length1 = self->priv->_params_length1;
+ _tmp1__length1 = self->priv->_params_length1;
#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp4_ = _publishing_rajce_arg_item_ref0 (newItem);
+ _tmp2_ = _publishing_rajce_arg_item_ref0 (newItem);
#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _vala_array_add8 (&self->priv->_params, &self->priv->_params_length1, &self->priv->__params_size_, _tmp4_);
+ _vala_array_add8 (&self->priv->_params, &self->priv->_params_length1, &self->priv->__params_size_, _tmp2_);
#line 1298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_publishing_rajce_arg_item_unref0 (newItem);
-#line 9546 "RajcePublishing.c"
+#line 9971 "RajcePublishing.c"
}
-gchar* publishing_rajce_live_api_request_Params2XmlString (PublishingRajceLiveApiRequest* self, gboolean urlencode) {
+gchar*
+publishing_rajce_live_api_request_Params2XmlString (PublishingRajceLiveApiRequest* self,
+ gboolean urlencode)
+{
gchar* result = NULL;
xmlDoc* doc = NULL;
xmlDoc* _tmp0_;
@@ -9569,7 +9997,6 @@ gchar* publishing_rajce_live_api_request_Params2XmlString (PublishingRajceLiveAp
xmlDoc* _tmp12_;
gchar* _tmp13_ = NULL;
xmlDoc* _tmp14_;
- gboolean _tmp15_;
#line 1307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_val_if_fail (PUBLISHING_RAJCE_IS_LIVE_API_REQUEST (self), NULL);
#line 1309 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -9602,7 +10029,7 @@ gchar* publishing_rajce_live_api_request_Params2XmlString (PublishingRajceLiveAp
_tmp8_ = self->priv->_params;
#line 1314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_tmp8__length1 = self->priv->_params_length1;
-#line 9602 "RajcePublishing.c"
+#line 10029 "RajcePublishing.c"
{
PublishingRajceArgItem** arg_collection = NULL;
gint arg_collection_length1 = 0;
@@ -9614,14 +10041,14 @@ gchar* publishing_rajce_live_api_request_Params2XmlString (PublishingRajceLiveAp
arg_collection_length1 = _tmp8__length1;
#line 1314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
for (arg_it = 0; arg_it < _tmp8__length1; arg_it = arg_it + 1) {
-#line 9614 "RajcePublishing.c"
+#line 10041 "RajcePublishing.c"
PublishingRajceArgItem* _tmp9_;
PublishingRajceArgItem* arg = NULL;
#line 1314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_tmp9_ = _publishing_rajce_arg_item_ref0 (arg_collection[arg_it]);
#line 1314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
arg = _tmp9_;
-#line 9621 "RajcePublishing.c"
+#line 10048 "RajcePublishing.c"
{
xmlNode* _tmp10_;
PublishingRajceArgItem* _tmp11_;
@@ -9633,7 +10060,7 @@ gchar* publishing_rajce_live_api_request_Params2XmlString (PublishingRajceLiveAp
publishing_rajce_live_api_request_WriteParam (_tmp10_, _tmp11_);
#line 1314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_publishing_rajce_arg_item_unref0 (arg);
-#line 9633 "RajcePublishing.c"
+#line 10060 "RajcePublishing.c"
}
}
}
@@ -9650,122 +10077,102 @@ gchar* publishing_rajce_live_api_request_Params2XmlString (PublishingRajceLiveAp
#line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
xmlFreeDoc (_tmp14_);
#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp15_ = urlencode;
-#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- if (_tmp15_) {
-#line 9653 "RajcePublishing.c"
- const gchar* _tmp16_;
- gchar* _tmp17_;
+ if (urlencode) {
+#line 10078 "RajcePublishing.c"
+ const gchar* _tmp15_;
+ gchar* _tmp16_;
#line 1323 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp16_ = xmlstr;
+ _tmp15_ = xmlstr;
#line 1323 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp17_ = soup_uri_encode (_tmp16_, "&;");
+ _tmp16_ = soup_uri_encode (_tmp15_, "&;");
#line 1323 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- result = _tmp17_;
+ result = _tmp16_;
#line 1323 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_free0 (xmlstr);
#line 1323 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return result;
-#line 9666 "RajcePublishing.c"
+#line 10091 "RajcePublishing.c"
}
#line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
result = xmlstr;
#line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return result;
-#line 9672 "RajcePublishing.c"
+#line 10097 "RajcePublishing.c"
}
-static void publishing_rajce_live_api_request_WriteParam (xmlNode* node, PublishingRajceArgItem* arg) {
- PublishingRajceArgItem* _tmp0_;
- PublishingRajceArgItem** _tmp1_;
- gint _tmp1__length1;
+static void
+publishing_rajce_live_api_request_WriteParam (xmlNode* node,
+ PublishingRajceArgItem* arg)
+{
+ PublishingRajceArgItem** _tmp0_;
+ gint _tmp0__length1;
#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_if_fail (PUBLISHING_RAJCE_IS_ARG_ITEM (arg));
#line 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp0_ = arg;
+ _tmp0_ = arg->children;
#line 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp1_ = _tmp0_->children;
+ _tmp0__length1 = arg->children_length1;
#line 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp1__length1 = _tmp0_->children_length1;
-#line 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- if (_tmp1__length1 == 0) {
-#line 9690 "RajcePublishing.c"
- xmlNode* _tmp2_;
- PublishingRajceArgItem* _tmp3_;
- const gchar* _tmp4_;
- PublishingRajceArgItem* _tmp5_;
- const gchar* _tmp6_;
-#line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp2_ = node;
-#line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp3_ = arg;
-#line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp4_ = _tmp3_->key;
+ if (_tmp0__length1 == 0) {
+#line 10115 "RajcePublishing.c"
+ const gchar* _tmp1_;
+ const gchar* _tmp2_;
#line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp5_ = arg;
+ _tmp1_ = arg->key;
#line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp6_ = _tmp5_->val;
+ _tmp2_ = arg->val;
#line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- xmlNewTextChild (_tmp2_, NULL, (xmlChar*) _tmp4_, (xmlChar*) _tmp6_);
-#line 9708 "RajcePublishing.c"
+ xmlNewTextChild (node, NULL, (xmlChar*) _tmp1_, (xmlChar*) _tmp2_);
+#line 10124 "RajcePublishing.c"
} else {
xmlNode* subnode = NULL;
- xmlNode* _tmp7_;
- PublishingRajceArgItem* _tmp8_;
- const gchar* _tmp9_;
- xmlNode* _tmp10_;
- PublishingRajceArgItem* _tmp11_;
- PublishingRajceArgItem** _tmp12_;
- gint _tmp12__length1;
-#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp7_ = node;
-#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp8_ = arg;
+ const gchar* _tmp3_;
+ xmlNode* _tmp4_;
+ PublishingRajceArgItem** _tmp5_;
+ gint _tmp5__length1;
#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp9_ = _tmp8_->key;
+ _tmp3_ = arg->key;
#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp10_ = xmlNewTextChild (_tmp7_, NULL, (xmlChar*) _tmp9_, (xmlChar*) "");
+ _tmp4_ = xmlNewTextChild (node, NULL, (xmlChar*) _tmp3_, (xmlChar*) "");
#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- subnode = _tmp10_;
-#line 1339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp11_ = arg;
+ subnode = _tmp4_;
#line 1339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp12_ = _tmp11_->children;
+ _tmp5_ = arg->children;
#line 1339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp12__length1 = _tmp11_->children_length1;
-#line 9734 "RajcePublishing.c"
+ _tmp5__length1 = arg->children_length1;
+#line 10141 "RajcePublishing.c"
{
PublishingRajceArgItem** child_collection = NULL;
gint child_collection_length1 = 0;
gint _child_collection_size_ = 0;
gint child_it = 0;
#line 1339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- child_collection = _tmp12_;
+ child_collection = _tmp5_;
#line 1339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- child_collection_length1 = _tmp12__length1;
+ child_collection_length1 = _tmp5__length1;
#line 1339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- for (child_it = 0; child_it < _tmp12__length1; child_it = child_it + 1) {
-#line 9746 "RajcePublishing.c"
- PublishingRajceArgItem* _tmp13_;
+ for (child_it = 0; child_it < _tmp5__length1; child_it = child_it + 1) {
+#line 10153 "RajcePublishing.c"
+ PublishingRajceArgItem* _tmp6_;
PublishingRajceArgItem* child = NULL;
#line 1339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp13_ = _publishing_rajce_arg_item_ref0 (child_collection[child_it]);
+ _tmp6_ = _publishing_rajce_arg_item_ref0 (child_collection[child_it]);
#line 1339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- child = _tmp13_;
-#line 9753 "RajcePublishing.c"
+ child = _tmp6_;
+#line 10160 "RajcePublishing.c"
{
- xmlNode* _tmp14_;
- PublishingRajceArgItem* _tmp15_;
+ xmlNode* _tmp7_;
+ PublishingRajceArgItem* _tmp8_;
#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp14_ = subnode;
+ _tmp7_ = subnode;
#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp15_ = child;
+ _tmp8_ = child;
#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- publishing_rajce_live_api_request_WriteParam (_tmp14_, _tmp15_);
+ publishing_rajce_live_api_request_WriteParam (_tmp7_, _tmp8_);
#line 1339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_publishing_rajce_arg_item_unref0 (child);
-#line 9765 "RajcePublishing.c"
+#line 10172 "RajcePublishing.c"
}
}
}
@@ -9773,104 +10180,129 @@ static void publishing_rajce_live_api_request_WriteParam (xmlNode* node, Publish
}
-static void publishing_rajce_value_live_api_request_init (GValue* value) {
+static void
+publishing_rajce_value_live_api_request_init (GValue* value)
+{
#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
value->data[0].v_pointer = NULL;
-#line 9776 "RajcePublishing.c"
+#line 10185 "RajcePublishing.c"
}
-static void publishing_rajce_value_live_api_request_free_value (GValue* value) {
+static void
+publishing_rajce_value_live_api_request_free_value (GValue* value)
+{
#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (value->data[0].v_pointer) {
#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_live_api_request_unref (value->data[0].v_pointer);
-#line 9785 "RajcePublishing.c"
+#line 10196 "RajcePublishing.c"
}
}
-static void publishing_rajce_value_live_api_request_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+publishing_rajce_value_live_api_request_copy_value (const GValue* src_value,
+ GValue* dest_value)
+{
#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (src_value->data[0].v_pointer) {
#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
dest_value->data[0].v_pointer = publishing_rajce_live_api_request_ref (src_value->data[0].v_pointer);
-#line 9795 "RajcePublishing.c"
+#line 10209 "RajcePublishing.c"
} else {
#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
dest_value->data[0].v_pointer = NULL;
-#line 9799 "RajcePublishing.c"
+#line 10213 "RajcePublishing.c"
}
}
-static gpointer publishing_rajce_value_live_api_request_peek_pointer (const GValue* value) {
+static gpointer
+publishing_rajce_value_live_api_request_peek_pointer (const GValue* value)
+{
#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return value->data[0].v_pointer;
-#line 9807 "RajcePublishing.c"
+#line 10223 "RajcePublishing.c"
}
-static gchar* publishing_rajce_value_live_api_request_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_rajce_value_live_api_request_collect_value (GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (collect_values[0].v_pointer) {
-#line 9814 "RajcePublishing.c"
+#line 10235 "RajcePublishing.c"
PublishingRajceLiveApiRequest * object;
object = collect_values[0].v_pointer;
#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (object->parent_instance.g_class == NULL) {
#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 9821 "RajcePublishing.c"
+#line 10242 "RajcePublishing.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 9825 "RajcePublishing.c"
+#line 10246 "RajcePublishing.c"
}
#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
value->data[0].v_pointer = publishing_rajce_live_api_request_ref (object);
-#line 9829 "RajcePublishing.c"
+#line 10250 "RajcePublishing.c"
} else {
#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
value->data[0].v_pointer = NULL;
-#line 9833 "RajcePublishing.c"
+#line 10254 "RajcePublishing.c"
}
#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return NULL;
-#line 9837 "RajcePublishing.c"
+#line 10258 "RajcePublishing.c"
}
-static gchar* publishing_rajce_value_live_api_request_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_rajce_value_live_api_request_lcopy_value (const GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
PublishingRajceLiveApiRequest ** object_p;
object_p = collect_values[0].v_pointer;
#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (!object_p) {
#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 9848 "RajcePublishing.c"
+#line 10274 "RajcePublishing.c"
}
#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (!value->data[0].v_pointer) {
#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
*object_p = NULL;
-#line 9854 "RajcePublishing.c"
+#line 10280 "RajcePublishing.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
*object_p = value->data[0].v_pointer;
-#line 9858 "RajcePublishing.c"
+#line 10284 "RajcePublishing.c"
} else {
#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
*object_p = publishing_rajce_live_api_request_ref (value->data[0].v_pointer);
-#line 9862 "RajcePublishing.c"
+#line 10288 "RajcePublishing.c"
}
#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return NULL;
-#line 9866 "RajcePublishing.c"
+#line 10292 "RajcePublishing.c"
}
-GParamSpec* publishing_rajce_param_spec_live_api_request (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+publishing_rajce_param_spec_live_api_request (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags)
+{
PublishingRajceParamSpecLiveApiRequest* spec;
#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_RAJCE_TYPE_LIVE_API_REQUEST), NULL);
@@ -9880,20 +10312,25 @@ GParamSpec* publishing_rajce_param_spec_live_api_request (const gchar* name, con
G_PARAM_SPEC (spec)->value_type = object_type;
#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return G_PARAM_SPEC (spec);
-#line 9880 "RajcePublishing.c"
+#line 10312 "RajcePublishing.c"
}
-gpointer publishing_rajce_value_get_live_api_request (const GValue* value) {
+gpointer
+publishing_rajce_value_get_live_api_request (const GValue* value)
+{
#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_RAJCE_TYPE_LIVE_API_REQUEST), NULL);
#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return value->data[0].v_pointer;
-#line 9889 "RajcePublishing.c"
+#line 10323 "RajcePublishing.c"
}
-void publishing_rajce_value_set_live_api_request (GValue* value, gpointer v_object) {
+void
+publishing_rajce_value_set_live_api_request (GValue* value,
+ gpointer v_object)
+{
PublishingRajceLiveApiRequest * old;
#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_RAJCE_TYPE_LIVE_API_REQUEST));
@@ -9909,22 +10346,25 @@ void publishing_rajce_value_set_live_api_request (GValue* value, gpointer v_obje
value->data[0].v_pointer = v_object;
#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_live_api_request_ref (value->data[0].v_pointer);
-#line 9909 "RajcePublishing.c"
+#line 10346 "RajcePublishing.c"
} else {
#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
value->data[0].v_pointer = NULL;
-#line 9913 "RajcePublishing.c"
+#line 10350 "RajcePublishing.c"
}
#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (old) {
#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_live_api_request_unref (old);
-#line 9919 "RajcePublishing.c"
+#line 10356 "RajcePublishing.c"
}
}
-void publishing_rajce_value_take_live_api_request (GValue* value, gpointer v_object) {
+void
+publishing_rajce_value_take_live_api_request (GValue* value,
+ gpointer v_object)
+{
PublishingRajceLiveApiRequest * old;
#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_RAJCE_TYPE_LIVE_API_REQUEST));
@@ -9938,42 +10378,48 @@ void publishing_rajce_value_take_live_api_request (GValue* value, gpointer v_obj
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
value->data[0].v_pointer = v_object;
-#line 9938 "RajcePublishing.c"
+#line 10378 "RajcePublishing.c"
} else {
#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
value->data[0].v_pointer = NULL;
-#line 9942 "RajcePublishing.c"
+#line 10382 "RajcePublishing.c"
}
#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (old) {
#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_live_api_request_unref (old);
-#line 9948 "RajcePublishing.c"
+#line 10388 "RajcePublishing.c"
}
}
-static void publishing_rajce_live_api_request_class_init (PublishingRajceLiveApiRequestClass * klass) {
+static void
+publishing_rajce_live_api_request_class_init (PublishingRajceLiveApiRequestClass * klass)
+{
#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_live_api_request_parent_class = g_type_class_peek_parent (klass);
#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
((PublishingRajceLiveApiRequestClass *) klass)->finalize = publishing_rajce_live_api_request_finalize;
#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_type_class_add_private (klass, sizeof (PublishingRajceLiveApiRequestPrivate));
-#line 9960 "RajcePublishing.c"
+#line 10402 "RajcePublishing.c"
}
-static void publishing_rajce_live_api_request_instance_init (PublishingRajceLiveApiRequest * self) {
+static void
+publishing_rajce_live_api_request_instance_init (PublishingRajceLiveApiRequest * self)
+{
#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
self->priv = PUBLISHING_RAJCE_LIVE_API_REQUEST_GET_PRIVATE (self);
#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
self->ref_count = 1;
-#line 9969 "RajcePublishing.c"
+#line 10413 "RajcePublishing.c"
}
-static void publishing_rajce_live_api_request_finalize (PublishingRajceLiveApiRequest * obj) {
+static void
+publishing_rajce_live_api_request_finalize (PublishingRajceLiveApiRequest * obj)
+{
PublishingRajceLiveApiRequest * self;
#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_RAJCE_TYPE_LIVE_API_REQUEST, PublishingRajceLiveApiRequest);
@@ -9983,11 +10429,13 @@ static void publishing_rajce_live_api_request_finalize (PublishingRajceLiveApiRe
self->priv->_params = (_vala_array_free (self->priv->_params, self->priv->_params_length1, (GDestroyNotify) publishing_rajce_arg_item_unref), NULL);
#line 1261 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_free0 (self->priv->_cmd);
-#line 9983 "RajcePublishing.c"
+#line 10429 "RajcePublishing.c"
}
-GType publishing_rajce_live_api_request_get_type (void) {
+GType
+publishing_rajce_live_api_request_get_type (void)
+{
static volatile gsize publishing_rajce_live_api_request_type_id__volatile = 0;
if (g_once_init_enter (&publishing_rajce_live_api_request_type_id__volatile)) {
static const GTypeValueTable g_define_type_value_table = { publishing_rajce_value_live_api_request_init, publishing_rajce_value_live_api_request_free_value, publishing_rajce_value_live_api_request_copy_value, publishing_rajce_value_live_api_request_peek_pointer, "p", publishing_rajce_value_live_api_request_collect_value, "p", publishing_rajce_value_live_api_request_lcopy_value };
@@ -10001,18 +10449,22 @@ GType publishing_rajce_live_api_request_get_type (void) {
}
-gpointer publishing_rajce_live_api_request_ref (gpointer instance) {
+gpointer
+publishing_rajce_live_api_request_ref (gpointer instance)
+{
PublishingRajceLiveApiRequest * self;
self = instance;
#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_atomic_int_inc (&self->ref_count);
#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return instance;
-#line 10008 "RajcePublishing.c"
+#line 10458 "RajcePublishing.c"
}
-void publishing_rajce_live_api_request_unref (gpointer instance) {
+void
+publishing_rajce_live_api_request_unref (gpointer instance)
+{
PublishingRajceLiveApiRequest * self;
self = instance;
#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -10021,138 +10473,134 @@ void publishing_rajce_live_api_request_unref (gpointer instance) {
PUBLISHING_RAJCE_LIVE_API_REQUEST_GET_CLASS (self)->finalize (self);
#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 10021 "RajcePublishing.c"
+#line 10473 "RajcePublishing.c"
}
}
-PublishingRajceTransaction* publishing_rajce_transaction_construct (GType object_type, PublishingRajceSession* session) {
+PublishingRajceTransaction*
+publishing_rajce_transaction_construct (GType object_type,
+ PublishingRajceSession* session)
+{
PublishingRajceTransaction* self = NULL;
- PublishingRajceSession* _tmp0_;
#line 1356 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_val_if_fail (PUBLISHING_RAJCE_IS_SESSION (session), NULL);
#line 1358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp0_ = session;
-#line 1358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- self = (PublishingRajceTransaction*) publishing_rest_support_transaction_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
+ self = (PublishingRajceTransaction*) publishing_rest_support_transaction_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
#line 1356 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return self;
-#line 10037 "RajcePublishing.c"
+#line 10489 "RajcePublishing.c"
}
-PublishingRajceTransaction* publishing_rajce_transaction_new (PublishingRajceSession* session) {
+PublishingRajceTransaction*
+publishing_rajce_transaction_new (PublishingRajceSession* session)
+{
#line 1356 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return publishing_rajce_transaction_construct (PUBLISHING_RAJCE_TYPE_TRANSACTION, session);
-#line 10044 "RajcePublishing.c"
+#line 10498 "RajcePublishing.c"
}
-gchar* publishing_rajce_transaction_validate_xml (PublishingRESTSupportXmlDocument* doc) {
+gchar*
+publishing_rajce_transaction_validate_xml (PublishingRESTSupportXmlDocument* doc)
+{
gchar* result = NULL;
xmlNode* root = NULL;
- PublishingRESTSupportXmlDocument* _tmp0_;
+ xmlNode* _tmp0_;
xmlNode* _tmp1_;
- xmlNode* _tmp2_;
gchar* name = NULL;
- xmlNode* _tmp4_;
- const gchar* _tmp5_;
- gchar* _tmp6_;
- gboolean _tmp7_ = FALSE;
- const gchar* _tmp8_;
+ xmlNode* _tmp3_;
+ const gchar* _tmp4_;
+ gchar* _tmp5_;
+ gboolean _tmp6_ = FALSE;
+ const gchar* _tmp7_;
xmlNode* errcode = NULL;
xmlNode* _result_ = NULL;
+ xmlNode* _tmp16_;
+ gchar* _tmp17_;
+ gchar* _tmp18_;
xmlNode* _tmp19_;
gchar* _tmp20_;
gchar* _tmp21_;
- gint _tmp22_;
- xmlNode* _tmp23_;
- gchar* _tmp24_;
- gchar* _tmp25_;
- gchar* _tmp26_;
- gchar* _tmp27_;
+ gchar* _tmp22_;
+ gchar* _tmp23_;
GError * _inner_error_ = NULL;
#line 1361 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_XML_DOCUMENT (doc), NULL);
#line 1363 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp0_ = doc;
-#line 1363 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp1_ = publishing_rest_support_xml_document_get_root_node (_tmp0_);
+ _tmp0_ = publishing_rest_support_xml_document_get_root_node (doc);
#line 1363 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- root = _tmp1_;
+ root = _tmp0_;
#line 1364 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp2_ = root;
+ _tmp1_ = root;
#line 1364 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- if (_tmp2_ == NULL) {
-#line 10084 "RajcePublishing.c"
- gchar* _tmp3_;
+ if (_tmp1_ == NULL) {
+#line 10536 "RajcePublishing.c"
+ gchar* _tmp2_;
#line 1366 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp3_ = g_strdup ("No XML returned from server");
+ _tmp2_ = g_strdup ("No XML returned from server");
#line 1366 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- result = _tmp3_;
+ result = _tmp2_;
#line 1366 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return result;
-#line 10092 "RajcePublishing.c"
+#line 10544 "RajcePublishing.c"
}
#line 1368 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp4_ = root;
+ _tmp3_ = root;
#line 1368 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp5_ = _tmp4_->name;
+ _tmp4_ = _tmp3_->name;
#line 1368 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp6_ = g_strdup (_tmp5_);
+ _tmp5_ = g_strdup (_tmp4_);
#line 1368 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- name = _tmp6_;
+ name = _tmp5_;
#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp8_ = name;
+ _tmp7_ = name;
#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- if (_tmp8_ == NULL) {
+ if (_tmp7_ == NULL) {
#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp7_ = TRUE;
-#line 10108 "RajcePublishing.c"
+ _tmp6_ = TRUE;
+#line 10560 "RajcePublishing.c"
} else {
- const gchar* _tmp9_;
+ const gchar* _tmp8_;
#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp9_ = name;
+ _tmp8_ = name;
#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp7_ = g_strcmp0 (_tmp9_, "response") != 0;
-#line 10115 "RajcePublishing.c"
+ _tmp6_ = g_strcmp0 (_tmp8_, "response") != 0;
+#line 10567 "RajcePublishing.c"
}
#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- if (_tmp7_) {
-#line 10119 "RajcePublishing.c"
- gchar* _tmp10_;
+ if (_tmp6_) {
+#line 10571 "RajcePublishing.c"
+ gchar* _tmp9_;
#line 1373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp10_ = g_strdup ("No response from Rajce in XML");
+ _tmp9_ = g_strdup ("No response from Rajce in XML");
#line 1373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- result = _tmp10_;
+ result = _tmp9_;
#line 1373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_free0 (name);
#line 1373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return result;
-#line 10129 "RajcePublishing.c"
+#line 10581 "RajcePublishing.c"
}
{
- xmlNode* _tmp11_ = NULL;
- PublishingRESTSupportXmlDocument* _tmp12_;
- xmlNode* _tmp13_;
+ xmlNode* _tmp10_ = NULL;
+ xmlNode* _tmp11_;
+ xmlNode* _tmp12_;
+ xmlNode* _tmp13_ = NULL;
xmlNode* _tmp14_;
- xmlNode* _tmp15_ = NULL;
- PublishingRESTSupportXmlDocument* _tmp16_;
- xmlNode* _tmp17_;
- xmlNode* _tmp18_;
-#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp12_ = doc;
+ xmlNode* _tmp15_;
#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp13_ = root;
+ _tmp11_ = root;
#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp14_ = publishing_rest_support_xml_document_get_named_child (_tmp12_, _tmp13_, "errorCode", &_inner_error_);
+ _tmp12_ = publishing_rest_support_xml_document_get_named_child (doc, _tmp11_, "errorCode", &_inner_error_);
#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp11_ = _tmp14_;
+ _tmp10_ = _tmp12_;
#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 10152 "RajcePublishing.c"
+#line 10600 "RajcePublishing.c"
goto __catch31_spit_publishing_publishing_error;
}
#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -10163,23 +10611,21 @@ gchar* publishing_rajce_transaction_validate_xml (PublishingRESTSupportXmlDocume
g_clear_error (&_inner_error_);
#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return NULL;
-#line 10163 "RajcePublishing.c"
+#line 10611 "RajcePublishing.c"
}
#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- errcode = _tmp11_;
-#line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp16_ = doc;
+ errcode = _tmp10_;
#line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp17_ = root;
+ _tmp14_ = root;
#line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp18_ = publishing_rest_support_xml_document_get_named_child (_tmp16_, _tmp17_, "result", &_inner_error_);
+ _tmp15_ = publishing_rest_support_xml_document_get_named_child (doc, _tmp14_, "result", &_inner_error_);
#line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp15_ = _tmp18_;
+ _tmp13_ = _tmp15_;
#line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 10179 "RajcePublishing.c"
+#line 10625 "RajcePublishing.c"
goto __catch31_spit_publishing_publishing_error;
}
#line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -10190,11 +10636,11 @@ gchar* publishing_rajce_transaction_validate_xml (PublishingRESTSupportXmlDocume
g_clear_error (&_inner_error_);
#line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return NULL;
-#line 10190 "RajcePublishing.c"
+#line 10636 "RajcePublishing.c"
}
#line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _result_ = _tmp15_;
-#line 10194 "RajcePublishing.c"
+ _result_ = _tmp13_;
+#line 10640 "RajcePublishing.c"
}
goto __finally31;
__catch31_spit_publishing_publishing_error:
@@ -10212,7 +10658,7 @@ gchar* publishing_rajce_transaction_validate_xml (PublishingRESTSupportXmlDocume
_g_free0 (name);
#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return result;
-#line 10212 "RajcePublishing.c"
+#line 10658 "RajcePublishing.c"
}
__finally31:
#line 1377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -10225,48 +10671,50 @@ gchar* publishing_rajce_transaction_validate_xml (PublishingRESTSupportXmlDocume
g_clear_error (&_inner_error_);
#line 1377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return NULL;
-#line 10225 "RajcePublishing.c"
+#line 10671 "RajcePublishing.c"
}
#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp19_ = errcode;
-#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp20_ = (gchar*) xmlNodeGetContent (_tmp19_);
-#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp21_ = _tmp20_;
+ _tmp16_ = errcode;
#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp22_ = atoi (_tmp21_);
+ _tmp17_ = (gchar*) xmlNodeGetContent (_tmp16_);
#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp23_ = _result_;
+ _tmp18_ = _tmp17_;
#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp24_ = (gchar*) xmlNodeGetContent (_tmp23_);
+ _tmp19_ = _result_;
#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp25_ = _tmp24_;
+ _tmp20_ = (gchar*) xmlNodeGetContent (_tmp19_);
#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp26_ = g_strdup_printf ("999 Rajce Error [%d]: %s", _tmp22_, _tmp25_);
+ _tmp21_ = _tmp20_;
#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp27_ = _tmp26_;
+ _tmp22_ = g_strdup_printf ("999 Rajce Error [%d]: %s", atoi (_tmp18_), _tmp21_);
#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _g_free0 (_tmp25_);
+ _tmp23_ = _tmp22_;
#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_free0 (_tmp21_);
#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- result = _tmp27_;
+ _g_free0 (_tmp18_);
+#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+ result = _tmp23_;
#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_g_free0 (name);
#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return result;
-#line 10255 "RajcePublishing.c"
+#line 10699 "RajcePublishing.c"
}
-static void publishing_rajce_transaction_class_init (PublishingRajceTransactionClass * klass) {
+static void
+publishing_rajce_transaction_class_init (PublishingRajceTransactionClass * klass)
+{
#line 1354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 10262 "RajcePublishing.c"
+#line 10708 "RajcePublishing.c"
}
-static void publishing_rajce_transaction_instance_init (PublishingRajceTransaction * self) {
+static void
+publishing_rajce_transaction_instance_init (PublishingRajceTransaction * self)
+{
}
@@ -10276,7 +10724,9 @@ static void publishing_rajce_transaction_instance_init (PublishingRajceTransacti
* This class implements the generic logic for all REST transactions used
* by the Rajce publishing plugin.
*/
-GType publishing_rajce_transaction_get_type (void) {
+GType
+publishing_rajce_transaction_get_type (void)
+{
static volatile gsize publishing_rajce_transaction_type_id__volatile = 0;
if (g_once_init_enter (&publishing_rajce_transaction_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingRajceTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_rajce_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingRajceTransaction), 0, (GInstanceInitFunc) publishing_rajce_transaction_instance_init, NULL };
@@ -10288,17 +10738,18 @@ GType publishing_rajce_transaction_get_type (void) {
}
-PublishingRajceSessionLoginTransaction* publishing_rajce_session_login_transaction_construct (GType object_type, PublishingRajceSession* session, const gchar* url, const gchar* username, const gchar* token) {
+PublishingRajceSessionLoginTransaction*
+publishing_rajce_session_login_transaction_construct (GType object_type,
+ PublishingRajceSession* session,
+ const gchar* url,
+ const gchar* username,
+ const gchar* token)
+{
PublishingRajceSessionLoginTransaction* self = NULL;
- const gchar* _tmp0_;
- PublishingRajceSession* _tmp1_;
- const gchar* _tmp2_;
PublishingRajceLiveApiRequest* req = NULL;
- PublishingRajceLiveApiRequest* _tmp3_;
- const gchar* _tmp4_;
- const gchar* _tmp5_;
+ PublishingRajceLiveApiRequest* _tmp0_;
gchar* xml = NULL;
- gchar* _tmp6_;
+ gchar* _tmp1_;
#line 1395 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_val_if_fail (PUBLISHING_RAJCE_IS_SESSION (session), NULL);
#line 1395 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -10308,35 +10759,25 @@ PublishingRajceSessionLoginTransaction* publishing_rajce_session_login_transacti
#line 1395 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_val_if_fail (token != NULL, NULL);
#line 1397 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp0_ = url;
-#line 1397 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_debug ("RajcePublishing.vala:1397: SessionLoginTransaction: URL: %s", _tmp0_);
+ g_debug ("RajcePublishing.vala:1397: SessionLoginTransaction: URL: %s", url);
#line 1398 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp1_ = session;
-#line 1398 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp2_ = url;
-#line 1398 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- self = (PublishingRajceSessionLoginTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp2_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
+ self = (PublishingRajceSessionLoginTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), url, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
#line 1399 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp3_ = publishing_rajce_live_api_request_new ("login");
+ _tmp0_ = publishing_rajce_live_api_request_new ("login");
#line 1399 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- req = _tmp3_;
+ req = _tmp0_;
#line 1400 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_live_api_request_AddParam (req, "clientID", "RajceShotwellPlugin");
#line 1401 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_live_api_request_AddParam (req, "currentVersion", "1.1.1.1");
#line 1402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp4_ = username;
-#line 1402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- publishing_rajce_live_api_request_AddParam (req, "login", _tmp4_);
-#line 1403 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp5_ = token;
+ publishing_rajce_live_api_request_AddParam (req, "login", username);
#line 1403 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- publishing_rajce_live_api_request_AddParam (req, "password", _tmp5_);
+ publishing_rajce_live_api_request_AddParam (req, "password", token);
#line 1404 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp6_ = publishing_rajce_live_api_request_Params2XmlString (req, TRUE);
+ _tmp1_ = publishing_rajce_live_api_request_Params2XmlString (req, TRUE);
#line 1404 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- xml = _tmp6_;
+ xml = _tmp1_;
#line 1405 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "data", xml);
#line 1395 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -10345,32 +10786,43 @@ PublishingRajceSessionLoginTransaction* publishing_rajce_session_login_transacti
_publishing_rajce_live_api_request_unref0 (req);
#line 1395 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return self;
-#line 10345 "RajcePublishing.c"
+#line 10786 "RajcePublishing.c"
}
-PublishingRajceSessionLoginTransaction* publishing_rajce_session_login_transaction_new (PublishingRajceSession* session, const gchar* url, const gchar* username, const gchar* token) {
+PublishingRajceSessionLoginTransaction*
+publishing_rajce_session_login_transaction_new (PublishingRajceSession* session,
+ const gchar* url,
+ const gchar* username,
+ const gchar* token)
+{
#line 1395 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return publishing_rajce_session_login_transaction_construct (PUBLISHING_RAJCE_TYPE_SESSION_LOGIN_TRANSACTION, session, url, username, token);
-#line 10352 "RajcePublishing.c"
+#line 10798 "RajcePublishing.c"
}
-static void publishing_rajce_session_login_transaction_class_init (PublishingRajceSessionLoginTransactionClass * klass) {
+static void
+publishing_rajce_session_login_transaction_class_init (PublishingRajceSessionLoginTransactionClass * klass)
+{
#line 1393 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_session_login_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 10359 "RajcePublishing.c"
+#line 10807 "RajcePublishing.c"
}
-static void publishing_rajce_session_login_transaction_instance_init (PublishingRajceSessionLoginTransaction * self) {
+static void
+publishing_rajce_session_login_transaction_instance_init (PublishingRajceSessionLoginTransaction * self)
+{
}
/**
* Transaction used to implement the network login interaction.
*/
-GType publishing_rajce_session_login_transaction_get_type (void) {
+GType
+publishing_rajce_session_login_transaction_get_type (void)
+{
static volatile gsize publishing_rajce_session_login_transaction_type_id__volatile = 0;
if (g_once_init_enter (&publishing_rajce_session_login_transaction_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingRajceSessionLoginTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_rajce_session_login_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingRajceSessionLoginTransaction), 0, (GInstanceInitFunc) publishing_rajce_session_login_transaction_instance_init, NULL };
@@ -10382,205 +10834,225 @@ GType publishing_rajce_session_login_transaction_get_type (void) {
}
-static void _vala_array_add9 (PublishingRajceArgItem** * array, int* length, int* size, PublishingRajceArgItem* value) {
+static void
+_vala_array_add9 (PublishingRajceArgItem** * array,
+ int* length,
+ int* size,
+ PublishingRajceArgItem* value)
+{
#line 1420 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if ((*length) == (*size)) {
#line 1420 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 1420 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
*array = g_renew (PublishingRajceArgItem*, *array, (*size) + 1);
-#line 10389 "RajcePublishing.c"
+#line 10846 "RajcePublishing.c"
}
#line 1420 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
(*array)[(*length)++] = value;
#line 1420 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
(*array)[*length] = NULL;
-#line 10395 "RajcePublishing.c"
+#line 10852 "RajcePublishing.c"
}
-static void _vala_array_add10 (PublishingRajceArgItem** * array, int* length, int* size, PublishingRajceArgItem* value) {
+static void
+_vala_array_add10 (PublishingRajceArgItem** * array,
+ int* length,
+ int* size,
+ PublishingRajceArgItem* value)
+{
#line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if ((*length) == (*size)) {
#line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
*array = g_renew (PublishingRajceArgItem*, *array, (*size) + 1);
-#line 10406 "RajcePublishing.c"
+#line 10868 "RajcePublishing.c"
}
#line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
(*array)[(*length)++] = value;
#line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
(*array)[*length] = NULL;
-#line 10412 "RajcePublishing.c"
+#line 10874 "RajcePublishing.c"
}
-static void _vala_array_add11 (PublishingRajceArgItem** * array, int* length, int* size, PublishingRajceArgItem* value) {
+static void
+_vala_array_add11 (PublishingRajceArgItem** * array,
+ int* length,
+ int* size,
+ PublishingRajceArgItem* value)
+{
#line 1422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if ((*length) == (*size)) {
#line 1422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 1422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
*array = g_renew (PublishingRajceArgItem*, *array, (*size) + 1);
-#line 10423 "RajcePublishing.c"
+#line 10890 "RajcePublishing.c"
}
#line 1422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
(*array)[(*length)++] = value;
#line 1422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
(*array)[*length] = NULL;
-#line 10429 "RajcePublishing.c"
+#line 10896 "RajcePublishing.c"
}
-static void _vala_array_add12 (PublishingRajceArgItem** * array, int* length, int* size, PublishingRajceArgItem* value) {
+static void
+_vala_array_add12 (PublishingRajceArgItem** * array,
+ int* length,
+ int* size,
+ PublishingRajceArgItem* value)
+{
#line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if ((*length) == (*size)) {
#line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
*array = g_renew (PublishingRajceArgItem*, *array, (*size) + 1);
-#line 10440 "RajcePublishing.c"
+#line 10912 "RajcePublishing.c"
}
#line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
(*array)[(*length)++] = value;
#line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
(*array)[*length] = NULL;
-#line 10446 "RajcePublishing.c"
+#line 10918 "RajcePublishing.c"
}
-static void _vala_array_add13 (PublishingRajceArgItem** * array, int* length, int* size, PublishingRajceArgItem* value) {
+static void
+_vala_array_add13 (PublishingRajceArgItem** * array,
+ int* length,
+ int* size,
+ PublishingRajceArgItem* value)
+{
#line 1424 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
if ((*length) == (*size)) {
#line 1424 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 1424 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
*array = g_renew (PublishingRajceArgItem*, *array, (*size) + 1);
-#line 10457 "RajcePublishing.c"
+#line 10934 "RajcePublishing.c"
}
#line 1424 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
(*array)[(*length)++] = value;
#line 1424 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
(*array)[*length] = NULL;
-#line 10463 "RajcePublishing.c"
+#line 10940 "RajcePublishing.c"
}
-PublishingRajceGetAlbumsTransaction* publishing_rajce_get_albums_transaction_construct (GType object_type, PublishingRajceSession* session, const gchar* url) {
+PublishingRajceGetAlbumsTransaction*
+publishing_rajce_get_albums_transaction_construct (GType object_type,
+ PublishingRajceSession* session,
+ const gchar* url)
+{
PublishingRajceGetAlbumsTransaction* self = NULL;
- PublishingRajceSession* _tmp0_;
- const gchar* _tmp1_;
PublishingRajceLiveApiRequest* req = NULL;
- PublishingRajceLiveApiRequest* _tmp2_;
- PublishingRajceSession* _tmp3_;
- gchar* _tmp4_;
- gchar* _tmp5_;
+ PublishingRajceLiveApiRequest* _tmp0_;
+ gchar* _tmp1_;
+ gchar* _tmp2_;
PublishingRajceArgItem** columns = NULL;
- PublishingRajceArgItem** _tmp6_;
+ PublishingRajceArgItem** _tmp3_;
gint columns_length1;
gint _columns_size_;
- PublishingRajceArgItem** _tmp7_;
- gint _tmp7__length1;
- PublishingRajceArgItem* _tmp8_;
- PublishingRajceArgItem** _tmp9_;
- gint _tmp9__length1;
- PublishingRajceArgItem* _tmp10_;
- PublishingRajceArgItem** _tmp11_;
- gint _tmp11__length1;
- PublishingRajceArgItem* _tmp12_;
- PublishingRajceArgItem** _tmp13_;
- gint _tmp13__length1;
- PublishingRajceArgItem* _tmp14_;
- PublishingRajceArgItem** _tmp15_;
- gint _tmp15__length1;
- PublishingRajceArgItem* _tmp16_;
- PublishingRajceArgItem** _tmp17_;
- gint _tmp17__length1;
+ PublishingRajceArgItem** _tmp4_;
+ gint _tmp4__length1;
+ PublishingRajceArgItem* _tmp5_;
+ PublishingRajceArgItem** _tmp6_;
+ gint _tmp6__length1;
+ PublishingRajceArgItem* _tmp7_;
+ PublishingRajceArgItem** _tmp8_;
+ gint _tmp8__length1;
+ PublishingRajceArgItem* _tmp9_;
+ PublishingRajceArgItem** _tmp10_;
+ gint _tmp10__length1;
+ PublishingRajceArgItem* _tmp11_;
+ PublishingRajceArgItem** _tmp12_;
+ gint _tmp12__length1;
+ PublishingRajceArgItem* _tmp13_;
+ PublishingRajceArgItem** _tmp14_;
+ gint _tmp14__length1;
gchar* xml = NULL;
- gchar* _tmp18_;
+ gchar* _tmp15_;
#line 1414 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_val_if_fail (PUBLISHING_RAJCE_IS_SESSION (session), NULL);
#line 1414 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_val_if_fail (url != NULL, NULL);
#line 1416 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp0_ = session;
-#line 1416 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp1_ = url;
-#line 1416 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- self = (PublishingRajceGetAlbumsTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
+ self = (PublishingRajceGetAlbumsTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), url, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
#line 1417 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp2_ = publishing_rajce_live_api_request_new ("getAlbumList");
+ _tmp0_ = publishing_rajce_live_api_request_new ("getAlbumList");
#line 1417 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- req = _tmp2_;
+ req = _tmp0_;
#line 1418 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp3_ = session;
+ _tmp1_ = publishing_rajce_session_get_usertoken (session);
#line 1418 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp4_ = publishing_rajce_session_get_usertoken (_tmp3_);
-#line 1418 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp5_ = _tmp4_;
+ _tmp2_ = _tmp1_;
#line 1418 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- publishing_rajce_live_api_request_AddParam (req, "token", _tmp5_);
+ publishing_rajce_live_api_request_AddParam (req, "token", _tmp2_);
#line 1418 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _g_free0 (_tmp5_);
+ _g_free0 (_tmp2_);
#line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp6_ = g_new0 (PublishingRajceArgItem*, 0 + 1);
+ _tmp3_ = g_new0 (PublishingRajceArgItem*, 0 + 1);
#line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- columns = _tmp6_;
+ columns = _tmp3_;
#line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
columns_length1 = 0;
#line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_columns_size_ = columns_length1;
#line 1420 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp7_ = columns;
+ _tmp4_ = columns;
#line 1420 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp7__length1 = columns_length1;
+ _tmp4__length1 = columns_length1;
#line 1420 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp8_ = publishing_rajce_arg_item_new ("column", "viewCount");
+ _tmp5_ = publishing_rajce_arg_item_new ("column", "viewCount");
#line 1420 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _vala_array_add9 (&columns, &columns_length1, &_columns_size_, _tmp8_);
+ _vala_array_add9 (&columns, &columns_length1, &_columns_size_, _tmp5_);
#line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp9_ = columns;
+ _tmp6_ = columns;
#line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp9__length1 = columns_length1;
+ _tmp6__length1 = columns_length1;
#line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp10_ = publishing_rajce_arg_item_new ("column", "isFavourite");
+ _tmp7_ = publishing_rajce_arg_item_new ("column", "isFavourite");
#line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _vala_array_add10 (&columns, &columns_length1, &_columns_size_, _tmp10_);
+ _vala_array_add10 (&columns, &columns_length1, &_columns_size_, _tmp7_);
#line 1422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp11_ = columns;
+ _tmp8_ = columns;
#line 1422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp11__length1 = columns_length1;
+ _tmp8__length1 = columns_length1;
#line 1422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp12_ = publishing_rajce_arg_item_new ("column", "descriptionHtml");
+ _tmp9_ = publishing_rajce_arg_item_new ("column", "descriptionHtml");
#line 1422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _vala_array_add11 (&columns, &columns_length1, &_columns_size_, _tmp12_);
+ _vala_array_add11 (&columns, &columns_length1, &_columns_size_, _tmp9_);
#line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp13_ = columns;
+ _tmp10_ = columns;
#line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp13__length1 = columns_length1;
+ _tmp10__length1 = columns_length1;
#line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp14_ = publishing_rajce_arg_item_new ("column", "coverPhotoID");
+ _tmp11_ = publishing_rajce_arg_item_new ("column", "coverPhotoID");
#line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _vala_array_add12 (&columns, &columns_length1, &_columns_size_, _tmp14_);
+ _vala_array_add12 (&columns, &columns_length1, &_columns_size_, _tmp11_);
#line 1424 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp15_ = columns;
+ _tmp12_ = columns;
#line 1424 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp15__length1 = columns_length1;
+ _tmp12__length1 = columns_length1;
#line 1424 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp16_ = publishing_rajce_arg_item_new ("column", "localPath");
+ _tmp13_ = publishing_rajce_arg_item_new ("column", "localPath");
#line 1424 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _vala_array_add13 (&columns, &columns_length1, &_columns_size_, _tmp16_);
+ _vala_array_add13 (&columns, &columns_length1, &_columns_size_, _tmp13_);
#line 1425 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp17_ = columns;
+ _tmp14_ = columns;
#line 1425 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp17__length1 = columns_length1;
+ _tmp14__length1 = columns_length1;
#line 1425 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- publishing_rajce_live_api_request_AddParamNode (req, "columns", _tmp17_, _tmp17__length1);
+ publishing_rajce_live_api_request_AddParamNode (req, "columns", _tmp14_, _tmp14__length1);
#line 1426 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp18_ = publishing_rajce_live_api_request_Params2XmlString (req, TRUE);
+ _tmp15_ = publishing_rajce_live_api_request_Params2XmlString (req, TRUE);
#line 1426 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- xml = _tmp18_;
+ xml = _tmp15_;
#line 1427 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "data", xml);
#line 1414 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -10591,32 +11063,41 @@ PublishingRajceGetAlbumsTransaction* publishing_rajce_get_albums_transaction_con
_publishing_rajce_live_api_request_unref0 (req);
#line 1414 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return self;
-#line 10591 "RajcePublishing.c"
+#line 11063 "RajcePublishing.c"
}
-PublishingRajceGetAlbumsTransaction* publishing_rajce_get_albums_transaction_new (PublishingRajceSession* session, const gchar* url) {
+PublishingRajceGetAlbumsTransaction*
+publishing_rajce_get_albums_transaction_new (PublishingRajceSession* session,
+ const gchar* url)
+{
#line 1414 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return publishing_rajce_get_albums_transaction_construct (PUBLISHING_RAJCE_TYPE_GET_ALBUMS_TRANSACTION, session, url);
-#line 10598 "RajcePublishing.c"
+#line 11073 "RajcePublishing.c"
}
-static void publishing_rajce_get_albums_transaction_class_init (PublishingRajceGetAlbumsTransactionClass * klass) {
+static void
+publishing_rajce_get_albums_transaction_class_init (PublishingRajceGetAlbumsTransactionClass * klass)
+{
#line 1412 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_get_albums_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 10605 "RajcePublishing.c"
+#line 11082 "RajcePublishing.c"
}
-static void publishing_rajce_get_albums_transaction_instance_init (PublishingRajceGetAlbumsTransaction * self) {
+static void
+publishing_rajce_get_albums_transaction_instance_init (PublishingRajceGetAlbumsTransaction * self)
+{
}
/**
* Transaction used to implement the get albums interaction.
*/
-GType publishing_rajce_get_albums_transaction_get_type (void) {
+GType
+publishing_rajce_get_albums_transaction_get_type (void)
+{
static volatile gsize publishing_rajce_get_albums_transaction_type_id__volatile = 0;
if (g_once_init_enter (&publishing_rajce_get_albums_transaction_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingRajceGetAlbumsTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_rajce_get_albums_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingRajceGetAlbumsTransaction), 0, (GInstanceInitFunc) publishing_rajce_get_albums_transaction_instance_init, NULL };
@@ -10628,19 +11109,20 @@ GType publishing_rajce_get_albums_transaction_get_type (void) {
}
-PublishingRajceCreateAlbumTransaction* publishing_rajce_create_album_transaction_construct (GType object_type, PublishingRajceSession* session, const gchar* url, const gchar* albumName, gboolean hidden) {
+PublishingRajceCreateAlbumTransaction*
+publishing_rajce_create_album_transaction_construct (GType object_type,
+ PublishingRajceSession* session,
+ const gchar* url,
+ const gchar* albumName,
+ gboolean hidden)
+{
PublishingRajceCreateAlbumTransaction* self = NULL;
- PublishingRajceSession* _tmp0_;
- const gchar* _tmp1_;
PublishingRajceLiveApiRequest* req = NULL;
- PublishingRajceLiveApiRequest* _tmp2_;
- PublishingRajceSession* _tmp3_;
- gchar* _tmp4_;
- gchar* _tmp5_;
- const gchar* _tmp6_;
- gboolean _tmp7_;
+ PublishingRajceLiveApiRequest* _tmp0_;
+ gchar* _tmp1_;
+ gchar* _tmp2_;
gchar* xml = NULL;
- gchar* _tmp8_;
+ gchar* _tmp3_;
#line 1436 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_val_if_fail (PUBLISHING_RAJCE_IS_SESSION (session), NULL);
#line 1436 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -10648,39 +11130,29 @@ PublishingRajceCreateAlbumTransaction* publishing_rajce_create_album_transaction
#line 1436 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_val_if_fail (albumName != NULL, NULL);
#line 1438 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp0_ = session;
-#line 1438 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp1_ = url;
-#line 1438 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- self = (PublishingRajceCreateAlbumTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
+ self = (PublishingRajceCreateAlbumTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), url, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
#line 1439 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp2_ = publishing_rajce_live_api_request_new ("createAlbum");
+ _tmp0_ = publishing_rajce_live_api_request_new ("createAlbum");
#line 1439 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- req = _tmp2_;
+ req = _tmp0_;
#line 1440 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp3_ = session;
+ _tmp1_ = publishing_rajce_session_get_usertoken (session);
#line 1440 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp4_ = publishing_rajce_session_get_usertoken (_tmp3_);
+ _tmp2_ = _tmp1_;
#line 1440 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp5_ = _tmp4_;
+ publishing_rajce_live_api_request_AddParam (req, "token", _tmp2_);
#line 1440 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- publishing_rajce_live_api_request_AddParam (req, "token", _tmp5_);
-#line 1440 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _g_free0 (_tmp5_);
+ _g_free0 (_tmp2_);
#line 1441 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp6_ = albumName;
-#line 1441 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- publishing_rajce_live_api_request_AddParam (req, "albumName", _tmp6_);
+ publishing_rajce_live_api_request_AddParam (req, "albumName", albumName);
#line 1442 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_live_api_request_AddParam (req, "albumDescription", "");
#line 1443 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp7_ = hidden;
-#line 1443 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- publishing_rajce_live_api_request_AddParamBool (req, "albumVisible", !_tmp7_);
+ publishing_rajce_live_api_request_AddParamBool (req, "albumVisible", !hidden);
#line 1444 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp8_ = publishing_rajce_live_api_request_Params2XmlString (req, TRUE);
+ _tmp3_ = publishing_rajce_live_api_request_Params2XmlString (req, TRUE);
#line 1444 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- xml = _tmp8_;
+ xml = _tmp3_;
#line 1445 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "data", xml);
#line 1436 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -10689,32 +11161,43 @@ PublishingRajceCreateAlbumTransaction* publishing_rajce_create_album_transaction
_publishing_rajce_live_api_request_unref0 (req);
#line 1436 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return self;
-#line 10689 "RajcePublishing.c"
+#line 11161 "RajcePublishing.c"
}
-PublishingRajceCreateAlbumTransaction* publishing_rajce_create_album_transaction_new (PublishingRajceSession* session, const gchar* url, const gchar* albumName, gboolean hidden) {
+PublishingRajceCreateAlbumTransaction*
+publishing_rajce_create_album_transaction_new (PublishingRajceSession* session,
+ const gchar* url,
+ const gchar* albumName,
+ gboolean hidden)
+{
#line 1436 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return publishing_rajce_create_album_transaction_construct (PUBLISHING_RAJCE_TYPE_CREATE_ALBUM_TRANSACTION, session, url, albumName, hidden);
-#line 10696 "RajcePublishing.c"
+#line 11173 "RajcePublishing.c"
}
-static void publishing_rajce_create_album_transaction_class_init (PublishingRajceCreateAlbumTransactionClass * klass) {
+static void
+publishing_rajce_create_album_transaction_class_init (PublishingRajceCreateAlbumTransactionClass * klass)
+{
#line 1434 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_create_album_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 10703 "RajcePublishing.c"
+#line 11182 "RajcePublishing.c"
}
-static void publishing_rajce_create_album_transaction_instance_init (PublishingRajceCreateAlbumTransaction * self) {
+static void
+publishing_rajce_create_album_transaction_instance_init (PublishingRajceCreateAlbumTransaction * self)
+{
}
/**
* Transaction used to implement the create album interaction.
*/
-GType publishing_rajce_create_album_transaction_get_type (void) {
+GType
+publishing_rajce_create_album_transaction_get_type (void)
+{
static volatile gsize publishing_rajce_create_album_transaction_type_id__volatile = 0;
if (g_once_init_enter (&publishing_rajce_create_album_transaction_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingRajceCreateAlbumTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_rajce_create_album_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingRajceCreateAlbumTransaction), 0, (GInstanceInitFunc) publishing_rajce_create_album_transaction_instance_init, NULL };
@@ -10726,50 +11209,43 @@ GType publishing_rajce_create_album_transaction_get_type (void) {
}
-PublishingRajceOpenAlbumTransaction* publishing_rajce_open_album_transaction_construct (GType object_type, PublishingRajceSession* session, const gchar* url, gint albumID) {
+PublishingRajceOpenAlbumTransaction*
+publishing_rajce_open_album_transaction_construct (GType object_type,
+ PublishingRajceSession* session,
+ const gchar* url,
+ gint albumID)
+{
PublishingRajceOpenAlbumTransaction* self = NULL;
- PublishingRajceSession* _tmp0_;
- const gchar* _tmp1_;
PublishingRajceLiveApiRequest* req = NULL;
- PublishingRajceLiveApiRequest* _tmp2_;
- PublishingRajceSession* _tmp3_;
- gchar* _tmp4_;
- gchar* _tmp5_;
- gint _tmp6_;
+ PublishingRajceLiveApiRequest* _tmp0_;
+ gchar* _tmp1_;
+ gchar* _tmp2_;
gchar* xml = NULL;
- gchar* _tmp7_;
+ gchar* _tmp3_;
#line 1454 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_val_if_fail (PUBLISHING_RAJCE_IS_SESSION (session), NULL);
#line 1454 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_val_if_fail (url != NULL, NULL);
#line 1456 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp0_ = session;
-#line 1456 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp1_ = url;
-#line 1456 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- self = (PublishingRajceOpenAlbumTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
+ self = (PublishingRajceOpenAlbumTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), url, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
#line 1457 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp2_ = publishing_rajce_live_api_request_new ("openAlbum");
+ _tmp0_ = publishing_rajce_live_api_request_new ("openAlbum");
#line 1457 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- req = _tmp2_;
-#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp3_ = session;
+ req = _tmp0_;
#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp4_ = publishing_rajce_session_get_usertoken (_tmp3_);
+ _tmp1_ = publishing_rajce_session_get_usertoken (session);
#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp5_ = _tmp4_;
+ _tmp2_ = _tmp1_;
#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- publishing_rajce_live_api_request_AddParam (req, "token", _tmp5_);
+ publishing_rajce_live_api_request_AddParam (req, "token", _tmp2_);
#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _g_free0 (_tmp5_);
-#line 1459 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp6_ = albumID;
+ _g_free0 (_tmp2_);
#line 1459 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- publishing_rajce_live_api_request_AddParamInt (req, "albumID", _tmp6_);
+ publishing_rajce_live_api_request_AddParamInt (req, "albumID", albumID);
#line 1460 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp7_ = publishing_rajce_live_api_request_Params2XmlString (req, TRUE);
+ _tmp3_ = publishing_rajce_live_api_request_Params2XmlString (req, TRUE);
#line 1460 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- xml = _tmp7_;
+ xml = _tmp3_;
#line 1461 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "data", xml);
#line 1454 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -10778,32 +11254,42 @@ PublishingRajceOpenAlbumTransaction* publishing_rajce_open_album_transaction_con
_publishing_rajce_live_api_request_unref0 (req);
#line 1454 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return self;
-#line 10778 "RajcePublishing.c"
+#line 11254 "RajcePublishing.c"
}
-PublishingRajceOpenAlbumTransaction* publishing_rajce_open_album_transaction_new (PublishingRajceSession* session, const gchar* url, gint albumID) {
+PublishingRajceOpenAlbumTransaction*
+publishing_rajce_open_album_transaction_new (PublishingRajceSession* session,
+ const gchar* url,
+ gint albumID)
+{
#line 1454 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return publishing_rajce_open_album_transaction_construct (PUBLISHING_RAJCE_TYPE_OPEN_ALBUM_TRANSACTION, session, url, albumID);
-#line 10785 "RajcePublishing.c"
+#line 11265 "RajcePublishing.c"
}
-static void publishing_rajce_open_album_transaction_class_init (PublishingRajceOpenAlbumTransactionClass * klass) {
+static void
+publishing_rajce_open_album_transaction_class_init (PublishingRajceOpenAlbumTransactionClass * klass)
+{
#line 1452 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_open_album_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 10792 "RajcePublishing.c"
+#line 11274 "RajcePublishing.c"
}
-static void publishing_rajce_open_album_transaction_instance_init (PublishingRajceOpenAlbumTransaction * self) {
+static void
+publishing_rajce_open_album_transaction_instance_init (PublishingRajceOpenAlbumTransaction * self)
+{
}
/**
* Transaction used to implement the open album interaction.
*/
-GType publishing_rajce_open_album_transaction_get_type (void) {
+GType
+publishing_rajce_open_album_transaction_get_type (void)
+{
static volatile gsize publishing_rajce_open_album_transaction_type_id__volatile = 0;
if (g_once_init_enter (&publishing_rajce_open_album_transaction_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingRajceOpenAlbumTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_rajce_open_album_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingRajceOpenAlbumTransaction), 0, (GInstanceInitFunc) publishing_rajce_open_album_transaction_instance_init, NULL };
@@ -10815,58 +11301,50 @@ GType publishing_rajce_open_album_transaction_get_type (void) {
}
-PublishingRajceGetAlbumUrlTransaction* publishing_rajce_get_album_url_transaction_construct (GType object_type, PublishingRajceSession* session, const gchar* url) {
+PublishingRajceGetAlbumUrlTransaction*
+publishing_rajce_get_album_url_transaction_construct (GType object_type,
+ PublishingRajceSession* session,
+ const gchar* url)
+{
PublishingRajceGetAlbumUrlTransaction* self = NULL;
- PublishingRajceSession* _tmp0_;
- const gchar* _tmp1_;
PublishingRajceLiveApiRequest* req = NULL;
- PublishingRajceLiveApiRequest* _tmp2_;
- PublishingRajceSession* _tmp3_;
+ PublishingRajceLiveApiRequest* _tmp0_;
+ gchar* _tmp1_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
gchar* _tmp4_;
- gchar* _tmp5_;
- PublishingRajceSession* _tmp6_;
- gchar* _tmp7_;
- gchar* _tmp8_;
gchar* xml = NULL;
- gchar* _tmp9_;
+ gchar* _tmp5_;
#line 1470 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_val_if_fail (PUBLISHING_RAJCE_IS_SESSION (session), NULL);
#line 1470 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_val_if_fail (url != NULL, NULL);
#line 1472 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp0_ = session;
-#line 1472 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp1_ = url;
-#line 1472 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- self = (PublishingRajceGetAlbumUrlTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
+ self = (PublishingRajceGetAlbumUrlTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), url, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
#line 1473 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp2_ = publishing_rajce_live_api_request_new ("getAlbumUrl");
+ _tmp0_ = publishing_rajce_live_api_request_new ("getAlbumUrl");
#line 1473 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- req = _tmp2_;
+ req = _tmp0_;
#line 1474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp3_ = session;
+ _tmp1_ = publishing_rajce_session_get_usertoken (session);
#line 1474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp4_ = publishing_rajce_session_get_usertoken (_tmp3_);
+ _tmp2_ = _tmp1_;
#line 1474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp5_ = _tmp4_;
-#line 1474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- publishing_rajce_live_api_request_AddParam (req, "token", _tmp5_);
+ publishing_rajce_live_api_request_AddParam (req, "token", _tmp2_);
#line 1474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _g_free0 (_tmp5_);
+ _g_free0 (_tmp2_);
#line 1475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp6_ = session;
+ _tmp3_ = publishing_rajce_session_get_albumtoken (session);
#line 1475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp7_ = publishing_rajce_session_get_albumtoken (_tmp6_);
-#line 1475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp8_ = _tmp7_;
+ _tmp4_ = _tmp3_;
#line 1475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- publishing_rajce_live_api_request_AddParam (req, "albumToken", _tmp8_);
+ publishing_rajce_live_api_request_AddParam (req, "albumToken", _tmp4_);
#line 1475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _g_free0 (_tmp8_);
+ _g_free0 (_tmp4_);
#line 1476 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp9_ = publishing_rajce_live_api_request_Params2XmlString (req, TRUE);
+ _tmp5_ = publishing_rajce_live_api_request_Params2XmlString (req, TRUE);
#line 1476 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- xml = _tmp9_;
+ xml = _tmp5_;
#line 1477 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "data", xml);
#line 1470 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -10875,32 +11353,41 @@ PublishingRajceGetAlbumUrlTransaction* publishing_rajce_get_album_url_transactio
_publishing_rajce_live_api_request_unref0 (req);
#line 1470 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return self;
-#line 10875 "RajcePublishing.c"
+#line 11353 "RajcePublishing.c"
}
-PublishingRajceGetAlbumUrlTransaction* publishing_rajce_get_album_url_transaction_new (PublishingRajceSession* session, const gchar* url) {
+PublishingRajceGetAlbumUrlTransaction*
+publishing_rajce_get_album_url_transaction_new (PublishingRajceSession* session,
+ const gchar* url)
+{
#line 1470 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return publishing_rajce_get_album_url_transaction_construct (PUBLISHING_RAJCE_TYPE_GET_ALBUM_URL_TRANSACTION, session, url);
-#line 10882 "RajcePublishing.c"
+#line 11363 "RajcePublishing.c"
}
-static void publishing_rajce_get_album_url_transaction_class_init (PublishingRajceGetAlbumUrlTransactionClass * klass) {
+static void
+publishing_rajce_get_album_url_transaction_class_init (PublishingRajceGetAlbumUrlTransactionClass * klass)
+{
#line 1468 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_get_album_url_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 10889 "RajcePublishing.c"
+#line 11372 "RajcePublishing.c"
}
-static void publishing_rajce_get_album_url_transaction_instance_init (PublishingRajceGetAlbumUrlTransaction * self) {
+static void
+publishing_rajce_get_album_url_transaction_instance_init (PublishingRajceGetAlbumUrlTransaction * self)
+{
}
/**
* Transaction used to implement the close album interaction.
*/
-GType publishing_rajce_get_album_url_transaction_get_type (void) {
+GType
+publishing_rajce_get_album_url_transaction_get_type (void)
+{
static volatile gsize publishing_rajce_get_album_url_transaction_type_id__volatile = 0;
if (g_once_init_enter (&publishing_rajce_get_album_url_transaction_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingRajceGetAlbumUrlTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_rajce_get_album_url_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingRajceGetAlbumUrlTransaction), 0, (GInstanceInitFunc) publishing_rajce_get_album_url_transaction_instance_init, NULL };
@@ -10912,58 +11399,50 @@ GType publishing_rajce_get_album_url_transaction_get_type (void) {
}
-PublishingRajceCloseAlbumTransaction* publishing_rajce_close_album_transaction_construct (GType object_type, PublishingRajceSession* session, const gchar* url) {
+PublishingRajceCloseAlbumTransaction*
+publishing_rajce_close_album_transaction_construct (GType object_type,
+ PublishingRajceSession* session,
+ const gchar* url)
+{
PublishingRajceCloseAlbumTransaction* self = NULL;
- PublishingRajceSession* _tmp0_;
- const gchar* _tmp1_;
PublishingRajceLiveApiRequest* req = NULL;
- PublishingRajceLiveApiRequest* _tmp2_;
- PublishingRajceSession* _tmp3_;
+ PublishingRajceLiveApiRequest* _tmp0_;
+ gchar* _tmp1_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
gchar* _tmp4_;
- gchar* _tmp5_;
- PublishingRajceSession* _tmp6_;
- gchar* _tmp7_;
- gchar* _tmp8_;
gchar* xml = NULL;
- gchar* _tmp9_;
+ gchar* _tmp5_;
#line 1486 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_val_if_fail (PUBLISHING_RAJCE_IS_SESSION (session), NULL);
#line 1486 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_val_if_fail (url != NULL, NULL);
#line 1488 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp0_ = session;
-#line 1488 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp1_ = url;
-#line 1488 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- self = (PublishingRajceCloseAlbumTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
+ self = (PublishingRajceCloseAlbumTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), url, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
#line 1489 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp2_ = publishing_rajce_live_api_request_new ("closeAlbum");
+ _tmp0_ = publishing_rajce_live_api_request_new ("closeAlbum");
#line 1489 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- req = _tmp2_;
-#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp3_ = session;
+ req = _tmp0_;
#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp4_ = publishing_rajce_session_get_usertoken (_tmp3_);
+ _tmp1_ = publishing_rajce_session_get_usertoken (session);
#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp5_ = _tmp4_;
+ _tmp2_ = _tmp1_;
#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- publishing_rajce_live_api_request_AddParam (req, "token", _tmp5_);
+ publishing_rajce_live_api_request_AddParam (req, "token", _tmp2_);
#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _g_free0 (_tmp5_);
-#line 1491 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp6_ = session;
+ _g_free0 (_tmp2_);
#line 1491 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp7_ = publishing_rajce_session_get_albumtoken (_tmp6_);
+ _tmp3_ = publishing_rajce_session_get_albumtoken (session);
#line 1491 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp8_ = _tmp7_;
+ _tmp4_ = _tmp3_;
#line 1491 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- publishing_rajce_live_api_request_AddParam (req, "albumToken", _tmp8_);
+ publishing_rajce_live_api_request_AddParam (req, "albumToken", _tmp4_);
#line 1491 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _g_free0 (_tmp8_);
+ _g_free0 (_tmp4_);
#line 1492 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp9_ = publishing_rajce_live_api_request_Params2XmlString (req, TRUE);
+ _tmp5_ = publishing_rajce_live_api_request_Params2XmlString (req, TRUE);
#line 1492 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- xml = _tmp9_;
+ xml = _tmp5_;
#line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "data", xml);
#line 1486 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -10972,32 +11451,41 @@ PublishingRajceCloseAlbumTransaction* publishing_rajce_close_album_transaction_c
_publishing_rajce_live_api_request_unref0 (req);
#line 1486 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return self;
-#line 10972 "RajcePublishing.c"
+#line 11451 "RajcePublishing.c"
}
-PublishingRajceCloseAlbumTransaction* publishing_rajce_close_album_transaction_new (PublishingRajceSession* session, const gchar* url) {
+PublishingRajceCloseAlbumTransaction*
+publishing_rajce_close_album_transaction_new (PublishingRajceSession* session,
+ const gchar* url)
+{
#line 1486 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return publishing_rajce_close_album_transaction_construct (PUBLISHING_RAJCE_TYPE_CLOSE_ALBUM_TRANSACTION, session, url);
-#line 10979 "RajcePublishing.c"
+#line 11461 "RajcePublishing.c"
}
-static void publishing_rajce_close_album_transaction_class_init (PublishingRajceCloseAlbumTransactionClass * klass) {
+static void
+publishing_rajce_close_album_transaction_class_init (PublishingRajceCloseAlbumTransactionClass * klass)
+{
#line 1484 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_close_album_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 10986 "RajcePublishing.c"
+#line 11470 "RajcePublishing.c"
}
-static void publishing_rajce_close_album_transaction_instance_init (PublishingRajceCloseAlbumTransaction * self) {
+static void
+publishing_rajce_close_album_transaction_instance_init (PublishingRajceCloseAlbumTransaction * self)
+{
}
/**
* Transaction used to implement the close album interaction.
*/
-GType publishing_rajce_close_album_transaction_get_type (void) {
+GType
+publishing_rajce_close_album_transaction_get_type (void)
+{
static volatile gsize publishing_rajce_close_album_transaction_type_id__volatile = 0;
if (g_once_init_enter (&publishing_rajce_close_album_transaction_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingRajceCloseAlbumTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_rajce_close_album_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingRajceCloseAlbumTransaction), 0, (GInstanceInitFunc) publishing_rajce_close_album_transaction_instance_init, NULL };
@@ -11009,45 +11497,40 @@ GType publishing_rajce_close_album_transaction_get_type (void) {
}
-PublishingRajceGetCategoriesTransaction* publishing_rajce_get_categories_transaction_construct (GType object_type, PublishingRajceSession* session, const gchar* url) {
+PublishingRajceGetCategoriesTransaction*
+publishing_rajce_get_categories_transaction_construct (GType object_type,
+ PublishingRajceSession* session,
+ const gchar* url)
+{
PublishingRajceGetCategoriesTransaction* self = NULL;
- PublishingRajceSession* _tmp0_;
- const gchar* _tmp1_;
PublishingRajceLiveApiRequest* req = NULL;
- PublishingRajceLiveApiRequest* _tmp2_;
- PublishingRajceSession* _tmp3_;
- gchar* _tmp4_;
- gchar* _tmp5_;
+ PublishingRajceLiveApiRequest* _tmp0_;
+ gchar* _tmp1_;
+ gchar* _tmp2_;
gchar* xml = NULL;
- gchar* _tmp6_;
+ gchar* _tmp3_;
#line 1502 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_val_if_fail (PUBLISHING_RAJCE_IS_SESSION (session), NULL);
#line 1502 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_val_if_fail (url != NULL, NULL);
#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp0_ = session;
-#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp1_ = url;
-#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- self = (PublishingRajceGetCategoriesTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
+ self = (PublishingRajceGetCategoriesTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), url, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
#line 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp2_ = publishing_rajce_live_api_request_new ("getCategories");
+ _tmp0_ = publishing_rajce_live_api_request_new ("getCategories");
#line 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- req = _tmp2_;
-#line 1506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp3_ = session;
+ req = _tmp0_;
#line 1506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp4_ = publishing_rajce_session_get_usertoken (_tmp3_);
+ _tmp1_ = publishing_rajce_session_get_usertoken (session);
#line 1506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp5_ = _tmp4_;
+ _tmp2_ = _tmp1_;
#line 1506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- publishing_rajce_live_api_request_AddParam (req, "token", _tmp5_);
+ publishing_rajce_live_api_request_AddParam (req, "token", _tmp2_);
#line 1506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _g_free0 (_tmp5_);
+ _g_free0 (_tmp2_);
#line 1507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp6_ = publishing_rajce_live_api_request_Params2XmlString (req, TRUE);
+ _tmp3_ = publishing_rajce_live_api_request_Params2XmlString (req, TRUE);
#line 1507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- xml = _tmp6_;
+ xml = _tmp3_;
#line 1508 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "data", xml);
#line 1502 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -11056,32 +11539,41 @@ PublishingRajceGetCategoriesTransaction* publishing_rajce_get_categories_transac
_publishing_rajce_live_api_request_unref0 (req);
#line 1502 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return self;
-#line 11056 "RajcePublishing.c"
+#line 11539 "RajcePublishing.c"
}
-PublishingRajceGetCategoriesTransaction* publishing_rajce_get_categories_transaction_new (PublishingRajceSession* session, const gchar* url) {
+PublishingRajceGetCategoriesTransaction*
+publishing_rajce_get_categories_transaction_new (PublishingRajceSession* session,
+ const gchar* url)
+{
#line 1502 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return publishing_rajce_get_categories_transaction_construct (PUBLISHING_RAJCE_TYPE_GET_CATEGORIES_TRANSACTION, session, url);
-#line 11063 "RajcePublishing.c"
+#line 11549 "RajcePublishing.c"
}
-static void publishing_rajce_get_categories_transaction_class_init (PublishingRajceGetCategoriesTransactionClass * klass) {
+static void
+publishing_rajce_get_categories_transaction_class_init (PublishingRajceGetCategoriesTransactionClass * klass)
+{
#line 1500 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_get_categories_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 11070 "RajcePublishing.c"
+#line 11558 "RajcePublishing.c"
}
-static void publishing_rajce_get_categories_transaction_instance_init (PublishingRajceGetCategoriesTransaction * self) {
+static void
+publishing_rajce_get_categories_transaction_instance_init (PublishingRajceGetCategoriesTransaction * self)
+{
}
/**
* Transaction used to implement the get categories interaction.
*/
-GType publishing_rajce_get_categories_transaction_get_type (void) {
+GType
+publishing_rajce_get_categories_transaction_get_type (void)
+{
static volatile gsize publishing_rajce_get_categories_transaction_type_id__volatile = 0;
if (g_once_init_enter (&publishing_rajce_get_categories_transaction_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingRajceGetCategoriesTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_rajce_get_categories_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingRajceGetCategoriesTransaction), 0, (GInstanceInitFunc) publishing_rajce_get_categories_transaction_instance_init, NULL };
@@ -11093,78 +11585,70 @@ GType publishing_rajce_get_categories_transaction_get_type (void) {
}
-static void _g_free0_ (gpointer var) {
+static void
+_g_free0_ (gpointer var)
+{
#line 1544 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
var = (g_free (var), NULL);
-#line 11096 "RajcePublishing.c"
+#line 11590 "RajcePublishing.c"
}
-PublishingRajceAddPhotoTransaction* publishing_rajce_add_photo_transaction_construct (GType object_type, PublishingRajceSession* session, const gchar* url, PublishingRajcePublishingParameters* parameters, SpitPublishingPublishable* publishable) {
+PublishingRajceAddPhotoTransaction*
+publishing_rajce_add_photo_transaction_construct (GType object_type,
+ PublishingRajceSession* session,
+ const gchar* url,
+ PublishingRajcePublishingParameters* parameters,
+ SpitPublishingPublishable* publishable)
+{
PublishingRajceAddPhotoTransaction* self = NULL;
- PublishingRajceSession* _tmp0_;
- SpitPublishingPublishable* _tmp1_;
- const gchar* _tmp2_;
- PublishingRajcePublishingParameters* _tmp3_;
- PublishingRajcePublishingParameters* _tmp4_;
- const gchar* _tmp5_ = NULL;
- PublishingRajcePublishingParameters* _tmp6_;
- gint* _tmp7_;
- SpitPublishingPublishable* _tmp8_;
- GFile* _tmp9_;
- GFile* _tmp10_;
- gchar* _tmp11_;
- gchar* _tmp12_;
- PublishingRajcePublishingParameters* _tmp13_;
- const gchar* _tmp14_;
+ PublishingRajcePublishingParameters* _tmp0_;
+ const gchar* _tmp1_ = NULL;
+ gint* _tmp2_;
+ GFile* _tmp3_;
+ GFile* _tmp4_;
+ gchar* _tmp5_;
+ gchar* _tmp6_;
+ const gchar* _tmp7_;
gchar* basename = NULL;
- SpitPublishingPublishable* _tmp15_;
- gchar* _tmp16_;
+ gchar* _tmp8_;
gchar* comment = NULL;
- SpitPublishingPublishable* _tmp17_;
- gchar* _tmp18_;
+ gchar* _tmp9_;
gchar* pubname = NULL;
- SpitPublishingPublishable* _tmp19_;
- gchar* _tmp20_;
+ gchar* _tmp10_;
gint width = 0;
- PublishingRajceSession* _tmp21_;
- gint _tmp22_;
gint height = 0;
- PublishingRajceSession* _tmp23_;
- gint _tmp24_;
PublishingRajceLiveApiRequest* req = NULL;
- PublishingRajceLiveApiRequest* _tmp25_;
- PublishingRajceLiveApiRequest* _tmp26_;
- PublishingRajceSession* _tmp27_;
- gchar* _tmp28_;
- gchar* _tmp29_;
+ PublishingRajceLiveApiRequest* _tmp11_;
+ PublishingRajceLiveApiRequest* _tmp12_;
+ gchar* _tmp13_;
+ gchar* _tmp14_;
+ PublishingRajceLiveApiRequest* _tmp15_;
+ gint _tmp16_;
+ PublishingRajceLiveApiRequest* _tmp17_;
+ gint _tmp18_;
+ PublishingRajceLiveApiRequest* _tmp19_;
+ gchar* _tmp20_;
+ gchar* _tmp21_;
+ PublishingRajceLiveApiRequest* _tmp22_;
+ const gchar* _tmp23_;
+ PublishingRajceLiveApiRequest* _tmp24_;
+ const gchar* _tmp25_;
+ const gchar* _tmp26_ = NULL;
+ const gchar* _tmp27_;
+ PublishingRajceLiveApiRequest* _tmp29_;
+ gchar* xml = NULL;
PublishingRajceLiveApiRequest* _tmp30_;
- gint _tmp31_;
- PublishingRajceLiveApiRequest* _tmp32_;
- gint _tmp33_;
- PublishingRajceLiveApiRequest* _tmp34_;
- PublishingRajceSession* _tmp35_;
+ gchar* _tmp31_;
+ GHashTable* disposition_table = NULL;
+ GHashFunc _tmp32_;
+ GEqualFunc _tmp33_;
+ GHashTable* _tmp34_;
+ gchar* _tmp35_;
gchar* _tmp36_;
gchar* _tmp37_;
- PublishingRajceLiveApiRequest* _tmp38_;
- const gchar* _tmp39_;
- PublishingRajceLiveApiRequest* _tmp40_;
- const gchar* _tmp41_;
- const gchar* _tmp42_ = NULL;
- const gchar* _tmp43_;
- PublishingRajceLiveApiRequest* _tmp45_;
- gchar* xml = NULL;
- PublishingRajceLiveApiRequest* _tmp46_;
- gchar* _tmp47_;
- GHashTable* disposition_table = NULL;
- GHashFunc _tmp48_;
- GEqualFunc _tmp49_;
- GHashTable* _tmp50_;
- gchar* _tmp51_;
- gchar* _tmp52_;
- gchar* _tmp53_;
- const gchar* _tmp54_;
- gchar* _tmp55_;
+ const gchar* _tmp38_;
+ gchar* _tmp39_;
#line 1519 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_val_if_fail (PUBLISHING_RAJCE_IS_SESSION (session), NULL);
#line 1519 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -11174,188 +11658,156 @@ PublishingRajceAddPhotoTransaction* publishing_rajce_add_photo_transaction_const
#line 1519 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL);
#line 1521 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp0_ = session;
-#line 1521 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp1_ = publishable;
-#line 1521 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp2_ = url;
-#line 1521 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- self = (PublishingRajceAddPhotoTransaction*) publishing_rest_support_upload_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, _tmp2_);
-#line 1522 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp3_ = parameters;
+ self = (PublishingRajceAddPhotoTransaction*) publishing_rest_support_upload_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), publishable, url);
#line 1522 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp4_ = _publishing_rajce_publishing_parameters_ref0 (_tmp3_);
+ _tmp0_ = _publishing_rajce_publishing_parameters_ref0 (parameters);
#line 1522 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_publishing_rajce_publishing_parameters_unref0 (self->priv->parameters);
#line 1522 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- self->priv->parameters = _tmp4_;
+ self->priv->parameters = _tmp0_;
#line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp6_ = parameters;
+ _tmp2_ = parameters->album_id;
#line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp7_ = _tmp6_->album_id;
+ if ((*_tmp2_) > 0) {
#line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- if ((*_tmp7_) > 0) {
-#line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp5_ = "";
-#line 11197 "RajcePublishing.c"
+ _tmp1_ = "";
+#line 11671 "RajcePublishing.c"
} else {
#line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp5_ = " new";
-#line 11201 "RajcePublishing.c"
+ _tmp1_ = " new";
+#line 11675 "RajcePublishing.c"
}
#line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp8_ = publishable;
-#line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp9_ = spit_publishing_publishable_get_serialized_file (_tmp8_);
+ _tmp3_ = spit_publishing_publishable_get_serialized_file (publishable);
#line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp10_ = _tmp9_;
-#line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp11_ = g_file_get_basename (_tmp10_);
+ _tmp4_ = _tmp3_;
#line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp12_ = _tmp11_;
+ _tmp5_ = g_file_get_basename (_tmp4_);
#line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp13_ = parameters;
+ _tmp6_ = _tmp5_;
#line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp14_ = _tmp13_->album_name;
+ _tmp7_ = parameters->album_name;
#line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_debug ("RajcePublishing.vala:1524: RajcePlugin: Uploading photo %s to%s album " \
-"%s", _tmp12_, _tmp5_, _tmp14_);
+"%s", _tmp6_, _tmp1_, _tmp7_);
#line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _g_free0 (_tmp12_);
+ _g_free0 (_tmp6_);
#line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _g_object_unref0 (_tmp10_);
-#line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp15_ = publishable;
+ _g_object_unref0 (_tmp4_);
#line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp16_ = spit_publishing_publishable_get_param_string (_tmp15_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME);
+ _tmp8_ = spit_publishing_publishable_get_param_string (publishable, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME);
#line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- basename = _tmp16_;
+ basename = _tmp8_;
#line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp17_ = publishable;
+ _tmp9_ = spit_publishing_publishable_get_param_string (publishable, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_COMMENT);
#line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp18_ = spit_publishing_publishable_get_param_string (_tmp17_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_COMMENT);
-#line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- comment = _tmp18_;
-#line 1528 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp19_ = publishable;
+ comment = _tmp9_;
#line 1528 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp20_ = spit_publishing_publishable_get_publishing_name (_tmp19_);
+ _tmp10_ = spit_publishing_publishable_get_publishing_name (publishable);
#line 1528 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- pubname = _tmp20_;
+ pubname = _tmp10_;
#line 1530 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp21_ = session;
-#line 1530 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp22_ = publishing_rajce_session_get_maxsize (_tmp21_);
-#line 1530 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- width = _tmp22_;
-#line 1531 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp23_ = session;
-#line 1531 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp24_ = publishing_rajce_session_get_maxsize (_tmp23_);
+ width = publishing_rajce_session_get_maxsize (session);
#line 1531 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- height = _tmp24_;
+ height = publishing_rajce_session_get_maxsize (session);
#line 1533 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp25_ = publishing_rajce_live_api_request_new ("addPhoto");
+ _tmp11_ = publishing_rajce_live_api_request_new ("addPhoto");
#line 1533 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- req = _tmp25_;
+ req = _tmp11_;
#line 1534 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp26_ = req;
+ _tmp12_ = req;
#line 1534 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp27_ = session;
+ _tmp13_ = publishing_rajce_session_get_usertoken (session);
#line 1534 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp28_ = publishing_rajce_session_get_usertoken (_tmp27_);
-#line 1534 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp29_ = _tmp28_;
+ _tmp14_ = _tmp13_;
#line 1534 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- publishing_rajce_live_api_request_AddParam (_tmp26_, "token", _tmp29_);
+ publishing_rajce_live_api_request_AddParam (_tmp12_, "token", _tmp14_);
#line 1534 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _g_free0 (_tmp29_);
+ _g_free0 (_tmp14_);
#line 1535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp30_ = req;
+ _tmp15_ = req;
#line 1535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp31_ = width;
+ _tmp16_ = width;
#line 1535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- publishing_rajce_live_api_request_AddParamInt (_tmp30_, "width", _tmp31_);
+ publishing_rajce_live_api_request_AddParamInt (_tmp15_, "width", _tmp16_);
#line 1536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp32_ = req;
+ _tmp17_ = req;
#line 1536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp33_ = height;
+ _tmp18_ = height;
#line 1536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- publishing_rajce_live_api_request_AddParamInt (_tmp32_, "height", _tmp33_);
-#line 1537 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp34_ = req;
+ publishing_rajce_live_api_request_AddParamInt (_tmp17_, "height", _tmp18_);
#line 1537 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp35_ = session;
+ _tmp19_ = req;
#line 1537 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp36_ = publishing_rajce_session_get_albumtoken (_tmp35_);
+ _tmp20_ = publishing_rajce_session_get_albumtoken (session);
#line 1537 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp37_ = _tmp36_;
+ _tmp21_ = _tmp20_;
#line 1537 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- publishing_rajce_live_api_request_AddParam (_tmp34_, "albumToken", _tmp37_);
+ publishing_rajce_live_api_request_AddParam (_tmp19_, "albumToken", _tmp21_);
#line 1537 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _g_free0 (_tmp37_);
+ _g_free0 (_tmp21_);
#line 1538 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp38_ = req;
+ _tmp22_ = req;
#line 1538 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp39_ = pubname;
+ _tmp23_ = pubname;
#line 1538 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- publishing_rajce_live_api_request_AddParam (_tmp38_, "photoName", _tmp39_);
+ publishing_rajce_live_api_request_AddParam (_tmp22_, "photoName", _tmp23_);
#line 1539 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp40_ = req;
+ _tmp24_ = req;
#line 1539 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp41_ = basename;
+ _tmp25_ = basename;
#line 1539 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- publishing_rajce_live_api_request_AddParam (_tmp40_, "fullFileName", _tmp41_);
+ publishing_rajce_live_api_request_AddParam (_tmp24_, "fullFileName", _tmp25_);
#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp43_ = comment;
+ _tmp27_ = comment;
#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- if (_tmp43_ != NULL) {
-#line 11309 "RajcePublishing.c"
- const gchar* _tmp44_;
+ if (_tmp27_ != NULL) {
+#line 11761 "RajcePublishing.c"
+ const gchar* _tmp28_;
#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp44_ = comment;
+ _tmp28_ = comment;
#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp42_ = _tmp44_;
-#line 11315 "RajcePublishing.c"
+ _tmp26_ = _tmp28_;
+#line 11767 "RajcePublishing.c"
} else {
#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp42_ = "";
-#line 11319 "RajcePublishing.c"
+ _tmp26_ = "";
+#line 11771 "RajcePublishing.c"
}
#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp45_ = req;
+ _tmp29_ = req;
#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- publishing_rajce_live_api_request_AddParam (_tmp45_, "description", _tmp42_);
+ publishing_rajce_live_api_request_AddParam (_tmp29_, "description", _tmp26_);
#line 1541 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp46_ = req;
+ _tmp30_ = req;
#line 1541 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp47_ = publishing_rajce_live_api_request_Params2XmlString (_tmp46_, FALSE);
+ _tmp31_ = publishing_rajce_live_api_request_Params2XmlString (_tmp30_, FALSE);
#line 1541 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- xml = _tmp47_;
+ xml = _tmp31_;
#line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "data", xml);
#line 1544 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp48_ = g_str_hash;
+ _tmp32_ = g_str_hash;
#line 1544 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp49_ = g_str_equal;
+ _tmp33_ = g_str_equal;
#line 1544 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp50_ = g_hash_table_new_full (_tmp48_, _tmp49_, _g_free0_, _g_free0_);
+ _tmp34_ = g_hash_table_new_full (_tmp32_, _tmp33_, _g_free0_, _g_free0_);
#line 1544 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- disposition_table = _tmp50_;
+ disposition_table = _tmp34_;
#line 1545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp51_ = g_strdup ("name");
+ _tmp35_ = g_strdup ("name");
#line 1545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp52_ = g_strdup ("photo");
+ _tmp36_ = g_strdup ("photo");
#line 1545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_hash_table_insert (disposition_table, _tmp51_, _tmp52_);
+ g_hash_table_insert (disposition_table, _tmp35_, _tmp36_);
#line 1546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp53_ = g_strdup ("filename");
+ _tmp37_ = g_strdup ("filename");
#line 1546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp54_ = basename;
+ _tmp38_ = basename;
#line 1546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp55_ = soup_uri_encode (_tmp54_, NULL);
+ _tmp39_ = soup_uri_encode (_tmp38_, NULL);
#line 1546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- g_hash_table_insert (disposition_table, _tmp53_, _tmp55_);
+ g_hash_table_insert (disposition_table, _tmp37_, _tmp39_);
#line 1547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rest_support_upload_transaction_set_binary_disposition_table (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction), disposition_table);
#line 1519 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -11372,38 +11824,49 @@ PublishingRajceAddPhotoTransaction* publishing_rajce_add_photo_transaction_const
_g_free0 (basename);
#line 1519 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return self;
-#line 11371 "RajcePublishing.c"
+#line 11823 "RajcePublishing.c"
}
-PublishingRajceAddPhotoTransaction* publishing_rajce_add_photo_transaction_new (PublishingRajceSession* session, const gchar* url, PublishingRajcePublishingParameters* parameters, SpitPublishingPublishable* publishable) {
+PublishingRajceAddPhotoTransaction*
+publishing_rajce_add_photo_transaction_new (PublishingRajceSession* session,
+ const gchar* url,
+ PublishingRajcePublishingParameters* parameters,
+ SpitPublishingPublishable* publishable)
+{
#line 1519 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
return publishing_rajce_add_photo_transaction_construct (PUBLISHING_RAJCE_TYPE_ADD_PHOTO_TRANSACTION, session, url, parameters, publishable);
-#line 11378 "RajcePublishing.c"
+#line 11835 "RajcePublishing.c"
}
-static void publishing_rajce_add_photo_transaction_class_init (PublishingRajceAddPhotoTransactionClass * klass) {
+static void
+publishing_rajce_add_photo_transaction_class_init (PublishingRajceAddPhotoTransactionClass * klass)
+{
#line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
publishing_rajce_add_photo_transaction_parent_class = g_type_class_peek_parent (klass);
#line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
((PublishingRESTSupportTransactionClass *) klass)->finalize = publishing_rajce_add_photo_transaction_finalize;
#line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
g_type_class_add_private (klass, sizeof (PublishingRajceAddPhotoTransactionPrivate));
-#line 11389 "RajcePublishing.c"
+#line 11848 "RajcePublishing.c"
}
-static void publishing_rajce_add_photo_transaction_instance_init (PublishingRajceAddPhotoTransaction * self) {
+static void
+publishing_rajce_add_photo_transaction_instance_init (PublishingRajceAddPhotoTransaction * self)
+{
#line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
self->priv = PUBLISHING_RAJCE_ADD_PHOTO_TRANSACTION_GET_PRIVATE (self);
#line 1517 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
self->priv->parameters = NULL;
-#line 11398 "RajcePublishing.c"
+#line 11859 "RajcePublishing.c"
}
-static void publishing_rajce_add_photo_transaction_finalize (PublishingRESTSupportTransaction * obj) {
+static void
+publishing_rajce_add_photo_transaction_finalize (PublishingRESTSupportTransaction * obj)
+{
PublishingRajceAddPhotoTransaction * self;
#line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_RAJCE_TYPE_ADD_PHOTO_TRANSACTION, PublishingRajceAddPhotoTransaction);
@@ -11411,14 +11874,16 @@ static void publishing_rajce_add_photo_transaction_finalize (PublishingRESTSuppo
_publishing_rajce_publishing_parameters_unref0 (self->priv->parameters);
#line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_rajce_add_photo_transaction_parent_class)->finalize (obj);
-#line 11410 "RajcePublishing.c"
+#line 11873 "RajcePublishing.c"
}
/**
* Transaction used to implement the upload photo.
*/
-GType publishing_rajce_add_photo_transaction_get_type (void) {
+GType
+publishing_rajce_add_photo_transaction_get_type (void)
+{
static volatile gsize publishing_rajce_add_photo_transaction_type_id__volatile = 0;
if (g_once_init_enter (&publishing_rajce_add_photo_transaction_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingRajceAddPhotoTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_rajce_add_photo_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingRajceAddPhotoTransaction), 0, (GInstanceInitFunc) publishing_rajce_add_photo_transaction_instance_init, NULL };
@@ -11430,7 +11895,11 @@ GType publishing_rajce_add_photo_transaction_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) {
@@ -11442,7 +11911,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/plugins/shotwell-publishing-extras/YandexPublishing.c b/plugins/shotwell-publishing-extras/YandexPublishing.c
index 10482e3..8a81c99 100644
--- a/plugins/shotwell-publishing-extras/YandexPublishing.c
+++ b/plugins/shotwell-publishing-extras/YandexPublishing.c
@@ -1,4 +1,4 @@
-/* YandexPublishing.c generated by valac 0.36.6, the Vala compiler
+/* YandexPublishing.c generated by valac 0.40.4, the Vala compiler
* generated from YandexPublishing.vala, do not modify */
/* Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>
@@ -7,6 +7,7 @@
* See the COPYING file in this distribution.
*/
+
#include <glib.h>
#include <glib-object.h>
#include <shotwell-plugin-dev-1.0.h>
@@ -37,6 +38,11 @@
typedef struct _YandexService YandexService;
typedef struct _YandexServiceClass YandexServiceClass;
typedef struct _YandexServicePrivate YandexServicePrivate;
+enum {
+ YANDEX_SERVICE_0_PROPERTY,
+ YANDEX_SERVICE_NUM_PROPERTIES
+};
+static GParamSpec* yandex_service_properties[YANDEX_SERVICE_NUM_PROPERTIES];
#define _g_free0(var) (var = (g_free (var), NULL))
#define PUBLISHING_YANDEX_TYPE_YANDEX_PUBLISHER (publishing_yandex_yandex_publisher_get_type ())
@@ -82,6 +88,11 @@ typedef struct _PublishingYandexSessionPrivate PublishingYandexSessionPrivate;
typedef struct _PublishingYandexWebAuthPane PublishingYandexWebAuthPane;
typedef struct _PublishingYandexWebAuthPaneClass PublishingYandexWebAuthPaneClass;
typedef struct _PublishingYandexWebAuthPanePrivate PublishingYandexWebAuthPanePrivate;
+enum {
+ PUBLISHING_YANDEX_WEB_AUTH_PANE_0_PROPERTY,
+ PUBLISHING_YANDEX_WEB_AUTH_PANE_NUM_PROPERTIES
+};
+static GParamSpec* publishing_yandex_web_auth_pane_properties[PUBLISHING_YANDEX_WEB_AUTH_PANE_NUM_PROPERTIES];
#define _g_regex_unref0(var) ((var == NULL) ? NULL : (var = (g_regex_unref (var), NULL)))
#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
@@ -90,9 +101,9 @@ typedef struct _PublishingYandexWebAuthPanePrivate PublishingYandexWebAuthPanePr
enum {
PUBLISHING_YANDEX_WEB_AUTH_PANE_LOGIN_SUCCEEDED_SIGNAL,
PUBLISHING_YANDEX_WEB_AUTH_PANE_LOGIN_FAILED_SIGNAL,
- PUBLISHING_YANDEX_WEB_AUTH_PANE_LAST_SIGNAL
+ PUBLISHING_YANDEX_WEB_AUTH_PANE_NUM_SIGNALS
};
-static guint publishing_yandex_web_auth_pane_signals[PUBLISHING_YANDEX_WEB_AUTH_PANE_LAST_SIGNAL] = {0};
+static guint publishing_yandex_web_auth_pane_signals[PUBLISHING_YANDEX_WEB_AUTH_PANE_NUM_SIGNALS] = {0};
#define PUBLISHING_YANDEX_TYPE_PUBLISH_OPTIONS (publishing_yandex_publish_options_get_type ())
#define PUBLISHING_YANDEX_PUBLISH_OPTIONS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_YANDEX_TYPE_PUBLISH_OPTIONS, PublishingYandexPublishOptions))
@@ -117,11 +128,16 @@ typedef struct _PublishingYandexPublishingOptionsPane PublishingYandexPublishing
typedef struct _PublishingYandexPublishingOptionsPaneClass PublishingYandexPublishingOptionsPaneClass;
typedef struct _PublishingYandexPublishingOptionsPanePrivate PublishingYandexPublishingOptionsPanePrivate;
enum {
+ PUBLISHING_YANDEX_PUBLISHING_OPTIONS_PANE_0_PROPERTY,
+ PUBLISHING_YANDEX_PUBLISHING_OPTIONS_PANE_NUM_PROPERTIES
+};
+static GParamSpec* publishing_yandex_publishing_options_pane_properties[PUBLISHING_YANDEX_PUBLISHING_OPTIONS_PANE_NUM_PROPERTIES];
+enum {
PUBLISHING_YANDEX_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL,
PUBLISHING_YANDEX_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL,
- PUBLISHING_YANDEX_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL
+ PUBLISHING_YANDEX_PUBLISHING_OPTIONS_PANE_NUM_SIGNALS
};
-static guint publishing_yandex_publishing_options_pane_signals[PUBLISHING_YANDEX_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL] = {0};
+static guint publishing_yandex_publishing_options_pane_signals[PUBLISHING_YANDEX_PUBLISHING_OPTIONS_PANE_NUM_SIGNALS] = {0};
#define PUBLISHING_YANDEX_TYPE_UPLOADER (publishing_yandex_uploader_get_type ())
#define PUBLISHING_YANDEX_UPLOADER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_YANDEX_TYPE_UPLOADER, PublishingYandexUploader))
@@ -148,6 +164,11 @@ typedef struct _PublishingYandexUploadTransactionPrivate PublishingYandexUploadT
#define _g_hash_table_unref0(var) ((var == NULL) ? NULL : (var = (g_hash_table_unref (var), NULL)))
#define __vala_SoupBuffer_free0(var) ((var == NULL) ? NULL : (var = (_vala_SoupBuffer_free (var), NULL)))
typedef struct _PublishingYandexYandexPublisherPrivate PublishingYandexYandexPublisherPrivate;
+enum {
+ PUBLISHING_YANDEX_YANDEX_PUBLISHER_0_PROPERTY,
+ PUBLISHING_YANDEX_YANDEX_PUBLISHER_NUM_PROPERTIES
+};
+static GParamSpec* publishing_yandex_yandex_publisher_properties[PUBLISHING_YANDEX_YANDEX_PUBLISHER_NUM_PROPERTIES];
#define _publishing_yandex_publish_options_unref0(var) ((var == NULL) ? NULL : (var = (publishing_yandex_publish_options_unref (var), NULL)))
#define _publishing_rest_support_xml_document_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rest_support_xml_document_unref (var), NULL)))
#define _publishing_rest_support_transaction_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rest_support_transaction_unref (var), NULL)))
@@ -300,185 +321,257 @@ static gpointer publishing_yandex_yandex_publisher_parent_class = NULL;
static SpitPublishingPublisherIface * publishing_yandex_yandex_publisher_spit_publishing_publisher_parent_iface = NULL;
GType yandex_service_get_type (void) G_GNUC_CONST;
-enum {
- YANDEX_SERVICE_DUMMY_PROPERTY
-};
-static gint yandex_service_real_get_pluggable_interface (SpitPluggable* base, gint min_host_interface, gint max_host_interface);
+static gint yandex_service_real_get_pluggable_interface (SpitPluggable* base,
+ gint min_host_interface,
+ gint max_host_interface);
static const gchar* yandex_service_real_get_id (SpitPluggable* base);
static const gchar* yandex_service_real_get_pluggable_name (SpitPluggable* base);
-static void yandex_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info);
-static SpitPublishingPublisher* yandex_service_real_create_publisher (SpitPublishingService* base, SpitPublishingPluginHost* host);
-PublishingYandexYandexPublisher* publishing_yandex_yandex_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host);
-PublishingYandexYandexPublisher* publishing_yandex_yandex_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host);
+static void yandex_service_real_get_info (SpitPluggable* base,
+ SpitPluggableInfo* info);
+static SpitPublishingPublisher* yandex_service_real_create_publisher (SpitPublishingService* base,
+ SpitPublishingPluginHost* host);
+PublishingYandexYandexPublisher* publishing_yandex_yandex_publisher_new (SpitPublishingService* service,
+ SpitPublishingPluginHost* host);
+PublishingYandexYandexPublisher* publishing_yandex_yandex_publisher_construct (GType object_type,
+ SpitPublishingService* service,
+ SpitPublishingPluginHost* host);
GType publishing_yandex_yandex_publisher_get_type (void) G_GNUC_CONST;
static SpitPublishingPublisherMediaType yandex_service_real_get_supported_media (SpitPublishingService* base);
-static void yandex_service_real_activation (SpitPluggable* base, gboolean enabled);
+static void yandex_service_real_activation (SpitPluggable* base,
+ gboolean enabled);
YandexService* yandex_service_new (void);
YandexService* yandex_service_construct (GType object_type);
#define PUBLISHING_YANDEX_SERVICE_NAME "Yandex.Fotki"
#define PUBLISHING_YANDEX_client_id "52be4756dee3438792c831a75d7cd360"
GType publishing_yandex_transaction_get_type (void) G_GNUC_CONST;
-enum {
- PUBLISHING_YANDEX_TRANSACTION_DUMMY_PROPERTY
-};
GType publishing_yandex_session_get_type (void) G_GNUC_CONST;
-PublishingYandexTransaction* publishing_yandex_transaction_new_with_url (PublishingYandexSession* session, const gchar* url, PublishingRESTSupportHttpMethod method);
-PublishingYandexTransaction* publishing_yandex_transaction_construct_with_url (GType object_type, PublishingYandexSession* session, const gchar* url, PublishingRESTSupportHttpMethod method);
+PublishingYandexTransaction* publishing_yandex_transaction_new_with_url (PublishingYandexSession* session,
+ const gchar* url,
+ PublishingRESTSupportHttpMethod method);
+PublishingYandexTransaction* publishing_yandex_transaction_construct_with_url (GType object_type,
+ PublishingYandexSession* session,
+ const gchar* url,
+ PublishingRESTSupportHttpMethod method);
static void publishing_yandex_transaction_add_headers (PublishingYandexTransaction* self);
gchar* publishing_yandex_session_get_auth_token (PublishingYandexSession* self);
-PublishingYandexTransaction* publishing_yandex_transaction_new (PublishingYandexSession* session, PublishingRESTSupportHttpMethod method);
-PublishingYandexTransaction* publishing_yandex_transaction_construct (GType object_type, PublishingYandexSession* session, PublishingRESTSupportHttpMethod method);
-void publishing_yandex_transaction_add_data (PublishingYandexTransaction* self, const gchar* type, const gchar* data);
+PublishingYandexTransaction* publishing_yandex_transaction_new (PublishingYandexSession* session,
+ PublishingRESTSupportHttpMethod method);
+PublishingYandexTransaction* publishing_yandex_transaction_construct (GType object_type,
+ PublishingYandexSession* session,
+ PublishingRESTSupportHttpMethod method);
+void publishing_yandex_transaction_add_data (PublishingYandexTransaction* self,
+ const gchar* type,
+ const gchar* data);
#define PUBLISHING_YANDEX_SESSION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_YANDEX_TYPE_SESSION, PublishingYandexSessionPrivate))
-enum {
- PUBLISHING_YANDEX_SESSION_DUMMY_PROPERTY
-};
PublishingYandexSession* publishing_yandex_session_new (void);
PublishingYandexSession* publishing_yandex_session_construct (GType object_type);
static gboolean publishing_yandex_session_real_is_authenticated (PublishingRESTSupportSession* base);
void publishing_yandex_session_deauthenticate (PublishingYandexSession* self);
-void publishing_yandex_session_set_auth_token (PublishingYandexSession* self, const gchar* token);
+void publishing_yandex_session_set_auth_token (PublishingYandexSession* self,
+ const gchar* token);
static void publishing_yandex_session_finalize (PublishingRESTSupportSession * obj);
GType publishing_yandex_web_auth_pane_get_type (void) G_GNUC_CONST;
#define PUBLISHING_YANDEX_WEB_AUTH_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_YANDEX_TYPE_WEB_AUTH_PANE, PublishingYandexWebAuthPanePrivate))
-enum {
- PUBLISHING_YANDEX_WEB_AUTH_PANE_DUMMY_PROPERTY
-};
PublishingYandexWebAuthPane* publishing_yandex_web_auth_pane_new (const gchar* login_url);
-PublishingYandexWebAuthPane* publishing_yandex_web_auth_pane_construct (GType object_type, const gchar* login_url);
+PublishingYandexWebAuthPane* publishing_yandex_web_auth_pane_construct (GType object_type,
+ const gchar* login_url);
static void publishing_yandex_web_auth_pane_real_constructed (GObject* base);
-static gboolean publishing_yandex_web_auth_pane_on_decide_policy (PublishingYandexWebAuthPane* self, WebKitPolicyDecision* decision, WebKitPolicyDecisionType type);
-static gboolean _publishing_yandex_web_auth_pane_on_decide_policy_webkit_web_view_decide_policy (WebKitWebView* _sender, WebKitPolicyDecision* decision, WebKitPolicyDecisionType type, gpointer self);
+static gboolean publishing_yandex_web_auth_pane_on_decide_policy (PublishingYandexWebAuthPane* self,
+ WebKitPolicyDecision* decision,
+ WebKitPolicyDecisionType type);
+static gboolean _publishing_yandex_web_auth_pane_on_decide_policy_webkit_web_view_decide_policy (WebKitWebView* _sender,
+ WebKitPolicyDecision* decision,
+ WebKitPolicyDecisionType type,
+ gpointer self);
static void publishing_yandex_web_auth_pane_real_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* base);
static WebKitNavigationAction* _vala_WebKitNavigationAction_copy (WebKitNavigationAction* self);
static void _vala_WebKitNavigationAction_free (WebKitNavigationAction* self);
static void publishing_yandex_web_auth_pane_finalize (GObject * obj);
gpointer publishing_yandex_publish_options_ref (gpointer instance);
void publishing_yandex_publish_options_unref (gpointer instance);
-GParamSpec* publishing_yandex_param_spec_publish_options (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void publishing_yandex_value_set_publish_options (GValue* value, gpointer v_object);
-void publishing_yandex_value_take_publish_options (GValue* value, gpointer v_object);
+GParamSpec* publishing_yandex_param_spec_publish_options (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void publishing_yandex_value_set_publish_options (GValue* value,
+ gpointer v_object);
+void publishing_yandex_value_take_publish_options (GValue* value,
+ gpointer v_object);
gpointer publishing_yandex_value_get_publish_options (const GValue* value);
GType publishing_yandex_publish_options_get_type (void) G_GNUC_CONST;
-enum {
- PUBLISHING_YANDEX_PUBLISH_OPTIONS_DUMMY_PROPERTY
-};
PublishingYandexPublishOptions* publishing_yandex_publish_options_new (void);
PublishingYandexPublishOptions* publishing_yandex_publish_options_construct (GType object_type);
static void publishing_yandex_publish_options_finalize (PublishingYandexPublishOptions * obj);
GType publishing_yandex_publishing_options_pane_get_type (void) G_GNUC_CONST;
#define PUBLISHING_YANDEX_PUBLISHING_OPTIONS_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_YANDEX_TYPE_PUBLISHING_OPTIONS_PANE, PublishingYandexPublishingOptionsPanePrivate))
-enum {
- PUBLISHING_YANDEX_PUBLISHING_OPTIONS_PANE_DUMMY_PROPERTY
-};
static SpitPublishingDialogPaneGeometryOptions publishing_yandex_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base);
static void publishing_yandex_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base);
static void publishing_yandex_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base);
static GtkWidget* publishing_yandex_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base);
-PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane_new (PublishingYandexPublishOptions* options, GeeHashMap* list, SpitPublishingPluginHost* host);
-PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane_construct (GType object_type, PublishingYandexPublishOptions* options, GeeHashMap* list, SpitPublishingPluginHost* host);
+PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane_new (PublishingYandexPublishOptions* options,
+ GeeHashMap* list,
+ SpitPublishingPluginHost* host);
+PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane_construct (GType object_type,
+ PublishingYandexPublishOptions* options,
+ GeeHashMap* list,
+ SpitPublishingPluginHost* host);
static void publishing_yandex_publishing_options_pane_on_publish_clicked (PublishingYandexPublishingOptionsPane* self);
-static void _publishing_yandex_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void _publishing_yandex_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender,
+ gpointer self);
static void publishing_yandex_publishing_options_pane_on_logout_clicked (PublishingYandexPublishingOptionsPane* self);
-static void _publishing_yandex_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void _publishing_yandex_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender,
+ gpointer self);
static void publishing_yandex_publishing_options_pane_finalize (GObject * obj);
GType publishing_yandex_uploader_get_type (void) G_GNUC_CONST;
#define PUBLISHING_YANDEX_UPLOADER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_YANDEX_TYPE_UPLOADER, PublishingYandexUploaderPrivate))
-enum {
- PUBLISHING_YANDEX_UPLOADER_DUMMY_PROPERTY
-};
-PublishingYandexUploader* publishing_yandex_uploader_new (PublishingYandexSession* session, PublishingYandexPublishOptions* options, SpitPublishingPublishable** photos, int photos_length1);
-PublishingYandexUploader* publishing_yandex_uploader_construct (GType object_type, PublishingYandexSession* session, PublishingYandexPublishOptions* options, SpitPublishingPublishable** photos, int photos_length1);
-static PublishingRESTSupportTransaction* publishing_yandex_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base, SpitPublishingPublishable* publishable);
-PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_new (PublishingYandexSession* session, PublishingYandexPublishOptions* options, SpitPublishingPublishable* photo);
-PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_construct (GType object_type, PublishingYandexSession* session, PublishingYandexPublishOptions* options, SpitPublishingPublishable* photo);
+PublishingYandexUploader* publishing_yandex_uploader_new (PublishingYandexSession* session,
+ PublishingYandexPublishOptions* options,
+ SpitPublishingPublishable** photos,
+ int photos_length1);
+PublishingYandexUploader* publishing_yandex_uploader_construct (GType object_type,
+ PublishingYandexSession* session,
+ PublishingYandexPublishOptions* options,
+ SpitPublishingPublishable** photos,
+ int photos_length1);
+static PublishingRESTSupportTransaction* publishing_yandex_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base,
+ SpitPublishingPublishable* publishable);
+PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_new (PublishingYandexSession* session,
+ PublishingYandexPublishOptions* options,
+ SpitPublishingPublishable* photo);
+PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_construct (GType object_type,
+ PublishingYandexSession* session,
+ PublishingYandexPublishOptions* options,
+ SpitPublishingPublishable* photo);
GType publishing_yandex_upload_transaction_get_type (void) G_GNUC_CONST;
static void publishing_yandex_uploader_finalize (PublishingRESTSupportBatchUploader * obj);
-enum {
- PUBLISHING_YANDEX_UPLOAD_TRANSACTION_DUMMY_PROPERTY
-};
static void _vala_SoupMultipart_free (SoupMultipart* self);
static void _g_free0_ (gpointer var);
static void _vala_SoupBuffer_free (SoupBuffer* self);
#define PUBLISHING_YANDEX_YANDEX_PUBLISHER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_YANDEX_TYPE_YANDEX_PUBLISHER, PublishingYandexYandexPublisherPrivate))
-enum {
- PUBLISHING_YANDEX_YANDEX_PUBLISHER_DUMMY_PROPERTY
-};
gchar* publishing_yandex_yandex_publisher_get_persistent_auth_token (PublishingYandexYandexPublisher* self);
-void publishing_yandex_yandex_publisher_set_persistent_auth_token (PublishingYandexYandexPublisher* self, const gchar* auth_token);
+void publishing_yandex_yandex_publisher_set_persistent_auth_token (PublishingYandexYandexPublisher* self,
+ const gchar* auth_token);
void publishing_yandex_yandex_publisher_invalidate_persistent_session (PublishingYandexYandexPublisher* self);
gboolean publishing_yandex_yandex_publisher_is_persistent_session_available (PublishingYandexYandexPublisher* self);
static gboolean publishing_yandex_yandex_publisher_real_is_running (SpitPublishingPublisher* base);
static SpitPublishingService* publishing_yandex_yandex_publisher_real_get_service (SpitPublishingPublisher* base);
-static gchar* publishing_yandex_yandex_publisher_check_response (PublishingYandexYandexPublisher* self, PublishingRESTSupportXmlDocument* doc);
-static void publishing_yandex_yandex_publisher_parse_album_entry (PublishingYandexYandexPublisher* self, xmlNode* e, GError** error);
-void publishing_yandex_yandex_publisher_parse_album_creation (PublishingYandexYandexPublisher* self, const gchar* data, GError** error);
-static gchar* _publishing_yandex_yandex_publisher_check_response_publishing_rest_support_xml_document_check_for_error_response (PublishingRESTSupportXmlDocument* doc, gpointer self);
-void publishing_yandex_yandex_publisher_parse_album_list (PublishingYandexYandexPublisher* self, const gchar* data, GError** error);
-static void publishing_yandex_yandex_publisher_album_creation_error (PublishingYandexYandexPublisher* self, PublishingRESTSupportTransaction* t, GError* err);
-static void publishing_yandex_yandex_publisher_album_creation_complete (PublishingYandexYandexPublisher* self, PublishingRESTSupportTransaction* t);
-static void _publishing_yandex_yandex_publisher_album_creation_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
-static void _publishing_yandex_yandex_publisher_album_creation_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self);
+static gchar* publishing_yandex_yandex_publisher_check_response (PublishingYandexYandexPublisher* self,
+ PublishingRESTSupportXmlDocument* doc);
+static void publishing_yandex_yandex_publisher_parse_album_entry (PublishingYandexYandexPublisher* self,
+ xmlNode* e,
+ GError** error);
+void publishing_yandex_yandex_publisher_parse_album_creation (PublishingYandexYandexPublisher* self,
+ const gchar* data,
+ GError** error);
+static gchar* _publishing_yandex_yandex_publisher_check_response_publishing_rest_support_xml_document_check_for_error_response (PublishingRESTSupportXmlDocument* doc,
+ gpointer self);
+void publishing_yandex_yandex_publisher_parse_album_list (PublishingYandexYandexPublisher* self,
+ const gchar* data,
+ GError** error);
+static void publishing_yandex_yandex_publisher_album_creation_error (PublishingYandexYandexPublisher* self,
+ PublishingRESTSupportTransaction* t,
+ GError* err);
+static void publishing_yandex_yandex_publisher_album_creation_complete (PublishingYandexYandexPublisher* self,
+ PublishingRESTSupportTransaction* t);
+static void _publishing_yandex_yandex_publisher_album_creation_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+ gpointer self);
+static void _publishing_yandex_yandex_publisher_album_creation_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+ GError* err,
+ gpointer self);
static void publishing_yandex_yandex_publisher_start_upload (PublishingYandexYandexPublisher* self);
static void publishing_yandex_yandex_publisher_create_destination_album (PublishingYandexYandexPublisher* self);
-static void publishing_yandex_yandex_publisher_on_upload_complete (PublishingYandexYandexPublisher* self, PublishingRESTSupportBatchUploader* uploader, gint num_published);
-static void _publishing_yandex_yandex_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender, gint num_photos_published, gpointer self);
-static void publishing_yandex_yandex_publisher_on_upload_error (PublishingYandexYandexPublisher* self, PublishingRESTSupportBatchUploader* uploader, GError* err);
-static void _publishing_yandex_yandex_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender, GError* err, gpointer self);
-static void publishing_yandex_yandex_publisher_on_upload_status_updated (PublishingYandexYandexPublisher* self, gint file_number, gdouble completed_fraction);
-static void _publishing_yandex_yandex_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self);
+static void publishing_yandex_yandex_publisher_on_upload_complete (PublishingYandexYandexPublisher* self,
+ PublishingRESTSupportBatchUploader* uploader,
+ gint num_published);
+static void _publishing_yandex_yandex_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender,
+ gint num_photos_published,
+ gpointer self);
+static void publishing_yandex_yandex_publisher_on_upload_error (PublishingYandexYandexPublisher* self,
+ PublishingRESTSupportBatchUploader* uploader,
+ GError* err);
+static void _publishing_yandex_yandex_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender,
+ GError* err,
+ gpointer self);
+static void publishing_yandex_yandex_publisher_on_upload_status_updated (PublishingYandexYandexPublisher* self,
+ gint file_number,
+ gdouble completed_fraction);
+static void _publishing_yandex_yandex_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number,
+ gdouble fraction_complete,
+ gpointer self);
static void publishing_yandex_yandex_publisher_on_logout (PublishingYandexYandexPublisher* self);
static void publishing_yandex_yandex_publisher_on_publish (PublishingYandexYandexPublisher* self);
-void publishing_yandex_yandex_publisher_service_get_album_list_error (PublishingYandexYandexPublisher* self, PublishingRESTSupportTransaction* t, GError* err);
-void publishing_yandex_yandex_publisher_service_get_album_list_complete (PublishingYandexYandexPublisher* self, PublishingRESTSupportTransaction* t);
-static void _publishing_yandex_yandex_publisher_service_get_album_list_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
-static void _publishing_yandex_yandex_publisher_service_get_album_list_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self);
-static void _publishing_yandex_yandex_publisher_on_publish_publishing_yandex_publishing_options_pane_publish (PublishingYandexPublishingOptionsPane* _sender, gpointer self);
-static void _publishing_yandex_yandex_publisher_on_logout_publishing_yandex_publishing_options_pane_logout (PublishingYandexPublishingOptionsPane* _sender, gpointer self);
-void publishing_yandex_yandex_publisher_service_get_album_list (PublishingYandexYandexPublisher* self, const gchar* url);
-void publishing_yandex_yandex_publisher_fetch_account_error (PublishingYandexYandexPublisher* self, PublishingRESTSupportTransaction* t, GError* err);
-void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandexYandexPublisher* self, PublishingRESTSupportTransaction* t);
-static void _publishing_yandex_yandex_publisher_fetch_account_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
-static void _publishing_yandex_yandex_publisher_fetch_account_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self);
-void publishing_yandex_yandex_publisher_fetch_account_information (PublishingYandexYandexPublisher* self, const gchar* auth_token);
-static void publishing_yandex_yandex_publisher_web_auth_login_succeeded (PublishingYandexYandexPublisher* self, const gchar* access_token);
+void publishing_yandex_yandex_publisher_service_get_album_list_error (PublishingYandexYandexPublisher* self,
+ PublishingRESTSupportTransaction* t,
+ GError* err);
+void publishing_yandex_yandex_publisher_service_get_album_list_complete (PublishingYandexYandexPublisher* self,
+ PublishingRESTSupportTransaction* t);
+static void _publishing_yandex_yandex_publisher_service_get_album_list_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+ gpointer self);
+static void _publishing_yandex_yandex_publisher_service_get_album_list_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+ GError* err,
+ gpointer self);
+static void _publishing_yandex_yandex_publisher_on_publish_publishing_yandex_publishing_options_pane_publish (PublishingYandexPublishingOptionsPane* _sender,
+ gpointer self);
+static void _publishing_yandex_yandex_publisher_on_logout_publishing_yandex_publishing_options_pane_logout (PublishingYandexPublishingOptionsPane* _sender,
+ gpointer self);
+void publishing_yandex_yandex_publisher_service_get_album_list (PublishingYandexYandexPublisher* self,
+ const gchar* url);
+void publishing_yandex_yandex_publisher_fetch_account_error (PublishingYandexYandexPublisher* self,
+ PublishingRESTSupportTransaction* t,
+ GError* err);
+void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandexYandexPublisher* self,
+ PublishingRESTSupportTransaction* t);
+static void _publishing_yandex_yandex_publisher_fetch_account_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+ gpointer self);
+static void _publishing_yandex_yandex_publisher_fetch_account_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+ GError* err,
+ gpointer self);
+void publishing_yandex_yandex_publisher_fetch_account_information (PublishingYandexYandexPublisher* self,
+ const gchar* auth_token);
+static void publishing_yandex_yandex_publisher_web_auth_login_succeeded (PublishingYandexYandexPublisher* self,
+ const gchar* access_token);
static void publishing_yandex_yandex_publisher_web_auth_login_failed (PublishingYandexYandexPublisher* self);
static void publishing_yandex_yandex_publisher_start_web_auth (PublishingYandexYandexPublisher* self);
-static void _publishing_yandex_yandex_publisher_web_auth_login_succeeded_publishing_yandex_web_auth_pane_login_succeeded (PublishingYandexWebAuthPane* _sender, const gchar* success_url, gpointer self);
-static void _publishing_yandex_yandex_publisher_web_auth_login_failed_publishing_yandex_web_auth_pane_login_failed (PublishingYandexWebAuthPane* _sender, gpointer self);
+static void _publishing_yandex_yandex_publisher_web_auth_login_succeeded_publishing_yandex_web_auth_pane_login_succeeded (PublishingYandexWebAuthPane* _sender,
+ const gchar* success_url,
+ gpointer self);
+static void _publishing_yandex_yandex_publisher_web_auth_login_failed_publishing_yandex_web_auth_pane_login_failed (PublishingYandexWebAuthPane* _sender,
+ gpointer self);
static void publishing_yandex_yandex_publisher_show_welcome_page (PublishingYandexYandexPublisher* self);
static void _publishing_yandex_yandex_publisher_start_web_auth_spit_publishing_login_callback (gpointer self);
static void publishing_yandex_yandex_publisher_real_start (SpitPublishingPublisher* base);
static void publishing_yandex_yandex_publisher_real_stop (SpitPublishingPublisher* base);
static void publishing_yandex_yandex_publisher_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 gint _vala_array_length (gpointer array);
-static gint yandex_service_real_get_pluggable_interface (SpitPluggable* base, gint min_host_interface, gint max_host_interface) {
+static gint
+yandex_service_real_get_pluggable_interface (SpitPluggable* base,
+ gint min_host_interface,
+ gint max_host_interface)
+{
YandexService * self;
gint result = 0;
- gint _tmp0_;
- gint _tmp1_;
- gint _tmp2_;
#line 8 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_YANDEX_SERVICE, YandexService);
#line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp0_ = min_host_interface;
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp1_ = max_host_interface;
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp2_ = spit_negotiate_interfaces (_tmp0_, _tmp1_, SPIT_PUBLISHING_CURRENT_INTERFACE);
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- result = _tmp2_;
+ result = spit_negotiate_interfaces (min_host_interface, max_host_interface, SPIT_PUBLISHING_CURRENT_INTERFACE);
#line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return result;
-#line 478 "YandexPublishing.c"
+#line 569 "YandexPublishing.c"
}
-static const gchar* yandex_service_real_get_id (SpitPluggable* base) {
+static const gchar*
+yandex_service_real_get_id (SpitPluggable* base)
+{
YandexService * self;
const gchar* result = NULL;
#line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -487,11 +580,13 @@ static const gchar* yandex_service_real_get_id (SpitPluggable* base) {
result = "org.yorba.shotwell.publishing.yandex-fotki";
#line 13 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return result;
-#line 491 "YandexPublishing.c"
+#line 584 "YandexPublishing.c"
}
-static const gchar* yandex_service_real_get_pluggable_name (SpitPluggable* base) {
+static const gchar*
+yandex_service_real_get_pluggable_name (SpitPluggable* base)
+{
YandexService * self;
const gchar* result = NULL;
#line 16 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -500,11 +595,14 @@ static const gchar* yandex_service_real_get_pluggable_name (SpitPluggable* base)
result = "Yandex.Fotki";
#line 17 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return result;
-#line 504 "YandexPublishing.c"
+#line 599 "YandexPublishing.c"
}
-static void yandex_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info) {
+static void
+yandex_service_real_get_info (SpitPluggable* base,
+ SpitPluggableInfo* info)
+{
YandexService * self;
gchar* _tmp0_;
gchar* _tmp1_;
@@ -561,32 +659,34 @@ static void yandex_service_real_get_info (SpitPluggable* base, SpitPluggableInfo
_g_free0 ((*info).license);
#line 28 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
(*info).license = _tmp6_;
-#line 565 "YandexPublishing.c"
+#line 663 "YandexPublishing.c"
}
-static SpitPublishingPublisher* yandex_service_real_create_publisher (SpitPublishingService* base, SpitPublishingPluginHost* host) {
+static SpitPublishingPublisher*
+yandex_service_real_create_publisher (SpitPublishingService* base,
+ SpitPublishingPluginHost* host)
+{
YandexService * self;
SpitPublishingPublisher* result = NULL;
- SpitPublishingPluginHost* _tmp0_;
- PublishingYandexYandexPublisher* _tmp1_;
+ PublishingYandexYandexPublisher* _tmp0_;
#line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_YANDEX_SERVICE, YandexService);
#line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL);
#line 32 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp0_ = host;
+ _tmp0_ = publishing_yandex_yandex_publisher_new (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_SERVICE, SpitPublishingService), host);
#line 32 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp1_ = publishing_yandex_yandex_publisher_new (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_SERVICE, SpitPublishingService), _tmp0_);
-#line 32 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher);
+ result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher);
#line 32 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return result;
-#line 586 "YandexPublishing.c"
+#line 684 "YandexPublishing.c"
}
-static SpitPublishingPublisherMediaType yandex_service_real_get_supported_media (SpitPublishingService* base) {
+static SpitPublishingPublisherMediaType
+yandex_service_real_get_supported_media (SpitPublishingService* base)
+{
YandexService * self;
SpitPublishingPublisherMediaType result = 0;
#line 35 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -595,43 +695,54 @@ static SpitPublishingPublisherMediaType yandex_service_real_get_supported_media
result = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO;
#line 36 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return result;
-#line 599 "YandexPublishing.c"
+#line 699 "YandexPublishing.c"
}
-static void yandex_service_real_activation (SpitPluggable* base, gboolean enabled) {
+static void
+yandex_service_real_activation (SpitPluggable* base,
+ gboolean enabled)
+{
YandexService * self;
#line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_YANDEX_SERVICE, YandexService);
-#line 607 "YandexPublishing.c"
+#line 710 "YandexPublishing.c"
}
-YandexService* yandex_service_construct (GType object_type) {
+YandexService*
+yandex_service_construct (GType object_type)
+{
YandexService * self = NULL;
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self = (YandexService*) g_object_new (object_type, NULL);
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return self;
-#line 617 "YandexPublishing.c"
+#line 722 "YandexPublishing.c"
}
-YandexService* yandex_service_new (void) {
+YandexService*
+yandex_service_new (void)
+{
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return yandex_service_construct (TYPE_YANDEX_SERVICE);
-#line 624 "YandexPublishing.c"
+#line 731 "YandexPublishing.c"
}
-static void yandex_service_class_init (YandexServiceClass * klass) {
+static void
+yandex_service_class_init (YandexServiceClass * klass)
+{
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
yandex_service_parent_class = g_type_class_peek_parent (klass);
-#line 631 "YandexPublishing.c"
+#line 740 "YandexPublishing.c"
}
-static void yandex_service_spit_pluggable_interface_init (SpitPluggableIface * iface) {
+static void
+yandex_service_spit_pluggable_interface_init (SpitPluggableIface * iface)
+{
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
yandex_service_spit_pluggable_parent_iface = g_type_interface_peek_parent (iface);
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -644,26 +755,32 @@ static void yandex_service_spit_pluggable_interface_init (SpitPluggableIface * i
iface->get_info = (void (*) (SpitPluggable *, SpitPluggableInfo*)) yandex_service_real_get_info;
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
iface->activation = (void (*) (SpitPluggable *, gboolean)) yandex_service_real_activation;
-#line 648 "YandexPublishing.c"
+#line 759 "YandexPublishing.c"
}
-static void yandex_service_spit_publishing_service_interface_init (SpitPublishingServiceIface * iface) {
+static void
+yandex_service_spit_publishing_service_interface_init (SpitPublishingServiceIface * iface)
+{
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
yandex_service_spit_publishing_service_parent_iface = g_type_interface_peek_parent (iface);
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
iface->create_publisher = (SpitPublishingPublisher* (*) (SpitPublishingService *, SpitPublishingPluginHost*)) yandex_service_real_create_publisher;
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
iface->get_supported_media = (SpitPublishingPublisherMediaType (*) (SpitPublishingService *)) yandex_service_real_get_supported_media;
-#line 659 "YandexPublishing.c"
+#line 772 "YandexPublishing.c"
}
-static void yandex_service_instance_init (YandexService * self) {
+static void
+yandex_service_instance_init (YandexService * self)
+{
}
-GType yandex_service_get_type (void) {
+GType
+yandex_service_get_type (void)
+{
static volatile gsize yandex_service_type_id__volatile = 0;
if (g_once_init_enter (&yandex_service_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (YandexServiceClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) yandex_service_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (YandexService), 0, (GInstanceInitFunc) yandex_service_instance_init, NULL };
@@ -679,43 +796,44 @@ GType yandex_service_get_type (void) {
}
-PublishingYandexTransaction* publishing_yandex_transaction_construct_with_url (GType object_type, PublishingYandexSession* session, const gchar* url, PublishingRESTSupportHttpMethod method) {
+PublishingYandexTransaction*
+publishing_yandex_transaction_construct_with_url (GType object_type,
+ PublishingYandexSession* session,
+ const gchar* url,
+ PublishingRESTSupportHttpMethod method)
+{
PublishingYandexTransaction* self = NULL;
- PublishingYandexSession* _tmp0_;
- const gchar* _tmp1_;
- PublishingRESTSupportHttpMethod _tmp2_;
#line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_val_if_fail (PUBLISHING_YANDEX_IS_SESSION (session), NULL);
#line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_val_if_fail (url != NULL, NULL);
#line 51 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp0_ = session;
-#line 51 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp1_ = url;
-#line 51 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp2_ = method;
-#line 51 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- self = (PublishingYandexTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, _tmp2_);
+ self = (PublishingYandexTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), url, method);
#line 52 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_transaction_add_headers (self);
#line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return self;
-#line 704 "YandexPublishing.c"
+#line 817 "YandexPublishing.c"
}
-PublishingYandexTransaction* publishing_yandex_transaction_new_with_url (PublishingYandexSession* session, const gchar* url, PublishingRESTSupportHttpMethod method) {
+PublishingYandexTransaction*
+publishing_yandex_transaction_new_with_url (PublishingYandexSession* session,
+ const gchar* url,
+ PublishingRESTSupportHttpMethod method)
+{
#line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return publishing_yandex_transaction_construct_with_url (PUBLISHING_YANDEX_TYPE_TRANSACTION, session, url, method);
-#line 711 "YandexPublishing.c"
+#line 828 "YandexPublishing.c"
}
-static void publishing_yandex_transaction_add_headers (PublishingYandexTransaction* self) {
+static void
+publishing_yandex_transaction_add_headers (PublishingYandexTransaction* self)
+{
PublishingRESTSupportSession* _tmp0_;
PublishingYandexSession* _tmp1_;
gboolean _tmp2_;
- gboolean _tmp3_;
#line 55 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (PUBLISHING_YANDEX_IS_TRANSACTION (self));
#line 56 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -725,75 +843,76 @@ static void publishing_yandex_transaction_add_headers (PublishingYandexTransacti
#line 56 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp2_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
#line 56 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp3_ = _tmp2_;
-#line 56 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_publishing_rest_support_session_unref0 (_tmp1_);
#line 56 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- if (_tmp3_) {
-#line 734 "YandexPublishing.c"
- PublishingRESTSupportSession* _tmp4_;
- PublishingYandexSession* _tmp5_;
+ if (_tmp2_) {
+#line 850 "YandexPublishing.c"
+ PublishingRESTSupportSession* _tmp3_;
+ PublishingYandexSession* _tmp4_;
+ gchar* _tmp5_;
gchar* _tmp6_;
gchar* _tmp7_;
gchar* _tmp8_;
- gchar* _tmp9_;
#line 57 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp4_ = publishing_rest_support_transaction_get_parent_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
+ _tmp3_ = publishing_rest_support_transaction_get_parent_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
#line 57 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, PUBLISHING_YANDEX_TYPE_SESSION, PublishingYandexSession);
+ _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, PUBLISHING_YANDEX_TYPE_SESSION, PublishingYandexSession);
#line 57 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp6_ = publishing_yandex_session_get_auth_token (_tmp5_);
+ _tmp5_ = publishing_yandex_session_get_auth_token (_tmp4_);
#line 57 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp7_ = _tmp6_;
+ _tmp6_ = _tmp5_;
#line 57 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp8_ = g_strdup_printf ("OAuth %s", _tmp7_);
+ _tmp7_ = g_strdup_printf ("OAuth %s", _tmp6_);
#line 57 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp9_ = _tmp8_;
+ _tmp8_ = _tmp7_;
#line 57 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "Authorization", _tmp9_);
+ publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "Authorization", _tmp8_);
#line 57 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _g_free0 (_tmp9_);
+ _g_free0 (_tmp8_);
#line 57 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _g_free0 (_tmp7_);
+ _g_free0 (_tmp6_);
#line 57 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _publishing_rest_support_session_unref0 (_tmp5_);
+ _publishing_rest_support_session_unref0 (_tmp4_);
#line 58 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "Connection", "close");
-#line 763 "YandexPublishing.c"
+#line 879 "YandexPublishing.c"
}
}
-PublishingYandexTransaction* publishing_yandex_transaction_construct (GType object_type, PublishingYandexSession* session, PublishingRESTSupportHttpMethod method) {
+PublishingYandexTransaction*
+publishing_yandex_transaction_construct (GType object_type,
+ PublishingYandexSession* session,
+ PublishingRESTSupportHttpMethod method)
+{
PublishingYandexTransaction* self = NULL;
- PublishingYandexSession* _tmp0_;
- PublishingRESTSupportHttpMethod _tmp1_;
#line 62 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_val_if_fail (PUBLISHING_YANDEX_IS_SESSION (session), NULL);
#line 63 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp0_ = session;
-#line 63 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp1_ = method;
-#line 63 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- self = (PublishingYandexTransaction*) publishing_rest_support_transaction_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_);
+ self = (PublishingYandexTransaction*) publishing_rest_support_transaction_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), method);
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_transaction_add_headers (self);
#line 62 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return self;
-#line 784 "YandexPublishing.c"
+#line 898 "YandexPublishing.c"
}
-PublishingYandexTransaction* publishing_yandex_transaction_new (PublishingYandexSession* session, PublishingRESTSupportHttpMethod method) {
+PublishingYandexTransaction*
+publishing_yandex_transaction_new (PublishingYandexSession* session,
+ PublishingRESTSupportHttpMethod method)
+{
#line 62 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return publishing_yandex_transaction_construct (PUBLISHING_YANDEX_TYPE_TRANSACTION, session, method);
-#line 791 "YandexPublishing.c"
+#line 908 "YandexPublishing.c"
}
-void publishing_yandex_transaction_add_data (PublishingYandexTransaction* self, const gchar* type, const gchar* data) {
- const gchar* _tmp0_;
- const gchar* _tmp1_;
+void
+publishing_yandex_transaction_add_data (PublishingYandexTransaction* self,
+ const gchar* type,
+ const gchar* data)
+{
#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (PUBLISHING_YANDEX_IS_TRANSACTION (self));
#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -801,27 +920,29 @@ void publishing_yandex_transaction_add_data (PublishingYandexTransaction* self,
#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (data != NULL);
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp0_ = data;
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp1_ = type;
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- publishing_rest_support_transaction_set_custom_payload (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp0_, _tmp1_, (gulong) 0);
-#line 810 "YandexPublishing.c"
+ publishing_rest_support_transaction_set_custom_payload (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), data, type, (gulong) 0);
+#line 925 "YandexPublishing.c"
}
-static void publishing_yandex_transaction_class_init (PublishingYandexTransactionClass * klass) {
+static void
+publishing_yandex_transaction_class_init (PublishingYandexTransactionClass * klass)
+{
#line 49 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 817 "YandexPublishing.c"
+#line 934 "YandexPublishing.c"
}
-static void publishing_yandex_transaction_instance_init (PublishingYandexTransaction * self) {
+static void
+publishing_yandex_transaction_instance_init (PublishingYandexTransaction * self)
+{
}
-GType publishing_yandex_transaction_get_type (void) {
+GType
+publishing_yandex_transaction_get_type (void)
+{
static volatile gsize publishing_yandex_transaction_type_id__volatile = 0;
if (g_once_init_enter (&publishing_yandex_transaction_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingYandexTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_yandex_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingYandexTransaction), 0, (GInstanceInitFunc) publishing_yandex_transaction_instance_init, NULL };
@@ -833,24 +954,30 @@ GType publishing_yandex_transaction_get_type (void) {
}
-PublishingYandexSession* publishing_yandex_session_construct (GType object_type) {
+PublishingYandexSession*
+publishing_yandex_session_construct (GType object_type)
+{
PublishingYandexSession* self = NULL;
#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self = (PublishingYandexSession*) publishing_rest_support_session_construct (object_type, NULL);
#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return self;
-#line 843 "YandexPublishing.c"
+#line 966 "YandexPublishing.c"
}
-PublishingYandexSession* publishing_yandex_session_new (void) {
+PublishingYandexSession*
+publishing_yandex_session_new (void)
+{
#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return publishing_yandex_session_construct (PUBLISHING_YANDEX_TYPE_SESSION);
-#line 850 "YandexPublishing.c"
+#line 975 "YandexPublishing.c"
}
-static gboolean publishing_yandex_session_real_is_authenticated (PublishingRESTSupportSession* base) {
+static gboolean
+publishing_yandex_session_real_is_authenticated (PublishingRESTSupportSession* base)
+{
PublishingYandexSession * self;
gboolean result = FALSE;
const gchar* _tmp0_;
@@ -862,41 +989,45 @@ static gboolean publishing_yandex_session_real_is_authenticated (PublishingRESTS
result = _tmp0_ != NULL;
#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return result;
-#line 866 "YandexPublishing.c"
+#line 993 "YandexPublishing.c"
}
-void publishing_yandex_session_deauthenticate (PublishingYandexSession* self) {
+void
+publishing_yandex_session_deauthenticate (PublishingYandexSession* self)
+{
#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (PUBLISHING_YANDEX_IS_SESSION (self));
#line 83 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (self->priv->auth_token);
#line 83 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self->priv->auth_token = NULL;
-#line 877 "YandexPublishing.c"
+#line 1006 "YandexPublishing.c"
}
-void publishing_yandex_session_set_auth_token (PublishingYandexSession* self, const gchar* token) {
- const gchar* _tmp0_;
- gchar* _tmp1_;
+void
+publishing_yandex_session_set_auth_token (PublishingYandexSession* self,
+ const gchar* token)
+{
+ gchar* _tmp0_;
#line 86 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (PUBLISHING_YANDEX_IS_SESSION (self));
#line 86 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (token != NULL);
#line 87 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp0_ = token;
-#line 87 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp1_ = g_strdup (_tmp0_);
+ _tmp0_ = g_strdup (token);
#line 87 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (self->priv->auth_token);
#line 87 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- self->priv->auth_token = _tmp1_;
-#line 896 "YandexPublishing.c"
+ self->priv->auth_token = _tmp0_;
+#line 1025 "YandexPublishing.c"
}
-gchar* publishing_yandex_session_get_auth_token (PublishingYandexSession* self) {
+gchar*
+publishing_yandex_session_get_auth_token (PublishingYandexSession* self)
+{
gchar* result = NULL;
const gchar* _tmp0_;
gchar* _tmp1_;
@@ -910,11 +1041,13 @@ gchar* publishing_yandex_session_get_auth_token (PublishingYandexSession* self)
result = _tmp1_;
#line 91 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return result;
-#line 914 "YandexPublishing.c"
+#line 1045 "YandexPublishing.c"
}
-static void publishing_yandex_session_class_init (PublishingYandexSessionClass * klass) {
+static void
+publishing_yandex_session_class_init (PublishingYandexSessionClass * klass)
+{
#line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_session_parent_class = g_type_class_peek_parent (klass);
#line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -923,20 +1056,24 @@ static void publishing_yandex_session_class_init (PublishingYandexSessionClass *
g_type_class_add_private (klass, sizeof (PublishingYandexSessionPrivate));
#line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*) (PublishingRESTSupportSession *)) publishing_yandex_session_real_is_authenticated;
-#line 927 "YandexPublishing.c"
+#line 1060 "YandexPublishing.c"
}
-static void publishing_yandex_session_instance_init (PublishingYandexSession * self) {
+static void
+publishing_yandex_session_instance_init (PublishingYandexSession * self)
+{
#line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self->priv = PUBLISHING_YANDEX_SESSION_GET_PRIVATE (self);
#line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self->priv->auth_token = NULL;
-#line 936 "YandexPublishing.c"
+#line 1071 "YandexPublishing.c"
}
-static void publishing_yandex_session_finalize (PublishingRESTSupportSession * obj) {
+static void
+publishing_yandex_session_finalize (PublishingRESTSupportSession * obj)
+{
PublishingYandexSession * self;
#line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YANDEX_TYPE_SESSION, PublishingYandexSession);
@@ -944,11 +1081,13 @@ static void publishing_yandex_session_finalize (PublishingRESTSupportSession * o
_g_free0 (self->priv->auth_token);
#line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
PUBLISHING_REST_SUPPORT_SESSION_CLASS (publishing_yandex_session_parent_class)->finalize (obj);
-#line 948 "YandexPublishing.c"
+#line 1085 "YandexPublishing.c"
}
-GType publishing_yandex_session_get_type (void) {
+GType
+publishing_yandex_session_get_type (void)
+{
static volatile gsize publishing_yandex_session_type_id__volatile = 0;
if (g_once_init_enter (&publishing_yandex_session_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingYandexSessionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_yandex_session_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingYandexSession), 0, (GInstanceInitFunc) publishing_yandex_session_instance_init, NULL };
@@ -960,45 +1099,54 @@ GType publishing_yandex_session_get_type (void) {
}
-PublishingYandexWebAuthPane* publishing_yandex_web_auth_pane_construct (GType object_type, const gchar* login_url) {
+PublishingYandexWebAuthPane*
+publishing_yandex_web_auth_pane_construct (GType object_type,
+ const gchar* login_url)
+{
PublishingYandexWebAuthPane * self = NULL;
- const gchar* _tmp0_;
#line 101 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_val_if_fail (login_url != NULL, NULL);
#line 102 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp0_ = login_url;
-#line 102 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- self = (PublishingYandexWebAuthPane*) g_object_new (object_type, "login-uri", _tmp0_, "preferred-geometry", SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_RESIZABLE, NULL);
+ self = (PublishingYandexWebAuthPane*) g_object_new (object_type, "login-uri", login_url, "preferred-geometry", SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_RESIZABLE, NULL);
#line 101 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return self;
-#line 975 "YandexPublishing.c"
+#line 1114 "YandexPublishing.c"
}
-PublishingYandexWebAuthPane* publishing_yandex_web_auth_pane_new (const gchar* login_url) {
+PublishingYandexWebAuthPane*
+publishing_yandex_web_auth_pane_new (const gchar* login_url)
+{
#line 101 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return publishing_yandex_web_auth_pane_construct (PUBLISHING_YANDEX_TYPE_WEB_AUTH_PANE, login_url);
-#line 982 "YandexPublishing.c"
+#line 1123 "YandexPublishing.c"
}
-static gboolean _publishing_yandex_web_auth_pane_on_decide_policy_webkit_web_view_decide_policy (WebKitWebView* _sender, WebKitPolicyDecision* decision, WebKitPolicyDecisionType type, gpointer self) {
+static gboolean
+_publishing_yandex_web_auth_pane_on_decide_policy_webkit_web_view_decide_policy (WebKitWebView* _sender,
+ WebKitPolicyDecision* decision,
+ WebKitPolicyDecisionType type,
+ gpointer self)
+{
gboolean result;
result = publishing_yandex_web_auth_pane_on_decide_policy ((PublishingYandexWebAuthPane*) self, decision, type);
#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return result;
-#line 991 "YandexPublishing.c"
+#line 1137 "YandexPublishing.c"
}
-static void publishing_yandex_web_auth_pane_real_constructed (GObject* base) {
+static void
+publishing_yandex_web_auth_pane_real_constructed (GObject* base)
+{
PublishingYandexWebAuthPane * self;
WebKitWebView* _tmp3_;
WebKitWebView* _tmp4_;
GError * _inner_error_ = NULL;
#line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_WEB_AUTH_PANE, PublishingYandexWebAuthPane);
-#line 1002 "YandexPublishing.c"
+#line 1150 "YandexPublishing.c"
{
GRegex* _tmp0_ = NULL;
GRegex* _tmp1_;
@@ -1011,7 +1159,7 @@ static void publishing_yandex_web_auth_pane_real_constructed (GObject* base) {
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 1015 "YandexPublishing.c"
+#line 1163 "YandexPublishing.c"
goto __catch32_g_regex_error;
}
#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -1020,7 +1168,7 @@ static void publishing_yandex_web_auth_pane_real_constructed (GObject* base) {
g_clear_error (&_inner_error_);
#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return;
-#line 1024 "YandexPublishing.c"
+#line 1172 "YandexPublishing.c"
}
#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp2_ = _tmp0_;
@@ -1032,7 +1180,7 @@ static void publishing_yandex_web_auth_pane_real_constructed (GObject* base) {
self->priv->re = _tmp2_;
#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_regex_unref0 (_tmp0_);
-#line 1036 "YandexPublishing.c"
+#line 1184 "YandexPublishing.c"
}
goto __finally32;
__catch32_g_regex_error:
@@ -1046,7 +1194,7 @@ static void publishing_yandex_web_auth_pane_real_constructed (GObject* base) {
g_assert_not_reached ();
#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_error_free0 (e);
-#line 1050 "YandexPublishing.c"
+#line 1198 "YandexPublishing.c"
}
__finally32:
#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -1057,7 +1205,7 @@ static void publishing_yandex_web_auth_pane_real_constructed (GObject* base) {
g_clear_error (&_inner_error_);
#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return;
-#line 1061 "YandexPublishing.c"
+#line 1209 "YandexPublishing.c"
}
#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp3_ = shotwell_plugins_common_web_authentication_pane_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPane));
@@ -1067,179 +1215,183 @@ static void publishing_yandex_web_auth_pane_real_constructed (GObject* base) {
g_signal_connect_object (_tmp4_, "decide-policy", (GCallback) _publishing_yandex_web_auth_pane_on_decide_policy_webkit_web_view_decide_policy, self, 0);
#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_object_unref0 (_tmp4_);
-#line 1071 "YandexPublishing.c"
+#line 1219 "YandexPublishing.c"
}
-static void publishing_yandex_web_auth_pane_real_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* base) {
+static void
+publishing_yandex_web_auth_pane_real_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* base)
+{
PublishingYandexWebAuthPane * self;
#line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_WEB_AUTH_PANE, PublishingYandexWebAuthPane);
-#line 1079 "YandexPublishing.c"
+#line 1229 "YandexPublishing.c"
}
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return self ? g_object_ref (self) : NULL;
-#line 1086 "YandexPublishing.c"
+#line 1238 "YandexPublishing.c"
}
-static WebKitNavigationAction* _vala_WebKitNavigationAction_copy (WebKitNavigationAction* self) {
+static WebKitNavigationAction*
+_vala_WebKitNavigationAction_copy (WebKitNavigationAction* self)
+{
#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return g_boxed_copy (webkit_navigation_action_get_type (), self);
-#line 1093 "YandexPublishing.c"
+#line 1247 "YandexPublishing.c"
}
-static gpointer __vala_WebKitNavigationAction_copy0 (gpointer self) {
+static gpointer
+__vala_WebKitNavigationAction_copy0 (gpointer self)
+{
#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return self ? _vala_WebKitNavigationAction_copy (self) : NULL;
-#line 1100 "YandexPublishing.c"
+#line 1256 "YandexPublishing.c"
}
-static void _vala_WebKitNavigationAction_free (WebKitNavigationAction* self) {
+static void
+_vala_WebKitNavigationAction_free (WebKitNavigationAction* self)
+{
#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_boxed_free (webkit_navigation_action_get_type (), self);
-#line 1107 "YandexPublishing.c"
+#line 1265 "YandexPublishing.c"
}
-static gboolean publishing_yandex_web_auth_pane_on_decide_policy (PublishingYandexWebAuthPane* self, WebKitPolicyDecision* decision, WebKitPolicyDecisionType type) {
+static gboolean
+publishing_yandex_web_auth_pane_on_decide_policy (PublishingYandexWebAuthPane* self,
+ WebKitPolicyDecision* decision,
+ WebKitPolicyDecisionType type)
+{
gboolean result = FALSE;
- WebKitPolicyDecisionType _tmp0_;
#line 119 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_val_if_fail (PUBLISHING_YANDEX_IS_WEB_AUTH_PANE (self), FALSE);
#line 119 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_val_if_fail (WEBKIT_IS_POLICY_DECISION (decision), FALSE);
#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp0_ = type;
-#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- switch (_tmp0_) {
+ switch (type) {
#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
case WEBKIT_POLICY_DECISION_TYPE_NAVIGATION_ACTION:
-#line 1124 "YandexPublishing.c"
+#line 1283 "YandexPublishing.c"
{
WebKitNavigationPolicyDecision* n_decision = NULL;
- WebKitPolicyDecision* _tmp1_;
- WebKitNavigationPolicyDecision* _tmp2_;
+ WebKitNavigationPolicyDecision* _tmp0_;
WebKitNavigationAction* action = NULL;
- WebKitNavigationPolicyDecision* _tmp3_;
+ WebKitNavigationPolicyDecision* _tmp1_;
+ WebKitNavigationAction* _tmp2_;
+ WebKitNavigationAction* _tmp3_;
WebKitNavigationAction* _tmp4_;
- WebKitNavigationAction* _tmp5_;
- WebKitNavigationAction* _tmp6_;
gchar* uri = NULL;
- WebKitNavigationAction* _tmp7_;
- WebKitURIRequest* _tmp8_;
- const gchar* _tmp9_;
+ WebKitNavigationAction* _tmp5_;
+ WebKitURIRequest* _tmp6_;
+ const gchar* _tmp7_;
+ const gchar* _tmp8_;
+ gchar* _tmp9_;
const gchar* _tmp10_;
- gchar* _tmp11_;
- const gchar* _tmp12_;
GMatchInfo* info = NULL;
- GRegex* _tmp13_;
- const gchar* _tmp14_;
- GMatchInfo* _tmp15_ = NULL;
- gboolean _tmp16_;
- WebKitPolicyDecision* _tmp28_;
-#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp1_ = decision;
+ GRegex* _tmp11_;
+ const gchar* _tmp12_;
+ GMatchInfo* _tmp13_ = NULL;
+ gboolean _tmp14_;
#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, webkit_navigation_policy_decision_get_type (), WebKitNavigationPolicyDecision));
+ _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (decision, webkit_navigation_policy_decision_get_type (), WebKitNavigationPolicyDecision));
#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- n_decision = _tmp2_;
+ n_decision = _tmp0_;
#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp3_ = n_decision;
+ _tmp1_ = n_decision;
#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp4_ = webkit_navigation_policy_decision_get_navigation_action (_tmp3_);
+ _tmp2_ = webkit_navigation_policy_decision_get_navigation_action (_tmp1_);
#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp5_ = _tmp4_;
+ _tmp3_ = _tmp2_;
#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp6_ = __vala_WebKitNavigationAction_copy0 (_tmp5_);
+ _tmp4_ = __vala_WebKitNavigationAction_copy0 (_tmp3_);
#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- action = _tmp6_;
+ action = _tmp4_;
#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp7_ = action;
+ _tmp5_ = action;
#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp8_ = webkit_navigation_action_get_request (_tmp7_);
+ _tmp6_ = webkit_navigation_action_get_request (_tmp5_);
#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp9_ = webkit_uri_request_get_uri (_tmp8_);
+ _tmp7_ = webkit_uri_request_get_uri (_tmp6_);
#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp10_ = _tmp9_;
+ _tmp8_ = _tmp7_;
#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp11_ = g_strdup (_tmp10_);
+ _tmp9_ = g_strdup (_tmp8_);
#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- uri = _tmp11_;
+ uri = _tmp9_;
#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp12_ = uri;
+ _tmp10_ = uri;
#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_debug ("YandexPublishing.vala:126: Navigating to '%s'", _tmp12_);
+ g_debug ("YandexPublishing.vala:126: Navigating to '%s'", _tmp10_);
#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
info = NULL;
#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp13_ = self->priv->re;
+ _tmp11_ = self->priv->re;
#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp14_ = uri;
+ _tmp12_ = uri;
#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp16_ = g_regex_match (_tmp13_, _tmp14_, 0, &_tmp15_);
+ _tmp14_ = g_regex_match (_tmp11_, _tmp12_, 0, &_tmp13_);
#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_match_info_unref0 (info);
#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- info = _tmp15_;
+ info = _tmp13_;
#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- if (_tmp16_) {
-#line 1193 "YandexPublishing.c"
+ if (_tmp14_) {
+#line 1348 "YandexPublishing.c"
gchar* access_token = NULL;
- GMatchInfo* _tmp17_;
+ GMatchInfo* _tmp15_;
+ gchar** _tmp16_;
+ gchar** _tmp17_;
gchar** _tmp18_;
- gchar** _tmp19_;
- gchar** _tmp20_;
- gint _tmp20__length1;
- const gchar* _tmp21_;
- gchar* _tmp22_;
- gchar* _tmp23_;
- const gchar* _tmp24_;
- const gchar* _tmp25_;
+ gint _tmp18__length1;
+ const gchar* _tmp19_;
+ gchar* _tmp20_;
+ gchar* _tmp21_;
+ const gchar* _tmp22_;
+ const gchar* _tmp23_;
#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp17_ = info;
+ _tmp15_ = info;
#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp19_ = _tmp18_ = g_match_info_fetch_all (_tmp17_);
+ _tmp17_ = _tmp16_ = g_match_info_fetch_all (_tmp15_);
#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp20_ = _tmp19_;
+ _tmp18_ = _tmp17_;
#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp20__length1 = _vala_array_length (_tmp18_);
+ _tmp18__length1 = _vala_array_length (_tmp16_);
#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp21_ = _tmp20_[2];
+ _tmp19_ = _tmp18_[2];
#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp22_ = g_strdup (_tmp21_);
+ _tmp20_ = g_strdup (_tmp19_);
#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp23_ = _tmp22_;
+ _tmp21_ = _tmp20_;
#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp20_ = (_vala_array_free (_tmp20_, _tmp20__length1, (GDestroyNotify) g_free), NULL);
+ _tmp18_ = (_vala_array_free (_tmp18_, _tmp18__length1, (GDestroyNotify) g_free), NULL);
#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- access_token = _tmp23_;
+ access_token = _tmp21_;
#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp24_ = access_token;
+ _tmp22_ = access_token;
#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_debug ("YandexPublishing.vala:133: Load completed: %s", _tmp24_);
+ g_debug ("YandexPublishing.vala:133: Load completed: %s", _tmp22_);
#line 134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
shotwell_plugins_common_web_authentication_pane_set_cursor (G_TYPE_CHECK_INSTANCE_CAST (self, SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPane), GDK_LEFT_PTR);
#line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp25_ = access_token;
+ _tmp23_ = access_token;
#line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- if (_tmp25_ != NULL) {
-#line 1233 "YandexPublishing.c"
- const gchar* _tmp26_;
- WebKitPolicyDecision* _tmp27_;
+ if (_tmp23_ != NULL) {
+#line 1388 "YandexPublishing.c"
+ const gchar* _tmp24_;
#line 136 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp26_ = access_token;
+ _tmp24_ = access_token;
#line 136 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_signal_emit (self, publishing_yandex_web_auth_pane_signals[PUBLISHING_YANDEX_WEB_AUTH_PANE_LOGIN_SUCCEEDED_SIGNAL], 0, _tmp26_);
-#line 137 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp27_ = decision;
+ g_signal_emit (self, publishing_yandex_web_auth_pane_signals[PUBLISHING_YANDEX_WEB_AUTH_PANE_LOGIN_SUCCEEDED_SIGNAL], 0, _tmp24_);
#line 137 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- webkit_policy_decision_ignore (_tmp27_);
+ webkit_policy_decision_ignore (decision);
#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (access_token);
#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -1252,20 +1404,18 @@ static gboolean publishing_yandex_web_auth_pane_on_decide_policy (PublishingYand
_g_object_unref0 (n_decision);
#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
break;
-#line 1256 "YandexPublishing.c"
+#line 1408 "YandexPublishing.c"
} else {
#line 140 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_signal_emit (self, publishing_yandex_web_auth_pane_signals[PUBLISHING_YANDEX_WEB_AUTH_PANE_LOGIN_FAILED_SIGNAL], 0);
-#line 1260 "YandexPublishing.c"
+#line 1412 "YandexPublishing.c"
}
#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (access_token);
-#line 1264 "YandexPublishing.c"
+#line 1416 "YandexPublishing.c"
}
#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp28_ = decision;
-#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- webkit_policy_decision_use (_tmp28_);
+ webkit_policy_decision_use (decision);
#line 143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_match_info_unref0 (info);
#line 143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -1276,20 +1426,17 @@ static gboolean publishing_yandex_web_auth_pane_on_decide_policy (PublishingYand
_g_object_unref0 (n_decision);
#line 143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
break;
-#line 1280 "YandexPublishing.c"
+#line 1430 "YandexPublishing.c"
}
#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
case WEBKIT_POLICY_DECISION_TYPE_RESPONSE:
-#line 1284 "YandexPublishing.c"
+#line 1434 "YandexPublishing.c"
{
- WebKitPolicyDecision* _tmp29_;
-#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp29_ = decision;
#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- webkit_policy_decision_use (_tmp29_);
+ webkit_policy_decision_use (decision);
#line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
break;
-#line 1293 "YandexPublishing.c"
+#line 1440 "YandexPublishing.c"
}
default:
{
@@ -1297,18 +1444,20 @@ static gboolean publishing_yandex_web_auth_pane_on_decide_policy (PublishingYand
result = FALSE;
#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return result;
-#line 1301 "YandexPublishing.c"
+#line 1448 "YandexPublishing.c"
}
}
#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
result = TRUE;
#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return result;
-#line 1308 "YandexPublishing.c"
+#line 1455 "YandexPublishing.c"
}
-static void publishing_yandex_web_auth_pane_class_init (PublishingYandexWebAuthPaneClass * klass) {
+static void
+publishing_yandex_web_auth_pane_class_init (PublishingYandexWebAuthPaneClass * klass)
+{
#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_web_auth_pane_parent_class = g_type_class_peek_parent (klass);
#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -1323,18 +1472,22 @@ static void publishing_yandex_web_auth_pane_class_init (PublishingYandexWebAuthP
publishing_yandex_web_auth_pane_signals[PUBLISHING_YANDEX_WEB_AUTH_PANE_LOGIN_SUCCEEDED_SIGNAL] = g_signal_new ("login-succeeded", PUBLISHING_YANDEX_TYPE_WEB_AUTH_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING);
#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_web_auth_pane_signals[PUBLISHING_YANDEX_WEB_AUTH_PANE_LOGIN_FAILED_SIGNAL] = g_signal_new ("login-failed", PUBLISHING_YANDEX_TYPE_WEB_AUTH_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 1327 "YandexPublishing.c"
+#line 1476 "YandexPublishing.c"
}
-static void publishing_yandex_web_auth_pane_instance_init (PublishingYandexWebAuthPane * self) {
+static void
+publishing_yandex_web_auth_pane_instance_init (PublishingYandexWebAuthPane * self)
+{
#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self->priv = PUBLISHING_YANDEX_WEB_AUTH_PANE_GET_PRIVATE (self);
-#line 1334 "YandexPublishing.c"
+#line 1485 "YandexPublishing.c"
}
-static void publishing_yandex_web_auth_pane_finalize (GObject * obj) {
+static void
+publishing_yandex_web_auth_pane_finalize (GObject * obj)
+{
PublishingYandexWebAuthPane * self;
#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YANDEX_TYPE_WEB_AUTH_PANE, PublishingYandexWebAuthPane);
@@ -1342,11 +1495,13 @@ static void publishing_yandex_web_auth_pane_finalize (GObject * obj) {
_g_regex_unref0 (self->priv->re);
#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
G_OBJECT_CLASS (publishing_yandex_web_auth_pane_parent_class)->finalize (obj);
-#line 1346 "YandexPublishing.c"
+#line 1499 "YandexPublishing.c"
}
-GType publishing_yandex_web_auth_pane_get_type (void) {
+GType
+publishing_yandex_web_auth_pane_get_type (void)
+{
static volatile gsize publishing_yandex_web_auth_pane_type_id__volatile = 0;
if (g_once_init_enter (&publishing_yandex_web_auth_pane_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingYandexWebAuthPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_yandex_web_auth_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingYandexWebAuthPane), 0, (GInstanceInitFunc) publishing_yandex_web_auth_pane_instance_init, NULL };
@@ -1358,121 +1513,150 @@ GType publishing_yandex_web_auth_pane_get_type (void) {
}
-PublishingYandexPublishOptions* publishing_yandex_publish_options_construct (GType object_type) {
+PublishingYandexPublishOptions*
+publishing_yandex_publish_options_construct (GType object_type)
+{
PublishingYandexPublishOptions* self = NULL;
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self = (PublishingYandexPublishOptions*) g_type_create_instance (object_type);
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return self;
-#line 1368 "YandexPublishing.c"
+#line 1525 "YandexPublishing.c"
}
-PublishingYandexPublishOptions* publishing_yandex_publish_options_new (void) {
+PublishingYandexPublishOptions*
+publishing_yandex_publish_options_new (void)
+{
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return publishing_yandex_publish_options_construct (PUBLISHING_YANDEX_TYPE_PUBLISH_OPTIONS);
-#line 1375 "YandexPublishing.c"
+#line 1534 "YandexPublishing.c"
}
-static void publishing_yandex_value_publish_options_init (GValue* value) {
+static void
+publishing_yandex_value_publish_options_init (GValue* value)
+{
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 1382 "YandexPublishing.c"
+#line 1543 "YandexPublishing.c"
}
-static void publishing_yandex_value_publish_options_free_value (GValue* value) {
+static void
+publishing_yandex_value_publish_options_free_value (GValue* value)
+{
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (value->data[0].v_pointer) {
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_publish_options_unref (value->data[0].v_pointer);
-#line 1391 "YandexPublishing.c"
+#line 1554 "YandexPublishing.c"
}
}
-static void publishing_yandex_value_publish_options_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+publishing_yandex_value_publish_options_copy_value (const GValue* src_value,
+ GValue* dest_value)
+{
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (src_value->data[0].v_pointer) {
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
dest_value->data[0].v_pointer = publishing_yandex_publish_options_ref (src_value->data[0].v_pointer);
-#line 1401 "YandexPublishing.c"
+#line 1567 "YandexPublishing.c"
} else {
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
dest_value->data[0].v_pointer = NULL;
-#line 1405 "YandexPublishing.c"
+#line 1571 "YandexPublishing.c"
}
}
-static gpointer publishing_yandex_value_publish_options_peek_pointer (const GValue* value) {
+static gpointer
+publishing_yandex_value_publish_options_peek_pointer (const GValue* value)
+{
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return value->data[0].v_pointer;
-#line 1413 "YandexPublishing.c"
+#line 1581 "YandexPublishing.c"
}
-static gchar* publishing_yandex_value_publish_options_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_yandex_value_publish_options_collect_value (GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (collect_values[0].v_pointer) {
-#line 1420 "YandexPublishing.c"
+#line 1593 "YandexPublishing.c"
PublishingYandexPublishOptions * object;
object = collect_values[0].v_pointer;
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (object->parent_instance.g_class == NULL) {
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1427 "YandexPublishing.c"
+#line 1600 "YandexPublishing.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1431 "YandexPublishing.c"
+#line 1604 "YandexPublishing.c"
}
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
value->data[0].v_pointer = publishing_yandex_publish_options_ref (object);
-#line 1435 "YandexPublishing.c"
+#line 1608 "YandexPublishing.c"
} else {
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 1439 "YandexPublishing.c"
+#line 1612 "YandexPublishing.c"
}
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return NULL;
-#line 1443 "YandexPublishing.c"
+#line 1616 "YandexPublishing.c"
}
-static gchar* publishing_yandex_value_publish_options_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_yandex_value_publish_options_lcopy_value (const GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
PublishingYandexPublishOptions ** object_p;
object_p = collect_values[0].v_pointer;
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (!object_p) {
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1454 "YandexPublishing.c"
+#line 1632 "YandexPublishing.c"
}
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (!value->data[0].v_pointer) {
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
*object_p = NULL;
-#line 1460 "YandexPublishing.c"
+#line 1638 "YandexPublishing.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
*object_p = value->data[0].v_pointer;
-#line 1464 "YandexPublishing.c"
+#line 1642 "YandexPublishing.c"
} else {
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
*object_p = publishing_yandex_publish_options_ref (value->data[0].v_pointer);
-#line 1468 "YandexPublishing.c"
+#line 1646 "YandexPublishing.c"
}
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return NULL;
-#line 1472 "YandexPublishing.c"
+#line 1650 "YandexPublishing.c"
}
-GParamSpec* publishing_yandex_param_spec_publish_options (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+publishing_yandex_param_spec_publish_options (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags)
+{
PublishingYandexParamSpecPublishOptions* spec;
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_YANDEX_TYPE_PUBLISH_OPTIONS), NULL);
@@ -1482,20 +1666,25 @@ GParamSpec* publishing_yandex_param_spec_publish_options (const gchar* name, con
G_PARAM_SPEC (spec)->value_type = object_type;
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return G_PARAM_SPEC (spec);
-#line 1486 "YandexPublishing.c"
+#line 1670 "YandexPublishing.c"
}
-gpointer publishing_yandex_value_get_publish_options (const GValue* value) {
+gpointer
+publishing_yandex_value_get_publish_options (const GValue* value)
+{
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_YANDEX_TYPE_PUBLISH_OPTIONS), NULL);
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return value->data[0].v_pointer;
-#line 1495 "YandexPublishing.c"
+#line 1681 "YandexPublishing.c"
}
-void publishing_yandex_value_set_publish_options (GValue* value, gpointer v_object) {
+void
+publishing_yandex_value_set_publish_options (GValue* value,
+ gpointer v_object)
+{
PublishingYandexPublishOptions * old;
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_YANDEX_TYPE_PUBLISH_OPTIONS));
@@ -1511,22 +1700,25 @@ void publishing_yandex_value_set_publish_options (GValue* value, gpointer v_obje
value->data[0].v_pointer = v_object;
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_publish_options_ref (value->data[0].v_pointer);
-#line 1515 "YandexPublishing.c"
+#line 1704 "YandexPublishing.c"
} else {
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 1519 "YandexPublishing.c"
+#line 1708 "YandexPublishing.c"
}
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (old) {
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_publish_options_unref (old);
-#line 1525 "YandexPublishing.c"
+#line 1714 "YandexPublishing.c"
}
}
-void publishing_yandex_value_take_publish_options (GValue* value, gpointer v_object) {
+void
+publishing_yandex_value_take_publish_options (GValue* value,
+ gpointer v_object)
+{
PublishingYandexPublishOptions * old;
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_YANDEX_TYPE_PUBLISH_OPTIONS));
@@ -1540,31 +1732,35 @@ void publishing_yandex_value_take_publish_options (GValue* value, gpointer v_obj
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
value->data[0].v_pointer = v_object;
-#line 1544 "YandexPublishing.c"
+#line 1736 "YandexPublishing.c"
} else {
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 1548 "YandexPublishing.c"
+#line 1740 "YandexPublishing.c"
}
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (old) {
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_publish_options_unref (old);
-#line 1554 "YandexPublishing.c"
+#line 1746 "YandexPublishing.c"
}
}
-static void publishing_yandex_publish_options_class_init (PublishingYandexPublishOptionsClass * klass) {
+static void
+publishing_yandex_publish_options_class_init (PublishingYandexPublishOptionsClass * klass)
+{
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_publish_options_parent_class = g_type_class_peek_parent (klass);
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
((PublishingYandexPublishOptionsClass *) klass)->finalize = publishing_yandex_publish_options_finalize;
-#line 1564 "YandexPublishing.c"
+#line 1758 "YandexPublishing.c"
}
-static void publishing_yandex_publish_options_instance_init (PublishingYandexPublishOptions * self) {
+static void
+publishing_yandex_publish_options_instance_init (PublishingYandexPublishOptions * self)
+{
#line 155 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self->disable_comments = FALSE;
#line 156 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -1575,11 +1771,13 @@ static void publishing_yandex_publish_options_instance_init (PublishingYandexPub
self->destination_album_url = NULL;
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self->ref_count = 1;
-#line 1579 "YandexPublishing.c"
+#line 1775 "YandexPublishing.c"
}
-static void publishing_yandex_publish_options_finalize (PublishingYandexPublishOptions * obj) {
+static void
+publishing_yandex_publish_options_finalize (PublishingYandexPublishOptions * obj)
+{
PublishingYandexPublishOptions * self;
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YANDEX_TYPE_PUBLISH_OPTIONS, PublishingYandexPublishOptions);
@@ -1591,11 +1789,13 @@ static void publishing_yandex_publish_options_finalize (PublishingYandexPublishO
_g_free0 (self->destination_album);
#line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (self->destination_album_url);
-#line 1595 "YandexPublishing.c"
+#line 1793 "YandexPublishing.c"
}
-GType publishing_yandex_publish_options_get_type (void) {
+GType
+publishing_yandex_publish_options_get_type (void)
+{
static volatile gsize publishing_yandex_publish_options_type_id__volatile = 0;
if (g_once_init_enter (&publishing_yandex_publish_options_type_id__volatile)) {
static const GTypeValueTable g_define_type_value_table = { publishing_yandex_value_publish_options_init, publishing_yandex_value_publish_options_free_value, publishing_yandex_value_publish_options_copy_value, publishing_yandex_value_publish_options_peek_pointer, "p", publishing_yandex_value_publish_options_collect_value, "p", publishing_yandex_value_publish_options_lcopy_value };
@@ -1609,18 +1809,22 @@ GType publishing_yandex_publish_options_get_type (void) {
}
-gpointer publishing_yandex_publish_options_ref (gpointer instance) {
+gpointer
+publishing_yandex_publish_options_ref (gpointer instance)
+{
PublishingYandexPublishOptions * self;
self = instance;
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_atomic_int_inc (&self->ref_count);
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return instance;
-#line 1620 "YandexPublishing.c"
+#line 1822 "YandexPublishing.c"
}
-void publishing_yandex_publish_options_unref (gpointer instance) {
+void
+publishing_yandex_publish_options_unref (gpointer instance)
+{
PublishingYandexPublishOptions * self;
self = instance;
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -1629,12 +1833,14 @@ void publishing_yandex_publish_options_unref (gpointer instance) {
PUBLISHING_YANDEX_PUBLISH_OPTIONS_GET_CLASS (self)->finalize (self);
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 1633 "YandexPublishing.c"
+#line 1837 "YandexPublishing.c"
}
}
-static SpitPublishingDialogPaneGeometryOptions publishing_yandex_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) {
+static SpitPublishingDialogPaneGeometryOptions
+publishing_yandex_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base)
+{
PublishingYandexPublishingOptionsPane * self;
SpitPublishingDialogPaneGeometryOptions result = 0;
#line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -1643,27 +1849,33 @@ static SpitPublishingDialogPaneGeometryOptions publishing_yandex_publishing_opti
result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
#line 176 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return result;
-#line 1647 "YandexPublishing.c"
+#line 1853 "YandexPublishing.c"
}
-static void publishing_yandex_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base) {
+static void
+publishing_yandex_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base)
+{
PublishingYandexPublishingOptionsPane * self;
#line 178 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_PUBLISHING_OPTIONS_PANE, PublishingYandexPublishingOptionsPane);
-#line 1655 "YandexPublishing.c"
+#line 1863 "YandexPublishing.c"
}
-static void publishing_yandex_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) {
+static void
+publishing_yandex_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base)
+{
PublishingYandexPublishingOptionsPane * self;
#line 180 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_PUBLISHING_OPTIONS_PANE, PublishingYandexPublishingOptionsPane);
-#line 1663 "YandexPublishing.c"
+#line 1873 "YandexPublishing.c"
}
-static GtkWidget* publishing_yandex_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base) {
+static GtkWidget*
+publishing_yandex_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base)
+{
PublishingYandexPublishingOptionsPane * self;
GtkWidget* result = NULL;
GtkBox* _tmp0_;
@@ -1678,28 +1890,38 @@ static GtkWidget* publishing_yandex_publishing_options_pane_real_get_widget (Spi
result = _tmp1_;
#line 183 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return result;
-#line 1682 "YandexPublishing.c"
+#line 1894 "YandexPublishing.c"
}
-static void _publishing_yandex_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+_publishing_yandex_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender,
+ gpointer self)
+{
#line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_publishing_options_pane_on_publish_clicked ((PublishingYandexPublishingOptionsPane*) self);
-#line 1689 "YandexPublishing.c"
+#line 1904 "YandexPublishing.c"
}
-static void _publishing_yandex_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+_publishing_yandex_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender,
+ gpointer self)
+{
#line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_publishing_options_pane_on_logout_clicked ((PublishingYandexPublishingOptionsPane*) self);
-#line 1696 "YandexPublishing.c"
+#line 1914 "YandexPublishing.c"
}
-PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane_construct (GType object_type, PublishingYandexPublishOptions* options, GeeHashMap* list, SpitPublishingPluginHost* host) {
+PublishingYandexPublishingOptionsPane*
+publishing_yandex_publishing_options_pane_construct (GType object_type,
+ PublishingYandexPublishOptions* options,
+ GeeHashMap* list,
+ SpitPublishingPluginHost* host)
+{
PublishingYandexPublishingOptionsPane * self = NULL;
- PublishingYandexPublishOptions* _tmp0_;
- GtkBox* _tmp1_;
+ GtkBox* _tmp0_;
GError * _inner_error_ = NULL;
#line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_val_if_fail (PUBLISHING_YANDEX_IS_PUBLISH_OPTIONS (options), NULL);
@@ -1710,217 +1932,209 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane
#line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self = (PublishingYandexPublishingOptionsPane*) g_object_new (object_type, NULL);
#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp0_ = options;
-#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- self->priv->options = _tmp0_;
+ self->priv->options = options;
#line 190 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp1_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+ _tmp0_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
#line 190 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_object_ref_sink (_tmp1_);
+ g_object_ref_sink (_tmp0_);
#line 190 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_object_unref0 (self->priv->box);
#line 190 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- self->priv->box = _tmp1_;
-#line 1725 "YandexPublishing.c"
+ self->priv->box = _tmp0_;
+#line 1945 "YandexPublishing.c"
{
+ GtkBuilder* _tmp1_;
GtkBuilder* _tmp2_;
GtkBuilder* _tmp3_;
- GtkBuilder* _tmp4_;
GtkWidget* content = NULL;
- GtkBuilder* _tmp5_;
- GObject* _tmp6_;
- GtkWidget* _tmp7_;
- GtkBuilder* _tmp8_;
- GObject* _tmp9_;
- GtkComboBoxText* _tmp10_;
- GtkComboBoxText* _tmp23_;
+ GtkBuilder* _tmp4_;
+ GObject* _tmp5_;
+ GtkWidget* _tmp6_;
+ GtkBuilder* _tmp7_;
+ GObject* _tmp8_;
+ GtkComboBoxText* _tmp9_;
+ GtkComboBoxText* _tmp20_;
+ GtkBuilder* _tmp21_;
+ GObject* _tmp22_;
+ GtkButton* _tmp23_;
GtkBuilder* _tmp24_;
GObject* _tmp25_;
GtkButton* _tmp26_;
- GtkBuilder* _tmp27_;
- GObject* _tmp28_;
- GtkButton* _tmp29_;
- GtkButton* _tmp30_;
- GtkButton* _tmp31_;
+ GtkButton* _tmp27_;
+ GtkButton* _tmp28_;
+ GtkWidget* _tmp29_;
+ GtkContainer* _tmp30_;
+ GtkContainer* _tmp31_;
GtkWidget* _tmp32_;
- GtkContainer* _tmp33_;
- GtkContainer* _tmp34_;
- GtkWidget* _tmp35_;
- GtkBox* _tmp36_;
- GtkWidget* _tmp37_;
+ GtkBox* _tmp33_;
+ GtkWidget* _tmp34_;
#line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp2_ = gtk_builder_new ();
+ _tmp1_ = gtk_builder_new ();
#line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_object_unref0 (self->priv->builder);
#line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- self->priv->builder = _tmp2_;
+ self->priv->builder = _tmp1_;
#line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp3_ = self->priv->builder;
+ _tmp2_ = self->priv->builder;
#line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- gtk_builder_add_from_resource (_tmp3_, PLUGIN_RESOURCE_PATH "/yandex_publish_model.ui", &_inner_error_);
+ gtk_builder_add_from_resource (_tmp2_, PLUGIN_RESOURCE_PATH "/yandex_publish_model.ui", &_inner_error_);
#line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1764 "YandexPublishing.c"
+#line 1984 "YandexPublishing.c"
goto __catch33_g_error;
}
#line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp4_ = self->priv->builder;
+ _tmp3_ = self->priv->builder;
#line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- gtk_builder_connect_signals (_tmp4_, NULL);
+ gtk_builder_connect_signals (_tmp3_, NULL);
#line 197 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp5_ = self->priv->builder;
+ _tmp4_ = self->priv->builder;
#line 197 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp6_ = gtk_builder_get_object (_tmp5_, "content");
+ _tmp5_ = gtk_builder_get_object (_tmp4_, "content");
#line 197 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp7_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp6_, gtk_widget_get_type ()) ? ((GtkWidget*) _tmp6_) : NULL);
+ _tmp6_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, gtk_widget_get_type ()) ? ((GtkWidget*) _tmp5_) : NULL);
#line 197 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- content = _tmp7_;
+ content = _tmp6_;
#line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp8_ = self->priv->builder;
+ _tmp7_ = self->priv->builder;
#line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp9_ = gtk_builder_get_object (_tmp8_, "album_list");
+ _tmp8_ = gtk_builder_get_object (_tmp7_, "album_list");
#line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp10_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, gtk_combo_box_text_get_type ()) ? ((GtkComboBoxText*) _tmp9_) : NULL);
+ _tmp9_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, gtk_combo_box_text_get_type ()) ? ((GtkComboBoxText*) _tmp8_) : NULL);
#line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_object_unref0 (self->priv->album_list);
#line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- self->priv->album_list = _tmp10_;
-#line 1789 "YandexPublishing.c"
+ self->priv->album_list = _tmp9_;
+#line 2009 "YandexPublishing.c"
{
GeeIterator* _key_it = NULL;
- GeeHashMap* _tmp11_;
+ GeeSet* _tmp10_;
+ GeeSet* _tmp11_;
GeeSet* _tmp12_;
- GeeSet* _tmp13_;
- GeeSet* _tmp14_;
- GeeIterator* _tmp15_;
- GeeIterator* _tmp16_;
-#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp11_ = list;
+ GeeIterator* _tmp13_;
+ GeeIterator* _tmp14_;
#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp12_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
+ _tmp10_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (list, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp13_ = _tmp12_;
+ _tmp11_ = _tmp10_;
#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp14_ = _tmp13_;
+ _tmp12_ = _tmp11_;
#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp15_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ITERABLE, GeeIterable));
+ _tmp13_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ITERABLE, GeeIterable));
#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp16_ = _tmp15_;
+ _tmp14_ = _tmp13_;
#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _g_object_unref0 (_tmp14_);
+ _g_object_unref0 (_tmp12_);
#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _key_it = _tmp16_;
+ _key_it = _tmp14_;
#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
while (TRUE) {
-#line 1816 "YandexPublishing.c"
- GeeIterator* _tmp17_;
- gboolean _tmp18_;
+#line 2033 "YandexPublishing.c"
+ GeeIterator* _tmp15_;
gchar* key = NULL;
- GeeIterator* _tmp19_;
- gpointer _tmp20_;
- GtkComboBoxText* _tmp21_;
- const gchar* _tmp22_;
-#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp17_ = _key_it;
+ GeeIterator* _tmp16_;
+ gpointer _tmp17_;
+ GtkComboBoxText* _tmp18_;
+ const gchar* _tmp19_;
#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp18_ = gee_iterator_next (_tmp17_);
+ _tmp15_ = _key_it;
#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- if (!_tmp18_) {
+ if (!gee_iterator_next (_tmp15_)) {
#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
break;
-#line 1832 "YandexPublishing.c"
+#line 2046 "YandexPublishing.c"
}
#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp19_ = _key_it;
+ _tmp16_ = _key_it;
#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp20_ = gee_iterator_get (_tmp19_);
+ _tmp17_ = gee_iterator_get (_tmp16_);
#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- key = (gchar*) _tmp20_;
+ key = (gchar*) _tmp17_;
#line 201 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp21_ = self->priv->album_list;
+ _tmp18_ = self->priv->album_list;
#line 201 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp22_ = key;
+ _tmp19_ = key;
#line 201 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- gtk_combo_box_text_append_text (_tmp21_, _tmp22_);
+ gtk_combo_box_text_append_text (_tmp18_, _tmp19_);
#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (key);
-#line 1848 "YandexPublishing.c"
+#line 2062 "YandexPublishing.c"
}
#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_object_unref0 (_key_it);
-#line 1852 "YandexPublishing.c"
+#line 2066 "YandexPublishing.c"
}
#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp23_ = self->priv->album_list;
+ _tmp20_ = self->priv->album_list;
#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_combo_box_get_type (), GtkComboBox), 0);
+ gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_combo_box_get_type (), GtkComboBox), 0);
#line 205 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp24_ = self->priv->builder;
+ _tmp21_ = self->priv->builder;
#line 205 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp25_ = gtk_builder_get_object (_tmp24_, "publish_button");
+ _tmp22_ = gtk_builder_get_object (_tmp21_, "publish_button");
#line 205 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp26_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp25_, gtk_button_get_type ()) ? ((GtkButton*) _tmp25_) : NULL);
+ _tmp23_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp22_, gtk_button_get_type ()) ? ((GtkButton*) _tmp22_) : NULL);
#line 205 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_object_unref0 (self->priv->publish_button);
#line 205 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- self->priv->publish_button = _tmp26_;
+ self->priv->publish_button = _tmp23_;
#line 206 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp27_ = self->priv->builder;
+ _tmp24_ = self->priv->builder;
#line 206 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp28_ = gtk_builder_get_object (_tmp27_, "logout_button");
+ _tmp25_ = gtk_builder_get_object (_tmp24_, "logout_button");
#line 206 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp29_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp28_, gtk_button_get_type ()) ? ((GtkButton*) _tmp28_) : NULL);
+ _tmp26_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp25_, gtk_button_get_type ()) ? ((GtkButton*) _tmp25_) : NULL);
#line 206 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_object_unref0 (self->priv->logout_button);
#line 206 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- self->priv->logout_button = _tmp29_;
+ self->priv->logout_button = _tmp26_;
#line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp30_ = self->priv->publish_button;
+ _tmp27_ = self->priv->publish_button;
#line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_signal_connect_object (_tmp30_, "clicked", (GCallback) _publishing_yandex_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0);
+ g_signal_connect_object (_tmp27_, "clicked", (GCallback) _publishing_yandex_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0);
#line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp31_ = self->priv->logout_button;
+ _tmp28_ = self->priv->logout_button;
#line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_signal_connect_object (_tmp31_, "clicked", (GCallback) _publishing_yandex_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0);
+ g_signal_connect_object (_tmp28_, "clicked", (GCallback) _publishing_yandex_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0);
#line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp32_ = content;
+ _tmp29_ = content;
#line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp33_ = gtk_widget_get_parent (_tmp32_);
+ _tmp30_ = gtk_widget_get_parent (_tmp29_);
#line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp34_ = _tmp33_;
+ _tmp31_ = _tmp30_;
#line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp35_ = content;
+ _tmp32_ = content;
#line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- gtk_container_remove (_tmp34_, _tmp35_);
+ gtk_container_remove (_tmp31_, _tmp32_);
#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp36_ = self->priv->box;
+ _tmp33_ = self->priv->box;
#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp37_ = content;
+ _tmp34_ = content;
#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- gtk_box_pack_start (_tmp36_, _tmp37_, TRUE, TRUE, (guint) 0);
+ gtk_box_pack_start (_tmp33_, _tmp34_, TRUE, TRUE, (guint) 0);
#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_object_unref0 (content);
-#line 1904 "YandexPublishing.c"
+#line 2118 "YandexPublishing.c"
}
goto __finally33;
__catch33_g_error:
{
GError* e = NULL;
- GError* _tmp38_;
- const gchar* _tmp39_;
+ GError* _tmp35_;
+ const gchar* _tmp36_;
#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
e = _inner_error_;
#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_inner_error_ = NULL;
#line 214 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp38_ = e;
+ _tmp35_ = e;
#line 214 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp39_ = _tmp38_->message;
+ _tmp36_ = _tmp35_->message;
#line 214 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_warning ("YandexPublishing.vala:214: Could not load UI: %s", _tmp39_);
+ g_warning ("YandexPublishing.vala:214: Could not load UI: %s", _tmp36_);
#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_error_free0 (e);
-#line 1924 "YandexPublishing.c"
+#line 2138 "YandexPublishing.c"
}
__finally33:
#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -1931,31 +2145,39 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane
g_clear_error (&_inner_error_);
#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return NULL;
-#line 1935 "YandexPublishing.c"
+#line 2149 "YandexPublishing.c"
}
#line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return self;
-#line 1939 "YandexPublishing.c"
+#line 2153 "YandexPublishing.c"
}
-PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane_new (PublishingYandexPublishOptions* options, GeeHashMap* list, SpitPublishingPluginHost* host) {
+PublishingYandexPublishingOptionsPane*
+publishing_yandex_publishing_options_pane_new (PublishingYandexPublishOptions* options,
+ GeeHashMap* list,
+ SpitPublishingPluginHost* host)
+{
#line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return publishing_yandex_publishing_options_pane_construct (PUBLISHING_YANDEX_TYPE_PUBLISHING_OPTIONS_PANE, options, list, host);
-#line 1946 "YandexPublishing.c"
+#line 2164 "YandexPublishing.c"
}
-static void publishing_yandex_publishing_options_pane_on_logout_clicked (PublishingYandexPublishingOptionsPane* self) {
+static void
+publishing_yandex_publishing_options_pane_on_logout_clicked (PublishingYandexPublishingOptionsPane* self)
+{
#line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (PUBLISHING_YANDEX_IS_PUBLISHING_OPTIONS_PANE (self));
#line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_signal_emit (self, publishing_yandex_publishing_options_pane_signals[PUBLISHING_YANDEX_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL], 0);
-#line 1955 "YandexPublishing.c"
+#line 2175 "YandexPublishing.c"
}
-static void publishing_yandex_publishing_options_pane_on_publish_clicked (PublishingYandexPublishingOptionsPane* self) {
+static void
+publishing_yandex_publishing_options_pane_on_publish_clicked (PublishingYandexPublishingOptionsPane* self)
+{
PublishingYandexPublishOptions* _tmp0_;
GtkComboBoxText* _tmp1_;
gchar* _tmp2_;
@@ -2052,11 +2274,13 @@ static void publishing_yandex_publishing_options_pane_on_publish_clicked (Publis
_g_object_unref0 (access_type);
#line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_object_unref0 (tmp);
-#line 2056 "YandexPublishing.c"
+#line 2278 "YandexPublishing.c"
}
-static void publishing_yandex_publishing_options_pane_class_init (PublishingYandexPublishingOptionsPaneClass * klass) {
+static void
+publishing_yandex_publishing_options_pane_class_init (PublishingYandexPublishingOptionsPaneClass * klass)
+{
#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_publishing_options_pane_parent_class = g_type_class_peek_parent (klass);
#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -2067,11 +2291,13 @@ static void publishing_yandex_publishing_options_pane_class_init (PublishingYand
publishing_yandex_publishing_options_pane_signals[PUBLISHING_YANDEX_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL] = g_signal_new ("publish", PUBLISHING_YANDEX_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_publishing_options_pane_signals[PUBLISHING_YANDEX_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL] = g_signal_new ("logout", PUBLISHING_YANDEX_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 2071 "YandexPublishing.c"
+#line 2295 "YandexPublishing.c"
}
-static void publishing_yandex_publishing_options_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) {
+static void
+publishing_yandex_publishing_options_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface)
+{
#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -2082,18 +2308,22 @@ static void publishing_yandex_publishing_options_pane_spit_publishing_dialog_pan
iface->on_pane_uninstalled = (void (*) (SpitPublishingDialogPane *)) publishing_yandex_publishing_options_pane_real_on_pane_uninstalled;
#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
iface->get_widget = (GtkWidget* (*) (SpitPublishingDialogPane *)) publishing_yandex_publishing_options_pane_real_get_widget;
-#line 2086 "YandexPublishing.c"
+#line 2312 "YandexPublishing.c"
}
-static void publishing_yandex_publishing_options_pane_instance_init (PublishingYandexPublishingOptionsPane * self) {
+static void
+publishing_yandex_publishing_options_pane_instance_init (PublishingYandexPublishingOptionsPane * self)
+{
#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self->priv = PUBLISHING_YANDEX_PUBLISHING_OPTIONS_PANE_GET_PRIVATE (self);
-#line 2093 "YandexPublishing.c"
+#line 2321 "YandexPublishing.c"
}
-static void publishing_yandex_publishing_options_pane_finalize (GObject * obj) {
+static void
+publishing_yandex_publishing_options_pane_finalize (GObject * obj)
+{
PublishingYandexPublishingOptionsPane * self;
#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YANDEX_TYPE_PUBLISHING_OPTIONS_PANE, PublishingYandexPublishingOptionsPane);
@@ -2109,11 +2339,13 @@ static void publishing_yandex_publishing_options_pane_finalize (GObject * obj) {
_g_object_unref0 (self->priv->album_list);
#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
G_OBJECT_CLASS (publishing_yandex_publishing_options_pane_parent_class)->finalize (obj);
-#line 2113 "YandexPublishing.c"
+#line 2343 "YandexPublishing.c"
}
-GType publishing_yandex_publishing_options_pane_get_type (void) {
+GType
+publishing_yandex_publishing_options_pane_get_type (void)
+{
static volatile gsize publishing_yandex_publishing_options_pane_type_id__volatile = 0;
if (g_once_init_enter (&publishing_yandex_publishing_options_pane_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingYandexPublishingOptionsPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_yandex_publishing_options_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingYandexPublishingOptionsPane), 0, (GInstanceInitFunc) publishing_yandex_publishing_options_pane_instance_init, NULL };
@@ -2127,42 +2359,44 @@ GType publishing_yandex_publishing_options_pane_get_type (void) {
}
-PublishingYandexUploader* publishing_yandex_uploader_construct (GType object_type, PublishingYandexSession* session, PublishingYandexPublishOptions* options, SpitPublishingPublishable** photos, int photos_length1) {
+PublishingYandexUploader*
+publishing_yandex_uploader_construct (GType object_type,
+ PublishingYandexSession* session,
+ PublishingYandexPublishOptions* options,
+ SpitPublishingPublishable** photos,
+ int photos_length1)
+{
PublishingYandexUploader* self = NULL;
- PublishingYandexSession* _tmp0_;
- SpitPublishingPublishable** _tmp1_;
- gint _tmp1__length1;
- PublishingYandexPublishOptions* _tmp2_;
#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_val_if_fail (PUBLISHING_YANDEX_IS_SESSION (session), NULL);
#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_val_if_fail (PUBLISHING_YANDEX_IS_PUBLISH_OPTIONS (options), NULL);
#line 242 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp0_ = session;
-#line 242 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp1_ = photos;
-#line 242 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp1__length1 = photos_length1;
-#line 242 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- self = (PublishingYandexUploader*) publishing_rest_support_batch_uploader_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, _tmp1__length1);
+ self = (PublishingYandexUploader*) publishing_rest_support_batch_uploader_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), photos, photos_length1);
#line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp2_ = options;
-#line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- self->priv->options = _tmp2_;
+ self->priv->options = options;
#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return self;
-#line 2155 "YandexPublishing.c"
+#line 2381 "YandexPublishing.c"
}
-PublishingYandexUploader* publishing_yandex_uploader_new (PublishingYandexSession* session, PublishingYandexPublishOptions* options, SpitPublishingPublishable** photos, int photos_length1) {
+PublishingYandexUploader*
+publishing_yandex_uploader_new (PublishingYandexSession* session,
+ PublishingYandexPublishOptions* options,
+ SpitPublishingPublishable** photos,
+ int photos_length1)
+{
#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return publishing_yandex_uploader_construct (PUBLISHING_YANDEX_TYPE_UPLOADER, session, options, photos, photos_length1);
-#line 2162 "YandexPublishing.c"
+#line 2393 "YandexPublishing.c"
}
-static PublishingRESTSupportTransaction* publishing_yandex_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base, SpitPublishingPublishable* publishable) {
+static PublishingRESTSupportTransaction*
+publishing_yandex_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base,
+ SpitPublishingPublishable* publishable)
+{
PublishingYandexUploader * self;
PublishingRESTSupportTransaction* result = NULL;
PublishingRESTSupportSession* _tmp0_;
@@ -2200,11 +2434,13 @@ static PublishingRESTSupportTransaction* publishing_yandex_uploader_real_create_
result = _tmp6_;
#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return result;
-#line 2204 "YandexPublishing.c"
+#line 2438 "YandexPublishing.c"
}
-static void publishing_yandex_uploader_class_init (PublishingYandexUploaderClass * klass) {
+static void
+publishing_yandex_uploader_class_init (PublishingYandexUploaderClass * klass)
+{
#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_uploader_parent_class = g_type_class_peek_parent (klass);
#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -2213,28 +2449,34 @@ static void publishing_yandex_uploader_class_init (PublishingYandexUploaderClass
g_type_class_add_private (klass, sizeof (PublishingYandexUploaderPrivate));
#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = (PublishingRESTSupportTransaction* (*) (PublishingRESTSupportBatchUploader *, SpitPublishingPublishable*)) publishing_yandex_uploader_real_create_transaction;
-#line 2217 "YandexPublishing.c"
+#line 2453 "YandexPublishing.c"
}
-static void publishing_yandex_uploader_instance_init (PublishingYandexUploader * self) {
+static void
+publishing_yandex_uploader_instance_init (PublishingYandexUploader * self)
+{
#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self->priv = PUBLISHING_YANDEX_UPLOADER_GET_PRIVATE (self);
-#line 2224 "YandexPublishing.c"
+#line 2462 "YandexPublishing.c"
}
-static void publishing_yandex_uploader_finalize (PublishingRESTSupportBatchUploader * obj) {
+static void
+publishing_yandex_uploader_finalize (PublishingRESTSupportBatchUploader * obj)
+{
PublishingYandexUploader * self;
#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YANDEX_TYPE_UPLOADER, PublishingYandexUploader);
#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_CLASS (publishing_yandex_uploader_parent_class)->finalize (obj);
-#line 2234 "YandexPublishing.c"
+#line 2474 "YandexPublishing.c"
}
-GType publishing_yandex_uploader_get_type (void) {
+GType
+publishing_yandex_uploader_get_type (void)
+{
static volatile gsize publishing_yandex_uploader_type_id__volatile = 0;
if (g_once_init_enter (&publishing_yandex_uploader_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingYandexUploaderClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_yandex_uploader_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingYandexUploader), 0, (GInstanceInitFunc) publishing_yandex_uploader_instance_init, NULL };
@@ -2246,40 +2488,47 @@ GType publishing_yandex_uploader_get_type (void) {
}
-static gchar* bool_to_string (gboolean self) {
+static gchar*
+bool_to_string (gboolean self)
+{
gchar* result = NULL;
-#line 37 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 37 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
if (self) {
-#line 2254 "YandexPublishing.c"
+#line 2498 "YandexPublishing.c"
gchar* _tmp0_;
-#line 38 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 38 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp0_ = g_strdup ("true");
-#line 38 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 38 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
result = _tmp0_;
-#line 38 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 38 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 2262 "YandexPublishing.c"
+#line 2506 "YandexPublishing.c"
} else {
gchar* _tmp1_;
-#line 40 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 40 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp1_ = g_strdup ("false");
-#line 40 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 40 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
result = _tmp1_;
-#line 40 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 40 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 2271 "YandexPublishing.c"
+#line 2515 "YandexPublishing.c"
}
}
-static void _vala_SoupMultipart_free (SoupMultipart* self) {
+static void
+_vala_SoupMultipart_free (SoupMultipart* self)
+{
#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_boxed_free (soup_multipart_get_type (), self);
-#line 2279 "YandexPublishing.c"
+#line 2525 "YandexPublishing.c"
}
-static guint8* string_get_data (const gchar* self, int* result_length1) {
+static guint8*
+string_get_data (const gchar* self,
+ int* result_length1)
+{
guint8* result;
guint8* res = NULL;
gint res_length1;
@@ -2291,126 +2540,123 @@ static guint8* string_get_data (const gchar* self, int* result_length1) {
gint _tmp3__length1;
guint8* _tmp4_;
gint _tmp4__length1;
-#line 1428 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1442 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1443 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
res = (guint8*) self;
-#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1443 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
res_length1 = -1;
-#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1443 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_res_size_ = res_length1;
-#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1444 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp0_ = strlen (self);
-#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1444 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp1_ = _tmp0_;
-#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1444 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
res_length1 = (gint) _tmp1_;
-#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1444 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp2_ = res_length1;
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp3_ = res;
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp3__length1 = res_length1;
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp4_ = _tmp3_;
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp4__length1 = _tmp3__length1;
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
if (result_length1) {
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
*result_length1 = _tmp4__length1;
-#line 2323 "YandexPublishing.c"
+#line 2572 "YandexPublishing.c"
}
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
result = _tmp4_;
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 2329 "YandexPublishing.c"
+#line 2578 "YandexPublishing.c"
}
-static void _g_free0_ (gpointer var) {
+static void
+_g_free0_ (gpointer var)
+{
#line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
var = (g_free (var), NULL);
-#line 2336 "YandexPublishing.c"
+#line 2587 "YandexPublishing.c"
}
-static void _vala_SoupBuffer_free (SoupBuffer* self) {
+static void
+_vala_SoupBuffer_free (SoupBuffer* self)
+{
#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_boxed_free (soup_buffer_get_type (), self);
-#line 2343 "YandexPublishing.c"
+#line 2596 "YandexPublishing.c"
}
-PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_construct (GType object_type, PublishingYandexSession* session, PublishingYandexPublishOptions* options, SpitPublishingPublishable* photo) {
+PublishingYandexUploadTransaction*
+publishing_yandex_upload_transaction_construct (GType object_type,
+ PublishingYandexSession* session,
+ PublishingYandexPublishOptions* options,
+ SpitPublishingPublishable* photo)
+{
PublishingYandexUploadTransaction* self = NULL;
- PublishingYandexSession* _tmp0_;
- PublishingYandexPublishOptions* _tmp1_;
- const gchar* _tmp2_;
- SpitPublishingPublishable* _tmp3_;
- gchar* _tmp4_;
- gchar* _tmp5_;
- PublishingYandexPublishOptions* _tmp6_;
- const gchar* _tmp7_;
- PublishingYandexPublishOptions* _tmp8_;
- const gchar* _tmp9_;
+ const gchar* _tmp0_;
+ gchar* _tmp1_;
+ gchar* _tmp2_;
+ const gchar* _tmp3_;
+ const gchar* _tmp4_;
SoupMultipart* message_parts = NULL;
- SoupMultipart* _tmp10_;
- SpitPublishingPublishable* _tmp11_;
+ SoupMultipart* _tmp5_;
+ gchar* _tmp6_;
+ gchar* _tmp7_;
+ gboolean _tmp8_;
+ gchar* _tmp9_;
+ gchar* _tmp10_;
+ gboolean _tmp11_;
gchar* _tmp12_;
gchar* _tmp13_;
- PublishingYandexPublishOptions* _tmp14_;
- gboolean _tmp15_;
+ const gchar* _tmp14_;
+ gchar* _tmp15_;
gchar* _tmp16_;
- gchar* _tmp17_;
- PublishingYandexPublishOptions* _tmp18_;
- gboolean _tmp19_;
- gchar* _tmp20_;
- gchar* _tmp21_;
- PublishingYandexPublishOptions* _tmp22_;
- const gchar* _tmp23_;
- gchar* _tmp24_;
- gchar* _tmp25_;
gchar* photo_data = NULL;
gsize data_length = 0UL;
gint image_part_num = 0;
- gint _tmp40_;
SoupBuffer* bindable_data = NULL;
- guint8* _tmp41_;
- gint _tmp41__length1;
- guint8* _tmp42_;
- gint _tmp42__length1;
- SoupBuffer* _tmp43_;
- SpitPublishingPublishable* _tmp44_;
- GFile* _tmp45_;
- GFile* _tmp46_;
- gchar* _tmp47_;
- gchar* _tmp48_;
+ guint8* _tmp29_;
+ gint _tmp29__length1;
+ guint8* _tmp30_;
+ gint _tmp30__length1;
+ SoupBuffer* _tmp31_;
+ GFile* _tmp32_;
+ GFile* _tmp33_;
+ gchar* _tmp34_;
+ gchar* _tmp35_;
SoupMessageHeaders* image_part_header = NULL;
SoupBuffer* image_part_body = NULL;
- SoupMessageHeaders* _tmp49_ = NULL;
- SoupBuffer* _tmp50_ = NULL;
+ SoupMessageHeaders* _tmp36_ = NULL;
+ SoupBuffer* _tmp37_ = NULL;
GHashTable* _result_ = NULL;
- GHashFunc _tmp51_;
- GEqualFunc _tmp52_;
- GHashTable* _tmp53_;
- gchar* _tmp54_;
- gchar* _tmp55_;
- gchar* _tmp56_;
- gchar* _tmp57_;
+ GHashFunc _tmp38_;
+ GEqualFunc _tmp39_;
+ GHashTable* _tmp40_;
+ gchar* _tmp41_;
+ gchar* _tmp42_;
+ gchar* _tmp43_;
+ gchar* _tmp44_;
SoupMessage* outbound_message = NULL;
- gchar* _tmp58_;
- gchar* _tmp59_;
- SoupMessage* _tmp60_;
- SoupMessage* _tmp61_;
- SoupMessageHeaders* _tmp62_;
- PublishingYandexSession* _tmp63_;
- gchar* _tmp64_;
- gchar* _tmp65_;
- gchar* _tmp66_;
- gchar* _tmp67_;
- SoupMessageHeaders* _tmp68_;
+ gchar* _tmp45_;
+ gchar* _tmp46_;
+ SoupMessage* _tmp47_;
+ SoupMessage* _tmp48_;
+ SoupMessageHeaders* _tmp49_;
+ gchar* _tmp50_;
+ gchar* _tmp51_;
+ gchar* _tmp52_;
+ gchar* _tmp53_;
+ SoupMessageHeaders* _tmp54_;
GError * _inner_error_ = NULL;
#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_val_if_fail (PUBLISHING_YANDEX_IS_SESSION (session), NULL);
@@ -2419,119 +2665,98 @@ PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_construc
#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (photo), NULL);
#line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp0_ = session;
-#line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp1_ = options;
-#line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp2_ = _tmp1_->destination_album_url;
+ _tmp0_ = options->destination_album_url;
#line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- self = (PublishingYandexUploadTransaction*) publishing_yandex_transaction_construct_with_url (object_type, _tmp0_, _tmp2_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
+ self = (PublishingYandexUploadTransaction*) publishing_yandex_transaction_construct_with_url (object_type, session, _tmp0_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
#line 257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_rest_support_transaction_set_custom_payload (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "qwe", "image/jpeg", (gulong) 1);
#line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp3_ = photo;
-#line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp4_ = spit_publishing_publishable_get_publishing_name (_tmp3_);
-#line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp5_ = _tmp4_;
-#line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp6_ = options;
+ _tmp1_ = spit_publishing_publishable_get_publishing_name (photo);
#line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp7_ = _tmp6_->destination_album;
+ _tmp2_ = _tmp1_;
#line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp8_ = options;
+ _tmp3_ = options->destination_album;
#line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp9_ = _tmp8_->destination_album_url;
+ _tmp4_ = options->destination_album_url;
#line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_debug ("YandexPublishing.vala:259: Uploading '%s' -> %s : %s", _tmp5_, _tmp7_, _tmp9_);
+ g_debug ("YandexPublishing.vala:259: Uploading '%s' -> %s : %s", _tmp2_, _tmp3_, _tmp4_);
#line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _g_free0 (_tmp5_);
+ _g_free0 (_tmp2_);
#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp10_ = soup_multipart_new ("multipart/form-data");
+ _tmp5_ = soup_multipart_new ("multipart/form-data");
#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- message_parts = _tmp10_;
-#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp11_ = photo;
+ message_parts = _tmp5_;
#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp12_ = spit_publishing_publishable_get_publishing_name (_tmp11_);
+ _tmp6_ = spit_publishing_publishable_get_publishing_name (photo);
#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp13_ = _tmp12_;
+ _tmp7_ = _tmp6_;
#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- soup_multipart_append_form_string (message_parts, "title", _tmp13_);
+ soup_multipart_append_form_string (message_parts, "title", _tmp7_);
#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _g_free0 (_tmp13_);
-#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp14_ = options;
+ _g_free0 (_tmp7_);
#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp15_ = _tmp14_->hide_original;
+ _tmp8_ = options->hide_original;
#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp16_ = bool_to_string (_tmp15_);
+ _tmp9_ = bool_to_string (_tmp8_);
#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp17_ = _tmp16_;
+ _tmp10_ = _tmp9_;
#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- soup_multipart_append_form_string (message_parts, "hide_original", _tmp17_);
+ soup_multipart_append_form_string (message_parts, "hide_original", _tmp10_);
#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _g_free0 (_tmp17_);
+ _g_free0 (_tmp10_);
#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp18_ = options;
+ _tmp11_ = options->disable_comments;
#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp19_ = _tmp18_->disable_comments;
+ _tmp12_ = bool_to_string (_tmp11_);
#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp20_ = bool_to_string (_tmp19_);
-#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp21_ = _tmp20_;
+ _tmp13_ = _tmp12_;
#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- soup_multipart_append_form_string (message_parts, "disable_comments", _tmp21_);
+ soup_multipart_append_form_string (message_parts, "disable_comments", _tmp13_);
#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _g_free0 (_tmp21_);
-#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp22_ = options;
+ _g_free0 (_tmp13_);
#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp23_ = _tmp22_->access_type;
+ _tmp14_ = options->access_type;
#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp24_ = g_utf8_strdown (_tmp23_, (gssize) -1);
+ _tmp15_ = g_utf8_strdown (_tmp14_, (gssize) -1);
#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp25_ = _tmp24_;
+ _tmp16_ = _tmp15_;
#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- soup_multipart_append_form_string (message_parts, "access", _tmp25_);
+ soup_multipart_append_form_string (message_parts, "access", _tmp16_);
#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _g_free0 (_tmp25_);
-#line 2500 "YandexPublishing.c"
+ _g_free0 (_tmp16_);
+#line 2728 "YandexPublishing.c"
{
- SpitPublishingPublishable* _tmp26_;
- GFile* _tmp27_;
- GFile* _tmp28_;
- gchar* _tmp29_;
- gchar* _tmp30_;
- gchar* _tmp31_ = NULL;
- gsize _tmp32_ = 0UL;
-#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp26_ = photo;
+ GFile* _tmp17_;
+ GFile* _tmp18_;
+ gchar* _tmp19_;
+ gchar* _tmp20_;
+ gchar* _tmp21_ = NULL;
+ gsize _tmp22_ = 0UL;
#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp27_ = spit_publishing_publishable_get_serialized_file (_tmp26_);
+ _tmp17_ = spit_publishing_publishable_get_serialized_file (photo);
#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp28_ = _tmp27_;
+ _tmp18_ = _tmp17_;
#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp29_ = g_file_get_path (_tmp28_);
+ _tmp19_ = g_file_get_path (_tmp18_);
#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp30_ = _tmp29_;
+ _tmp20_ = _tmp19_;
#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_file_get_contents (_tmp30_, &_tmp31_, &_tmp32_, &_inner_error_);
+ g_file_get_contents (_tmp20_, &_tmp21_, &_tmp22_, &_inner_error_);
#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (photo_data);
#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- photo_data = _tmp31_;
+ photo_data = _tmp21_;
#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- data_length = _tmp32_;
+ data_length = _tmp22_;
#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _g_free0 (_tmp30_);
+ _g_free0 (_tmp20_);
#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _g_object_unref0 (_tmp28_);
+ _g_object_unref0 (_tmp18_);
#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (_inner_error_->domain == G_FILE_ERROR) {
-#line 2535 "YandexPublishing.c"
+#line 2760 "YandexPublishing.c"
goto __catch34_g_file_error;
}
#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -2544,47 +2769,44 @@ PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_construc
g_clear_error (&_inner_error_);
#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return NULL;
-#line 2548 "YandexPublishing.c"
+#line 2773 "YandexPublishing.c"
}
}
goto __finally34;
__catch34_g_file_error:
{
GError* e = NULL;
- SpitPublishingPublishable* _tmp33_;
- GFile* _tmp34_;
- GFile* _tmp35_;
- gchar* _tmp36_;
- gchar* _tmp37_;
- GError* _tmp38_;
- const gchar* _tmp39_;
+ GFile* _tmp23_;
+ GFile* _tmp24_;
+ gchar* _tmp25_;
+ gchar* _tmp26_;
+ GError* _tmp27_;
+ const gchar* _tmp28_;
#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
e = _inner_error_;
#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_inner_error_ = NULL;
#line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp33_ = photo;
+ _tmp23_ = spit_publishing_publishable_get_serialized_file (photo);
#line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp34_ = spit_publishing_publishable_get_serialized_file (_tmp33_);
+ _tmp24_ = _tmp23_;
#line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp35_ = _tmp34_;
+ _tmp25_ = g_file_get_path (_tmp24_);
#line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp36_ = g_file_get_path (_tmp35_);
+ _tmp26_ = _tmp25_;
#line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp37_ = _tmp36_;
+ _tmp27_ = e;
#line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp38_ = e;
+ _tmp28_ = _tmp27_->message;
#line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp39_ = _tmp38_->message;
+ g_critical ("YandexPublishing.vala:273: Failed to read data file '%s': %s", _tmp26_, _tmp28_);
#line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_critical ("YandexPublishing.vala:273: Failed to read data file '%s': %s", _tmp37_, _tmp39_);
+ _g_free0 (_tmp26_);
#line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _g_free0 (_tmp37_);
-#line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _g_object_unref0 (_tmp35_);
+ _g_object_unref0 (_tmp24_);
#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_error_free0 (e);
-#line 2588 "YandexPublishing.c"
+#line 2810 "YandexPublishing.c"
}
__finally34:
#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -2599,100 +2821,94 @@ PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_construc
g_clear_error (&_inner_error_);
#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return NULL;
-#line 2603 "YandexPublishing.c"
+#line 2825 "YandexPublishing.c"
}
#line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp40_ = soup_multipart_get_length (message_parts);
-#line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- image_part_num = _tmp40_;
+ image_part_num = soup_multipart_get_length (message_parts);
#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp41_ = string_get_data (photo_data, &_tmp41__length1);
+ _tmp29_ = string_get_data (photo_data, &_tmp29__length1);
#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp42_ = _tmp41_;
+ _tmp30_ = _tmp29_;
#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp42__length1 = _tmp41__length1;
+ _tmp30__length1 = _tmp29__length1;
#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp43_ = soup_buffer_new (SOUP_MEMORY_COPY, _tmp42_ + 0, ((gint) data_length) - 0);
+ _tmp31_ = soup_buffer_new (SOUP_MEMORY_COPY, _tmp30_ + 0, ((gint) data_length) - 0);
#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- bindable_data = _tmp43_;
+ bindable_data = _tmp31_;
#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp44_ = photo;
+ _tmp32_ = spit_publishing_publishable_get_serialized_file (photo);
#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp45_ = spit_publishing_publishable_get_serialized_file (_tmp44_);
+ _tmp33_ = _tmp32_;
#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp46_ = _tmp45_;
+ _tmp34_ = g_file_get_path (_tmp33_);
#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp47_ = g_file_get_path (_tmp46_);
-#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp48_ = _tmp47_;
+ _tmp35_ = _tmp34_;
#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- soup_multipart_append_form_file (message_parts, "", _tmp48_, "image/jpeg", bindable_data);
+ soup_multipart_append_form_file (message_parts, "", _tmp35_, "image/jpeg", bindable_data);
#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _g_free0 (_tmp48_);
+ _g_free0 (_tmp35_);
#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _g_object_unref0 (_tmp46_);
+ _g_object_unref0 (_tmp33_);
#line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- soup_multipart_get_part (message_parts, image_part_num, &_tmp49_, &_tmp50_);
+ soup_multipart_get_part (message_parts, image_part_num, &_tmp36_, &_tmp37_);
#line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- image_part_header = _tmp49_;
+ image_part_header = _tmp36_;
#line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- image_part_body = _tmp50_;
+ image_part_body = _tmp37_;
#line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp51_ = g_str_hash;
+ _tmp38_ = g_str_hash;
#line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp52_ = g_str_equal;
+ _tmp39_ = g_str_equal;
#line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp53_ = g_hash_table_new_full (_tmp51_, _tmp52_, _g_free0_, _g_free0_);
+ _tmp40_ = g_hash_table_new_full (_tmp38_, _tmp39_, _g_free0_, _g_free0_);
#line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _result_ = _tmp53_;
+ _result_ = _tmp40_;
#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp54_ = g_strdup ("name");
+ _tmp41_ = g_strdup ("name");
#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp55_ = g_strdup ("image");
+ _tmp42_ = g_strdup ("image");
#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_hash_table_insert (_result_, _tmp54_, _tmp55_);
+ g_hash_table_insert (_result_, _tmp41_, _tmp42_);
#line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp56_ = g_strdup ("filename");
+ _tmp43_ = g_strdup ("filename");
#line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp57_ = g_strdup ("unused");
+ _tmp44_ = g_strdup ("unused");
#line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_hash_table_insert (_result_, _tmp56_, _tmp57_);
+ g_hash_table_insert (_result_, _tmp43_, _tmp44_);
#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
soup_message_headers_set_content_disposition (image_part_header, "form-data", _result_);
#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp58_ = publishing_rest_support_transaction_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
+ _tmp45_ = publishing_rest_support_transaction_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp59_ = _tmp58_;
+ _tmp46_ = _tmp45_;
#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp60_ = soup_form_request_new_from_multipart (_tmp59_, message_parts);
+ _tmp47_ = soup_form_request_new_from_multipart (_tmp46_, message_parts);
#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp61_ = _tmp60_;
+ _tmp48_ = _tmp47_;
#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _g_free0 (_tmp59_);
+ _g_free0 (_tmp46_);
#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- outbound_message = _tmp61_;
-#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp62_ = outbound_message->request_headers;
+ outbound_message = _tmp48_;
#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp63_ = session;
+ _tmp49_ = outbound_message->request_headers;
#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp64_ = publishing_yandex_session_get_auth_token (_tmp63_);
+ _tmp50_ = publishing_yandex_session_get_auth_token (session);
#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp65_ = _tmp64_;
+ _tmp51_ = _tmp50_;
#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp66_ = g_strdup_printf ("OAuth %s", _tmp65_);
+ _tmp52_ = g_strdup_printf ("OAuth %s", _tmp51_);
#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp67_ = _tmp66_;
+ _tmp53_ = _tmp52_;
#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- soup_message_headers_append (_tmp62_, "Authorization", _tmp67_);
+ soup_message_headers_append (_tmp49_, "Authorization", _tmp53_);
#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _g_free0 (_tmp67_);
+ _g_free0 (_tmp53_);
#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _g_free0 (_tmp65_);
+ _g_free0 (_tmp51_);
#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp68_ = outbound_message->request_headers;
+ _tmp54_ = outbound_message->request_headers;
#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- soup_message_headers_append (_tmp68_, "Connection", "close");
+ soup_message_headers_append (_tmp54_, "Connection", "close");
#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_rest_support_transaction_set_message (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), outbound_message);
#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -2707,29 +2923,39 @@ PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_construc
__vala_SoupMultipart_free0 (message_parts);
#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return self;
-#line 2711 "YandexPublishing.c"
+#line 2927 "YandexPublishing.c"
}
-PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_new (PublishingYandexSession* session, PublishingYandexPublishOptions* options, SpitPublishingPublishable* photo) {
+PublishingYandexUploadTransaction*
+publishing_yandex_upload_transaction_new (PublishingYandexSession* session,
+ PublishingYandexPublishOptions* options,
+ SpitPublishingPublishable* photo)
+{
#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return publishing_yandex_upload_transaction_construct (PUBLISHING_YANDEX_TYPE_UPLOAD_TRANSACTION, session, options, photo);
-#line 2718 "YandexPublishing.c"
+#line 2938 "YandexPublishing.c"
}
-static void publishing_yandex_upload_transaction_class_init (PublishingYandexUploadTransactionClass * klass) {
+static void
+publishing_yandex_upload_transaction_class_init (PublishingYandexUploadTransactionClass * klass)
+{
#line 253 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_upload_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 2725 "YandexPublishing.c"
+#line 2947 "YandexPublishing.c"
}
-static void publishing_yandex_upload_transaction_instance_init (PublishingYandexUploadTransaction * self) {
+static void
+publishing_yandex_upload_transaction_instance_init (PublishingYandexUploadTransaction * self)
+{
}
-GType publishing_yandex_upload_transaction_get_type (void) {
+GType
+publishing_yandex_upload_transaction_get_type (void)
+{
static volatile gsize publishing_yandex_upload_transaction_type_id__volatile = 0;
if (g_once_init_enter (&publishing_yandex_upload_transaction_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingYandexUploadTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_yandex_upload_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingYandexUploadTransaction), 0, (GInstanceInitFunc) publishing_yandex_upload_transaction_instance_init, NULL };
@@ -2741,13 +2967,15 @@ GType publishing_yandex_upload_transaction_get_type (void) {
}
-PublishingYandexYandexPublisher* publishing_yandex_yandex_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host) {
+PublishingYandexYandexPublisher*
+publishing_yandex_yandex_publisher_construct (GType object_type,
+ SpitPublishingService* service,
+ SpitPublishingPluginHost* host)
+{
PublishingYandexYandexPublisher * self = NULL;
- SpitPublishingService* _tmp0_;
- SpitPublishingPluginHost* _tmp1_;
- PublishingYandexSession* _tmp2_;
- GeeHashMap* _tmp3_;
- PublishingYandexPublishOptions* _tmp4_;
+ PublishingYandexSession* _tmp0_;
+ GeeHashMap* _tmp1_;
+ PublishingYandexPublishOptions* _tmp2_;
#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_val_if_fail (SPIT_PUBLISHING_IS_SERVICE (service), NULL);
#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -2755,45 +2983,46 @@ PublishingYandexYandexPublisher* publishing_yandex_yandex_publisher_construct (G
#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self = (PublishingYandexYandexPublisher*) g_object_new (object_type, NULL);
#line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp0_ = service;
-#line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- self->priv->service = _tmp0_;
-#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp1_ = host;
+ self->priv->service = service;
#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- self->priv->host = _tmp1_;
+ self->priv->host = host;
#line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp2_ = publishing_yandex_session_new ();
+ _tmp0_ = publishing_yandex_session_new ();
#line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_publishing_rest_support_session_unref0 (self->priv->session);
#line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- self->priv->session = _tmp2_;
+ self->priv->session = _tmp0_;
#line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp3_ = 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);
+ _tmp1_ = 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 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_object_unref0 (self->priv->album_list);
#line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- self->priv->album_list = _tmp3_;
+ self->priv->album_list = _tmp1_;
#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp4_ = publishing_yandex_publish_options_new ();
+ _tmp2_ = publishing_yandex_publish_options_new ();
#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_publishing_yandex_publish_options_unref0 (self->priv->options);
#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- self->priv->options = _tmp4_;
+ self->priv->options = _tmp2_;
#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return self;
-#line 2786 "YandexPublishing.c"
+#line 3010 "YandexPublishing.c"
}
-PublishingYandexYandexPublisher* publishing_yandex_yandex_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host) {
+PublishingYandexYandexPublisher*
+publishing_yandex_yandex_publisher_new (SpitPublishingService* service,
+ SpitPublishingPluginHost* host)
+{
#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return publishing_yandex_yandex_publisher_construct (PUBLISHING_YANDEX_TYPE_YANDEX_PUBLISHER, service, host);
-#line 2793 "YandexPublishing.c"
+#line 3020 "YandexPublishing.c"
}
-gchar* publishing_yandex_yandex_publisher_get_persistent_auth_token (PublishingYandexYandexPublisher* self) {
+gchar*
+publishing_yandex_yandex_publisher_get_persistent_auth_token (PublishingYandexYandexPublisher* self)
+{
gchar* result = NULL;
SpitPublishingPluginHost* _tmp0_;
gchar* _tmp1_;
@@ -2807,13 +3036,15 @@ gchar* publishing_yandex_yandex_publisher_get_persistent_auth_token (PublishingY
result = _tmp1_;
#line 323 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return result;
-#line 2811 "YandexPublishing.c"
+#line 3040 "YandexPublishing.c"
}
-void publishing_yandex_yandex_publisher_set_persistent_auth_token (PublishingYandexYandexPublisher* self, const gchar* auth_token) {
+void
+publishing_yandex_yandex_publisher_set_persistent_auth_token (PublishingYandexYandexPublisher* self,
+ const gchar* auth_token)
+{
SpitPublishingPluginHost* _tmp0_;
- const gchar* _tmp1_;
#line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
#line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -2821,14 +3052,14 @@ void publishing_yandex_yandex_publisher_set_persistent_auth_token (PublishingYan
#line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp0_ = self->priv->host;
#line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp1_ = auth_token;
-#line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "auth_token", _tmp1_);
-#line 2828 "YandexPublishing.c"
+ spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "auth_token", auth_token);
+#line 3057 "YandexPublishing.c"
}
-void publishing_yandex_yandex_publisher_invalidate_persistent_session (PublishingYandexYandexPublisher* self) {
+void
+publishing_yandex_yandex_publisher_invalidate_persistent_session (PublishingYandexYandexPublisher* self)
+{
SpitPublishingPluginHost* _tmp0_;
#line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
@@ -2836,11 +3067,13 @@ void publishing_yandex_yandex_publisher_invalidate_persistent_session (Publishin
_tmp0_ = self->priv->host;
#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
spit_host_interface_unset_config_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "auth_token");
-#line 2840 "YandexPublishing.c"
+#line 3071 "YandexPublishing.c"
}
-gboolean publishing_yandex_yandex_publisher_is_persistent_session_available (PublishingYandexYandexPublisher* self) {
+gboolean
+publishing_yandex_yandex_publisher_is_persistent_session_available (PublishingYandexYandexPublisher* self)
+{
gboolean result = FALSE;
gchar* _tmp0_;
gchar* _tmp1_;
@@ -2859,11 +3092,13 @@ gboolean publishing_yandex_yandex_publisher_is_persistent_session_available (Pub
result = _tmp2_;
#line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return result;
-#line 2863 "YandexPublishing.c"
+#line 3096 "YandexPublishing.c"
}
-static gboolean publishing_yandex_yandex_publisher_real_is_running (SpitPublishingPublisher* base) {
+static gboolean
+publishing_yandex_yandex_publisher_real_is_running (SpitPublishingPublisher* base)
+{
PublishingYandexYandexPublisher * self;
gboolean result = FALSE;
gboolean _tmp0_;
@@ -2875,11 +3110,13 @@ static gboolean publishing_yandex_yandex_publisher_real_is_running (SpitPublishi
result = _tmp0_;
#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return result;
-#line 2879 "YandexPublishing.c"
+#line 3114 "YandexPublishing.c"
}
-static SpitPublishingService* publishing_yandex_yandex_publisher_real_get_service (SpitPublishingPublisher* base) {
+static SpitPublishingService*
+publishing_yandex_yandex_publisher_real_get_service (SpitPublishingPublisher* base)
+{
PublishingYandexYandexPublisher * self;
SpitPublishingService* result = NULL;
SpitPublishingService* _tmp0_;
@@ -2894,11 +3131,14 @@ static SpitPublishingService* publishing_yandex_yandex_publisher_real_get_servic
result = _tmp1_;
#line 343 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return result;
-#line 2898 "YandexPublishing.c"
+#line 3135 "YandexPublishing.c"
}
-static gchar* publishing_yandex_yandex_publisher_check_response (PublishingYandexYandexPublisher* self, PublishingRESTSupportXmlDocument* doc) {
+static gchar*
+publishing_yandex_yandex_publisher_check_response (PublishingYandexYandexPublisher* self,
+ PublishingRESTSupportXmlDocument* doc)
+{
gchar* result = NULL;
#line 346 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_val_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self), NULL);
@@ -2908,11 +3148,15 @@ static gchar* publishing_yandex_yandex_publisher_check_response (PublishingYande
result = NULL;
#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return result;
-#line 2912 "YandexPublishing.c"
+#line 3152 "YandexPublishing.c"
}
-static void publishing_yandex_yandex_publisher_parse_album_entry (PublishingYandexYandexPublisher* self, xmlNode* e, GError** error) {
+static void
+publishing_yandex_yandex_publisher_parse_album_entry (PublishingYandexYandexPublisher* self,
+ xmlNode* e,
+ GError** error)
+{
gchar* title = NULL;
gchar* link = NULL;
#line 350 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -2921,154 +3165,151 @@ static void publishing_yandex_yandex_publisher_parse_album_entry (PublishingYand
title = NULL;
#line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
link = NULL;
-#line 2925 "YandexPublishing.c"
+#line 3169 "YandexPublishing.c"
{
xmlNode* c = NULL;
xmlNode* _tmp0_;
- xmlNode* _tmp1_;
#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp0_ = e;
+ _tmp0_ = e->children;
#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp1_ = _tmp0_->children;
-#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- c = _tmp1_;
-#line 2936 "YandexPublishing.c"
+ c = _tmp0_;
+#line 3177 "YandexPublishing.c"
{
- gboolean _tmp2_ = FALSE;
+ gboolean _tmp1_ = FALSE;
#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp2_ = TRUE;
+ _tmp1_ = TRUE;
#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
while (TRUE) {
-#line 2943 "YandexPublishing.c"
+#line 3184 "YandexPublishing.c"
+ xmlNode* _tmp4_;
xmlNode* _tmp5_;
- xmlNode* _tmp6_;
- const gchar* _tmp7_;
- gboolean _tmp10_ = FALSE;
- xmlNode* _tmp11_;
- const gchar* _tmp12_;
- gboolean _tmp18_ = FALSE;
- const gchar* _tmp19_;
+ const gchar* _tmp6_;
+ gboolean _tmp9_ = FALSE;
+ xmlNode* _tmp10_;
+ const gchar* _tmp11_;
+ gboolean _tmp17_ = FALSE;
+ const gchar* _tmp18_;
#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- if (!_tmp2_) {
-#line 2954 "YandexPublishing.c"
+ if (!_tmp1_) {
+#line 3195 "YandexPublishing.c"
+ xmlNode* _tmp2_;
xmlNode* _tmp3_;
- xmlNode* _tmp4_;
#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp3_ = c;
+ _tmp2_ = c;
#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp4_ = _tmp3_->next;
+ _tmp3_ = _tmp2_->next;
#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- c = _tmp4_;
-#line 2963 "YandexPublishing.c"
+ c = _tmp3_;
+#line 3204 "YandexPublishing.c"
}
#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp2_ = FALSE;
+ _tmp1_ = FALSE;
#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp5_ = c;
+ _tmp4_ = c;
#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- if (!(_tmp5_ != NULL)) {
+ if (!(_tmp4_ != NULL)) {
#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
break;
-#line 2973 "YandexPublishing.c"
+#line 3214 "YandexPublishing.c"
}
#line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp6_ = c;
+ _tmp5_ = c;
#line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp7_ = _tmp6_->name;
+ _tmp6_ = _tmp5_->name;
#line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- if (g_strcmp0 (_tmp7_, "title") == 0) {
-#line 2981 "YandexPublishing.c"
- xmlNode* _tmp8_;
- gchar* _tmp9_;
+ if (g_strcmp0 (_tmp6_, "title") == 0) {
+#line 3222 "YandexPublishing.c"
+ xmlNode* _tmp7_;
+ gchar* _tmp8_;
#line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp8_ = c;
+ _tmp7_ = c;
#line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp9_ = (gchar*) xmlNodeGetContent (_tmp8_);
+ _tmp8_ = (gchar*) xmlNodeGetContent (_tmp7_);
#line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (title);
#line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- title = _tmp9_;
-#line 2992 "YandexPublishing.c"
+ title = _tmp8_;
+#line 3233 "YandexPublishing.c"
}
#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp11_ = c;
+ _tmp10_ = c;
#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp12_ = _tmp11_->name;
+ _tmp11_ = _tmp10_->name;
#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- if (g_strcmp0 (_tmp12_, "link") == 0) {
-#line 3000 "YandexPublishing.c"
- xmlNode* _tmp13_;
+ if (g_strcmp0 (_tmp11_, "link") == 0) {
+#line 3241 "YandexPublishing.c"
+ xmlNode* _tmp12_;
+ gchar* _tmp13_;
gchar* _tmp14_;
- gchar* _tmp15_;
#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp13_ = c;
+ _tmp12_ = c;
#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp14_ = (gchar*) xmlGetProp (_tmp13_, (xmlChar*) "rel");
+ _tmp13_ = (gchar*) xmlGetProp (_tmp12_, (xmlChar*) "rel");
#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp15_ = _tmp14_;
+ _tmp14_ = _tmp13_;
#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp10_ = g_strcmp0 (_tmp15_, "photos") == 0;
+ _tmp9_ = g_strcmp0 (_tmp14_, "photos") == 0;
#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _g_free0 (_tmp15_);
-#line 3014 "YandexPublishing.c"
+ _g_free0 (_tmp14_);
+#line 3255 "YandexPublishing.c"
} else {
#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp10_ = FALSE;
-#line 3018 "YandexPublishing.c"
+ _tmp9_ = FALSE;
+#line 3259 "YandexPublishing.c"
}
#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- if (_tmp10_) {
-#line 3022 "YandexPublishing.c"
- xmlNode* _tmp16_;
- gchar* _tmp17_;
+ if (_tmp9_) {
+#line 3263 "YandexPublishing.c"
+ xmlNode* _tmp15_;
+ gchar* _tmp16_;
#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp16_ = c;
+ _tmp15_ = c;
#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp17_ = (gchar*) xmlGetProp (_tmp16_, (xmlChar*) "href");
+ _tmp16_ = (gchar*) xmlGetProp (_tmp15_, (xmlChar*) "href");
#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (link);
#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- link = _tmp17_;
-#line 3033 "YandexPublishing.c"
+ link = _tmp16_;
+#line 3274 "YandexPublishing.c"
}
#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp19_ = title;
+ _tmp18_ = title;
#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- if (_tmp19_ != NULL) {
-#line 3039 "YandexPublishing.c"
- const gchar* _tmp20_;
+ if (_tmp18_ != NULL) {
+#line 3280 "YandexPublishing.c"
+ const gchar* _tmp19_;
#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp20_ = link;
+ _tmp19_ = link;
#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp18_ = _tmp20_ != NULL;
-#line 3045 "YandexPublishing.c"
+ _tmp17_ = _tmp19_ != NULL;
+#line 3286 "YandexPublishing.c"
} else {
#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp18_ = FALSE;
-#line 3049 "YandexPublishing.c"
+ _tmp17_ = FALSE;
+#line 3290 "YandexPublishing.c"
}
#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- if (_tmp18_) {
-#line 3053 "YandexPublishing.c"
+ if (_tmp17_) {
+#line 3294 "YandexPublishing.c"
+ const gchar* _tmp20_;
const gchar* _tmp21_;
- const gchar* _tmp22_;
- GeeHashMap* _tmp23_;
+ GeeHashMap* _tmp22_;
+ const gchar* _tmp23_;
const gchar* _tmp24_;
- const gchar* _tmp25_;
#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp21_ = title;
+ _tmp20_ = title;
#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp22_ = link;
+ _tmp21_ = link;
#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_debug ("YandexPublishing.vala:362: Added album: '%s', link: %s", _tmp21_, _tmp22_);
+ g_debug ("YandexPublishing.vala:362: Added album: '%s', link: %s", _tmp20_, _tmp21_);
#line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp23_ = self->priv->album_list;
+ _tmp22_ = self->priv->album_list;
#line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp24_ = title;
+ _tmp23_ = title;
#line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp25_ = link;
+ _tmp24_ = link;
#line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp24_, _tmp25_);
+ gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp23_, _tmp24_);
#line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (title);
#line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3079,7 +3320,7 @@ static void publishing_yandex_yandex_publisher_parse_album_entry (PublishingYand
link = NULL;
#line 366 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
break;
-#line 3083 "YandexPublishing.c"
+#line 3324 "YandexPublishing.c"
}
}
}
@@ -3088,38 +3329,42 @@ static void publishing_yandex_yandex_publisher_parse_album_entry (PublishingYand
_g_free0 (link);
#line 350 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (title);
-#line 3092 "YandexPublishing.c"
+#line 3333 "YandexPublishing.c"
}
-static gchar* _publishing_yandex_yandex_publisher_check_response_publishing_rest_support_xml_document_check_for_error_response (PublishingRESTSupportXmlDocument* doc, gpointer self) {
+static gchar*
+_publishing_yandex_yandex_publisher_check_response_publishing_rest_support_xml_document_check_for_error_response (PublishingRESTSupportXmlDocument* doc,
+ gpointer self)
+{
gchar* result;
result = publishing_yandex_yandex_publisher_check_response ((PublishingYandexYandexPublisher*) self, doc);
#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return result;
-#line 3101 "YandexPublishing.c"
+#line 3345 "YandexPublishing.c"
}
-void publishing_yandex_yandex_publisher_parse_album_creation (PublishingYandexYandexPublisher* self, const gchar* data, GError** error) {
+void
+publishing_yandex_yandex_publisher_parse_album_creation (PublishingYandexYandexPublisher* self,
+ const gchar* data,
+ GError** error)
+{
PublishingRESTSupportXmlDocument* doc = NULL;
- const gchar* _tmp0_;
- PublishingRESTSupportXmlDocument* _tmp1_;
+ PublishingRESTSupportXmlDocument* _tmp0_;
xmlNode* root = NULL;
- PublishingRESTSupportXmlDocument* _tmp2_;
+ PublishingRESTSupportXmlDocument* _tmp1_;
+ xmlNode* _tmp2_;
xmlNode* _tmp3_;
- xmlNode* _tmp4_;
GError * _inner_error_ = NULL;
#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (data != NULL);
#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp0_ = data;
-#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp1_ = publishing_rest_support_xml_document_parse_string (_tmp0_, _publishing_yandex_yandex_publisher_check_response_publishing_rest_support_xml_document_check_for_error_response, self, &_inner_error_);
+ _tmp0_ = publishing_rest_support_xml_document_parse_string (data, _publishing_yandex_yandex_publisher_check_response_publishing_rest_support_xml_document_check_for_error_response, self, &_inner_error_);
#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- doc = _tmp1_;
+ doc = _tmp0_;
#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3128,7 +3373,7 @@ void publishing_yandex_yandex_publisher_parse_album_creation (PublishingYandexYa
g_propagate_error (error, _inner_error_);
#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return;
-#line 3132 "YandexPublishing.c"
+#line 3377 "YandexPublishing.c"
} else {
#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3136,19 +3381,19 @@ void publishing_yandex_yandex_publisher_parse_album_creation (PublishingYandexYa
g_clear_error (&_inner_error_);
#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return;
-#line 3140 "YandexPublishing.c"
+#line 3385 "YandexPublishing.c"
}
}
#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp2_ = doc;
+ _tmp1_ = doc;
#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp3_ = publishing_rest_support_xml_document_get_root_node (_tmp2_);
+ _tmp2_ = publishing_rest_support_xml_document_get_root_node (_tmp1_);
#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- root = _tmp3_;
+ root = _tmp2_;
#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp4_ = root;
+ _tmp3_ = root;
#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- publishing_yandex_yandex_publisher_parse_album_entry (self, _tmp4_, &_inner_error_);
+ publishing_yandex_yandex_publisher_parse_album_entry (self, _tmp3_, &_inner_error_);
#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3159,7 +3404,7 @@ void publishing_yandex_yandex_publisher_parse_album_creation (PublishingYandexYa
_publishing_rest_support_xml_document_unref0 (doc);
#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return;
-#line 3163 "YandexPublishing.c"
+#line 3408 "YandexPublishing.c"
} else {
#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_publishing_rest_support_xml_document_unref0 (doc);
@@ -3169,33 +3414,34 @@ void publishing_yandex_yandex_publisher_parse_album_creation (PublishingYandexYa
g_clear_error (&_inner_error_);
#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return;
-#line 3173 "YandexPublishing.c"
+#line 3418 "YandexPublishing.c"
}
}
#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_publishing_rest_support_xml_document_unref0 (doc);
-#line 3178 "YandexPublishing.c"
+#line 3423 "YandexPublishing.c"
}
-void publishing_yandex_yandex_publisher_parse_album_list (PublishingYandexYandexPublisher* self, const gchar* data, GError** error) {
+void
+publishing_yandex_yandex_publisher_parse_album_list (PublishingYandexYandexPublisher* self,
+ const gchar* data,
+ GError** error)
+{
PublishingRESTSupportXmlDocument* doc = NULL;
- const gchar* _tmp0_;
- PublishingRESTSupportXmlDocument* _tmp1_;
+ PublishingRESTSupportXmlDocument* _tmp0_;
xmlNode* root = NULL;
- PublishingRESTSupportXmlDocument* _tmp2_;
- xmlNode* _tmp3_;
+ PublishingRESTSupportXmlDocument* _tmp1_;
+ xmlNode* _tmp2_;
GError * _inner_error_ = NULL;
#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (data != NULL);
#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp0_ = data;
-#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp1_ = publishing_rest_support_xml_document_parse_string (_tmp0_, _publishing_yandex_yandex_publisher_check_response_publishing_rest_support_xml_document_check_for_error_response, self, &_inner_error_);
+ _tmp0_ = publishing_rest_support_xml_document_parse_string (data, _publishing_yandex_yandex_publisher_check_response_publishing_rest_support_xml_document_check_for_error_response, self, &_inner_error_);
#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- doc = _tmp1_;
+ doc = _tmp0_;
#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3204,7 +3450,7 @@ void publishing_yandex_yandex_publisher_parse_album_list (PublishingYandexYandex
g_propagate_error (error, _inner_error_);
#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return;
-#line 3208 "YandexPublishing.c"
+#line 3454 "YandexPublishing.c"
} else {
#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3212,75 +3458,75 @@ void publishing_yandex_yandex_publisher_parse_album_list (PublishingYandexYandex
g_clear_error (&_inner_error_);
#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return;
-#line 3216 "YandexPublishing.c"
+#line 3462 "YandexPublishing.c"
}
}
#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp2_ = doc;
+ _tmp1_ = doc;
#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp3_ = publishing_rest_support_xml_document_get_root_node (_tmp2_);
+ _tmp2_ = publishing_rest_support_xml_document_get_root_node (_tmp1_);
#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- root = _tmp3_;
-#line 3225 "YandexPublishing.c"
+ root = _tmp2_;
+#line 3471 "YandexPublishing.c"
{
xmlNode* e = NULL;
+ xmlNode* _tmp3_;
xmlNode* _tmp4_;
- xmlNode* _tmp5_;
#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp4_ = root;
+ _tmp3_ = root;
#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp5_ = _tmp4_->children;
+ _tmp4_ = _tmp3_->children;
#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- e = _tmp5_;
-#line 3236 "YandexPublishing.c"
+ e = _tmp4_;
+#line 3482 "YandexPublishing.c"
{
- gboolean _tmp6_ = FALSE;
+ gboolean _tmp5_ = FALSE;
#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp6_ = TRUE;
+ _tmp5_ = TRUE;
#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
while (TRUE) {
-#line 3243 "YandexPublishing.c"
+#line 3489 "YandexPublishing.c"
+ xmlNode* _tmp8_;
xmlNode* _tmp9_;
- xmlNode* _tmp10_;
- const gchar* _tmp11_;
- xmlNode* _tmp12_;
+ const gchar* _tmp10_;
+ xmlNode* _tmp11_;
#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- if (!_tmp6_) {
-#line 3250 "YandexPublishing.c"
+ if (!_tmp5_) {
+#line 3496 "YandexPublishing.c"
+ xmlNode* _tmp6_;
xmlNode* _tmp7_;
- xmlNode* _tmp8_;
#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp7_ = e;
+ _tmp6_ = e;
#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp8_ = _tmp7_->next;
+ _tmp7_ = _tmp6_->next;
#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- e = _tmp8_;
-#line 3259 "YandexPublishing.c"
+ e = _tmp7_;
+#line 3505 "YandexPublishing.c"
}
#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp6_ = FALSE;
+ _tmp5_ = FALSE;
#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp9_ = e;
+ _tmp8_ = e;
#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- if (!(_tmp9_ != NULL)) {
+ if (!(_tmp8_ != NULL)) {
#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
break;
-#line 3269 "YandexPublishing.c"
+#line 3515 "YandexPublishing.c"
}
#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp10_ = e;
+ _tmp9_ = e;
#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp11_ = _tmp10_->name;
+ _tmp10_ = _tmp9_->name;
#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- if (g_strcmp0 (_tmp11_, "entry") != 0) {
+ if (g_strcmp0 (_tmp10_, "entry") != 0) {
#line 384 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
continue;
-#line 3279 "YandexPublishing.c"
+#line 3525 "YandexPublishing.c"
}
#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp12_ = e;
+ _tmp11_ = e;
#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- publishing_yandex_yandex_publisher_parse_album_entry (self, _tmp12_, &_inner_error_);
+ publishing_yandex_yandex_publisher_parse_album_entry (self, _tmp11_, &_inner_error_);
#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3291,7 +3537,7 @@ void publishing_yandex_yandex_publisher_parse_album_list (PublishingYandexYandex
_publishing_rest_support_xml_document_unref0 (doc);
#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return;
-#line 3295 "YandexPublishing.c"
+#line 3541 "YandexPublishing.c"
} else {
#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_publishing_rest_support_xml_document_unref0 (doc);
@@ -3301,7 +3547,7 @@ void publishing_yandex_yandex_publisher_parse_album_list (PublishingYandexYandex
g_clear_error (&_inner_error_);
#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return;
-#line 3305 "YandexPublishing.c"
+#line 3551 "YandexPublishing.c"
}
}
}
@@ -3309,105 +3555,101 @@ void publishing_yandex_yandex_publisher_parse_album_list (PublishingYandexYandex
}
#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_publishing_rest_support_xml_document_unref0 (doc);
-#line 3313 "YandexPublishing.c"
+#line 3559 "YandexPublishing.c"
}
-static void _publishing_yandex_yandex_publisher_album_creation_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
+static void
+_publishing_yandex_yandex_publisher_album_creation_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+ gpointer self)
+{
#line 391 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_yandex_publisher_album_creation_complete ((PublishingYandexYandexPublisher*) self, _sender);
-#line 3320 "YandexPublishing.c"
+#line 3569 "YandexPublishing.c"
}
-static void _publishing_yandex_yandex_publisher_album_creation_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
+static void
+_publishing_yandex_yandex_publisher_album_creation_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+ GError* err,
+ gpointer self)
+{
#line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_yandex_publisher_album_creation_error ((PublishingYandexYandexPublisher*) self, _sender, err);
-#line 3327 "YandexPublishing.c"
+#line 3580 "YandexPublishing.c"
}
-static void publishing_yandex_yandex_publisher_album_creation_error (PublishingYandexYandexPublisher* self, PublishingRESTSupportTransaction* t, GError* err) {
- PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_yandex_yandex_publisher_album_creation_error (PublishingYandexYandexPublisher* self,
+ PublishingRESTSupportTransaction* t,
+ GError* err)
+{
+ guint _tmp0_;
guint _tmp1_;
- PublishingRESTSupportTransaction* _tmp2_;
- guint _tmp3_;
- GError* _tmp4_;
- const gchar* _tmp5_;
+ const gchar* _tmp2_;
#line 390 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
#line 390 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (t));
#line 391 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp0_ = t;
-#line 391 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
+ g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
#line 391 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_album_creation_complete_publishing_rest_support_transaction_completed, self);
-#line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp2_ = t;
+ g_signal_handlers_disconnect_matched (t, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_album_creation_complete_publishing_rest_support_transaction_completed, self);
#line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
+ g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
#line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_album_creation_error_publishing_rest_support_transaction_network_error, self);
+ g_signal_handlers_disconnect_matched (t, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_album_creation_error_publishing_rest_support_transaction_network_error, self);
#line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp4_ = err;
+ _tmp2_ = err->message;
#line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp5_ = _tmp4_->message;
-#line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_warning ("YandexPublishing.vala:394: Album creation error: %s", _tmp5_);
-#line 3360 "YandexPublishing.c"
+ g_warning ("YandexPublishing.vala:394: Album creation error: %s", _tmp2_);
+#line 3608 "YandexPublishing.c"
}
-static void publishing_yandex_yandex_publisher_album_creation_complete (PublishingYandexYandexPublisher* self, PublishingRESTSupportTransaction* t) {
- PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_yandex_yandex_publisher_album_creation_complete (PublishingYandexYandexPublisher* self,
+ PublishingRESTSupportTransaction* t)
+{
+ guint _tmp0_;
guint _tmp1_;
- PublishingRESTSupportTransaction* _tmp2_;
- guint _tmp3_;
- GeeHashMap* _tmp9_;
- PublishingYandexPublishOptions* _tmp10_;
- const gchar* _tmp11_;
- gpointer _tmp12_;
- gchar* _tmp13_;
- gboolean _tmp14_;
+ GeeHashMap* _tmp6_;
+ PublishingYandexPublishOptions* _tmp7_;
+ const gchar* _tmp8_;
+ gpointer _tmp9_;
+ gchar* _tmp10_;
+ gboolean _tmp11_;
GError * _inner_error_ = NULL;
#line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
#line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (t));
#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp0_ = t;
-#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
+ g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_album_creation_complete_publishing_rest_support_transaction_completed, self);
-#line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp2_ = t;
+ g_signal_handlers_disconnect_matched (t, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_album_creation_complete_publishing_rest_support_transaction_completed, self);
#line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
+ g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
#line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_album_creation_error_publishing_rest_support_transaction_network_error, self);
-#line 3392 "YandexPublishing.c"
+ g_signal_handlers_disconnect_matched (t, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_album_creation_error_publishing_rest_support_transaction_network_error, self);
+#line 3637 "YandexPublishing.c"
{
- PublishingRESTSupportTransaction* _tmp4_;
- gchar* _tmp5_;
- gchar* _tmp6_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp4_ = t;
+ _tmp2_ = publishing_rest_support_transaction_get_response (t);
#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp5_ = publishing_rest_support_transaction_get_response (_tmp4_);
+ _tmp3_ = _tmp2_;
#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp6_ = _tmp5_;
+ publishing_yandex_yandex_publisher_parse_album_creation (self, _tmp3_, &_inner_error_);
#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- publishing_yandex_yandex_publisher_parse_album_creation (self, _tmp6_, &_inner_error_);
-#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _g_free0 (_tmp6_);
+ _g_free0 (_tmp3_);
#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3411 "YandexPublishing.c"
+#line 3653 "YandexPublishing.c"
goto __catch35_spit_publishing_publishing_error;
}
#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3416,30 +3658,30 @@ static void publishing_yandex_yandex_publisher_album_creation_complete (Publishi
g_clear_error (&_inner_error_);
#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return;
-#line 3420 "YandexPublishing.c"
+#line 3662 "YandexPublishing.c"
}
}
goto __finally35;
__catch35_spit_publishing_publishing_error:
{
GError* err = NULL;
- SpitPublishingPluginHost* _tmp7_;
- GError* _tmp8_;
+ SpitPublishingPluginHost* _tmp4_;
+ GError* _tmp5_;
#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
err = _inner_error_;
#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_inner_error_ = NULL;
#line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp7_ = self->priv->host;
+ _tmp4_ = self->priv->host;
#line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp8_ = err;
+ _tmp5_ = err;
#line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- spit_publishing_plugin_host_post_error (_tmp7_, _tmp8_);
+ spit_publishing_plugin_host_post_error (_tmp4_, _tmp5_);
#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_error_free0 (err);
#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return;
-#line 3443 "YandexPublishing.c"
+#line 3685 "YandexPublishing.c"
}
__finally35:
#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3450,47 +3692,49 @@ static void publishing_yandex_yandex_publisher_album_creation_complete (Publishi
g_clear_error (&_inner_error_);
#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return;
-#line 3454 "YandexPublishing.c"
+#line 3696 "YandexPublishing.c"
}
#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp9_ = self->priv->album_list;
+ _tmp6_ = self->priv->album_list;
#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp10_ = self->priv->options;
+ _tmp7_ = self->priv->options;
#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp11_ = _tmp10_->destination_album;
+ _tmp8_ = _tmp7_->destination_album;
#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp12_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp11_);
+ _tmp9_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp8_);
#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp13_ = (gchar*) _tmp12_;
+ _tmp10_ = (gchar*) _tmp9_;
#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp14_ = _tmp13_ != NULL;
+ _tmp11_ = _tmp10_ != NULL;
#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _g_free0 (_tmp13_);
+ _g_free0 (_tmp10_);
#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- if (_tmp14_) {
+ if (_tmp11_) {
#line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_yandex_publisher_start_upload (self);
-#line 3474 "YandexPublishing.c"
+#line 3716 "YandexPublishing.c"
} else {
- SpitPublishingPluginHost* _tmp15_;
- GError* _tmp16_;
- GError* _tmp17_;
+ SpitPublishingPluginHost* _tmp12_;
+ GError* _tmp13_;
+ GError* _tmp14_;
#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp15_ = self->priv->host;
+ _tmp12_ = self->priv->host;
#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp16_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_PROTOCOL_ERROR, "Server did not create album");
+ _tmp13_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_PROTOCOL_ERROR, "Server did not create album");
#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp17_ = _tmp16_;
+ _tmp14_ = _tmp13_;
#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- spit_publishing_plugin_host_post_error (_tmp15_, _tmp17_);
+ spit_publishing_plugin_host_post_error (_tmp12_, _tmp14_);
#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _g_error_free0 (_tmp17_);
-#line 3489 "YandexPublishing.c"
+ _g_error_free0 (_tmp14_);
+#line 3731 "YandexPublishing.c"
}
}
-static void publishing_yandex_yandex_publisher_create_destination_album (PublishingYandexYandexPublisher* self) {
+static void
+publishing_yandex_yandex_publisher_create_destination_album (PublishingYandexYandexPublisher* self)
+{
gchar* album = NULL;
PublishingYandexPublishOptions* _tmp0_;
const gchar* _tmp1_;
@@ -3531,7 +3775,7 @@ static void publishing_yandex_yandex_publisher_create_destination_album (Publish
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_yandex_yandex_publisher_album_creation_complete_publishing_rest_support_transaction_completed, self, 0);
#line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_yandex_yandex_publisher_album_creation_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 3534 "YandexPublishing.c"
+#line 3778 "YandexPublishing.c"
{
#line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
@@ -3539,7 +3783,7 @@ static void publishing_yandex_yandex_publisher_create_destination_album (Publish
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3542 "YandexPublishing.c"
+#line 3786 "YandexPublishing.c"
goto __catch36_spit_publishing_publishing_error;
}
#line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3554,7 +3798,7 @@ static void publishing_yandex_yandex_publisher_create_destination_album (Publish
g_clear_error (&_inner_error_);
#line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return;
-#line 3557 "YandexPublishing.c"
+#line 3801 "YandexPublishing.c"
}
}
goto __finally36;
@@ -3575,7 +3819,7 @@ static void publishing_yandex_yandex_publisher_create_destination_album (Publish
spit_publishing_plugin_host_post_error (_tmp7_, _tmp8_);
#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_error_free0 (err);
-#line 3578 "YandexPublishing.c"
+#line 3822 "YandexPublishing.c"
}
__finally36:
#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3592,7 +3836,7 @@ static void publishing_yandex_yandex_publisher_create_destination_album (Publish
g_clear_error (&_inner_error_);
#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return;
-#line 3595 "YandexPublishing.c"
+#line 3839 "YandexPublishing.c"
}
#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_publishing_rest_support_transaction_unref0 (t);
@@ -3600,156 +3844,155 @@ static void publishing_yandex_yandex_publisher_create_destination_album (Publish
_g_free0 (data);
#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (album);
-#line 3603 "YandexPublishing.c"
+#line 3847 "YandexPublishing.c"
}
-static void _publishing_yandex_yandex_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender, gint num_photos_published, gpointer self) {
+static void
+_publishing_yandex_yandex_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender,
+ gint num_photos_published,
+ gpointer self)
+{
#line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_yandex_publisher_on_upload_complete ((PublishingYandexYandexPublisher*) self, _sender, num_photos_published);
-#line 3610 "YandexPublishing.c"
+#line 3858 "YandexPublishing.c"
}
-static void _publishing_yandex_yandex_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender, GError* err, gpointer self) {
+static void
+_publishing_yandex_yandex_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender,
+ GError* err,
+ gpointer self)
+{
#line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_yandex_publisher_on_upload_error ((PublishingYandexYandexPublisher*) self, _sender, err);
-#line 3617 "YandexPublishing.c"
+#line 3869 "YandexPublishing.c"
}
-static void publishing_yandex_yandex_publisher_on_upload_complete (PublishingYandexYandexPublisher* self, PublishingRESTSupportBatchUploader* uploader, gint num_published) {
- PublishingRESTSupportBatchUploader* _tmp0_;
+static void
+publishing_yandex_yandex_publisher_on_upload_complete (PublishingYandexYandexPublisher* self,
+ PublishingRESTSupportBatchUploader* uploader,
+ gint num_published)
+{
+ guint _tmp0_;
guint _tmp1_;
- PublishingRESTSupportBatchUploader* _tmp2_;
- guint _tmp3_;
- gint _tmp4_;
- SpitPublishingPluginHost* _tmp8_;
- SpitPublishingPluginHost* _tmp9_;
+ SpitPublishingPluginHost* _tmp5_;
+ SpitPublishingPluginHost* _tmp6_;
#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (uploader));
#line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp0_ = uploader;
-#line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp1_, NULL, FALSE);
+ g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp0_, NULL, FALSE);
#line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self);
-#line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp2_ = uploader;
+ g_signal_handlers_disconnect_matched (uploader, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self);
#line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp3_, NULL, FALSE);
+ g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp1_, NULL, FALSE);
#line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self);
+ g_signal_handlers_disconnect_matched (uploader, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self);
#line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp4_ = num_published;
-#line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- if (_tmp4_ == 0) {
-#line 3649 "YandexPublishing.c"
- SpitPublishingPluginHost* _tmp5_;
- GError* _tmp6_;
- GError* _tmp7_;
+ if (num_published == 0) {
+#line 3896 "YandexPublishing.c"
+ SpitPublishingPluginHost* _tmp2_;
+ GError* _tmp3_;
+ GError* _tmp4_;
#line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp5_ = self->priv->host;
+ _tmp2_ = self->priv->host;
#line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp6_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, "");
+ _tmp3_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, "");
#line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp7_ = _tmp6_;
+ _tmp4_ = _tmp3_;
#line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- spit_publishing_plugin_host_post_error (_tmp5_, _tmp7_);
+ spit_publishing_plugin_host_post_error (_tmp2_, _tmp4_);
#line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _g_error_free0 (_tmp7_);
-#line 3663 "YandexPublishing.c"
+ _g_error_free0 (_tmp4_);
+#line 3910 "YandexPublishing.c"
}
#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp8_ = self->priv->host;
+ _tmp5_ = self->priv->host;
#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- spit_publishing_plugin_host_set_service_locked (_tmp8_, FALSE);
+ spit_publishing_plugin_host_set_service_locked (_tmp5_, FALSE);
#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp9_ = self->priv->host;
+ _tmp6_ = self->priv->host;
#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- spit_publishing_plugin_host_install_success_pane (_tmp9_);
-#line 3673 "YandexPublishing.c"
+ spit_publishing_plugin_host_install_success_pane (_tmp6_);
+#line 3920 "YandexPublishing.c"
}
-static void publishing_yandex_yandex_publisher_on_upload_error (PublishingYandexYandexPublisher* self, PublishingRESTSupportBatchUploader* uploader, GError* err) {
- PublishingRESTSupportBatchUploader* _tmp0_;
+static void
+publishing_yandex_yandex_publisher_on_upload_error (PublishingYandexYandexPublisher* self,
+ PublishingRESTSupportBatchUploader* uploader,
+ GError* err)
+{
+ guint _tmp0_;
guint _tmp1_;
- PublishingRESTSupportBatchUploader* _tmp2_;
- guint _tmp3_;
- GError* _tmp4_;
- const gchar* _tmp5_;
+ const gchar* _tmp2_;
#line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
#line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (uploader));
#line 445 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp0_ = uploader;
+ g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp0_, NULL, FALSE);
#line 445 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp1_, NULL, FALSE);
-#line 445 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self);
-#line 446 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp2_ = uploader;
+ g_signal_handlers_disconnect_matched (uploader, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self);
#line 446 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp3_, NULL, FALSE);
+ g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp1_, NULL, FALSE);
#line 446 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self);
-#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp4_ = err;
+ g_signal_handlers_disconnect_matched (uploader, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self);
#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp5_ = _tmp4_->message;
+ _tmp2_ = err->message;
#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_warning ("YandexPublishing.vala:448: Photo upload error: %s", _tmp5_);
-#line 3706 "YandexPublishing.c"
+ g_warning ("YandexPublishing.vala:448: Photo upload error: %s", _tmp2_);
+#line 3948 "YandexPublishing.c"
}
-static void publishing_yandex_yandex_publisher_on_upload_status_updated (PublishingYandexYandexPublisher* self, gint file_number, gdouble completed_fraction) {
- gdouble _tmp0_;
+static void
+publishing_yandex_yandex_publisher_on_upload_status_updated (PublishingYandexYandexPublisher* self,
+ gint file_number,
+ gdouble completed_fraction)
+{
+ SpitPublishingProgressCallback _tmp0_;
+ void* _tmp0__target;
SpitPublishingProgressCallback _tmp1_;
void* _tmp1__target;
- SpitPublishingProgressCallback _tmp2_;
- void* _tmp2__target;
- gint _tmp3_;
- gdouble _tmp4_;
#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
#line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp0_ = completed_fraction;
-#line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_debug ("YandexPublishing.vala:452: EVENT: uploader reports upload %.2f percent" \
-" complete.", 100.0 * _tmp0_);
+" complete.", 100.0 * completed_fraction);
#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp1_ = self->priv->progress_reporter;
+ _tmp0_ = self->priv->progress_reporter;
#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp1__target = self->priv->progress_reporter_target;
+ _tmp0__target = self->priv->progress_reporter_target;
#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _vala_assert (_tmp1_ != NULL, "progress_reporter != null");
-#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp2_ = self->priv->progress_reporter;
-#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp2__target = self->priv->progress_reporter_target;
+ _vala_assert (_tmp0_ != NULL, "progress_reporter != null");
#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp3_ = file_number;
+ _tmp1_ = self->priv->progress_reporter;
#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp4_ = completed_fraction;
+ _tmp1__target = self->priv->progress_reporter_target;
#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp2_ (_tmp3_, _tmp4_, _tmp2__target);
-#line 3740 "YandexPublishing.c"
+ _tmp1_ (file_number, completed_fraction, _tmp1__target);
+#line 3977 "YandexPublishing.c"
}
-static void _publishing_yandex_yandex_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self) {
+static void
+_publishing_yandex_yandex_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number,
+ gdouble fraction_complete,
+ gpointer self)
+{
#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_yandex_publisher_on_upload_status_updated ((PublishingYandexYandexPublisher*) self, file_number, fraction_complete);
-#line 3747 "YandexPublishing.c"
+#line 3988 "YandexPublishing.c"
}
-static void publishing_yandex_yandex_publisher_start_upload (PublishingYandexYandexPublisher* self) {
+static void
+publishing_yandex_yandex_publisher_start_upload (PublishingYandexYandexPublisher* self)
+{
SpitPublishingPluginHost* _tmp0_;
SpitPublishingPluginHost* _tmp1_;
void* _tmp2_;
@@ -3836,38 +4079,39 @@ static void publishing_yandex_yandex_publisher_start_upload (PublishingYandexYan
_publishing_rest_support_batch_uploader_unref0 (uploader);
#line 459 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishables = (_vala_array_free (publishables, publishables_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 3838 "YandexPublishing.c"
+#line 4081 "YandexPublishing.c"
}
-static void publishing_yandex_yandex_publisher_on_logout (PublishingYandexYandexPublisher* self) {
- gboolean _tmp0_;
- PublishingYandexSession* _tmp1_;
+static void
+publishing_yandex_yandex_publisher_on_logout (PublishingYandexYandexPublisher* self)
+{
+ PublishingYandexSession* _tmp0_;
#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- if (!_tmp0_) {
+ if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return;
-#line 3853 "YandexPublishing.c"
+#line 4095 "YandexPublishing.c"
}
#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp1_ = self->priv->session;
+ _tmp0_ = self->priv->session;
#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- publishing_yandex_session_deauthenticate (_tmp1_);
+ publishing_yandex_session_deauthenticate (_tmp0_);
#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_yandex_publisher_invalidate_persistent_session (self);
#line 480 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self->priv->running = FALSE;
#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
spit_publishing_publisher_start (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 3865 "YandexPublishing.c"
+#line 4107 "YandexPublishing.c"
}
-static void publishing_yandex_yandex_publisher_on_publish (PublishingYandexYandexPublisher* self) {
+static void
+publishing_yandex_yandex_publisher_on_publish (PublishingYandexYandexPublisher* self)
+{
PublishingYandexPublishOptions* _tmp0_;
const gchar* _tmp1_;
GeeHashMap* _tmp2_;
@@ -3919,139 +4163,138 @@ static void publishing_yandex_yandex_publisher_on_publish (PublishingYandexYande
if (_tmp12_) {
#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_yandex_publisher_create_destination_album (self);
-#line 3921 "YandexPublishing.c"
+#line 4165 "YandexPublishing.c"
} else {
#line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_yandex_publisher_start_upload (self);
-#line 3925 "YandexPublishing.c"
+#line 4169 "YandexPublishing.c"
}
}
-static void _publishing_yandex_yandex_publisher_service_get_album_list_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
+static void
+_publishing_yandex_yandex_publisher_service_get_album_list_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+ gpointer self)
+{
#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_yandex_publisher_service_get_album_list_complete ((PublishingYandexYandexPublisher*) self, _sender);
-#line 3933 "YandexPublishing.c"
+#line 4180 "YandexPublishing.c"
}
-static void _publishing_yandex_yandex_publisher_service_get_album_list_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
+static void
+_publishing_yandex_yandex_publisher_service_get_album_list_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+ GError* err,
+ gpointer self)
+{
#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_yandex_publisher_service_get_album_list_error ((PublishingYandexYandexPublisher*) self, _sender, err);
-#line 3940 "YandexPublishing.c"
+#line 4191 "YandexPublishing.c"
}
-void publishing_yandex_yandex_publisher_service_get_album_list_error (PublishingYandexYandexPublisher* self, PublishingRESTSupportTransaction* t, GError* err) {
- PublishingRESTSupportTransaction* _tmp0_;
+void
+publishing_yandex_yandex_publisher_service_get_album_list_error (PublishingYandexYandexPublisher* self,
+ PublishingRESTSupportTransaction* t,
+ GError* err)
+{
+ guint _tmp0_;
guint _tmp1_;
- PublishingRESTSupportTransaction* _tmp2_;
- guint _tmp3_;
- GError* _tmp4_;
- const gchar* _tmp5_;
+ const gchar* _tmp2_;
#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (t));
#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp0_ = t;
-#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
+ g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_service_get_album_list_complete_publishing_rest_support_transaction_completed, self);
-#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp2_ = t;
+ g_signal_handlers_disconnect_matched (t, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_service_get_album_list_complete_publishing_rest_support_transaction_completed, self);
#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
+ g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_service_get_album_list_error_publishing_rest_support_transaction_network_error, self);
+ g_signal_handlers_disconnect_matched (t, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_service_get_album_list_error_publishing_rest_support_transaction_network_error, self);
#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_yandex_publisher_invalidate_persistent_session (self);
#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp4_ = err;
+ _tmp2_ = err->message;
#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp5_ = _tmp4_->message;
-#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_warning ("YandexPublishing.vala:498: Failed to get album list: %s", _tmp5_);
-#line 3975 "YandexPublishing.c"
+ g_warning ("YandexPublishing.vala:498: Failed to get album list: %s", _tmp2_);
+#line 4221 "YandexPublishing.c"
}
-static void _publishing_yandex_yandex_publisher_on_publish_publishing_yandex_publishing_options_pane_publish (PublishingYandexPublishingOptionsPane* _sender, gpointer self) {
+static void
+_publishing_yandex_yandex_publisher_on_publish_publishing_yandex_publishing_options_pane_publish (PublishingYandexPublishingOptionsPane* _sender,
+ gpointer self)
+{
#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_yandex_publisher_on_publish ((PublishingYandexYandexPublisher*) self);
-#line 3982 "YandexPublishing.c"
+#line 4231 "YandexPublishing.c"
}
-static void _publishing_yandex_yandex_publisher_on_logout_publishing_yandex_publishing_options_pane_logout (PublishingYandexPublishingOptionsPane* _sender, gpointer self) {
+static void
+_publishing_yandex_yandex_publisher_on_logout_publishing_yandex_publishing_options_pane_logout (PublishingYandexPublishingOptionsPane* _sender,
+ gpointer self)
+{
#line 516 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_yandex_publisher_on_logout ((PublishingYandexYandexPublisher*) self);
-#line 3989 "YandexPublishing.c"
+#line 4241 "YandexPublishing.c"
}
-void publishing_yandex_yandex_publisher_service_get_album_list_complete (PublishingYandexYandexPublisher* self, PublishingRESTSupportTransaction* t) {
- PublishingRESTSupportTransaction* _tmp0_;
+void
+publishing_yandex_yandex_publisher_service_get_album_list_complete (PublishingYandexYandexPublisher* self,
+ PublishingRESTSupportTransaction* t)
+{
+ guint _tmp0_;
guint _tmp1_;
- PublishingRESTSupportTransaction* _tmp2_;
- guint _tmp3_;
- PublishingRESTSupportTransaction* _tmp4_;
- gchar* _tmp5_;
- gchar* _tmp6_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
PublishingYandexPublishingOptionsPane* publishing_options_pane = NULL;
- PublishingYandexPublishOptions* _tmp12_;
- GeeHashMap* _tmp13_;
- SpitPublishingPluginHost* _tmp14_;
- PublishingYandexPublishingOptionsPane* _tmp15_;
- SpitPublishingPluginHost* _tmp16_;
+ PublishingYandexPublishOptions* _tmp8_;
+ GeeHashMap* _tmp9_;
+ SpitPublishingPluginHost* _tmp10_;
+ PublishingYandexPublishingOptionsPane* _tmp11_;
+ SpitPublishingPluginHost* _tmp12_;
GError * _inner_error_ = NULL;
#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (t));
#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp0_ = t;
+ g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_service_get_album_list_complete_publishing_rest_support_transaction_completed, self);
-#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp2_ = t;
+ g_signal_handlers_disconnect_matched (t, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_service_get_album_list_complete_publishing_rest_support_transaction_completed, self);
#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
+ g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_service_get_album_list_error_publishing_rest_support_transaction_network_error, self);
-#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp4_ = t;
+ g_signal_handlers_disconnect_matched (t, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_service_get_album_list_error_publishing_rest_support_transaction_network_error, self);
#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp5_ = publishing_rest_support_transaction_get_response (_tmp4_);
+ _tmp2_ = publishing_rest_support_transaction_get_response (t);
#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp6_ = _tmp5_;
+ _tmp3_ = _tmp2_;
#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_debug ("YandexPublishing.vala:505: service_get_album_list_complete: %s", _tmp6_);
+ g_debug ("YandexPublishing.vala:505: service_get_album_list_complete: %s", _tmp3_);
#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _g_free0 (_tmp6_);
-#line 4034 "YandexPublishing.c"
+ _g_free0 (_tmp3_);
+#line 4280 "YandexPublishing.c"
{
- PublishingRESTSupportTransaction* _tmp7_;
- gchar* _tmp8_;
- gchar* _tmp9_;
-#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp7_ = t;
+ gchar* _tmp4_;
+ gchar* _tmp5_;
#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp8_ = publishing_rest_support_transaction_get_response (_tmp7_);
+ _tmp4_ = publishing_rest_support_transaction_get_response (t);
#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp9_ = _tmp8_;
+ _tmp5_ = _tmp4_;
#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- publishing_yandex_yandex_publisher_parse_album_list (self, _tmp9_, &_inner_error_);
+ publishing_yandex_yandex_publisher_parse_album_list (self, _tmp5_, &_inner_error_);
#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _g_free0 (_tmp9_);
+ _g_free0 (_tmp5_);
#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4053 "YandexPublishing.c"
+#line 4296 "YandexPublishing.c"
goto __catch37_spit_publishing_publishing_error;
}
#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4060,28 +4303,28 @@ void publishing_yandex_yandex_publisher_service_get_album_list_complete (Publish
g_clear_error (&_inner_error_);
#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return;
-#line 4062 "YandexPublishing.c"
+#line 4305 "YandexPublishing.c"
}
}
goto __finally37;
__catch37_spit_publishing_publishing_error:
{
GError* err = NULL;
- SpitPublishingPluginHost* _tmp10_;
- GError* _tmp11_;
+ SpitPublishingPluginHost* _tmp6_;
+ GError* _tmp7_;
#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
err = _inner_error_;
#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_inner_error_ = NULL;
#line 509 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp10_ = self->priv->host;
+ _tmp6_ = self->priv->host;
#line 509 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp11_ = err;
+ _tmp7_ = err;
#line 509 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- spit_publishing_plugin_host_post_error (_tmp10_, _tmp11_);
+ spit_publishing_plugin_host_post_error (_tmp6_, _tmp7_);
#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_error_free0 (err);
-#line 4083 "YandexPublishing.c"
+#line 4326 "YandexPublishing.c"
}
__finally37:
#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4092,65 +4335,62 @@ void publishing_yandex_yandex_publisher_service_get_album_list_complete (Publish
g_clear_error (&_inner_error_);
#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return;
-#line 4094 "YandexPublishing.c"
+#line 4337 "YandexPublishing.c"
}
#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp12_ = self->priv->options;
+ _tmp8_ = self->priv->options;
#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp13_ = self->priv->album_list;
+ _tmp9_ = self->priv->album_list;
#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp14_ = self->priv->host;
+ _tmp10_ = self->priv->host;
#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp15_ = publishing_yandex_publishing_options_pane_new (_tmp12_, _tmp13_, _tmp14_);
+ _tmp11_ = publishing_yandex_publishing_options_pane_new (_tmp8_, _tmp9_, _tmp10_);
#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- publishing_options_pane = _tmp15_;
+ publishing_options_pane = _tmp11_;
#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_signal_connect_object (publishing_options_pane, "publish", (GCallback) _publishing_yandex_yandex_publisher_on_publish_publishing_yandex_publishing_options_pane_publish, self, 0);
#line 516 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_signal_connect_object (publishing_options_pane, "logout", (GCallback) _publishing_yandex_yandex_publisher_on_logout_publishing_yandex_publishing_options_pane_logout, self, 0);
#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp16_ = self->priv->host;
+ _tmp12_ = self->priv->host;
#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- spit_publishing_plugin_host_install_dialog_pane (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (publishing_options_pane, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
+ spit_publishing_plugin_host_install_dialog_pane (_tmp12_, G_TYPE_CHECK_INSTANCE_CAST (publishing_options_pane, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_object_unref0 (publishing_options_pane);
-#line 4116 "YandexPublishing.c"
+#line 4359 "YandexPublishing.c"
}
-void publishing_yandex_yandex_publisher_service_get_album_list (PublishingYandexYandexPublisher* self, const gchar* url) {
- const gchar* _tmp0_;
- gchar* _tmp1_;
+void
+publishing_yandex_yandex_publisher_service_get_album_list (PublishingYandexYandexPublisher* self,
+ const gchar* url)
+{
+ gchar* _tmp0_;
PublishingYandexTransaction* t = NULL;
- PublishingYandexSession* _tmp2_;
- const gchar* _tmp3_;
- PublishingYandexTransaction* _tmp4_;
+ PublishingYandexSession* _tmp1_;
+ PublishingYandexTransaction* _tmp2_;
GError * _inner_error_ = NULL;
#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (url != NULL);
#line 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp0_ = url;
-#line 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp1_ = g_strdup (_tmp0_);
+ _tmp0_ = g_strdup (url);
#line 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (self->priv->service_url);
#line 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- self->priv->service_url = _tmp1_;
-#line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp2_ = self->priv->session;
+ self->priv->service_url = _tmp0_;
#line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp3_ = url;
+ _tmp1_ = self->priv->session;
#line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp4_ = publishing_yandex_transaction_new_with_url (_tmp2_, _tmp3_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET);
+ _tmp2_ = publishing_yandex_transaction_new_with_url (_tmp1_, url, PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET);
#line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- t = _tmp4_;
+ t = _tmp2_;
#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_yandex_yandex_publisher_service_get_album_list_complete_publishing_rest_support_transaction_completed, self, 0);
#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_yandex_yandex_publisher_service_get_album_list_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 4152 "YandexPublishing.c"
+#line 4392 "YandexPublishing.c"
{
#line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
@@ -4158,7 +4398,7 @@ void publishing_yandex_yandex_publisher_service_get_album_list (PublishingYandex
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4160 "YandexPublishing.c"
+#line 4400 "YandexPublishing.c"
goto __catch38_spit_publishing_publishing_error;
}
#line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4169,28 +4409,28 @@ void publishing_yandex_yandex_publisher_service_get_album_list (PublishingYandex
g_clear_error (&_inner_error_);
#line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return;
-#line 4171 "YandexPublishing.c"
+#line 4411 "YandexPublishing.c"
}
}
goto __finally38;
__catch38_spit_publishing_publishing_error:
{
GError* err = NULL;
- SpitPublishingPluginHost* _tmp5_;
- GError* _tmp6_;
+ SpitPublishingPluginHost* _tmp3_;
+ GError* _tmp4_;
#line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
err = _inner_error_;
#line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_inner_error_ = NULL;
#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp5_ = self->priv->host;
+ _tmp3_ = self->priv->host;
#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp6_ = err;
+ _tmp4_ = err;
#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- spit_publishing_plugin_host_post_error (_tmp5_, _tmp6_);
+ spit_publishing_plugin_host_post_error (_tmp3_, _tmp4_);
#line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_error_free0 (err);
-#line 4192 "YandexPublishing.c"
+#line 4432 "YandexPublishing.c"
}
__finally38:
#line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4203,126 +4443,119 @@ void publishing_yandex_yandex_publisher_service_get_album_list (PublishingYandex
g_clear_error (&_inner_error_);
#line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return;
-#line 4205 "YandexPublishing.c"
+#line 4445 "YandexPublishing.c"
}
#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_publishing_rest_support_transaction_unref0 (t);
-#line 4209 "YandexPublishing.c"
+#line 4449 "YandexPublishing.c"
}
-static void _publishing_yandex_yandex_publisher_fetch_account_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
+static void
+_publishing_yandex_yandex_publisher_fetch_account_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+ gpointer self)
+{
#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_yandex_publisher_fetch_account_complete ((PublishingYandexYandexPublisher*) self, _sender);
-#line 4216 "YandexPublishing.c"
+#line 4459 "YandexPublishing.c"
}
-static void _publishing_yandex_yandex_publisher_fetch_account_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
+static void
+_publishing_yandex_yandex_publisher_fetch_account_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+ GError* err,
+ gpointer self)
+{
#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_yandex_publisher_fetch_account_error ((PublishingYandexYandexPublisher*) self, _sender, err);
-#line 4223 "YandexPublishing.c"
+#line 4470 "YandexPublishing.c"
}
-void publishing_yandex_yandex_publisher_fetch_account_error (PublishingYandexYandexPublisher* self, PublishingRESTSupportTransaction* t, GError* err) {
- PublishingRESTSupportTransaction* _tmp0_;
+void
+publishing_yandex_yandex_publisher_fetch_account_error (PublishingYandexYandexPublisher* self,
+ PublishingRESTSupportTransaction* t,
+ GError* err)
+{
+ guint _tmp0_;
guint _tmp1_;
- PublishingRESTSupportTransaction* _tmp2_;
- guint _tmp3_;
- GError* _tmp4_;
- const gchar* _tmp5_;
+ const gchar* _tmp2_;
#line 534 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
#line 534 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (t));
#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp0_ = t;
-#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
+ g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_fetch_account_complete_publishing_rest_support_transaction_completed, self);
-#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp2_ = t;
+ g_signal_handlers_disconnect_matched (t, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_fetch_account_complete_publishing_rest_support_transaction_completed, self);
#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
+ g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_fetch_account_error_publishing_rest_support_transaction_network_error, self);
+ g_signal_handlers_disconnect_matched (t, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_fetch_account_error_publishing_rest_support_transaction_network_error, self);
#line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp4_ = err;
+ _tmp2_ = err->message;
#line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp5_ = _tmp4_->message;
-#line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_warning ("YandexPublishing.vala:538: Failed to fetch account info: %s", _tmp5_);
-#line 4256 "YandexPublishing.c"
+ g_warning ("YandexPublishing.vala:538: Failed to fetch account info: %s", _tmp2_);
+#line 4498 "YandexPublishing.c"
}
-void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandexYandexPublisher* self, PublishingRESTSupportTransaction* t) {
- PublishingRESTSupportTransaction* _tmp0_;
+void
+publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandexYandexPublisher* self,
+ PublishingRESTSupportTransaction* t)
+{
+ guint _tmp0_;
guint _tmp1_;
- PublishingRESTSupportTransaction* _tmp2_;
- guint _tmp3_;
- PublishingRESTSupportTransaction* _tmp4_;
- gchar* _tmp5_;
- gchar* _tmp6_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
GError * _inner_error_ = NULL;
#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (t));
#line 542 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp0_ = t;
+ g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
#line 542 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 542 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_fetch_account_complete_publishing_rest_support_transaction_completed, self);
-#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp2_ = t;
+ g_signal_handlers_disconnect_matched (t, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_fetch_account_complete_publishing_rest_support_transaction_completed, self);
#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
+ g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_fetch_account_error_publishing_rest_support_transaction_network_error, self);
-#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp4_ = t;
+ g_signal_handlers_disconnect_matched (t, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_fetch_account_error_publishing_rest_support_transaction_network_error, self);
#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp5_ = publishing_rest_support_transaction_get_response (_tmp4_);
+ _tmp2_ = publishing_rest_support_transaction_get_response (t);
#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp6_ = _tmp5_;
+ _tmp3_ = _tmp2_;
#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_debug ("YandexPublishing.vala:545: account info: %s", _tmp6_);
+ g_debug ("YandexPublishing.vala:545: account info: %s", _tmp3_);
#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _g_free0 (_tmp6_);
-#line 4295 "YandexPublishing.c"
+ _g_free0 (_tmp3_);
+#line 4531 "YandexPublishing.c"
{
PublishingRESTSupportXmlDocument* doc = NULL;
- PublishingRESTSupportTransaction* _tmp7_;
- gchar* _tmp8_;
- gchar* _tmp9_;
- PublishingRESTSupportXmlDocument* _tmp10_;
- PublishingRESTSupportXmlDocument* _tmp11_;
+ gchar* _tmp4_;
+ gchar* _tmp5_;
+ PublishingRESTSupportXmlDocument* _tmp6_;
+ PublishingRESTSupportXmlDocument* _tmp7_;
xmlNode* root = NULL;
- PublishingRESTSupportXmlDocument* _tmp12_;
- xmlNode* _tmp13_;
-#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp7_ = t;
+ PublishingRESTSupportXmlDocument* _tmp8_;
+ xmlNode* _tmp9_;
#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp8_ = publishing_rest_support_transaction_get_response (_tmp7_);
+ _tmp4_ = publishing_rest_support_transaction_get_response (t);
#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp9_ = _tmp8_;
+ _tmp5_ = _tmp4_;
#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp10_ = publishing_rest_support_xml_document_parse_string (_tmp9_, _publishing_yandex_yandex_publisher_check_response_publishing_rest_support_xml_document_check_for_error_response, self, &_inner_error_);
+ _tmp6_ = publishing_rest_support_xml_document_parse_string (_tmp5_, _publishing_yandex_yandex_publisher_check_response_publishing_rest_support_xml_document_check_for_error_response, self, &_inner_error_);
#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp11_ = _tmp10_;
+ _tmp7_ = _tmp6_;
#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _g_free0 (_tmp9_);
+ _g_free0 (_tmp5_);
#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- doc = _tmp11_;
+ doc = _tmp7_;
#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4324 "YandexPublishing.c"
+#line 4557 "YandexPublishing.c"
goto __catch39_spit_publishing_publishing_error;
}
#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4331,172 +4564,172 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
g_clear_error (&_inner_error_);
#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return;
-#line 4333 "YandexPublishing.c"
+#line 4566 "YandexPublishing.c"
}
#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp12_ = doc;
+ _tmp8_ = doc;
#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp13_ = publishing_rest_support_xml_document_get_root_node (_tmp12_);
+ _tmp9_ = publishing_rest_support_xml_document_get_root_node (_tmp8_);
#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- root = _tmp13_;
-#line 4341 "YandexPublishing.c"
+ root = _tmp9_;
+#line 4574 "YandexPublishing.c"
{
xmlNode* work = NULL;
- xmlNode* _tmp14_;
- xmlNode* _tmp15_;
+ xmlNode* _tmp10_;
+ xmlNode* _tmp11_;
#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp14_ = root;
+ _tmp10_ = root;
#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp15_ = _tmp14_->children;
+ _tmp11_ = _tmp10_->children;
#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- work = _tmp15_;
-#line 4352 "YandexPublishing.c"
+ work = _tmp11_;
+#line 4585 "YandexPublishing.c"
{
- gboolean _tmp16_ = FALSE;
+ gboolean _tmp12_ = FALSE;
#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp16_ = TRUE;
+ _tmp12_ = TRUE;
#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
while (TRUE) {
-#line 4359 "YandexPublishing.c"
- xmlNode* _tmp19_;
- xmlNode* _tmp20_;
- const gchar* _tmp21_;
+#line 4592 "YandexPublishing.c"
+ xmlNode* _tmp15_;
+ xmlNode* _tmp16_;
+ const gchar* _tmp17_;
#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- if (!_tmp16_) {
-#line 4365 "YandexPublishing.c"
- xmlNode* _tmp17_;
- xmlNode* _tmp18_;
+ if (!_tmp12_) {
+#line 4598 "YandexPublishing.c"
+ xmlNode* _tmp13_;
+ xmlNode* _tmp14_;
#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp17_ = work;
+ _tmp13_ = work;
#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp18_ = _tmp17_->next;
+ _tmp14_ = _tmp13_->next;
#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- work = _tmp18_;
-#line 4374 "YandexPublishing.c"
+ work = _tmp14_;
+#line 4607 "YandexPublishing.c"
}
#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp16_ = FALSE;
+ _tmp12_ = FALSE;
#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp19_ = work;
+ _tmp15_ = work;
#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- if (!(_tmp19_ != NULL)) {
+ if (!(_tmp15_ != NULL)) {
#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
break;
-#line 4384 "YandexPublishing.c"
+#line 4617 "YandexPublishing.c"
}
#line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp20_ = work;
+ _tmp16_ = work;
#line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp21_ = _tmp20_->name;
+ _tmp17_ = _tmp16_->name;
#line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- if (g_strcmp0 (_tmp21_, "workspace") != 0) {
+ if (g_strcmp0 (_tmp17_, "workspace") != 0) {
#line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
continue;
-#line 4394 "YandexPublishing.c"
+#line 4627 "YandexPublishing.c"
}
{
xmlNode* c = NULL;
- xmlNode* _tmp22_;
- xmlNode* _tmp23_;
+ xmlNode* _tmp18_;
+ xmlNode* _tmp19_;
#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp22_ = work;
+ _tmp18_ = work;
#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp23_ = _tmp22_->children;
+ _tmp19_ = _tmp18_->children;
#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- c = _tmp23_;
-#line 4406 "YandexPublishing.c"
+ c = _tmp19_;
+#line 4639 "YandexPublishing.c"
{
- gboolean _tmp24_ = FALSE;
+ gboolean _tmp20_ = FALSE;
#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp24_ = TRUE;
+ _tmp20_ = TRUE;
#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
while (TRUE) {
-#line 4413 "YandexPublishing.c"
- xmlNode* _tmp27_;
- xmlNode* _tmp28_;
- const gchar* _tmp29_;
- xmlNode* _tmp30_;
- gchar* _tmp31_;
- gchar* _tmp32_;
- gboolean _tmp33_;
+#line 4646 "YandexPublishing.c"
+ xmlNode* _tmp23_;
+ xmlNode* _tmp24_;
+ const gchar* _tmp25_;
+ xmlNode* _tmp26_;
+ gchar* _tmp27_;
+ gchar* _tmp28_;
+ gboolean _tmp29_;
#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- if (!_tmp24_) {
-#line 4423 "YandexPublishing.c"
- xmlNode* _tmp25_;
- xmlNode* _tmp26_;
+ if (!_tmp20_) {
+#line 4656 "YandexPublishing.c"
+ xmlNode* _tmp21_;
+ xmlNode* _tmp22_;
#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp25_ = c;
+ _tmp21_ = c;
#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp26_ = _tmp25_->next;
+ _tmp22_ = _tmp21_->next;
#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- c = _tmp26_;
-#line 4432 "YandexPublishing.c"
+ c = _tmp22_;
+#line 4665 "YandexPublishing.c"
}
#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp24_ = FALSE;
+ _tmp20_ = FALSE;
#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp27_ = c;
+ _tmp23_ = c;
#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- if (!(_tmp27_ != NULL)) {
+ if (!(_tmp23_ != NULL)) {
#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
break;
-#line 4442 "YandexPublishing.c"
+#line 4675 "YandexPublishing.c"
}
#line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp28_ = c;
+ _tmp24_ = c;
#line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp29_ = _tmp28_->name;
+ _tmp25_ = _tmp24_->name;
#line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- if (g_strcmp0 (_tmp29_, "collection") != 0) {
+ if (g_strcmp0 (_tmp25_, "collection") != 0) {
#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
continue;
-#line 4452 "YandexPublishing.c"
+#line 4685 "YandexPublishing.c"
}
#line 557 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp30_ = c;
+ _tmp26_ = c;
#line 557 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp31_ = (gchar*) xmlGetProp (_tmp30_, (xmlChar*) "id");
+ _tmp27_ = (gchar*) xmlGetProp (_tmp26_, (xmlChar*) "id");
#line 557 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp32_ = _tmp31_;
+ _tmp28_ = _tmp27_;
#line 557 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp33_ = g_strcmp0 (_tmp32_, "album-list") == 0;
+ _tmp29_ = g_strcmp0 (_tmp28_, "album-list") == 0;
#line 557 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _g_free0 (_tmp32_);
+ _g_free0 (_tmp28_);
#line 557 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- if (_tmp33_) {
-#line 4466 "YandexPublishing.c"
+ if (_tmp29_) {
+#line 4699 "YandexPublishing.c"
gchar* url = NULL;
- xmlNode* _tmp34_;
- gchar* _tmp35_;
- PublishingYandexSession* _tmp36_;
- gchar* _tmp37_;
- gchar* _tmp38_;
- const gchar* _tmp39_;
+ xmlNode* _tmp30_;
+ gchar* _tmp31_;
+ PublishingYandexSession* _tmp32_;
+ gchar* _tmp33_;
+ gchar* _tmp34_;
+ const gchar* _tmp35_;
#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp34_ = c;
+ _tmp30_ = c;
#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp35_ = (gchar*) xmlGetProp (_tmp34_, (xmlChar*) "href");
+ _tmp31_ = (gchar*) xmlGetProp (_tmp30_, (xmlChar*) "href");
#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- url = _tmp35_;
+ url = _tmp31_;
#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp36_ = self->priv->session;
+ _tmp32_ = self->priv->session;
#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp37_ = publishing_yandex_session_get_auth_token (_tmp36_);
+ _tmp33_ = publishing_yandex_session_get_auth_token (_tmp32_);
#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp38_ = _tmp37_;
+ _tmp34_ = _tmp33_;
#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- publishing_yandex_yandex_publisher_set_persistent_auth_token (self, _tmp38_);
+ publishing_yandex_yandex_publisher_set_persistent_auth_token (self, _tmp34_);
#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _g_free0 (_tmp38_);
+ _g_free0 (_tmp34_);
#line 561 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp39_ = url;
+ _tmp35_ = url;
#line 561 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- publishing_yandex_yandex_publisher_service_get_album_list (self, _tmp39_);
+ publishing_yandex_yandex_publisher_service_get_album_list (self, _tmp35_);
#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (url);
#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
break;
-#line 4498 "YandexPublishing.c"
+#line 4731 "YandexPublishing.c"
}
}
}
@@ -4506,27 +4739,27 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
}
#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_publishing_rest_support_xml_document_unref0 (doc);
-#line 4508 "YandexPublishing.c"
+#line 4741 "YandexPublishing.c"
}
goto __finally39;
__catch39_spit_publishing_publishing_error:
{
GError* err = NULL;
- SpitPublishingPluginHost* _tmp40_;
- GError* _tmp41_;
+ SpitPublishingPluginHost* _tmp36_;
+ GError* _tmp37_;
#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
err = _inner_error_;
#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_inner_error_ = NULL;
#line 567 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp40_ = self->priv->host;
+ _tmp36_ = self->priv->host;
#line 567 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp41_ = err;
+ _tmp37_ = err;
#line 567 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- spit_publishing_plugin_host_post_error (_tmp40_, _tmp41_);
+ spit_publishing_plugin_host_post_error (_tmp36_, _tmp37_);
#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_error_free0 (err);
-#line 4528 "YandexPublishing.c"
+#line 4761 "YandexPublishing.c"
}
__finally39:
#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4537,17 +4770,19 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
g_clear_error (&_inner_error_);
#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return;
-#line 4539 "YandexPublishing.c"
+#line 4772 "YandexPublishing.c"
}
}
-void publishing_yandex_yandex_publisher_fetch_account_information (PublishingYandexYandexPublisher* self, const gchar* auth_token) {
+void
+publishing_yandex_yandex_publisher_fetch_account_information (PublishingYandexYandexPublisher* self,
+ const gchar* auth_token)
+{
PublishingYandexSession* _tmp0_;
- const gchar* _tmp1_;
PublishingYandexTransaction* t = NULL;
- PublishingYandexSession* _tmp2_;
- PublishingYandexTransaction* _tmp3_;
+ PublishingYandexSession* _tmp1_;
+ PublishingYandexTransaction* _tmp2_;
GError * _inner_error_ = NULL;
#line 571 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
@@ -4556,20 +4791,18 @@ void publishing_yandex_yandex_publisher_fetch_account_information (PublishingYan
#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp0_ = self->priv->session;
#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp1_ = auth_token;
-#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- publishing_yandex_session_set_auth_token (_tmp0_, _tmp1_);
+ publishing_yandex_session_set_auth_token (_tmp0_, auth_token);
#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp2_ = self->priv->session;
+ _tmp1_ = self->priv->session;
#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp3_ = publishing_yandex_transaction_new_with_url (_tmp2_, "https://api-fotki.yandex.ru/api/me/", PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET);
+ _tmp2_ = publishing_yandex_transaction_new_with_url (_tmp1_, "https://api-fotki.yandex.ru/api/me/", PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET);
#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- t = _tmp3_;
+ t = _tmp2_;
#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_yandex_yandex_publisher_fetch_account_complete_publishing_rest_support_transaction_completed, self, 0);
#line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_yandex_yandex_publisher_fetch_account_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 4571 "YandexPublishing.c"
+#line 4804 "YandexPublishing.c"
{
#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
@@ -4577,7 +4810,7 @@ void publishing_yandex_yandex_publisher_fetch_account_information (PublishingYan
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4579 "YandexPublishing.c"
+#line 4812 "YandexPublishing.c"
goto __catch40_spit_publishing_publishing_error;
}
#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4588,28 +4821,28 @@ void publishing_yandex_yandex_publisher_fetch_account_information (PublishingYan
g_clear_error (&_inner_error_);
#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return;
-#line 4590 "YandexPublishing.c"
+#line 4823 "YandexPublishing.c"
}
}
goto __finally40;
__catch40_spit_publishing_publishing_error:
{
GError* err = NULL;
- SpitPublishingPluginHost* _tmp4_;
- GError* _tmp5_;
+ SpitPublishingPluginHost* _tmp3_;
+ GError* _tmp4_;
#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
err = _inner_error_;
#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_inner_error_ = NULL;
#line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp4_ = self->priv->host;
+ _tmp3_ = self->priv->host;
#line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp5_ = err;
+ _tmp4_ = err;
#line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- spit_publishing_plugin_host_post_error (_tmp4_, _tmp5_);
+ spit_publishing_plugin_host_post_error (_tmp3_, _tmp4_);
#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_error_free0 (err);
-#line 4611 "YandexPublishing.c"
+#line 4844 "YandexPublishing.c"
}
__finally40:
#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4622,67 +4855,75 @@ void publishing_yandex_yandex_publisher_fetch_account_information (PublishingYan
g_clear_error (&_inner_error_);
#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return;
-#line 4624 "YandexPublishing.c"
+#line 4857 "YandexPublishing.c"
}
#line 571 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_publishing_rest_support_transaction_unref0 (t);
-#line 4628 "YandexPublishing.c"
+#line 4861 "YandexPublishing.c"
}
-static void publishing_yandex_yandex_publisher_web_auth_login_succeeded (PublishingYandexYandexPublisher* self, const gchar* access_token) {
- const gchar* _tmp0_;
+static void
+publishing_yandex_yandex_publisher_web_auth_login_succeeded (PublishingYandexYandexPublisher* self,
+ const gchar* access_token)
+{
+ SpitPublishingPluginHost* _tmp0_;
SpitPublishingPluginHost* _tmp1_;
- SpitPublishingPluginHost* _tmp2_;
- const gchar* _tmp3_;
#line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
#line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (access_token != NULL);
#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp0_ = access_token;
-#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_debug ("YandexPublishing.vala:586: login succeeded with token %s", _tmp0_);
+ g_debug ("YandexPublishing.vala:586: login succeeded with token %s", access_token);
#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp1_ = self->priv->host;
+ _tmp0_ = self->priv->host;
#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- spit_publishing_plugin_host_set_service_locked (_tmp1_, TRUE);
+ spit_publishing_plugin_host_set_service_locked (_tmp0_, TRUE);
#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp2_ = self->priv->host;
+ _tmp1_ = self->priv->host;
#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- spit_publishing_plugin_host_install_account_fetch_wait_pane (_tmp2_);
+ spit_publishing_plugin_host_install_account_fetch_wait_pane (_tmp1_);
#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp3_ = access_token;
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- publishing_yandex_yandex_publisher_fetch_account_information (self, _tmp3_);
-#line 4657 "YandexPublishing.c"
+ publishing_yandex_yandex_publisher_fetch_account_information (self, access_token);
+#line 4887 "YandexPublishing.c"
}
-static void publishing_yandex_yandex_publisher_web_auth_login_failed (PublishingYandexYandexPublisher* self) {
+static void
+publishing_yandex_yandex_publisher_web_auth_login_failed (PublishingYandexYandexPublisher* self)
+{
#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_debug ("YandexPublishing.vala:595: login failed");
-#line 4666 "YandexPublishing.c"
+#line 4898 "YandexPublishing.c"
}
-static void _publishing_yandex_yandex_publisher_web_auth_login_succeeded_publishing_yandex_web_auth_pane_login_succeeded (PublishingYandexWebAuthPane* _sender, const gchar* success_url, gpointer self) {
+static void
+_publishing_yandex_yandex_publisher_web_auth_login_succeeded_publishing_yandex_web_auth_pane_login_succeeded (PublishingYandexWebAuthPane* _sender,
+ const gchar* success_url,
+ gpointer self)
+{
#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_yandex_publisher_web_auth_login_succeeded ((PublishingYandexYandexPublisher*) self, success_url);
-#line 4673 "YandexPublishing.c"
+#line 4909 "YandexPublishing.c"
}
-static void _publishing_yandex_yandex_publisher_web_auth_login_failed_publishing_yandex_web_auth_pane_login_failed (PublishingYandexWebAuthPane* _sender, gpointer self) {
+static void
+_publishing_yandex_yandex_publisher_web_auth_login_failed_publishing_yandex_web_auth_pane_login_failed (PublishingYandexWebAuthPane* _sender,
+ gpointer self)
+{
#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_yandex_publisher_web_auth_login_failed ((PublishingYandexYandexPublisher*) self);
-#line 4680 "YandexPublishing.c"
+#line 4919 "YandexPublishing.c"
}
-static void publishing_yandex_yandex_publisher_start_web_auth (PublishingYandexYandexPublisher* self) {
+static void
+publishing_yandex_yandex_publisher_start_web_auth (PublishingYandexYandexPublisher* self)
+{
SpitPublishingPluginHost* _tmp0_;
gchar* _tmp1_;
gchar* _tmp2_;
@@ -4723,18 +4964,22 @@ static void publishing_yandex_yandex_publisher_start_web_auth (PublishingYandexY
_tmp7_ = self->priv->web_auth_pane;
#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
spit_publishing_plugin_host_install_dialog_pane (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
-#line 4725 "YandexPublishing.c"
+#line 4966 "YandexPublishing.c"
}
-static void _publishing_yandex_yandex_publisher_start_web_auth_spit_publishing_login_callback (gpointer self) {
+static void
+_publishing_yandex_yandex_publisher_start_web_auth_spit_publishing_login_callback (gpointer self)
+{
#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_yandex_publisher_start_web_auth ((PublishingYandexYandexPublisher*) self);
-#line 4732 "YandexPublishing.c"
+#line 4975 "YandexPublishing.c"
}
-static void publishing_yandex_yandex_publisher_show_welcome_page (PublishingYandexYandexPublisher* self) {
+static void
+publishing_yandex_yandex_publisher_show_welcome_page (PublishingYandexYandexPublisher* self)
+{
SpitPublishingPluginHost* _tmp0_;
#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
@@ -4742,76 +4987,74 @@ static void publishing_yandex_yandex_publisher_show_welcome_page (PublishingYand
_tmp0_ = self->priv->host;
#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
spit_publishing_plugin_host_install_welcome_pane (_tmp0_, _ ("You are not currently logged into Yandex.Fotki."), _publishing_yandex_yandex_publisher_start_web_auth_spit_publishing_login_callback, self);
-#line 4744 "YandexPublishing.c"
+#line 4989 "YandexPublishing.c"
}
-static void publishing_yandex_yandex_publisher_real_start (SpitPublishingPublisher* base) {
+static void
+publishing_yandex_yandex_publisher_real_start (SpitPublishingPublisher* base)
+{
PublishingYandexYandexPublisher * self;
- gboolean _tmp0_;
- SpitPublishingPluginHost* _tmp1_;
- gboolean _tmp2_;
+ SpitPublishingPluginHost* _tmp0_;
#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_YANDEX_PUBLISHER, PublishingYandexYandexPublisher);
#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- if (_tmp0_) {
+ if (spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return;
-#line 4761 "YandexPublishing.c"
+#line 5004 "YandexPublishing.c"
}
#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp1_ = self->priv->host;
+ _tmp0_ = self->priv->host;
#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- if (_tmp1_ == NULL) {
+ if (_tmp0_ == NULL) {
#line 618 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_error ("YandexPublishing.vala:618: YandexPublisher: start( ): can't start; thi" \
"s publisher is not restartable.");
-#line 4769 "YandexPublishing.c"
+#line 5012 "YandexPublishing.c"
}
#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_debug ("YandexPublishing.vala:620: YandexPublisher: starting interaction.");
#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self->priv->running = TRUE;
#line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp2_ = publishing_yandex_yandex_publisher_is_persistent_session_available (self);
-#line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- if (_tmp2_) {
-#line 4779 "YandexPublishing.c"
- PublishingYandexSession* _tmp3_;
+ if (publishing_yandex_yandex_publisher_is_persistent_session_available (self)) {
+#line 5020 "YandexPublishing.c"
+ PublishingYandexSession* _tmp1_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
gchar* _tmp4_;
gchar* _tmp5_;
- gchar* _tmp6_;
- gchar* _tmp7_;
#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp3_ = self->priv->session;
+ _tmp1_ = self->priv->session;
#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp4_ = publishing_yandex_yandex_publisher_get_persistent_auth_token (self);
+ _tmp2_ = publishing_yandex_yandex_publisher_get_persistent_auth_token (self);
#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp5_ = _tmp4_;
+ _tmp3_ = _tmp2_;
#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- publishing_yandex_session_set_auth_token (_tmp3_, _tmp5_);
+ publishing_yandex_session_set_auth_token (_tmp1_, _tmp3_);
#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _g_free0 (_tmp5_);
+ _g_free0 (_tmp3_);
#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp6_ = publishing_yandex_yandex_publisher_get_persistent_auth_token (self);
+ _tmp4_ = publishing_yandex_yandex_publisher_get_persistent_auth_token (self);
#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp7_ = _tmp6_;
+ _tmp5_ = _tmp4_;
#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- publishing_yandex_yandex_publisher_fetch_account_information (self, _tmp7_);
+ publishing_yandex_yandex_publisher_fetch_account_information (self, _tmp5_);
#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _g_free0 (_tmp7_);
-#line 4803 "YandexPublishing.c"
+ _g_free0 (_tmp5_);
+#line 5044 "YandexPublishing.c"
} else {
#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_yandex_publisher_show_welcome_page (self);
-#line 4807 "YandexPublishing.c"
+#line 5048 "YandexPublishing.c"
}
}
-static void publishing_yandex_yandex_publisher_real_stop (SpitPublishingPublisher* base) {
+static void
+publishing_yandex_yandex_publisher_real_stop (SpitPublishingPublisher* base)
+{
PublishingYandexYandexPublisher * self;
#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_YANDEX_PUBLISHER, PublishingYandexYandexPublisher);
@@ -4821,22 +5064,26 @@ static void publishing_yandex_yandex_publisher_real_stop (SpitPublishingPublishe
self->priv->host = NULL;
#line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self->priv->running = FALSE;
-#line 4822 "YandexPublishing.c"
+#line 5065 "YandexPublishing.c"
}
-static void publishing_yandex_yandex_publisher_class_init (PublishingYandexYandexPublisherClass * klass) {
+static void
+publishing_yandex_yandex_publisher_class_init (PublishingYandexYandexPublisherClass * klass)
+{
#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_yandex_publisher_parent_class = g_type_class_peek_parent (klass);
#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_type_class_add_private (klass, sizeof (PublishingYandexYandexPublisherPrivate));
#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
G_OBJECT_CLASS (klass)->finalize = publishing_yandex_yandex_publisher_finalize;
-#line 4833 "YandexPublishing.c"
+#line 5078 "YandexPublishing.c"
}
-static void publishing_yandex_yandex_publisher_spit_publishing_publisher_interface_init (SpitPublishingPublisherIface * iface) {
+static void
+publishing_yandex_yandex_publisher_spit_publishing_publisher_interface_init (SpitPublishingPublisherIface * iface)
+{
#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_yandex_publisher_spit_publishing_publisher_parent_iface = g_type_interface_peek_parent (iface);
#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4847,11 +5094,13 @@ static void publishing_yandex_yandex_publisher_spit_publishing_publisher_interfa
iface->start = (void (*) (SpitPublishingPublisher *)) publishing_yandex_yandex_publisher_real_start;
#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
iface->stop = (void (*) (SpitPublishingPublisher *)) publishing_yandex_yandex_publisher_real_stop;
-#line 4848 "YandexPublishing.c"
+#line 5095 "YandexPublishing.c"
}
-static void publishing_yandex_yandex_publisher_instance_init (PublishingYandexYandexPublisher * self) {
+static void
+publishing_yandex_yandex_publisher_instance_init (PublishingYandexYandexPublisher * self)
+{
#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self->priv = PUBLISHING_YANDEX_YANDEX_PUBLISHER_GET_PRIVATE (self);
#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4872,11 +5121,13 @@ static void publishing_yandex_yandex_publisher_instance_init (PublishingYandexYa
self->priv->running = FALSE;
#line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self->priv->web_auth_pane = NULL;
-#line 4873 "YandexPublishing.c"
+#line 5122 "YandexPublishing.c"
}
-static void publishing_yandex_yandex_publisher_finalize (GObject * obj) {
+static void
+publishing_yandex_yandex_publisher_finalize (GObject * obj)
+{
PublishingYandexYandexPublisher * self;
#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YANDEX_TYPE_YANDEX_PUBLISHER, PublishingYandexYandexPublisher);
@@ -4900,11 +5151,13 @@ static void publishing_yandex_yandex_publisher_finalize (GObject * obj) {
_publishing_rest_support_session_unref0 (self->priv->session);
#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
G_OBJECT_CLASS (publishing_yandex_yandex_publisher_parent_class)->finalize (obj);
-#line 4901 "YandexPublishing.c"
+#line 5152 "YandexPublishing.c"
}
-GType publishing_yandex_yandex_publisher_get_type (void) {
+GType
+publishing_yandex_yandex_publisher_get_type (void)
+{
static volatile gsize publishing_yandex_yandex_publisher_type_id__volatile = 0;
if (g_once_init_enter (&publishing_yandex_yandex_publisher_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingYandexYandexPublisherClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_yandex_yandex_publisher_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingYandexYandexPublisher), 0, (GInstanceInitFunc) publishing_yandex_yandex_publisher_instance_init, NULL };
@@ -4918,7 +5171,11 @@ GType publishing_yandex_yandex_publisher_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) {
@@ -4930,13 +5187,19 @@ 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);
}
-static gint _vala_array_length (gpointer array) {
+static gint
+_vala_array_length (gpointer array)
+{
int length;
length = 0;
if (array) {
diff --git a/plugins/shotwell-publishing-extras/shotwell-publishing-extras.c b/plugins/shotwell-publishing-extras/shotwell-publishing-extras.c
index c4556dd..e873272 100644
--- a/plugins/shotwell-publishing-extras/shotwell-publishing-extras.c
+++ b/plugins/shotwell-publishing-extras/shotwell-publishing-extras.c
@@ -1,4 +1,4 @@
-/* shotwell-publishing-extras.c generated by valac 0.36.6, the Vala compiler
+/* shotwell-publishing-extras.c generated by valac 0.40.4, the Vala compiler
* generated from shotwell-publishing-extras.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>
@@ -26,6 +27,11 @@
typedef struct _ShotwellPublishingExtraServices ShotwellPublishingExtraServices;
typedef struct _ShotwellPublishingExtraServicesClass ShotwellPublishingExtraServicesClass;
typedef struct _ShotwellPublishingExtraServicesPrivate ShotwellPublishingExtraServicesPrivate;
+enum {
+ SHOTWELL_PUBLISHING_EXTRA_SERVICES_0_PROPERTY,
+ SHOTWELL_PUBLISHING_EXTRA_SERVICES_NUM_PROPERTIES
+};
+static GParamSpec* shotwell_publishing_extra_services_properties[SHOTWELL_PUBLISHING_EXTRA_SERVICES_NUM_PROPERTIES];
#define TYPE_GALLERY3_SERVICE (gallery3_service_get_type ())
#define GALLERY3_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_GALLERY3_SERVICE, Gallery3Service))
@@ -59,50 +65,64 @@ static SpitModuleIface * shotwell_publishing_extra_services_spit_module_parent_i
GType shotwell_publishing_extra_services_get_type (void) G_GNUC_CONST;
#define SHOTWELL_PUBLISHING_EXTRA_SERVICES_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SHOTWELL_PUBLISHING_EXTRA_SERVICES, ShotwellPublishingExtraServicesPrivate))
-enum {
- SHOTWELL_PUBLISHING_EXTRA_SERVICES_DUMMY_PROPERTY
-};
ShotwellPublishingExtraServices* shotwell_publishing_extra_services_new (GFile* module_file);
-ShotwellPublishingExtraServices* shotwell_publishing_extra_services_construct (GType object_type, GFile* module_file);
+ShotwellPublishingExtraServices* shotwell_publishing_extra_services_construct (GType object_type,
+ GFile* module_file);
Gallery3Service* gallery3_service_new (GFile* resource_directory);
-Gallery3Service* gallery3_service_construct (GType object_type, GFile* resource_directory);
+Gallery3Service* gallery3_service_construct (GType object_type,
+ GFile* resource_directory);
GType gallery3_service_get_type (void) G_GNUC_CONST;
-static void _vala_array_add14 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value);
+static void _vala_array_add14 (SpitPluggable** * array,
+ int* length,
+ int* size,
+ SpitPluggable* value);
static const gchar* shotwell_publishing_extra_services_real_get_module_name (SpitModule* base);
static const gchar* shotwell_publishing_extra_services_real_get_version (SpitModule* base);
static const gchar* shotwell_publishing_extra_services_real_get_id (SpitModule* base);
-static SpitPluggable** shotwell_publishing_extra_services_real_get_pluggables (SpitModule* base, int* result_length1);
+static SpitPluggable** shotwell_publishing_extra_services_real_get_pluggables (SpitModule* base,
+ int* result_length1);
static void shotwell_publishing_extra_services_finalize (GObject * obj);
SpitModule* spit_entry_point (SpitEntryPointParams* params);
-static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
-static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
-
-
-static void _vala_array_add14 (SpitPluggable** * array, int* length, int* size, SpitPluggable* 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_add14 (SpitPluggable** * array,
+ int* length,
+ int* size,
+ SpitPluggable* value)
+{
#line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
if ((*length) == (*size)) {
#line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
*array = g_renew (SpitPluggable*, *array, (*size) + 1);
-#line 89 "shotwell-publishing-extras.c"
+#line 107 "shotwell-publishing-extras.c"
}
#line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
(*array)[(*length)++] = value;
#line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
(*array)[*length] = NULL;
-#line 95 "shotwell-publishing-extras.c"
+#line 113 "shotwell-publishing-extras.c"
}
-ShotwellPublishingExtraServices* shotwell_publishing_extra_services_construct (GType object_type, GFile* module_file) {
+ShotwellPublishingExtraServices*
+shotwell_publishing_extra_services_construct (GType object_type,
+ GFile* module_file)
+{
ShotwellPublishingExtraServices * self = NULL;
SpitPluggable** _tmp0_;
gint _tmp0__length1;
GFile* _tmp1_;
GFile* _tmp2_;
- GFile* _tmp3_;
- Gallery3Service* _tmp4_;
+ Gallery3Service* _tmp3_;
#line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
g_return_val_if_fail (G_IS_FILE (module_file), NULL);
#line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
@@ -112,31 +132,33 @@ ShotwellPublishingExtraServices* shotwell_publishing_extra_services_construct (G
#line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
_tmp0__length1 = self->priv->pluggables_length1;
#line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
- _tmp1_ = module_file;
-#line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
- _tmp2_ = g_file_get_parent (_tmp1_);
+ _tmp1_ = g_file_get_parent (module_file);
#line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
- _tmp3_ = _tmp2_;
+ _tmp2_ = _tmp1_;
#line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
- _tmp4_ = gallery3_service_new (_tmp3_);
+ _tmp3_ = gallery3_service_new (_tmp2_);
#line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
- _vala_array_add14 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+ _vala_array_add14 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
#line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
- _g_object_unref0 (_tmp3_);
+ _g_object_unref0 (_tmp2_);
#line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
return self;
-#line 129 "shotwell-publishing-extras.c"
+#line 147 "shotwell-publishing-extras.c"
}
-ShotwellPublishingExtraServices* shotwell_publishing_extra_services_new (GFile* module_file) {
+ShotwellPublishingExtraServices*
+shotwell_publishing_extra_services_new (GFile* module_file)
+{
#line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
return shotwell_publishing_extra_services_construct (TYPE_SHOTWELL_PUBLISHING_EXTRA_SERVICES, module_file);
-#line 136 "shotwell-publishing-extras.c"
+#line 156 "shotwell-publishing-extras.c"
}
-static const gchar* shotwell_publishing_extra_services_real_get_module_name (SpitModule* base) {
+static const gchar*
+shotwell_publishing_extra_services_real_get_module_name (SpitModule* base)
+{
ShotwellPublishingExtraServices * self;
const gchar* result = NULL;
#line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
@@ -145,11 +167,13 @@ static const gchar* shotwell_publishing_extra_services_real_get_module_name (Spi
result = _ ("Shotwell Extra Publishing Services");
#line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
return result;
-#line 149 "shotwell-publishing-extras.c"
+#line 171 "shotwell-publishing-extras.c"
}
-static const gchar* shotwell_publishing_extra_services_real_get_version (SpitModule* base) {
+static const gchar*
+shotwell_publishing_extra_services_real_get_version (SpitModule* base)
+{
ShotwellPublishingExtraServices * self;
const gchar* result = NULL;
#line 30 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
@@ -158,11 +182,13 @@ static const gchar* shotwell_publishing_extra_services_real_get_version (SpitMod
result = _VERSION;
#line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
return result;
-#line 162 "shotwell-publishing-extras.c"
+#line 186 "shotwell-publishing-extras.c"
}
-static const gchar* shotwell_publishing_extra_services_real_get_id (SpitModule* base) {
+static const gchar*
+shotwell_publishing_extra_services_real_get_id (SpitModule* base)
+{
ShotwellPublishingExtraServices * self;
const gchar* result = NULL;
#line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
@@ -171,11 +197,14 @@ static const gchar* shotwell_publishing_extra_services_real_get_id (SpitModule*
result = "org.yorba.shotwell.publishing.extras";
#line 35 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
return result;
-#line 175 "shotwell-publishing-extras.c"
+#line 201 "shotwell-publishing-extras.c"
}
-static SpitPluggable** shotwell_publishing_extra_services_real_get_pluggables (SpitModule* base, int* result_length1) {
+static SpitPluggable**
+shotwell_publishing_extra_services_real_get_pluggables (SpitModule* base,
+ int* result_length1)
+{
ShotwellPublishingExtraServices * self;
SpitPluggable** result = NULL;
SpitPluggable** _tmp0_;
@@ -196,28 +225,32 @@ static SpitPluggable** shotwell_publishing_extra_services_real_get_pluggables (S
if (result_length1) {
#line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
*result_length1 = _tmp1__length1;
-#line 200 "shotwell-publishing-extras.c"
+#line 229 "shotwell-publishing-extras.c"
}
#line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
result = _tmp1_;
#line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
return result;
-#line 206 "shotwell-publishing-extras.c"
+#line 235 "shotwell-publishing-extras.c"
}
-static void shotwell_publishing_extra_services_class_init (ShotwellPublishingExtraServicesClass * klass) {
+static void
+shotwell_publishing_extra_services_class_init (ShotwellPublishingExtraServicesClass * klass)
+{
#line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
shotwell_publishing_extra_services_parent_class = g_type_class_peek_parent (klass);
#line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
g_type_class_add_private (klass, sizeof (ShotwellPublishingExtraServicesPrivate));
#line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
G_OBJECT_CLASS (klass)->finalize = shotwell_publishing_extra_services_finalize;
-#line 217 "shotwell-publishing-extras.c"
+#line 248 "shotwell-publishing-extras.c"
}
-static void shotwell_publishing_extra_services_spit_module_interface_init (SpitModuleIface * iface) {
+static void
+shotwell_publishing_extra_services_spit_module_interface_init (SpitModuleIface * iface)
+{
#line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
shotwell_publishing_extra_services_spit_module_parent_iface = g_type_interface_peek_parent (iface);
#line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
@@ -228,11 +261,13 @@ static void shotwell_publishing_extra_services_spit_module_interface_init (SpitM
iface->get_id = (const gchar* (*) (SpitModule *)) shotwell_publishing_extra_services_real_get_id;
#line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
iface->get_pluggables = (SpitPluggable** (*) (SpitModule *, int*)) shotwell_publishing_extra_services_real_get_pluggables;
-#line 232 "shotwell-publishing-extras.c"
+#line 265 "shotwell-publishing-extras.c"
}
-static void shotwell_publishing_extra_services_instance_init (ShotwellPublishingExtraServices * self) {
+static void
+shotwell_publishing_extra_services_instance_init (ShotwellPublishingExtraServices * self)
+{
SpitPluggable** _tmp0_;
#line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
self->priv = SHOTWELL_PUBLISHING_EXTRA_SERVICES_GET_PRIVATE (self);
@@ -244,11 +279,13 @@ static void shotwell_publishing_extra_services_instance_init (ShotwellPublishing
self->priv->pluggables_length1 = 0;
#line 10 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
self->priv->_pluggables_size_ = self->priv->pluggables_length1;
-#line 248 "shotwell-publishing-extras.c"
+#line 283 "shotwell-publishing-extras.c"
}
-static void shotwell_publishing_extra_services_finalize (GObject * obj) {
+static void
+shotwell_publishing_extra_services_finalize (GObject * obj)
+{
ShotwellPublishingExtraServices * self;
#line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SHOTWELL_PUBLISHING_EXTRA_SERVICES, ShotwellPublishingExtraServices);
@@ -256,11 +293,13 @@ static void shotwell_publishing_extra_services_finalize (GObject * obj) {
self->priv->pluggables = (_vala_array_free (self->priv->pluggables, self->priv->pluggables_length1, (GDestroyNotify) g_object_unref), NULL);
#line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
G_OBJECT_CLASS (shotwell_publishing_extra_services_parent_class)->finalize (obj);
-#line 260 "shotwell-publishing-extras.c"
+#line 297 "shotwell-publishing-extras.c"
}
-GType shotwell_publishing_extra_services_get_type (void) {
+GType
+shotwell_publishing_extra_services_get_type (void)
+{
static volatile gsize shotwell_publishing_extra_services_type_id__volatile = 0;
if (g_once_init_enter (&shotwell_publishing_extra_services_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (ShotwellPublishingExtraServicesClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) shotwell_publishing_extra_services_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ShotwellPublishingExtraServices), 0, (GInstanceInitFunc) shotwell_publishing_extra_services_instance_init, NULL };
@@ -274,65 +313,56 @@ GType shotwell_publishing_extra_services_get_type (void) {
}
-SpitModule* spit_entry_point (SpitEntryPointParams* params) {
+SpitModule*
+spit_entry_point (SpitEntryPointParams* params)
+{
SpitModule* result = NULL;
- SpitEntryPointParams* _tmp0_;
+ gint _tmp0_;
gint _tmp1_;
- SpitEntryPointParams* _tmp2_;
+ ShotwellPublishingExtraServices* _tmp2_ = NULL;
gint _tmp3_;
- gint _tmp4_;
- ShotwellPublishingExtraServices* _tmp5_ = NULL;
- SpitEntryPointParams* _tmp6_;
- gint _tmp7_;
-#line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
- _tmp0_ = params;
-#line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
- _tmp1_ = (*_tmp0_).host_min_spit_interface;
#line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
- _tmp2_ = params;
+ _tmp0_ = (*params).host_min_spit_interface;
#line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
- _tmp3_ = (*_tmp2_).host_max_spit_interface;
+ _tmp1_ = (*params).host_max_spit_interface;
#line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
- _tmp4_ = spit_negotiate_interfaces (_tmp1_, _tmp3_, SPIT_CURRENT_INTERFACE);
-#line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
- (*params).module_spit_interface = _tmp4_;
-#line 48 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
- _tmp6_ = params;
+ (*params).module_spit_interface = spit_negotiate_interfaces (_tmp0_, _tmp1_, SPIT_CURRENT_INTERFACE);
#line 48 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
- _tmp7_ = (*_tmp6_).module_spit_interface;
+ _tmp3_ = (*params).module_spit_interface;
#line 48 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
- if (_tmp7_ != SPIT_UNSUPPORTED_INTERFACE) {
-#line 306 "shotwell-publishing-extras.c"
- SpitEntryPointParams* _tmp8_;
- GFile* _tmp9_;
- ShotwellPublishingExtraServices* _tmp10_;
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
- _tmp8_ = params;
+ if (_tmp3_ != SPIT_UNSUPPORTED_INTERFACE) {
+#line 335 "shotwell-publishing-extras.c"
+ GFile* _tmp4_;
+ ShotwellPublishingExtraServices* _tmp5_;
#line 49 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
- _tmp9_ = (*_tmp8_).module_file;
+ _tmp4_ = (*params).module_file;
#line 49 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
- _tmp10_ = shotwell_publishing_extra_services_new (_tmp9_);
+ _tmp5_ = shotwell_publishing_extra_services_new (_tmp4_);
#line 49 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
- _g_object_unref0 (_tmp5_);
+ _g_object_unref0 (_tmp2_);
#line 49 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
- _tmp5_ = _tmp10_;
-#line 320 "shotwell-publishing-extras.c"
+ _tmp2_ = _tmp5_;
+#line 346 "shotwell-publishing-extras.c"
} else {
#line 49 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
- _g_object_unref0 (_tmp5_);
+ _g_object_unref0 (_tmp2_);
#line 49 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
- _tmp5_ = NULL;
-#line 326 "shotwell-publishing-extras.c"
+ _tmp2_ = NULL;
+#line 352 "shotwell-publishing-extras.c"
}
#line 48 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
- result = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SPIT_TYPE_MODULE, SpitModule);
+ result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SPIT_TYPE_MODULE, SpitModule);
#line 48 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
return result;
-#line 332 "shotwell-publishing-extras.c"
+#line 358 "shotwell-publishing-extras.c"
}
-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) {
@@ -344,7 +374,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/plugins/shotwell-publishing/FacebookPublishing.c b/plugins/shotwell-publishing/FacebookPublishing.c
index 12575cb..3b257d4 100644
--- a/plugins/shotwell-publishing/FacebookPublishing.c
+++ b/plugins/shotwell-publishing/FacebookPublishing.c
@@ -1,4 +1,4 @@
-/* FacebookPublishing.c generated by valac 0.36.6, the Vala compiler
+/* FacebookPublishing.c generated by valac 0.40.4, the Vala compiler
* generated from FacebookPublishing.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>
@@ -35,6 +36,11 @@
typedef struct _FacebookService FacebookService;
typedef struct _FacebookServiceClass FacebookServiceClass;
typedef struct _FacebookServicePrivate FacebookServicePrivate;
+enum {
+ FACEBOOK_SERVICE_0_PROPERTY,
+ FACEBOOK_SERVICE_NUM_PROPERTIES
+};
+static GParamSpec* facebook_service_properties[FACEBOOK_SERVICE_NUM_PROPERTIES];
#define _g_free0(var) (var = (g_free (var), NULL))
#define PUBLISHING_FACEBOOK_TYPE_FACEBOOK_PUBLISHER (publishing_facebook_facebook_publisher_get_type ())
@@ -104,6 +110,11 @@ typedef struct _PublishingFacebookPublishingOptionsPaneClass PublishingFacebookP
typedef struct _PublishingFacebookUploader PublishingFacebookUploader;
typedef struct _PublishingFacebookUploaderClass PublishingFacebookUploaderClass;
+enum {
+ PUBLISHING_FACEBOOK_FACEBOOK_PUBLISHER_0_PROPERTY,
+ PUBLISHING_FACEBOOK_FACEBOOK_PUBLISHER_NUM_PROPERTIES
+};
+static GParamSpec* publishing_facebook_facebook_publisher_properties[PUBLISHING_FACEBOOK_FACEBOOK_PUBLISHER_NUM_PROPERTIES];
#define _publishing_facebook_publishing_parameters_unref0(var) ((var == NULL) ? NULL : (var = (publishing_facebook_publishing_parameters_unref (var), NULL)))
#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
#define _publishing_facebook_graph_session_unref0(var) ((var == NULL) ? NULL : (var = (publishing_facebook_graph_session_unref (var), NULL)))
@@ -136,6 +147,11 @@ typedef struct _PublishingFacebookPublishingOptionsPanePrivate PublishingFaceboo
typedef struct _PublishingFacebookPublishingOptionsPanePrivacyDescription PublishingFacebookPublishingOptionsPanePrivacyDescription;
typedef struct _PublishingFacebookPublishingOptionsPanePrivacyDescriptionClass PublishingFacebookPublishingOptionsPanePrivacyDescriptionClass;
+enum {
+ PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_0_PROPERTY,
+ PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_NUM_PROPERTIES
+};
+static GParamSpec* publishing_facebook_publishing_options_pane_properties[PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_NUM_PROPERTIES];
#define _g_slist_free0(var) ((var == NULL) ? NULL : (var = (g_slist_free (var), NULL)))
typedef struct _PublishingFacebookPublishingOptionsPanePrivacyDescriptionPrivate PublishingFacebookPublishingOptionsPanePrivacyDescriptionPrivate;
#define _publishing_facebook_publishing_options_pane_privacy_description_unref0(var) ((var == NULL) ? NULL : (var = (publishing_facebook_publishing_options_pane_privacy_description_unref (var), NULL)))
@@ -143,9 +159,9 @@ typedef struct _PublishingFacebookPublishingOptionsPaneParamSpecPrivacyDescripti
enum {
PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL,
PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL,
- PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL
+ PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_NUM_SIGNALS
};
-static guint publishing_facebook_publishing_options_pane_signals[PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL] = {0};
+static guint publishing_facebook_publishing_options_pane_signals[PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_NUM_SIGNALS] = {0};
#define PUBLISHING_FACEBOOK_TYPE_ENDPOINT (publishing_facebook_endpoint_get_type ())
typedef struct _PublishingFacebookGraphMessagePrivate PublishingFacebookGraphMessagePrivate;
@@ -154,9 +170,9 @@ enum {
PUBLISHING_FACEBOOK_GRAPH_MESSAGE_COMPLETED_SIGNAL,
PUBLISHING_FACEBOOK_GRAPH_MESSAGE_FAILED_SIGNAL,
PUBLISHING_FACEBOOK_GRAPH_MESSAGE_DATA_TRANSMITTED_SIGNAL,
- PUBLISHING_FACEBOOK_GRAPH_MESSAGE_LAST_SIGNAL
+ PUBLISHING_FACEBOOK_GRAPH_MESSAGE_NUM_SIGNALS
};
-static guint publishing_facebook_graph_message_signals[PUBLISHING_FACEBOOK_GRAPH_MESSAGE_LAST_SIGNAL] = {0};
+static guint publishing_facebook_graph_message_signals[PUBLISHING_FACEBOOK_GRAPH_MESSAGE_NUM_SIGNALS] = {0};
typedef struct _PublishingFacebookGraphSessionPrivate PublishingFacebookGraphSessionPrivate;
#define PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL (publishing_facebook_graph_session_graph_message_impl_get_type ())
@@ -222,17 +238,17 @@ typedef struct _PublishingFacebookGraphSessionGraphCreateAlbumMessagePrivate Pub
typedef struct _PublishingFacebookParamSpecGraphSession PublishingFacebookParamSpecGraphSession;
enum {
PUBLISHING_FACEBOOK_GRAPH_SESSION_AUTHENTICATED_SIGNAL,
- PUBLISHING_FACEBOOK_GRAPH_SESSION_LAST_SIGNAL
+ PUBLISHING_FACEBOOK_GRAPH_SESSION_NUM_SIGNALS
};
-static guint publishing_facebook_graph_session_signals[PUBLISHING_FACEBOOK_GRAPH_SESSION_LAST_SIGNAL] = {0};
+static guint publishing_facebook_graph_session_signals[PUBLISHING_FACEBOOK_GRAPH_SESSION_NUM_SIGNALS] = {0};
typedef struct _PublishingFacebookUploaderPrivate PublishingFacebookUploaderPrivate;
typedef struct _PublishingFacebookParamSpecUploader PublishingFacebookParamSpecUploader;
enum {
PUBLISHING_FACEBOOK_UPLOADER_UPLOAD_COMPLETE_SIGNAL,
PUBLISHING_FACEBOOK_UPLOADER_UPLOAD_ERROR_SIGNAL,
- PUBLISHING_FACEBOOK_UPLOADER_LAST_SIGNAL
+ PUBLISHING_FACEBOOK_UPLOADER_NUM_SIGNALS
};
-static guint publishing_facebook_uploader_signals[PUBLISHING_FACEBOOK_UPLOADER_LAST_SIGNAL] = {0};
+static guint publishing_facebook_uploader_signals[PUBLISHING_FACEBOOK_UPLOADER_NUM_SIGNALS] = {0};
#define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
#define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; }
#define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; }
@@ -522,21 +538,28 @@ static gpointer publishing_facebook_graph_session_graph_create_album_message_par
static gpointer publishing_facebook_uploader_parent_class = NULL;
GType facebook_service_get_type (void) G_GNUC_CONST;
-enum {
- FACEBOOK_SERVICE_DUMMY_PROPERTY
-};
#define FACEBOOK_SERVICE_ICON_FILENAME "facebook.png"
FacebookService* facebook_service_new (GFile* resource_directory);
-FacebookService* facebook_service_construct (GType object_type, GFile* resource_directory);
-static gint facebook_service_real_get_pluggable_interface (SpitPluggable* base, gint min_host_interface, gint max_host_interface);
+FacebookService* facebook_service_construct (GType object_type,
+ GFile* resource_directory);
+static gint facebook_service_real_get_pluggable_interface (SpitPluggable* base,
+ gint min_host_interface,
+ gint max_host_interface);
static const gchar* facebook_service_real_get_id (SpitPluggable* base);
static const gchar* facebook_service_real_get_pluggable_name (SpitPluggable* base);
-static void facebook_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info);
-static GdkPixbuf** _vala_array_dup1 (GdkPixbuf** self, int length);
-static void facebook_service_real_activation (SpitPluggable* base, gboolean enabled);
-static SpitPublishingPublisher* facebook_service_real_create_publisher (SpitPublishingService* base, SpitPublishingPluginHost* host);
-PublishingFacebookFacebookPublisher* publishing_facebook_facebook_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host);
-PublishingFacebookFacebookPublisher* publishing_facebook_facebook_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host);
+static void facebook_service_real_get_info (SpitPluggable* base,
+ SpitPluggableInfo* info);
+static GdkPixbuf** _vala_array_dup1 (GdkPixbuf** self,
+ int length);
+static void facebook_service_real_activation (SpitPluggable* base,
+ gboolean enabled);
+static SpitPublishingPublisher* facebook_service_real_create_publisher (SpitPublishingService* base,
+ SpitPublishingPluginHost* host);
+PublishingFacebookFacebookPublisher* publishing_facebook_facebook_publisher_new (SpitPublishingService* service,
+ SpitPublishingPluginHost* host);
+PublishingFacebookFacebookPublisher* publishing_facebook_facebook_publisher_construct (GType object_type,
+ SpitPublishingService* service,
+ SpitPublishingPluginHost* host);
GType publishing_facebook_facebook_publisher_get_type (void) G_GNUC_CONST;
static SpitPublishingPublisherMediaType facebook_service_real_get_supported_media (SpitPublishingService* base);
static void facebook_service_finalize (GObject * obj);
@@ -546,16 +569,22 @@ static void facebook_service_finalize (GObject * obj);
#define PUBLISHING_FACEBOOK_EXPIRED_SESSION_STATUS_CODE 400
gpointer publishing_facebook_album_ref (gpointer instance);
void publishing_facebook_album_unref (gpointer instance);
-GParamSpec* publishing_facebook_param_spec_album (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void publishing_facebook_value_set_album (GValue* value, gpointer v_object);
-void publishing_facebook_value_take_album (GValue* value, gpointer v_object);
+GParamSpec* publishing_facebook_param_spec_album (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void publishing_facebook_value_set_album (GValue* value,
+ gpointer v_object);
+void publishing_facebook_value_take_album (GValue* value,
+ gpointer v_object);
gpointer publishing_facebook_value_get_album (const GValue* value);
GType publishing_facebook_album_get_type (void) G_GNUC_CONST;
-enum {
- PUBLISHING_FACEBOOK_ALBUM_DUMMY_PROPERTY
-};
-PublishingFacebookAlbum* publishing_facebook_album_new (const gchar* name, const gchar* id);
-PublishingFacebookAlbum* publishing_facebook_album_construct (GType object_type, const gchar* name, const gchar* id);
+PublishingFacebookAlbum* publishing_facebook_album_new (const gchar* name,
+ const gchar* id);
+PublishingFacebookAlbum* publishing_facebook_album_construct (GType object_type,
+ const gchar* name,
+ const gchar* id);
static void publishing_facebook_album_finalize (PublishingFacebookAlbum * obj);
GType publishing_facebook_resolution_get_type (void) G_GNUC_CONST;
gchar* publishing_facebook_resolution_get_name (PublishingFacebookResolution self);
@@ -563,254 +592,438 @@ const gchar* publishing_facebook_resolution_to_string (PublishingFacebookResolut
gint publishing_facebook_resolution_get_pixels (PublishingFacebookResolution self);
gpointer publishing_facebook_publishing_parameters_ref (gpointer instance);
void publishing_facebook_publishing_parameters_unref (gpointer instance);
-GParamSpec* publishing_facebook_param_spec_publishing_parameters (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void publishing_facebook_value_set_publishing_parameters (GValue* value, gpointer v_object);
-void publishing_facebook_value_take_publishing_parameters (GValue* value, gpointer v_object);
+GParamSpec* publishing_facebook_param_spec_publishing_parameters (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void publishing_facebook_value_set_publishing_parameters (GValue* value,
+ gpointer v_object);
+void publishing_facebook_value_take_publishing_parameters (GValue* value,
+ gpointer v_object);
gpointer publishing_facebook_value_get_publishing_parameters (const GValue* value);
GType publishing_facebook_publishing_parameters_get_type (void) G_GNUC_CONST;
-enum {
- PUBLISHING_FACEBOOK_PUBLISHING_PARAMETERS_DUMMY_PROPERTY
-};
#define PUBLISHING_FACEBOOK_PUBLISHING_PARAMETERS_UNKNOWN_ALBUM -1
PublishingFacebookPublishingParameters* publishing_facebook_publishing_parameters_new (void);
PublishingFacebookPublishingParameters* publishing_facebook_publishing_parameters_construct (GType object_type);
-void publishing_facebook_publishing_parameters_add_album (PublishingFacebookPublishingParameters* self, const gchar* name, const gchar* id);
-static void _vala_array_add7 (PublishingFacebookAlbum** * array, int* length, int* size, PublishingFacebookAlbum* value);
-void publishing_facebook_publishing_parameters_set_target_album_by_name (PublishingFacebookPublishingParameters* self, const gchar* name);
+void publishing_facebook_publishing_parameters_add_album (PublishingFacebookPublishingParameters* self,
+ const gchar* name,
+ const gchar* id);
+static void _vala_array_add7 (PublishingFacebookAlbum** * array,
+ int* length,
+ int* size,
+ PublishingFacebookAlbum* value);
+void publishing_facebook_publishing_parameters_set_target_album_by_name (PublishingFacebookPublishingParameters* self,
+ const gchar* name);
gchar* publishing_facebook_publishing_parameters_get_target_album_name (PublishingFacebookPublishingParameters* self);
gchar* publishing_facebook_publishing_parameters_get_target_album_id (PublishingFacebookPublishingParameters* self);
static void publishing_facebook_publishing_parameters_finalize (PublishingFacebookPublishingParameters * obj);
gpointer publishing_facebook_graph_session_ref (gpointer instance);
void publishing_facebook_graph_session_unref (gpointer instance);
-GParamSpec* publishing_facebook_param_spec_graph_session (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void publishing_facebook_value_set_graph_session (GValue* value, gpointer v_object);
-void publishing_facebook_value_take_graph_session (GValue* value, gpointer v_object);
+GParamSpec* publishing_facebook_param_spec_graph_session (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void publishing_facebook_value_set_graph_session (GValue* value,
+ gpointer v_object);
+void publishing_facebook_value_take_graph_session (GValue* value,
+ gpointer v_object);
gpointer publishing_facebook_value_get_graph_session (const GValue* value);
GType publishing_facebook_graph_session_get_type (void) G_GNUC_CONST;
GType publishing_facebook_publishing_options_pane_get_type (void) G_GNUC_CONST;
gpointer publishing_facebook_uploader_ref (gpointer instance);
void publishing_facebook_uploader_unref (gpointer instance);
-GParamSpec* publishing_facebook_param_spec_uploader (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void publishing_facebook_value_set_uploader (GValue* value, gpointer v_object);
-void publishing_facebook_value_take_uploader (GValue* value, gpointer v_object);
+GParamSpec* publishing_facebook_param_spec_uploader (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void publishing_facebook_value_set_uploader (GValue* value,
+ gpointer v_object);
+void publishing_facebook_value_take_uploader (GValue* value,
+ gpointer v_object);
gpointer publishing_facebook_value_get_uploader (const GValue* value);
GType publishing_facebook_uploader_get_type (void) G_GNUC_CONST;
#define PUBLISHING_FACEBOOK_FACEBOOK_PUBLISHER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_FACEBOOK_TYPE_FACEBOOK_PUBLISHER, PublishingFacebookFacebookPublisherPrivate))
-enum {
- PUBLISHING_FACEBOOK_FACEBOOK_PUBLISHER_DUMMY_PROPERTY
-};
PublishingFacebookGraphSession* publishing_facebook_graph_session_new (void);
PublishingFacebookGraphSession* publishing_facebook_graph_session_construct (GType object_type);
static void publishing_facebook_facebook_publisher_on_session_authenticated (PublishingFacebookFacebookPublisher* self);
-static void _publishing_facebook_facebook_publisher_on_session_authenticated_publishing_facebook_graph_session_authenticated (PublishingFacebookGraphSession* _sender, gpointer self);
+static void _publishing_facebook_facebook_publisher_on_session_authenticated_publishing_facebook_graph_session_authenticated (PublishingFacebookGraphSession* _sender,
+ gpointer self);
static gboolean publishing_facebook_facebook_publisher_get_persistent_strip_metadata (PublishingFacebookFacebookPublisher* self);
-static void publishing_facebook_facebook_publisher_set_persistent_strip_metadata (PublishingFacebookFacebookPublisher* self, gboolean strip_metadata);
+static void publishing_facebook_facebook_publisher_set_persistent_strip_metadata (PublishingFacebookFacebookPublisher* self,
+ gboolean strip_metadata);
gint publishing_facebook_facebook_publisher_get_persistent_default_size (PublishingFacebookFacebookPublisher* self);
-void publishing_facebook_facebook_publisher_set_persistent_default_size (PublishingFacebookFacebookPublisher* self, gint size);
+void publishing_facebook_facebook_publisher_set_persistent_default_size (PublishingFacebookFacebookPublisher* self,
+ gint size);
static void publishing_facebook_facebook_publisher_do_fetch_user_info (PublishingFacebookFacebookPublisher* self);
gpointer publishing_facebook_graph_message_ref (gpointer instance);
void publishing_facebook_graph_message_unref (gpointer instance);
-GParamSpec* publishing_facebook_param_spec_graph_message (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void publishing_facebook_value_set_graph_message (GValue* value, gpointer v_object);
-void publishing_facebook_value_take_graph_message (GValue* value, gpointer v_object);
+GParamSpec* publishing_facebook_param_spec_graph_message (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void publishing_facebook_value_set_graph_message (GValue* value,
+ gpointer v_object);
+void publishing_facebook_value_take_graph_message (GValue* value,
+ gpointer v_object);
gpointer publishing_facebook_value_get_graph_message (const GValue* value);
GType publishing_facebook_graph_message_get_type (void) G_GNUC_CONST;
-PublishingFacebookGraphMessage* publishing_facebook_graph_session_new_query (PublishingFacebookGraphSession* self, const gchar* resource_path);
-static void publishing_facebook_facebook_publisher_on_fetch_user_info_completed (PublishingFacebookFacebookPublisher* self, PublishingFacebookGraphMessage* message);
-static void _publishing_facebook_facebook_publisher_on_fetch_user_info_completed_publishing_facebook_graph_message_completed (PublishingFacebookGraphMessage* _sender, gpointer self);
-static void publishing_facebook_facebook_publisher_on_fetch_user_info_error (PublishingFacebookFacebookPublisher* self, PublishingFacebookGraphMessage* message, GError* _error_);
-static void _publishing_facebook_facebook_publisher_on_fetch_user_info_error_publishing_facebook_graph_message_failed (PublishingFacebookGraphMessage* _sender, GError* err, gpointer self);
-void publishing_facebook_graph_session_send_message (PublishingFacebookGraphSession* self, PublishingFacebookGraphMessage* message);
+PublishingFacebookGraphMessage* publishing_facebook_graph_session_new_query (PublishingFacebookGraphSession* self,
+ const gchar* resource_path);
+static void publishing_facebook_facebook_publisher_on_fetch_user_info_completed (PublishingFacebookFacebookPublisher* self,
+ PublishingFacebookGraphMessage* message);
+static void _publishing_facebook_facebook_publisher_on_fetch_user_info_completed_publishing_facebook_graph_message_completed (PublishingFacebookGraphMessage* _sender,
+ gpointer self);
+static void publishing_facebook_facebook_publisher_on_fetch_user_info_error (PublishingFacebookFacebookPublisher* self,
+ PublishingFacebookGraphMessage* message,
+ GError* _error_);
+static void _publishing_facebook_facebook_publisher_on_fetch_user_info_error_publishing_facebook_graph_message_failed (PublishingFacebookGraphMessage* _sender,
+ GError* err,
+ gpointer self);
+void publishing_facebook_graph_session_send_message (PublishingFacebookGraphSession* self,
+ PublishingFacebookGraphMessage* message);
static void publishing_facebook_facebook_publisher_do_fetch_album_descriptions (PublishingFacebookFacebookPublisher* self);
-static void publishing_facebook_facebook_publisher_on_fetch_albums_completed (PublishingFacebookFacebookPublisher* self, PublishingFacebookGraphMessage* message);
-static void _publishing_facebook_facebook_publisher_on_fetch_albums_completed_publishing_facebook_graph_message_completed (PublishingFacebookGraphMessage* _sender, gpointer self);
-static void publishing_facebook_facebook_publisher_on_fetch_albums_error (PublishingFacebookFacebookPublisher* self, PublishingFacebookGraphMessage* message, GError* err);
-static void _publishing_facebook_facebook_publisher_on_fetch_albums_error_publishing_facebook_graph_message_failed (PublishingFacebookGraphMessage* _sender, GError* err, gpointer self);
-static void publishing_facebook_facebook_publisher_do_extract_user_info_from_json (PublishingFacebookFacebookPublisher* self, const gchar* json);
+static void publishing_facebook_facebook_publisher_on_fetch_albums_completed (PublishingFacebookFacebookPublisher* self,
+ PublishingFacebookGraphMessage* message);
+static void _publishing_facebook_facebook_publisher_on_fetch_albums_completed_publishing_facebook_graph_message_completed (PublishingFacebookGraphMessage* _sender,
+ gpointer self);
+static void publishing_facebook_facebook_publisher_on_fetch_albums_error (PublishingFacebookFacebookPublisher* self,
+ PublishingFacebookGraphMessage* message,
+ GError* err);
+static void _publishing_facebook_facebook_publisher_on_fetch_albums_error_publishing_facebook_graph_message_failed (PublishingFacebookGraphMessage* _sender,
+ GError* err,
+ gpointer self);
+static void publishing_facebook_facebook_publisher_do_extract_user_info_from_json (PublishingFacebookFacebookPublisher* self,
+ const gchar* json);
static JsonNode* _vala_JsonNode_copy (JsonNode* self);
static void _vala_JsonNode_free (JsonNode* self);
static void publishing_facebook_facebook_publisher_on_user_info_extracted (PublishingFacebookFacebookPublisher* self);
-static void publishing_facebook_facebook_publisher_do_extract_albums_from_json (PublishingFacebookFacebookPublisher* self, const gchar* json);
+static void publishing_facebook_facebook_publisher_do_extract_albums_from_json (PublishingFacebookFacebookPublisher* self,
+ const gchar* json);
static void publishing_facebook_facebook_publisher_on_albums_extracted (PublishingFacebookFacebookPublisher* self);
static void publishing_facebook_facebook_publisher_do_create_new_album (PublishingFacebookFacebookPublisher* self);
-PublishingFacebookGraphMessage* publishing_facebook_graph_session_new_create_album (PublishingFacebookGraphSession* self, const gchar* album_name, const gchar* privacy);
-static void publishing_facebook_facebook_publisher_on_create_album_completed (PublishingFacebookFacebookPublisher* self, PublishingFacebookGraphMessage* message);
-static void _publishing_facebook_facebook_publisher_on_create_album_completed_publishing_facebook_graph_message_completed (PublishingFacebookGraphMessage* _sender, gpointer self);
-static void publishing_facebook_facebook_publisher_on_create_album_error (PublishingFacebookFacebookPublisher* self, PublishingFacebookGraphMessage* message, GError* err);
-static void _publishing_facebook_facebook_publisher_on_create_album_error_publishing_facebook_graph_message_failed (PublishingFacebookGraphMessage* _sender, GError* err, gpointer self);
+PublishingFacebookGraphMessage* publishing_facebook_graph_session_new_create_album (PublishingFacebookGraphSession* self,
+ const gchar* album_name,
+ const gchar* privacy);
+static void publishing_facebook_facebook_publisher_on_create_album_completed (PublishingFacebookFacebookPublisher* self,
+ PublishingFacebookGraphMessage* message);
+static void _publishing_facebook_facebook_publisher_on_create_album_completed_publishing_facebook_graph_message_completed (PublishingFacebookGraphMessage* _sender,
+ gpointer self);
+static void publishing_facebook_facebook_publisher_on_create_album_error (PublishingFacebookFacebookPublisher* self,
+ PublishingFacebookGraphMessage* message,
+ GError* err);
+static void _publishing_facebook_facebook_publisher_on_create_album_error_publishing_facebook_graph_message_failed (PublishingFacebookGraphMessage* _sender,
+ GError* err,
+ gpointer self);
static void publishing_facebook_facebook_publisher_do_show_publishing_options_pane (PublishingFacebookFacebookPublisher* self);
-PublishingFacebookPublishingOptionsPane* publishing_facebook_publishing_options_pane_new (const gchar* username, PublishingFacebookAlbum** albums, int albums_length1, SpitPublishingPublisherMediaType media_type, PublishingFacebookFacebookPublisher* publisher, GtkBuilder* builder, gboolean strip_metadata, gboolean can_logout);
-PublishingFacebookPublishingOptionsPane* publishing_facebook_publishing_options_pane_construct (GType object_type, const gchar* username, PublishingFacebookAlbum** albums, int albums_length1, SpitPublishingPublisherMediaType media_type, PublishingFacebookFacebookPublisher* publisher, GtkBuilder* builder, gboolean strip_metadata, gboolean can_logout);
+PublishingFacebookPublishingOptionsPane* publishing_facebook_publishing_options_pane_new (const gchar* username,
+ PublishingFacebookAlbum** albums,
+ int albums_length1,
+ SpitPublishingPublisherMediaType media_type,
+ PublishingFacebookFacebookPublisher* publisher,
+ GtkBuilder* builder,
+ gboolean strip_metadata,
+ gboolean can_logout);
+PublishingFacebookPublishingOptionsPane* publishing_facebook_publishing_options_pane_construct (GType object_type,
+ const gchar* username,
+ PublishingFacebookAlbum** albums,
+ int albums_length1,
+ SpitPublishingPublisherMediaType media_type,
+ PublishingFacebookFacebookPublisher* publisher,
+ GtkBuilder* builder,
+ gboolean strip_metadata,
+ gboolean can_logout);
static void publishing_facebook_facebook_publisher_on_publishing_options_pane_logout (PublishingFacebookFacebookPublisher* self);
-static void _publishing_facebook_facebook_publisher_on_publishing_options_pane_logout_publishing_facebook_publishing_options_pane_logout (PublishingFacebookPublishingOptionsPane* _sender, gpointer self);
-static void publishing_facebook_facebook_publisher_on_publishing_options_pane_publish (PublishingFacebookFacebookPublisher* self, const gchar* target_album, const gchar* privacy_setting, PublishingFacebookResolution resolution, gboolean strip_metadata);
-static void _publishing_facebook_facebook_publisher_on_publishing_options_pane_publish_publishing_facebook_publishing_options_pane_publish (PublishingFacebookPublishingOptionsPane* _sender, const gchar* target_album, const gchar* privacy_setting, PublishingFacebookResolution target_resolution, gboolean strip_metadata, gpointer self);
+static void _publishing_facebook_facebook_publisher_on_publishing_options_pane_logout_publishing_facebook_publishing_options_pane_logout (PublishingFacebookPublishingOptionsPane* _sender,
+ gpointer self);
+static void publishing_facebook_facebook_publisher_on_publishing_options_pane_publish (PublishingFacebookFacebookPublisher* self,
+ const gchar* target_album,
+ const gchar* privacy_setting,
+ PublishingFacebookResolution resolution,
+ gboolean strip_metadata);
+static void _publishing_facebook_facebook_publisher_on_publishing_options_pane_publish_publishing_facebook_publishing_options_pane_publish (PublishingFacebookPublishingOptionsPane* _sender,
+ const gchar* target_album,
+ const gchar* privacy_setting,
+ PublishingFacebookResolution target_resolution,
+ gboolean strip_metadata,
+ gpointer self);
static void publishing_facebook_facebook_publisher_do_logout (PublishingFacebookFacebookPublisher* self);
-static void publishing_facebook_facebook_publisher_do_add_new_local_album_from_json (PublishingFacebookFacebookPublisher* self, const gchar* album_name, const gchar* json);
+static void publishing_facebook_facebook_publisher_do_add_new_local_album_from_json (PublishingFacebookFacebookPublisher* self,
+ const gchar* album_name,
+ const gchar* json);
static void publishing_facebook_facebook_publisher_do_upload (PublishingFacebookFacebookPublisher* self);
static void publishing_facebook_facebook_publisher_on_authenticator_succeeded (PublishingFacebookFacebookPublisher* self);
static void publishing_facebook_facebook_publisher_do_authenticate_session (PublishingFacebookFacebookPublisher* self);
static void publishing_facebook_facebook_publisher_on_authenticator_failed (PublishingFacebookFacebookPublisher* self);
-void publishing_facebook_graph_session_authenticate (PublishingFacebookGraphSession* self, const gchar* access_token);
-PublishingFacebookUploader* publishing_facebook_uploader_new (PublishingFacebookGraphSession* session, PublishingFacebookPublishingParameters* publishing_params, SpitPublishingPublishable** publishables, int publishables_length1);
-PublishingFacebookUploader* publishing_facebook_uploader_construct (GType object_type, PublishingFacebookGraphSession* session, PublishingFacebookPublishingParameters* publishing_params, SpitPublishingPublishable** publishables, int publishables_length1);
-static void publishing_facebook_facebook_publisher_on_upload_complete (PublishingFacebookFacebookPublisher* self, PublishingFacebookUploader* uploader, gint num_published);
-static void _publishing_facebook_facebook_publisher_on_upload_complete_publishing_facebook_uploader_upload_complete (PublishingFacebookUploader* _sender, gint num_photos_published, gpointer self);
-static void publishing_facebook_facebook_publisher_on_upload_error (PublishingFacebookFacebookPublisher* self, PublishingFacebookUploader* uploader, GError* err);
-static void _publishing_facebook_facebook_publisher_on_upload_error_publishing_facebook_uploader_upload_error (PublishingFacebookUploader* _sender, GError* err, gpointer self);
-void publishing_facebook_uploader_upload (PublishingFacebookUploader* self, SpitPublishingProgressCallback status_updated, void* status_updated_target);
-static void publishing_facebook_facebook_publisher_on_upload_status_updated (PublishingFacebookFacebookPublisher* self, gint file_number, gdouble completed_fraction);
-static void _publishing_facebook_facebook_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self);
+void publishing_facebook_graph_session_authenticate (PublishingFacebookGraphSession* self,
+ const gchar* access_token);
+PublishingFacebookUploader* publishing_facebook_uploader_new (PublishingFacebookGraphSession* session,
+ PublishingFacebookPublishingParameters* publishing_params,
+ SpitPublishingPublishable** publishables,
+ int publishables_length1);
+PublishingFacebookUploader* publishing_facebook_uploader_construct (GType object_type,
+ PublishingFacebookGraphSession* session,
+ PublishingFacebookPublishingParameters* publishing_params,
+ SpitPublishingPublishable** publishables,
+ int publishables_length1);
+static void publishing_facebook_facebook_publisher_on_upload_complete (PublishingFacebookFacebookPublisher* self,
+ PublishingFacebookUploader* uploader,
+ gint num_published);
+static void _publishing_facebook_facebook_publisher_on_upload_complete_publishing_facebook_uploader_upload_complete (PublishingFacebookUploader* _sender,
+ gint num_photos_published,
+ gpointer self);
+static void publishing_facebook_facebook_publisher_on_upload_error (PublishingFacebookFacebookPublisher* self,
+ PublishingFacebookUploader* uploader,
+ GError* err);
+static void _publishing_facebook_facebook_publisher_on_upload_error_publishing_facebook_uploader_upload_error (PublishingFacebookUploader* _sender,
+ GError* err,
+ gpointer self);
+void publishing_facebook_uploader_upload (PublishingFacebookUploader* self,
+ SpitPublishingProgressCallback status_updated,
+ void* status_updated_target);
+static void publishing_facebook_facebook_publisher_on_upload_status_updated (PublishingFacebookFacebookPublisher* self,
+ gint file_number,
+ gdouble completed_fraction);
+static void _publishing_facebook_facebook_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number,
+ gdouble fraction_complete,
+ gpointer self);
static void publishing_facebook_facebook_publisher_do_show_success_pane (PublishingFacebookFacebookPublisher* self);
-static void publishing_facebook_facebook_publisher_on_generic_error (PublishingFacebookFacebookPublisher* self, GError* _error_);
+static void publishing_facebook_facebook_publisher_on_generic_error (PublishingFacebookFacebookPublisher* self,
+ GError* _error_);
gboolean publishing_facebook_graph_session_is_authenticated (PublishingFacebookGraphSession* self);
gchar* publishing_facebook_graph_message_get_response_body (PublishingFacebookGraphMessage* self);
static SpitPublishingService* publishing_facebook_facebook_publisher_real_get_service (SpitPublishingPublisher* base);
gchar* publishing_facebook_facebook_publisher_get_service_name (PublishingFacebookFacebookPublisher* self);
gchar* publishing_facebook_facebook_publisher_get_user_visible_name (PublishingFacebookFacebookPublisher* self);
static void publishing_facebook_facebook_publisher_real_start (SpitPublishingPublisher* base);
-static void _publishing_facebook_facebook_publisher_on_authenticator_succeeded_spit_publishing_authenticator_authenticated (SpitPublishingAuthenticator* _sender, gpointer self);
-static void _publishing_facebook_facebook_publisher_on_authenticator_failed_spit_publishing_authenticator_authentication_failed (SpitPublishingAuthenticator* _sender, gpointer self);
+static void _publishing_facebook_facebook_publisher_on_authenticator_succeeded_spit_publishing_authenticator_authenticated (SpitPublishingAuthenticator* _sender,
+ gpointer self);
+static void _publishing_facebook_facebook_publisher_on_authenticator_failed_spit_publishing_authenticator_authentication_failed (SpitPublishingAuthenticator* _sender,
+ gpointer self);
static void publishing_facebook_facebook_publisher_real_stop (SpitPublishingPublisher* base);
void publishing_facebook_graph_session_stop_transactions (PublishingFacebookGraphSession* self);
static gboolean publishing_facebook_facebook_publisher_real_is_running (SpitPublishingPublisher* base);
static void publishing_facebook_facebook_publisher_finalize (GObject * obj);
static gpointer publishing_facebook_publishing_options_pane_privacy_description_ref (gpointer instance);
static void publishing_facebook_publishing_options_pane_privacy_description_unref (gpointer instance);
-static GParamSpec* publishing_facebook_publishing_options_pane_param_spec_privacy_description (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) G_GNUC_UNUSED;
-static void publishing_facebook_publishing_options_pane_value_set_privacy_description (GValue* value, gpointer v_object) G_GNUC_UNUSED;
-static void publishing_facebook_publishing_options_pane_value_take_privacy_description (GValue* value, gpointer v_object) G_GNUC_UNUSED;
+static GParamSpec* publishing_facebook_publishing_options_pane_param_spec_privacy_description (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags) G_GNUC_UNUSED;
+static void publishing_facebook_publishing_options_pane_value_set_privacy_description (GValue* value,
+ gpointer v_object) G_GNUC_UNUSED;
+static void publishing_facebook_publishing_options_pane_value_take_privacy_description (GValue* value,
+ gpointer v_object) G_GNUC_UNUSED;
static gpointer publishing_facebook_publishing_options_pane_value_get_privacy_description (const GValue* value) G_GNUC_UNUSED;
static GType publishing_facebook_publishing_options_pane_privacy_description_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
#define PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_FACEBOOK_TYPE_PUBLISHING_OPTIONS_PANE, PublishingFacebookPublishingOptionsPanePrivate))
-enum {
- PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_DUMMY_PROPERTY
-};
#define PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_HEADER_LABEL_TEXT _ ("You are logged into Facebook as %s.\n\n")
#define PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_PHOTOS_LABEL_TEXT _ ("Where would you like to publish the selected photos?")
#define PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_RESOLUTION_LABEL_TEXT _ ("Upload _size:")
#define PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_CONTENT_GROUP_SPACING 32
#define PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_STANDARD_ACTION_BUTTON_WIDTH 128
-static PublishingFacebookAlbum** _vala_array_dup2 (PublishingFacebookAlbum** self, int length);
-static PublishingFacebookPublishingOptionsPanePrivacyDescription** publishing_facebook_publishing_options_pane_create_privacy_descriptions (PublishingFacebookPublishingOptionsPane* self, int* result_length1);
-static PublishingFacebookResolution* publishing_facebook_publishing_options_pane_create_resolution_list (PublishingFacebookPublishingOptionsPane* self, int* result_length1);
+static PublishingFacebookAlbum** _vala_array_dup2 (PublishingFacebookAlbum** self,
+ int length);
+static PublishingFacebookPublishingOptionsPanePrivacyDescription** publishing_facebook_publishing_options_pane_create_privacy_descriptions (PublishingFacebookPublishingOptionsPane* self,
+ int* result_length1);
+static PublishingFacebookResolution* publishing_facebook_publishing_options_pane_create_resolution_list (PublishingFacebookPublishingOptionsPane* self,
+ int* result_length1);
static void publishing_facebook_publishing_options_pane_on_create_new_toggled (PublishingFacebookPublishingOptionsPane* self);
-static void _publishing_facebook_publishing_options_pane_on_create_new_toggled_gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void _publishing_facebook_publishing_options_pane_on_create_new_toggled_gtk_button_clicked (GtkButton* _sender,
+ gpointer self);
static void publishing_facebook_publishing_options_pane_on_use_existing_toggled (PublishingFacebookPublishingOptionsPane* self);
-static void _publishing_facebook_publishing_options_pane_on_use_existing_toggled_gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void _publishing_facebook_publishing_options_pane_on_use_existing_toggled_gtk_button_clicked (GtkButton* _sender,
+ gpointer self);
static void publishing_facebook_publishing_options_pane_setup_visibility_combo (PublishingFacebookPublishingOptionsPane* self);
static void publishing_facebook_publishing_options_pane_on_publish_button_clicked (PublishingFacebookPublishingOptionsPane* self);
-static void _publishing_facebook_publishing_options_pane_on_publish_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void _publishing_facebook_publishing_options_pane_on_publish_button_clicked_gtk_button_clicked (GtkButton* _sender,
+ gpointer self);
static void publishing_facebook_publishing_options_pane_on_logout_button_clicked (PublishingFacebookPublishingOptionsPane* self);
-static void _publishing_facebook_publishing_options_pane_on_logout_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void _publishing_facebook_publishing_options_pane_on_logout_button_clicked_gtk_button_clicked (GtkButton* _sender,
+ gpointer self);
static void publishing_facebook_publishing_options_pane_setup_resolution_combo (PublishingFacebookPublishingOptionsPane* self);
static void publishing_facebook_publishing_options_pane_on_size_changed (PublishingFacebookPublishingOptionsPane* self);
-static void _publishing_facebook_publishing_options_pane_on_size_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
+static void _publishing_facebook_publishing_options_pane_on_size_changed_gtk_combo_box_changed (GtkComboBox* _sender,
+ gpointer self);
static gboolean publishing_facebook_publishing_options_pane_publishing_photos (PublishingFacebookPublishingOptionsPane* self);
-static PublishingFacebookPublishingOptionsPanePrivacyDescription* publishing_facebook_publishing_options_pane_privacy_description_new (const gchar* description, const gchar* privacy_setting);
-static PublishingFacebookPublishingOptionsPanePrivacyDescription* publishing_facebook_publishing_options_pane_privacy_description_construct (GType object_type, const gchar* description, const gchar* privacy_setting);
-static void _vala_array_add8 (PublishingFacebookPublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingFacebookPublishingOptionsPanePrivacyDescription* value);
-static void _vala_array_add9 (PublishingFacebookPublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingFacebookPublishingOptionsPanePrivacyDescription* value);
-static void _vala_array_add10 (PublishingFacebookPublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingFacebookPublishingOptionsPanePrivacyDescription* value);
-static void _vala_array_add11 (PublishingFacebookResolution* * array, int* length, int* size, PublishingFacebookResolution value);
-static void _vala_array_add12 (PublishingFacebookResolution* * array, int* length, int* size, PublishingFacebookResolution value);
+static PublishingFacebookPublishingOptionsPanePrivacyDescription* publishing_facebook_publishing_options_pane_privacy_description_new (const gchar* description,
+ const gchar* privacy_setting);
+static PublishingFacebookPublishingOptionsPanePrivacyDescription* publishing_facebook_publishing_options_pane_privacy_description_construct (GType object_type,
+ const gchar* description,
+ const gchar* privacy_setting);
+static void _vala_array_add8 (PublishingFacebookPublishingOptionsPanePrivacyDescription** * array,
+ int* length,
+ int* size,
+ PublishingFacebookPublishingOptionsPanePrivacyDescription* value);
+static void _vala_array_add9 (PublishingFacebookPublishingOptionsPanePrivacyDescription** * array,
+ int* length,
+ int* size,
+ PublishingFacebookPublishingOptionsPanePrivacyDescription* value);
+static void _vala_array_add10 (PublishingFacebookPublishingOptionsPanePrivacyDescription** * array,
+ int* length,
+ int* size,
+ PublishingFacebookPublishingOptionsPanePrivacyDescription* value);
+static void _vala_array_add11 (PublishingFacebookResolution* * array,
+ int* length,
+ int* size,
+ PublishingFacebookResolution value);
+static void _vala_array_add12 (PublishingFacebookResolution* * array,
+ int* length,
+ int* size,
+ PublishingFacebookResolution value);
void publishing_facebook_publishing_options_pane_installed (PublishingFacebookPublishingOptionsPane* self);
static void publishing_facebook_publishing_options_pane_notify_logout (PublishingFacebookPublishingOptionsPane* self);
-static void publishing_facebook_publishing_options_pane_notify_publish (PublishingFacebookPublishingOptionsPane* self, const gchar* target_album, const gchar* privacy_setting, PublishingFacebookResolution target_resolution);
+static void publishing_facebook_publishing_options_pane_notify_publish (PublishingFacebookPublishingOptionsPane* self,
+ const gchar* target_album,
+ const gchar* privacy_setting,
+ PublishingFacebookResolution target_resolution);
static GtkWidget* publishing_facebook_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base);
static SpitPublishingDialogPaneGeometryOptions publishing_facebook_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base);
static void publishing_facebook_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base);
-static void _publishing_facebook_publishing_options_pane_notify_logout_publishing_facebook_publishing_options_pane_logout (PublishingFacebookPublishingOptionsPane* _sender, gpointer self);
-static void _publishing_facebook_publishing_options_pane_notify_publish_publishing_facebook_publishing_options_pane_publish (PublishingFacebookPublishingOptionsPane* _sender, const gchar* target_album, const gchar* privacy_setting, PublishingFacebookResolution target_resolution, gboolean strip_metadata, gpointer self);
+static void _publishing_facebook_publishing_options_pane_notify_logout_publishing_facebook_publishing_options_pane_logout (PublishingFacebookPublishingOptionsPane* _sender,
+ gpointer self);
+static void _publishing_facebook_publishing_options_pane_notify_publish_publishing_facebook_publishing_options_pane_publish (PublishingFacebookPublishingOptionsPane* _sender,
+ const gchar* target_album,
+ const gchar* privacy_setting,
+ PublishingFacebookResolution target_resolution,
+ gboolean strip_metadata,
+ gpointer self);
static void publishing_facebook_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base);
-static void g_cclosure_user_marshal_VOID__STRING_STRING_ENUM_BOOLEAN (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
-enum {
- PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_PRIVACY_DESCRIPTION_DUMMY_PROPERTY
-};
+static void g_cclosure_user_marshal_VOID__STRING_STRING_ENUM_BOOLEAN (GClosure * closure,
+ GValue * return_value,
+ guint n_param_values,
+ const GValue * param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data);
static void publishing_facebook_publishing_options_pane_privacy_description_finalize (PublishingFacebookPublishingOptionsPanePrivacyDescription * obj);
static void publishing_facebook_publishing_options_pane_finalize (GObject * obj);
GType publishing_facebook_endpoint_get_type (void) G_GNUC_CONST;
gchar* publishing_facebook_endpoint_to_uri (PublishingFacebookEndpoint self);
-enum {
- PUBLISHING_FACEBOOK_GRAPH_MESSAGE_DUMMY_PROPERTY
-};
gchar* publishing_facebook_graph_message_get_uri (PublishingFacebookGraphMessage* self);
static gchar* publishing_facebook_graph_message_real_get_uri (PublishingFacebookGraphMessage* self);
static gchar* publishing_facebook_graph_message_real_get_response_body (PublishingFacebookGraphMessage* self);
PublishingFacebookGraphMessage* publishing_facebook_graph_message_construct (GType object_type);
-static void g_cclosure_user_marshal_VOID__INT_INT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
+static void g_cclosure_user_marshal_VOID__INT_INT (GClosure * closure,
+ GValue * return_value,
+ guint n_param_values,
+ const GValue * param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data);
static void publishing_facebook_graph_message_finalize (PublishingFacebookGraphMessage * obj);
#define PUBLISHING_FACEBOOK_GRAPH_SESSION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_FACEBOOK_TYPE_GRAPH_SESSION, PublishingFacebookGraphSessionPrivate))
-enum {
- PUBLISHING_FACEBOOK_GRAPH_SESSION_DUMMY_PROPERTY
-};
-static void publishing_facebook_graph_session_on_request_unqueued (PublishingFacebookGraphSession* self, SoupMessage* msg);
-static void _publishing_facebook_graph_session_on_request_unqueued_soup_session_request_unqueued (SoupSession* _sender, SoupMessage* msg, gpointer self);
-static void publishing_facebook_graph_session_manage_message (PublishingFacebookGraphSession* self, PublishingFacebookGraphMessage* msg);
-static void publishing_facebook_graph_session_unmanage_message (PublishingFacebookGraphSession* self, PublishingFacebookGraphMessage* msg);
+static void publishing_facebook_graph_session_on_request_unqueued (PublishingFacebookGraphSession* self,
+ SoupMessage* msg);
+static void _publishing_facebook_graph_session_on_request_unqueued_soup_session_request_unqueued (SoupSession* _sender,
+ SoupMessage* msg,
+ gpointer self);
+static void publishing_facebook_graph_session_manage_message (PublishingFacebookGraphSession* self,
+ PublishingFacebookGraphMessage* msg);
+static void publishing_facebook_graph_session_unmanage_message (PublishingFacebookGraphSession* self,
+ PublishingFacebookGraphMessage* msg);
static GType publishing_facebook_graph_session_graph_message_impl_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
-static void publishing_facebook_graph_session_graph_message_impl_on_wrote_body_data (PublishingFacebookGraphSessionGraphMessageImpl* self, SoupBuffer* chunk);
-static void _publishing_facebook_graph_session_graph_message_impl_on_wrote_body_data_soup_message_wrote_body_data (SoupMessage* _sender, SoupBuffer* chunk, gpointer self);
-static PublishingFacebookGraphSessionGraphQueryMessage* publishing_facebook_graph_session_graph_query_message_new (PublishingFacebookGraphSession* host_session, const gchar* relative_uri, const gchar* access_token);
-static PublishingFacebookGraphSessionGraphQueryMessage* publishing_facebook_graph_session_graph_query_message_construct (GType object_type, PublishingFacebookGraphSession* host_session, const gchar* relative_uri, const gchar* access_token);
+static void publishing_facebook_graph_session_graph_message_impl_on_wrote_body_data (PublishingFacebookGraphSessionGraphMessageImpl* self,
+ SoupBuffer* chunk);
+static void _publishing_facebook_graph_session_graph_message_impl_on_wrote_body_data_soup_message_wrote_body_data (SoupMessage* _sender,
+ SoupBuffer* chunk,
+ gpointer self);
+static PublishingFacebookGraphSessionGraphQueryMessage* publishing_facebook_graph_session_graph_query_message_new (PublishingFacebookGraphSession* host_session,
+ const gchar* relative_uri,
+ const gchar* access_token);
+static PublishingFacebookGraphSessionGraphQueryMessage* publishing_facebook_graph_session_graph_query_message_construct (GType object_type,
+ PublishingFacebookGraphSession* host_session,
+ const gchar* relative_uri,
+ const gchar* access_token);
static GType publishing_facebook_graph_session_graph_query_message_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
-PublishingFacebookGraphMessage* publishing_facebook_graph_session_new_upload (PublishingFacebookGraphSession* self, const gchar* resource_path, SpitPublishingPublishable* publishable, gboolean suppress_titling, const gchar* resource_privacy);
-static PublishingFacebookGraphSessionGraphUploadMessage* publishing_facebook_graph_session_graph_upload_message_new (PublishingFacebookGraphSession* host_session, const gchar* access_token, const gchar* relative_uri, SpitPublishingPublishable* publishable, gboolean suppress_titling, const gchar* resource_privacy);
-static PublishingFacebookGraphSessionGraphUploadMessage* publishing_facebook_graph_session_graph_upload_message_construct (GType object_type, PublishingFacebookGraphSession* host_session, const gchar* access_token, const gchar* relative_uri, SpitPublishingPublishable* publishable, gboolean suppress_titling, const gchar* resource_privacy);
+PublishingFacebookGraphMessage* publishing_facebook_graph_session_new_upload (PublishingFacebookGraphSession* self,
+ const gchar* resource_path,
+ SpitPublishingPublishable* publishable,
+ gboolean suppress_titling,
+ const gchar* resource_privacy);
+static PublishingFacebookGraphSessionGraphUploadMessage* publishing_facebook_graph_session_graph_upload_message_new (PublishingFacebookGraphSession* host_session,
+ const gchar* access_token,
+ const gchar* relative_uri,
+ SpitPublishingPublishable* publishable,
+ gboolean suppress_titling,
+ const gchar* resource_privacy);
+static PublishingFacebookGraphSessionGraphUploadMessage* publishing_facebook_graph_session_graph_upload_message_construct (GType object_type,
+ PublishingFacebookGraphSession* host_session,
+ const gchar* access_token,
+ const gchar* relative_uri,
+ SpitPublishingPublishable* publishable,
+ gboolean suppress_titling,
+ const gchar* resource_privacy);
static GType publishing_facebook_graph_session_graph_upload_message_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
-static PublishingFacebookGraphSessionGraphCreateAlbumMessage* publishing_facebook_graph_session_graph_create_album_message_new (PublishingFacebookGraphSession* host_session, const gchar* access_token, const gchar* album_name, const gchar* album_privacy);
-static PublishingFacebookGraphSessionGraphCreateAlbumMessage* publishing_facebook_graph_session_graph_create_album_message_construct (GType object_type, PublishingFacebookGraphSession* host_session, const gchar* access_token, const gchar* album_name, const gchar* album_privacy);
+static PublishingFacebookGraphSessionGraphCreateAlbumMessage* publishing_facebook_graph_session_graph_create_album_message_new (PublishingFacebookGraphSession* host_session,
+ const gchar* access_token,
+ const gchar* album_name,
+ const gchar* album_privacy);
+static PublishingFacebookGraphSessionGraphCreateAlbumMessage* publishing_facebook_graph_session_graph_create_album_message_construct (GType object_type,
+ PublishingFacebookGraphSession* host_session,
+ const gchar* access_token,
+ const gchar* album_name,
+ const gchar* album_privacy);
static GType publishing_facebook_graph_session_graph_create_album_message_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
static gboolean publishing_facebook_graph_session_graph_message_impl_prepare_for_transmission (PublishingFacebookGraphSessionGraphMessageImpl* self);
-enum {
- PUBLISHING_FACEBOOK_GRAPH_SESSION_GRAPH_MESSAGE_IMPL_DUMMY_PROPERTY
-};
-static PublishingFacebookGraphSessionGraphMessageImpl* publishing_facebook_graph_session_graph_message_impl_construct (GType object_type, PublishingFacebookGraphSession* host_session, PublishingRESTSupportHttpMethod method, const gchar* relative_uri, const gchar* access_token, PublishingFacebookEndpoint endpoint);
+static PublishingFacebookGraphSessionGraphMessageImpl* publishing_facebook_graph_session_graph_message_impl_construct (GType object_type,
+ PublishingFacebookGraphSession* host_session,
+ PublishingRESTSupportHttpMethod method,
+ const gchar* relative_uri,
+ const gchar* access_token,
+ PublishingFacebookEndpoint endpoint);
static gboolean publishing_facebook_graph_session_graph_message_impl_real_prepare_for_transmission (PublishingFacebookGraphSessionGraphMessageImpl* self);
static gchar* publishing_facebook_graph_session_graph_message_impl_real_get_uri (PublishingFacebookGraphMessage* base);
static gchar* publishing_facebook_graph_session_graph_message_impl_real_get_response_body (PublishingFacebookGraphMessage* base);
static void publishing_facebook_graph_session_graph_message_impl_finalize (PublishingFacebookGraphMessage * obj);
-enum {
- PUBLISHING_FACEBOOK_GRAPH_SESSION_GRAPH_QUERY_MESSAGE_DUMMY_PROPERTY
-};
static void _vala_SoupURI_free (SoupURI* self);
static GType publishing_facebook_graph_session_graph_endpoint_probe_message_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
-enum {
- PUBLISHING_FACEBOOK_GRAPH_SESSION_GRAPH_ENDPOINT_PROBE_MESSAGE_DUMMY_PROPERTY
-};
static PublishingFacebookGraphSessionGraphEndpointProbeMessage* publishing_facebook_graph_session_graph_endpoint_probe_message_new (PublishingFacebookGraphSession* host_session);
-static PublishingFacebookGraphSessionGraphEndpointProbeMessage* publishing_facebook_graph_session_graph_endpoint_probe_message_construct (GType object_type, PublishingFacebookGraphSession* host_session);
+static PublishingFacebookGraphSessionGraphEndpointProbeMessage* publishing_facebook_graph_session_graph_endpoint_probe_message_construct (GType object_type,
+ PublishingFacebookGraphSession* host_session);
#define PUBLISHING_FACEBOOK_GRAPH_SESSION_GRAPH_UPLOAD_MESSAGE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_UPLOAD_MESSAGE, PublishingFacebookGraphSessionGraphUploadMessagePrivate))
-enum {
- PUBLISHING_FACEBOOK_GRAPH_SESSION_GRAPH_UPLOAD_MESSAGE_DUMMY_PROPERTY
-};
static void _vala_SoupMultipart_free (SoupMultipart* self);
static void _vala_SoupBuffer_free (SoupBuffer* self);
static gboolean publishing_facebook_graph_session_graph_upload_message_real_prepare_for_transmission (PublishingFacebookGraphSessionGraphMessageImpl* base);
static void publishing_facebook_graph_session_graph_upload_message_finalize (PublishingFacebookGraphMessage * obj);
-enum {
- PUBLISHING_FACEBOOK_GRAPH_SESSION_GRAPH_CREATE_ALBUM_MESSAGE_DUMMY_PROPERTY
-};
static void publishing_facebook_graph_session_finalize (PublishingFacebookGraphSession * obj);
#define PUBLISHING_FACEBOOK_UPLOADER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_FACEBOOK_TYPE_UPLOADER, PublishingFacebookUploaderPrivate))
-enum {
- PUBLISHING_FACEBOOK_UPLOADER_DUMMY_PROPERTY
-};
-static SpitPublishingPublishable** _vala_array_dup3 (SpitPublishingPublishable** self, int length);
+static SpitPublishingPublishable** _vala_array_dup3 (SpitPublishingPublishable** self,
+ int length);
static void publishing_facebook_uploader_send_current_file (PublishingFacebookUploader* self);
-static void publishing_facebook_uploader_on_chunk_transmitted (PublishingFacebookUploader* self, gint bytes_written_so_far, gint total_bytes);
-static void _publishing_facebook_uploader_on_chunk_transmitted_publishing_facebook_graph_message_data_transmitted (PublishingFacebookGraphMessage* _sender, gint bytes_sent_so_far, gint total_bytes, gpointer self);
-static void publishing_facebook_uploader_on_message_completed (PublishingFacebookUploader* self, PublishingFacebookGraphMessage* message);
-static void _publishing_facebook_uploader_on_message_completed_publishing_facebook_graph_message_completed (PublishingFacebookGraphMessage* _sender, gpointer self);
-static void publishing_facebook_uploader_on_message_failed (PublishingFacebookUploader* self, PublishingFacebookGraphMessage* message, GError* _error_);
-static void _publishing_facebook_uploader_on_message_failed_publishing_facebook_graph_message_failed (PublishingFacebookGraphMessage* _sender, GError* err, gpointer self);
+static void publishing_facebook_uploader_on_chunk_transmitted (PublishingFacebookUploader* self,
+ gint bytes_written_so_far,
+ gint total_bytes);
+static void _publishing_facebook_uploader_on_chunk_transmitted_publishing_facebook_graph_message_data_transmitted (PublishingFacebookGraphMessage* _sender,
+ gint bytes_sent_so_far,
+ gint total_bytes,
+ gpointer self);
+static void publishing_facebook_uploader_on_message_completed (PublishingFacebookUploader* self,
+ PublishingFacebookGraphMessage* message);
+static void _publishing_facebook_uploader_on_message_completed_publishing_facebook_graph_message_completed (PublishingFacebookGraphMessage* _sender,
+ gpointer self);
+static void publishing_facebook_uploader_on_message_failed (PublishingFacebookUploader* self,
+ PublishingFacebookGraphMessage* message,
+ GError* _error_);
+static void _publishing_facebook_uploader_on_message_failed_publishing_facebook_graph_message_failed (PublishingFacebookGraphMessage* _sender,
+ GError* err,
+ gpointer self);
static void publishing_facebook_uploader_send_files (PublishingFacebookUploader* self);
static void publishing_facebook_uploader_finalize (PublishingFacebookUploader * 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);
-
-
-FacebookService* facebook_service_construct (GType object_type, GFile* resource_directory) {
+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);
+
+
+FacebookService*
+facebook_service_construct (GType object_type,
+ GFile* resource_directory)
+{
FacebookService * self = NULL;
GdkPixbuf** _tmp0_;
gint _tmp0__length1;
@@ -824,7 +1037,7 @@ FacebookService* facebook_service_construct (GType object_type, GFile* resource_
_tmp0__length1 = facebook_service_icon_pixbuf_set_length1;
#line 13 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
if (_tmp0_ == NULL) {
-#line 828 "FacebookPublishing.c"
+#line 1041 "FacebookPublishing.c"
gint _tmp1_;
GdkPixbuf** _tmp2_;
#line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -837,44 +1050,43 @@ FacebookService* facebook_service_construct (GType object_type, GFile* resource_
facebook_service_icon_pixbuf_set_length1 = _tmp1_;
#line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_facebook_service_icon_pixbuf_set_size_ = facebook_service_icon_pixbuf_set_length1;
-#line 841 "FacebookPublishing.c"
+#line 1054 "FacebookPublishing.c"
}
#line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return self;
-#line 845 "FacebookPublishing.c"
+#line 1058 "FacebookPublishing.c"
}
-FacebookService* facebook_service_new (GFile* resource_directory) {
+FacebookService*
+facebook_service_new (GFile* resource_directory)
+{
#line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return facebook_service_construct (TYPE_FACEBOOK_SERVICE, resource_directory);
-#line 852 "FacebookPublishing.c"
+#line 1067 "FacebookPublishing.c"
}
-static gint facebook_service_real_get_pluggable_interface (SpitPluggable* base, gint min_host_interface, gint max_host_interface) {
+static gint
+facebook_service_real_get_pluggable_interface (SpitPluggable* base,
+ gint min_host_interface,
+ gint max_host_interface)
+{
FacebookService * self;
gint result = 0;
- gint _tmp0_;
- gint _tmp1_;
- gint _tmp2_;
#line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FACEBOOK_SERVICE, FacebookService);
#line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp0_ = min_host_interface;
-#line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp1_ = max_host_interface;
-#line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp2_ = spit_negotiate_interfaces (_tmp0_, _tmp1_, SPIT_PUBLISHING_CURRENT_INTERFACE);
-#line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- result = _tmp2_;
+ result = spit_negotiate_interfaces (min_host_interface, max_host_interface, SPIT_PUBLISHING_CURRENT_INTERFACE);
#line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return result;
-#line 874 "FacebookPublishing.c"
+#line 1084 "FacebookPublishing.c"
}
-static const gchar* facebook_service_real_get_id (SpitPluggable* base) {
+static const gchar*
+facebook_service_real_get_id (SpitPluggable* base)
+{
FacebookService * self;
const gchar* result = NULL;
#line 23 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -883,11 +1095,13 @@ static const gchar* facebook_service_real_get_id (SpitPluggable* base) {
result = "org.yorba.shotwell.publishing.facebook";
#line 24 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return result;
-#line 887 "FacebookPublishing.c"
+#line 1099 "FacebookPublishing.c"
}
-static const gchar* facebook_service_real_get_pluggable_name (SpitPluggable* base) {
+static const gchar*
+facebook_service_real_get_pluggable_name (SpitPluggable* base)
+{
FacebookService * self;
const gchar* result = NULL;
#line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -896,39 +1110,47 @@ static const gchar* facebook_service_real_get_pluggable_name (SpitPluggable* bas
result = "Facebook";
#line 28 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return result;
-#line 900 "FacebookPublishing.c"
+#line 1114 "FacebookPublishing.c"
}
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return self ? g_object_ref (self) : NULL;
-#line 907 "FacebookPublishing.c"
+#line 1123 "FacebookPublishing.c"
}
-static GdkPixbuf** _vala_array_dup1 (GdkPixbuf** self, int length) {
+static GdkPixbuf**
+_vala_array_dup1 (GdkPixbuf** self,
+ int length)
+{
GdkPixbuf** result;
int i;
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
result = g_new0 (GdkPixbuf*, length + 1);
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
for (i = 0; i < length; i++) {
-#line 918 "FacebookPublishing.c"
+#line 1137 "FacebookPublishing.c"
GdkPixbuf* _tmp0_;
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_tmp0_ = _g_object_ref0 (self[i]);
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
result[i] = _tmp0_;
-#line 924 "FacebookPublishing.c"
+#line 1143 "FacebookPublishing.c"
}
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return result;
-#line 928 "FacebookPublishing.c"
+#line 1147 "FacebookPublishing.c"
}
-static void facebook_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info) {
+static void
+facebook_service_real_get_info (SpitPluggable* base,
+ SpitPluggableInfo* info)
+{
FacebookService * self;
gchar* _tmp0_;
gchar* _tmp1_;
@@ -1003,40 +1225,45 @@ static void facebook_service_real_get_info (SpitPluggable* base, SpitPluggableIn
(*info).icons = _tmp8_;
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
(*info).icons_length1 = _tmp8__length1;
-#line 1007 "FacebookPublishing.c"
+#line 1229 "FacebookPublishing.c"
}
-static void facebook_service_real_activation (SpitPluggable* base, gboolean enabled) {
+static void
+facebook_service_real_activation (SpitPluggable* base,
+ gboolean enabled)
+{
FacebookService * self;
#line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FACEBOOK_SERVICE, FacebookService);
-#line 1015 "FacebookPublishing.c"
+#line 1240 "FacebookPublishing.c"
}
-static SpitPublishingPublisher* facebook_service_real_create_publisher (SpitPublishingService* base, SpitPublishingPluginHost* host) {
+static SpitPublishingPublisher*
+facebook_service_real_create_publisher (SpitPublishingService* base,
+ SpitPublishingPluginHost* host)
+{
FacebookService * self;
SpitPublishingPublisher* result = NULL;
- SpitPublishingPluginHost* _tmp0_;
- PublishingFacebookFacebookPublisher* _tmp1_;
+ PublishingFacebookFacebookPublisher* _tmp0_;
#line 46 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FACEBOOK_SERVICE, FacebookService);
#line 46 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL);
#line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp0_ = host;
+ _tmp0_ = publishing_facebook_facebook_publisher_new (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_SERVICE, SpitPublishingService), host);
#line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp1_ = publishing_facebook_facebook_publisher_new (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_SERVICE, SpitPublishingService), _tmp0_);
-#line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher);
+ result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher);
#line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return result;
-#line 1036 "FacebookPublishing.c"
+#line 1261 "FacebookPublishing.c"
}
-static SpitPublishingPublisherMediaType facebook_service_real_get_supported_media (SpitPublishingService* base) {
+static SpitPublishingPublisherMediaType
+facebook_service_real_get_supported_media (SpitPublishingService* base)
+{
FacebookService * self;
SpitPublishingPublisherMediaType result = 0;
#line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -1045,20 +1272,24 @@ static SpitPublishingPublisherMediaType facebook_service_real_get_supported_medi
result = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO | SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO;
#line 51 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return result;
-#line 1049 "FacebookPublishing.c"
+#line 1276 "FacebookPublishing.c"
}
-static void facebook_service_class_init (FacebookServiceClass * klass) {
+static void
+facebook_service_class_init (FacebookServiceClass * klass)
+{
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
facebook_service_parent_class = g_type_class_peek_parent (klass);
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
G_OBJECT_CLASS (klass)->finalize = facebook_service_finalize;
-#line 1058 "FacebookPublishing.c"
+#line 1287 "FacebookPublishing.c"
}
-static void facebook_service_spit_pluggable_interface_init (SpitPluggableIface * iface) {
+static void
+facebook_service_spit_pluggable_interface_init (SpitPluggableIface * iface)
+{
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
facebook_service_spit_pluggable_parent_iface = g_type_interface_peek_parent (iface);
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -1071,36 +1302,44 @@ static void facebook_service_spit_pluggable_interface_init (SpitPluggableIface *
iface->get_info = (void (*) (SpitPluggable *, SpitPluggableInfo*)) facebook_service_real_get_info;
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
iface->activation = (void (*) (SpitPluggable *, gboolean)) facebook_service_real_activation;
-#line 1075 "FacebookPublishing.c"
+#line 1306 "FacebookPublishing.c"
}
-static void facebook_service_spit_publishing_service_interface_init (SpitPublishingServiceIface * iface) {
+static void
+facebook_service_spit_publishing_service_interface_init (SpitPublishingServiceIface * iface)
+{
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
facebook_service_spit_publishing_service_parent_iface = g_type_interface_peek_parent (iface);
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
iface->create_publisher = (SpitPublishingPublisher* (*) (SpitPublishingService *, SpitPublishingPluginHost*)) facebook_service_real_create_publisher;
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
iface->get_supported_media = (SpitPublishingPublisherMediaType (*) (SpitPublishingService *)) facebook_service_real_get_supported_media;
-#line 1086 "FacebookPublishing.c"
+#line 1319 "FacebookPublishing.c"
}
-static void facebook_service_instance_init (FacebookService * self) {
+static void
+facebook_service_instance_init (FacebookService * self)
+{
}
-static void facebook_service_finalize (GObject * obj) {
+static void
+facebook_service_finalize (GObject * obj)
+{
FacebookService * self;
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_FACEBOOK_SERVICE, FacebookService);
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
G_OBJECT_CLASS (facebook_service_parent_class)->finalize (obj);
-#line 1100 "FacebookPublishing.c"
+#line 1337 "FacebookPublishing.c"
}
-GType facebook_service_get_type (void) {
+GType
+facebook_service_get_type (void)
+{
static volatile gsize facebook_service_type_id__volatile = 0;
if (g_once_init_enter (&facebook_service_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (FacebookServiceClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) facebook_service_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (FacebookService), 0, (GInstanceInitFunc) facebook_service_instance_init, NULL };
@@ -1116,12 +1355,14 @@ GType facebook_service_get_type (void) {
}
-PublishingFacebookAlbum* publishing_facebook_album_construct (GType object_type, const gchar* name, const gchar* id) {
+PublishingFacebookAlbum*
+publishing_facebook_album_construct (GType object_type,
+ const gchar* name,
+ const gchar* id)
+{
PublishingFacebookAlbum* self = NULL;
- const gchar* _tmp0_;
+ gchar* _tmp0_;
gchar* _tmp1_;
- const gchar* _tmp2_;
- gchar* _tmp3_;
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_val_if_fail (name != NULL, NULL);
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -1129,132 +1370,156 @@ PublishingFacebookAlbum* publishing_facebook_album_construct (GType object_type,
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
self = (PublishingFacebookAlbum*) g_type_create_instance (object_type);
#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp0_ = name;
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp1_ = g_strdup (_tmp0_);
+ _tmp0_ = g_strdup (name);
#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_g_free0 (self->name);
#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- self->name = _tmp1_;
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp2_ = id;
+ self->name = _tmp0_;
#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp3_ = g_strdup (_tmp2_);
+ _tmp1_ = g_strdup (id);
#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_g_free0 (self->id);
#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- self->id = _tmp3_;
+ self->id = _tmp1_;
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return self;
-#line 1150 "FacebookPublishing.c"
+#line 1387 "FacebookPublishing.c"
}
-PublishingFacebookAlbum* publishing_facebook_album_new (const gchar* name, const gchar* id) {
+PublishingFacebookAlbum*
+publishing_facebook_album_new (const gchar* name,
+ const gchar* id)
+{
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return publishing_facebook_album_construct (PUBLISHING_FACEBOOK_TYPE_ALBUM, name, id);
-#line 1157 "FacebookPublishing.c"
+#line 1397 "FacebookPublishing.c"
}
-static void publishing_facebook_value_album_init (GValue* value) {
+static void
+publishing_facebook_value_album_init (GValue* value)
+{
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 1164 "FacebookPublishing.c"
+#line 1406 "FacebookPublishing.c"
}
-static void publishing_facebook_value_album_free_value (GValue* value) {
+static void
+publishing_facebook_value_album_free_value (GValue* value)
+{
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
if (value->data[0].v_pointer) {
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_album_unref (value->data[0].v_pointer);
-#line 1173 "FacebookPublishing.c"
+#line 1417 "FacebookPublishing.c"
}
}
-static void publishing_facebook_value_album_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+publishing_facebook_value_album_copy_value (const GValue* src_value,
+ GValue* dest_value)
+{
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
if (src_value->data[0].v_pointer) {
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
dest_value->data[0].v_pointer = publishing_facebook_album_ref (src_value->data[0].v_pointer);
-#line 1183 "FacebookPublishing.c"
+#line 1430 "FacebookPublishing.c"
} else {
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
dest_value->data[0].v_pointer = NULL;
-#line 1187 "FacebookPublishing.c"
+#line 1434 "FacebookPublishing.c"
}
}
-static gpointer publishing_facebook_value_album_peek_pointer (const GValue* value) {
+static gpointer
+publishing_facebook_value_album_peek_pointer (const GValue* value)
+{
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return value->data[0].v_pointer;
-#line 1195 "FacebookPublishing.c"
+#line 1444 "FacebookPublishing.c"
}
-static gchar* publishing_facebook_value_album_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_facebook_value_album_collect_value (GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
if (collect_values[0].v_pointer) {
-#line 1202 "FacebookPublishing.c"
+#line 1456 "FacebookPublishing.c"
PublishingFacebookAlbum * object;
object = collect_values[0].v_pointer;
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
if (object->parent_instance.g_class == NULL) {
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1209 "FacebookPublishing.c"
+#line 1463 "FacebookPublishing.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1213 "FacebookPublishing.c"
+#line 1467 "FacebookPublishing.c"
}
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
value->data[0].v_pointer = publishing_facebook_album_ref (object);
-#line 1217 "FacebookPublishing.c"
+#line 1471 "FacebookPublishing.c"
} else {
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 1221 "FacebookPublishing.c"
+#line 1475 "FacebookPublishing.c"
}
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return NULL;
-#line 1225 "FacebookPublishing.c"
+#line 1479 "FacebookPublishing.c"
}
-static gchar* publishing_facebook_value_album_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_facebook_value_album_lcopy_value (const GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
PublishingFacebookAlbum ** object_p;
object_p = collect_values[0].v_pointer;
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
if (!object_p) {
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1236 "FacebookPublishing.c"
+#line 1495 "FacebookPublishing.c"
}
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
if (!value->data[0].v_pointer) {
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
*object_p = NULL;
-#line 1242 "FacebookPublishing.c"
+#line 1501 "FacebookPublishing.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
*object_p = value->data[0].v_pointer;
-#line 1246 "FacebookPublishing.c"
+#line 1505 "FacebookPublishing.c"
} else {
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
*object_p = publishing_facebook_album_ref (value->data[0].v_pointer);
-#line 1250 "FacebookPublishing.c"
+#line 1509 "FacebookPublishing.c"
}
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return NULL;
-#line 1254 "FacebookPublishing.c"
+#line 1513 "FacebookPublishing.c"
}
-GParamSpec* publishing_facebook_param_spec_album (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+publishing_facebook_param_spec_album (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags)
+{
PublishingFacebookParamSpecAlbum* spec;
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_FACEBOOK_TYPE_ALBUM), NULL);
@@ -1264,20 +1529,25 @@ GParamSpec* publishing_facebook_param_spec_album (const gchar* name, const gchar
G_PARAM_SPEC (spec)->value_type = object_type;
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return G_PARAM_SPEC (spec);
-#line 1268 "FacebookPublishing.c"
+#line 1533 "FacebookPublishing.c"
}
-gpointer publishing_facebook_value_get_album (const GValue* value) {
+gpointer
+publishing_facebook_value_get_album (const GValue* value)
+{
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_ALBUM), NULL);
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return value->data[0].v_pointer;
-#line 1277 "FacebookPublishing.c"
+#line 1544 "FacebookPublishing.c"
}
-void publishing_facebook_value_set_album (GValue* value, gpointer v_object) {
+void
+publishing_facebook_value_set_album (GValue* value,
+ gpointer v_object)
+{
PublishingFacebookAlbum * old;
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_ALBUM));
@@ -1293,22 +1563,25 @@ void publishing_facebook_value_set_album (GValue* value, gpointer v_object) {
value->data[0].v_pointer = v_object;
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_album_ref (value->data[0].v_pointer);
-#line 1297 "FacebookPublishing.c"
+#line 1567 "FacebookPublishing.c"
} else {
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 1301 "FacebookPublishing.c"
+#line 1571 "FacebookPublishing.c"
}
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
if (old) {
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_album_unref (old);
-#line 1307 "FacebookPublishing.c"
+#line 1577 "FacebookPublishing.c"
}
}
-void publishing_facebook_value_take_album (GValue* value, gpointer v_object) {
+void
+publishing_facebook_value_take_album (GValue* value,
+ gpointer v_object)
+{
PublishingFacebookAlbum * old;
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_ALBUM));
@@ -1322,38 +1595,44 @@ void publishing_facebook_value_take_album (GValue* value, gpointer v_object) {
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
value->data[0].v_pointer = v_object;
-#line 1326 "FacebookPublishing.c"
+#line 1599 "FacebookPublishing.c"
} else {
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 1330 "FacebookPublishing.c"
+#line 1603 "FacebookPublishing.c"
}
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
if (old) {
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_album_unref (old);
-#line 1336 "FacebookPublishing.c"
+#line 1609 "FacebookPublishing.c"
}
}
-static void publishing_facebook_album_class_init (PublishingFacebookAlbumClass * klass) {
+static void
+publishing_facebook_album_class_init (PublishingFacebookAlbumClass * klass)
+{
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_album_parent_class = g_type_class_peek_parent (klass);
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
((PublishingFacebookAlbumClass *) klass)->finalize = publishing_facebook_album_finalize;
-#line 1346 "FacebookPublishing.c"
+#line 1621 "FacebookPublishing.c"
}
-static void publishing_facebook_album_instance_init (PublishingFacebookAlbum * self) {
+static void
+publishing_facebook_album_instance_init (PublishingFacebookAlbum * self)
+{
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
self->ref_count = 1;
-#line 1353 "FacebookPublishing.c"
+#line 1630 "FacebookPublishing.c"
}
-static void publishing_facebook_album_finalize (PublishingFacebookAlbum * obj) {
+static void
+publishing_facebook_album_finalize (PublishingFacebookAlbum * obj)
+{
PublishingFacebookAlbum * self;
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FACEBOOK_TYPE_ALBUM, PublishingFacebookAlbum);
@@ -1363,11 +1642,13 @@ static void publishing_facebook_album_finalize (PublishingFacebookAlbum * obj) {
_g_free0 (self->name);
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_g_free0 (self->id);
-#line 1367 "FacebookPublishing.c"
+#line 1646 "FacebookPublishing.c"
}
-GType publishing_facebook_album_get_type (void) {
+GType
+publishing_facebook_album_get_type (void)
+{
static volatile gsize publishing_facebook_album_type_id__volatile = 0;
if (g_once_init_enter (&publishing_facebook_album_type_id__volatile)) {
static const GTypeValueTable g_define_type_value_table = { publishing_facebook_value_album_init, publishing_facebook_value_album_free_value, publishing_facebook_value_album_copy_value, publishing_facebook_value_album_peek_pointer, "p", publishing_facebook_value_album_collect_value, "p", publishing_facebook_value_album_lcopy_value };
@@ -1381,18 +1662,22 @@ GType publishing_facebook_album_get_type (void) {
}
-gpointer publishing_facebook_album_ref (gpointer instance) {
+gpointer
+publishing_facebook_album_ref (gpointer instance)
+{
PublishingFacebookAlbum * self;
self = instance;
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_atomic_int_inc (&self->ref_count);
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return instance;
-#line 1392 "FacebookPublishing.c"
+#line 1675 "FacebookPublishing.c"
}
-void publishing_facebook_album_unref (gpointer instance) {
+void
+publishing_facebook_album_unref (gpointer instance)
+{
PublishingFacebookAlbum * self;
self = instance;
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -1401,18 +1686,20 @@ void publishing_facebook_album_unref (gpointer instance) {
PUBLISHING_FACEBOOK_ALBUM_GET_CLASS (self)->finalize (self);
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 1405 "FacebookPublishing.c"
+#line 1690 "FacebookPublishing.c"
}
}
-gchar* publishing_facebook_resolution_get_name (PublishingFacebookResolution self) {
+gchar*
+publishing_facebook_resolution_get_name (PublishingFacebookResolution self)
+{
gchar* result = NULL;
#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
switch (self) {
#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
case PUBLISHING_FACEBOOK_RESOLUTION_STANDARD:
-#line 1416 "FacebookPublishing.c"
+#line 1703 "FacebookPublishing.c"
{
gchar* _tmp0_;
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -1421,11 +1708,11 @@ gchar* publishing_facebook_resolution_get_name (PublishingFacebookResolution sel
result = _tmp0_;
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return result;
-#line 1425 "FacebookPublishing.c"
+#line 1712 "FacebookPublishing.c"
}
#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
case PUBLISHING_FACEBOOK_RESOLUTION_HIGH:
-#line 1429 "FacebookPublishing.c"
+#line 1716 "FacebookPublishing.c"
{
gchar* _tmp1_;
#line 84 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -1434,7 +1721,7 @@ gchar* publishing_facebook_resolution_get_name (PublishingFacebookResolution sel
result = _tmp1_;
#line 84 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return result;
-#line 1438 "FacebookPublishing.c"
+#line 1725 "FacebookPublishing.c"
}
default:
{
@@ -1443,35 +1730,37 @@ gchar* publishing_facebook_resolution_get_name (PublishingFacebookResolution sel
_tmp2_ = g_enum_get_value (g_type_class_ref (PUBLISHING_FACEBOOK_TYPE_RESOLUTION), self);
#line 87 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_error ("FacebookPublishing.vala:87: Unknown resolution %s", (_tmp2_ != NULL) ? _tmp2_->value_name : NULL);
-#line 1447 "FacebookPublishing.c"
+#line 1734 "FacebookPublishing.c"
}
}
}
-gint publishing_facebook_resolution_get_pixels (PublishingFacebookResolution self) {
+gint
+publishing_facebook_resolution_get_pixels (PublishingFacebookResolution self)
+{
gint result = 0;
#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
switch (self) {
#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
case PUBLISHING_FACEBOOK_RESOLUTION_STANDARD:
-#line 1459 "FacebookPublishing.c"
+#line 1748 "FacebookPublishing.c"
{
#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
result = 720;
#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return result;
-#line 1465 "FacebookPublishing.c"
+#line 1754 "FacebookPublishing.c"
}
#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
case PUBLISHING_FACEBOOK_RESOLUTION_HIGH:
-#line 1469 "FacebookPublishing.c"
+#line 1758 "FacebookPublishing.c"
{
#line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
result = 2048;
#line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return result;
-#line 1475 "FacebookPublishing.c"
+#line 1764 "FacebookPublishing.c"
}
default:
{
@@ -1480,13 +1769,15 @@ gint publishing_facebook_resolution_get_pixels (PublishingFacebookResolution sel
_tmp0_ = g_enum_get_value (g_type_class_ref (PUBLISHING_FACEBOOK_TYPE_RESOLUTION), self);
#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_error ("FacebookPublishing.vala:100: Unknown resolution %s", (_tmp0_ != NULL) ? _tmp0_->value_name : NULL);
-#line 1484 "FacebookPublishing.c"
+#line 1773 "FacebookPublishing.c"
}
}
}
-GType publishing_facebook_resolution_get_type (void) {
+GType
+publishing_facebook_resolution_get_type (void)
+{
static volatile gsize publishing_facebook_resolution_type_id__volatile = 0;
if (g_once_init_enter (&publishing_facebook_resolution_type_id__volatile)) {
static const GEnumValue values[] = {{PUBLISHING_FACEBOOK_RESOLUTION_STANDARD, "PUBLISHING_FACEBOOK_RESOLUTION_STANDARD", "standard"}, {PUBLISHING_FACEBOOK_RESOLUTION_HIGH, "PUBLISHING_FACEBOOK_RESOLUTION_HIGH", "high"}, {0, NULL, NULL}};
@@ -1498,7 +1789,9 @@ GType publishing_facebook_resolution_get_type (void) {
}
-PublishingFacebookPublishingParameters* publishing_facebook_publishing_parameters_construct (GType object_type) {
+PublishingFacebookPublishingParameters*
+publishing_facebook_publishing_parameters_construct (GType object_type)
+{
PublishingFacebookPublishingParameters* self = NULL;
#line 119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
self = (PublishingFacebookPublishingParameters*) g_type_create_instance (object_type);
@@ -1526,51 +1819,62 @@ PublishingFacebookPublishingParameters* publishing_facebook_publishing_parameter
self->resolution = PUBLISHING_FACEBOOK_RESOLUTION_HIGH;
#line 119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return self;
-#line 1530 "FacebookPublishing.c"
+#line 1823 "FacebookPublishing.c"
}
-PublishingFacebookPublishingParameters* publishing_facebook_publishing_parameters_new (void) {
+PublishingFacebookPublishingParameters*
+publishing_facebook_publishing_parameters_new (void)
+{
#line 119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return publishing_facebook_publishing_parameters_construct (PUBLISHING_FACEBOOK_TYPE_PUBLISHING_PARAMETERS);
-#line 1537 "FacebookPublishing.c"
+#line 1832 "FacebookPublishing.c"
}
-static gpointer _publishing_facebook_album_ref0 (gpointer self) {
+static gpointer
+_publishing_facebook_album_ref0 (gpointer self)
+{
#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return self ? publishing_facebook_album_ref (self) : NULL;
-#line 1544 "FacebookPublishing.c"
+#line 1841 "FacebookPublishing.c"
}
-static void _vala_array_add7 (PublishingFacebookAlbum** * array, int* length, int* size, PublishingFacebookAlbum* value) {
+static void
+_vala_array_add7 (PublishingFacebookAlbum** * array,
+ int* length,
+ int* size,
+ PublishingFacebookAlbum* value)
+{
#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
if ((*length) == (*size)) {
#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
*array = g_renew (PublishingFacebookAlbum*, *array, (*size) + 1);
-#line 1555 "FacebookPublishing.c"
+#line 1857 "FacebookPublishing.c"
}
#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
(*array)[(*length)++] = value;
#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
(*array)[*length] = NULL;
-#line 1561 "FacebookPublishing.c"
+#line 1863 "FacebookPublishing.c"
}
-void publishing_facebook_publishing_parameters_add_album (PublishingFacebookPublishingParameters* self, const gchar* name, const gchar* id) {
+void
+publishing_facebook_publishing_parameters_add_album (PublishingFacebookPublishingParameters* self,
+ const gchar* name,
+ const gchar* id)
+{
PublishingFacebookAlbum** _tmp0_;
gint _tmp0__length1;
PublishingFacebookAlbum* new_album = NULL;
- const gchar* _tmp2_;
- const gchar* _tmp3_;
+ PublishingFacebookAlbum* _tmp2_;
+ PublishingFacebookAlbum** _tmp3_;
+ gint _tmp3__length1;
PublishingFacebookAlbum* _tmp4_;
- PublishingFacebookAlbum** _tmp5_;
- gint _tmp5__length1;
- PublishingFacebookAlbum* _tmp6_;
#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_PARAMETERS (self));
#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -1583,7 +1887,7 @@ void publishing_facebook_publishing_parameters_add_album (PublishingFacebookPubl
_tmp0__length1 = self->albums_length1;
#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
if (_tmp0_ == NULL) {
-#line 1587 "FacebookPublishing.c"
+#line 1891 "FacebookPublishing.c"
PublishingFacebookAlbum** _tmp1_;
#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_tmp1_ = g_new0 (PublishingFacebookAlbum*, 0 + 1);
@@ -1595,123 +1899,118 @@ void publishing_facebook_publishing_parameters_add_album (PublishingFacebookPubl
self->albums_length1 = 0;
#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
self->_albums_size_ = self->albums_length1;
-#line 1599 "FacebookPublishing.c"
+#line 1903 "FacebookPublishing.c"
}
#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp2_ = name;
-#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp3_ = id;
-#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp4_ = publishing_facebook_album_new (_tmp2_, _tmp3_);
+ _tmp2_ = publishing_facebook_album_new (name, id);
#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- new_album = _tmp4_;
+ new_album = _tmp2_;
#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp5_ = self->albums;
+ _tmp3_ = self->albums;
#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp5__length1 = self->albums_length1;
+ _tmp3__length1 = self->albums_length1;
#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp6_ = _publishing_facebook_album_ref0 (new_album);
+ _tmp4_ = _publishing_facebook_album_ref0 (new_album);
#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _vala_array_add7 (&self->albums, &self->albums_length1, &self->_albums_size_, _tmp6_);
+ _vala_array_add7 (&self->albums, &self->albums_length1, &self->_albums_size_, _tmp4_);
#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_publishing_facebook_album_unref0 (new_album);
-#line 1619 "FacebookPublishing.c"
+#line 1919 "FacebookPublishing.c"
}
-void publishing_facebook_publishing_parameters_set_target_album_by_name (PublishingFacebookPublishingParameters* self, const gchar* name) {
- const gchar* _tmp0_;
+void
+publishing_facebook_publishing_parameters_set_target_album_by_name (PublishingFacebookPublishingParameters* self,
+ const gchar* name)
+{
#line 136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_PARAMETERS (self));
#line 137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp0_ = name;
-#line 137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- if (_tmp0_ == NULL) {
+ if (name == NULL) {
#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
self->target_album = PUBLISHING_FACEBOOK_PUBLISHING_PARAMETERS_UNKNOWN_ALBUM;
#line 139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return;
-#line 1635 "FacebookPublishing.c"
+#line 1935 "FacebookPublishing.c"
}
{
gint i = 0;
#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
i = 0;
-#line 1641 "FacebookPublishing.c"
+#line 1941 "FacebookPublishing.c"
{
- gboolean _tmp1_ = FALSE;
+ gboolean _tmp0_ = FALSE;
#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp1_ = TRUE;
+ _tmp0_ = TRUE;
#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
while (TRUE) {
-#line 1648 "FacebookPublishing.c"
- gint _tmp3_;
+#line 1948 "FacebookPublishing.c"
+ gint _tmp2_;
+ PublishingFacebookAlbum** _tmp3_;
+ gint _tmp3__length1;
PublishingFacebookAlbum** _tmp4_;
gint _tmp4__length1;
- PublishingFacebookAlbum** _tmp5_;
- gint _tmp5__length1;
- gint _tmp6_;
- PublishingFacebookAlbum* _tmp7_;
- const gchar* _tmp8_;
- const gchar* _tmp9_;
+ gint _tmp5_;
+ PublishingFacebookAlbum* _tmp6_;
+ const gchar* _tmp7_;
#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- if (!_tmp1_) {
-#line 1660 "FacebookPublishing.c"
- gint _tmp2_;
+ if (!_tmp0_) {
+#line 1959 "FacebookPublishing.c"
+ gint _tmp1_;
#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp2_ = i;
+ _tmp1_ = i;
#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- i = _tmp2_ + 1;
-#line 1666 "FacebookPublishing.c"
+ i = _tmp1_ + 1;
+#line 1965 "FacebookPublishing.c"
}
#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp1_ = FALSE;
+ _tmp0_ = FALSE;
#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp3_ = i;
+ _tmp2_ = i;
#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp4_ = self->albums;
+ _tmp3_ = self->albums;
#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp4__length1 = self->albums_length1;
+ _tmp3__length1 = self->albums_length1;
#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- if (!(_tmp3_ < _tmp4__length1)) {
+ if (!(_tmp2_ < _tmp3__length1)) {
#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
break;
-#line 1680 "FacebookPublishing.c"
+#line 1979 "FacebookPublishing.c"
}
#line 144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp5_ = self->albums;
-#line 144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp5__length1 = self->albums_length1;
+ _tmp4_ = self->albums;
#line 144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp6_ = i;
+ _tmp4__length1 = self->albums_length1;
#line 144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp7_ = _tmp5_[_tmp6_];
+ _tmp5_ = i;
#line 144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp8_ = _tmp7_->name;
+ _tmp6_ = _tmp4_[_tmp5_];
#line 144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp9_ = name;
+ _tmp7_ = _tmp6_->name;
#line 144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- if (g_strcmp0 (_tmp8_, _tmp9_) == 0) {
-#line 1696 "FacebookPublishing.c"
- gint _tmp10_;
+ if (g_strcmp0 (_tmp7_, name) == 0) {
+#line 1993 "FacebookPublishing.c"
+ gint _tmp8_;
#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp10_ = i;
+ _tmp8_ = i;
#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- self->target_album = _tmp10_;
+ self->target_album = _tmp8_;
#line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return;
-#line 1704 "FacebookPublishing.c"
+#line 2001 "FacebookPublishing.c"
}
}
}
}
#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
self->target_album = PUBLISHING_FACEBOOK_PUBLISHING_PARAMETERS_UNKNOWN_ALBUM;
-#line 1711 "FacebookPublishing.c"
+#line 2008 "FacebookPublishing.c"
}
-gchar* publishing_facebook_publishing_parameters_get_target_album_name (PublishingFacebookPublishingParameters* self) {
+gchar*
+publishing_facebook_publishing_parameters_get_target_album_name (PublishingFacebookPublishingParameters* self)
+{
gchar* result = NULL;
gboolean _tmp0_ = FALSE;
PublishingFacebookAlbum** _tmp1_;
@@ -1732,14 +2031,14 @@ gchar* publishing_facebook_publishing_parameters_get_target_album_name (Publishi
if (_tmp1_ == NULL) {
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_tmp0_ = TRUE;
-#line 1736 "FacebookPublishing.c"
+#line 2035 "FacebookPublishing.c"
} else {
gint _tmp2_;
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_tmp2_ = self->target_album;
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_tmp0_ = _tmp2_ == PUBLISHING_FACEBOOK_PUBLISHING_PARAMETERS_UNKNOWN_ALBUM;
-#line 1743 "FacebookPublishing.c"
+#line 2042 "FacebookPublishing.c"
}
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
if (_tmp0_) {
@@ -1747,7 +2046,7 @@ gchar* publishing_facebook_publishing_parameters_get_target_album_name (Publishi
result = NULL;
#line 155 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return result;
-#line 1751 "FacebookPublishing.c"
+#line 2050 "FacebookPublishing.c"
}
#line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_tmp3_ = self->albums;
@@ -1765,11 +2064,13 @@ gchar* publishing_facebook_publishing_parameters_get_target_album_name (Publishi
result = _tmp7_;
#line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return result;
-#line 1769 "FacebookPublishing.c"
+#line 2068 "FacebookPublishing.c"
}
-gchar* publishing_facebook_publishing_parameters_get_target_album_id (PublishingFacebookPublishingParameters* self) {
+gchar*
+publishing_facebook_publishing_parameters_get_target_album_id (PublishingFacebookPublishingParameters* self)
+{
gchar* result = NULL;
gboolean _tmp0_ = FALSE;
PublishingFacebookAlbum** _tmp1_;
@@ -1790,14 +2091,14 @@ gchar* publishing_facebook_publishing_parameters_get_target_album_id (Publishing
if (_tmp1_ == NULL) {
#line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_tmp0_ = TRUE;
-#line 1794 "FacebookPublishing.c"
+#line 2095 "FacebookPublishing.c"
} else {
gint _tmp2_;
#line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_tmp2_ = self->target_album;
#line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_tmp0_ = _tmp2_ == PUBLISHING_FACEBOOK_PUBLISHING_PARAMETERS_UNKNOWN_ALBUM;
-#line 1801 "FacebookPublishing.c"
+#line 2102 "FacebookPublishing.c"
}
#line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
if (_tmp0_) {
@@ -1805,7 +2106,7 @@ gchar* publishing_facebook_publishing_parameters_get_target_album_id (Publishing
result = NULL;
#line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return result;
-#line 1809 "FacebookPublishing.c"
+#line 2110 "FacebookPublishing.c"
}
#line 164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_tmp3_ = self->albums;
@@ -1823,108 +2124,133 @@ gchar* publishing_facebook_publishing_parameters_get_target_album_id (Publishing
result = _tmp7_;
#line 164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return result;
-#line 1827 "FacebookPublishing.c"
+#line 2128 "FacebookPublishing.c"
}
-static void publishing_facebook_value_publishing_parameters_init (GValue* value) {
+static void
+publishing_facebook_value_publishing_parameters_init (GValue* value)
+{
#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 1834 "FacebookPublishing.c"
+#line 2137 "FacebookPublishing.c"
}
-static void publishing_facebook_value_publishing_parameters_free_value (GValue* value) {
+static void
+publishing_facebook_value_publishing_parameters_free_value (GValue* value)
+{
#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
if (value->data[0].v_pointer) {
#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_publishing_parameters_unref (value->data[0].v_pointer);
-#line 1843 "FacebookPublishing.c"
+#line 2148 "FacebookPublishing.c"
}
}
-static void publishing_facebook_value_publishing_parameters_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+publishing_facebook_value_publishing_parameters_copy_value (const GValue* src_value,
+ GValue* dest_value)
+{
#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
if (src_value->data[0].v_pointer) {
#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
dest_value->data[0].v_pointer = publishing_facebook_publishing_parameters_ref (src_value->data[0].v_pointer);
-#line 1853 "FacebookPublishing.c"
+#line 2161 "FacebookPublishing.c"
} else {
#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
dest_value->data[0].v_pointer = NULL;
-#line 1857 "FacebookPublishing.c"
+#line 2165 "FacebookPublishing.c"
}
}
-static gpointer publishing_facebook_value_publishing_parameters_peek_pointer (const GValue* value) {
+static gpointer
+publishing_facebook_value_publishing_parameters_peek_pointer (const GValue* value)
+{
#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return value->data[0].v_pointer;
-#line 1865 "FacebookPublishing.c"
+#line 2175 "FacebookPublishing.c"
}
-static gchar* publishing_facebook_value_publishing_parameters_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_facebook_value_publishing_parameters_collect_value (GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
if (collect_values[0].v_pointer) {
-#line 1872 "FacebookPublishing.c"
+#line 2187 "FacebookPublishing.c"
PublishingFacebookPublishingParameters * object;
object = collect_values[0].v_pointer;
#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
if (object->parent_instance.g_class == NULL) {
#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1879 "FacebookPublishing.c"
+#line 2194 "FacebookPublishing.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1883 "FacebookPublishing.c"
+#line 2198 "FacebookPublishing.c"
}
#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
value->data[0].v_pointer = publishing_facebook_publishing_parameters_ref (object);
-#line 1887 "FacebookPublishing.c"
+#line 2202 "FacebookPublishing.c"
} else {
#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 1891 "FacebookPublishing.c"
+#line 2206 "FacebookPublishing.c"
}
#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return NULL;
-#line 1895 "FacebookPublishing.c"
+#line 2210 "FacebookPublishing.c"
}
-static gchar* publishing_facebook_value_publishing_parameters_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_facebook_value_publishing_parameters_lcopy_value (const GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
PublishingFacebookPublishingParameters ** object_p;
object_p = collect_values[0].v_pointer;
#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
if (!object_p) {
#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1906 "FacebookPublishing.c"
+#line 2226 "FacebookPublishing.c"
}
#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
if (!value->data[0].v_pointer) {
#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
*object_p = NULL;
-#line 1912 "FacebookPublishing.c"
+#line 2232 "FacebookPublishing.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
*object_p = value->data[0].v_pointer;
-#line 1916 "FacebookPublishing.c"
+#line 2236 "FacebookPublishing.c"
} else {
#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
*object_p = publishing_facebook_publishing_parameters_ref (value->data[0].v_pointer);
-#line 1920 "FacebookPublishing.c"
+#line 2240 "FacebookPublishing.c"
}
#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return NULL;
-#line 1924 "FacebookPublishing.c"
+#line 2244 "FacebookPublishing.c"
}
-GParamSpec* publishing_facebook_param_spec_publishing_parameters (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+publishing_facebook_param_spec_publishing_parameters (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags)
+{
PublishingFacebookParamSpecPublishingParameters* spec;
#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_FACEBOOK_TYPE_PUBLISHING_PARAMETERS), NULL);
@@ -1934,20 +2260,25 @@ GParamSpec* publishing_facebook_param_spec_publishing_parameters (const gchar* n
G_PARAM_SPEC (spec)->value_type = object_type;
#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return G_PARAM_SPEC (spec);
-#line 1938 "FacebookPublishing.c"
+#line 2264 "FacebookPublishing.c"
}
-gpointer publishing_facebook_value_get_publishing_parameters (const GValue* value) {
+gpointer
+publishing_facebook_value_get_publishing_parameters (const GValue* value)
+{
#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_PUBLISHING_PARAMETERS), NULL);
#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return value->data[0].v_pointer;
-#line 1947 "FacebookPublishing.c"
+#line 2275 "FacebookPublishing.c"
}
-void publishing_facebook_value_set_publishing_parameters (GValue* value, gpointer v_object) {
+void
+publishing_facebook_value_set_publishing_parameters (GValue* value,
+ gpointer v_object)
+{
PublishingFacebookPublishingParameters * old;
#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_PUBLISHING_PARAMETERS));
@@ -1963,22 +2294,25 @@ void publishing_facebook_value_set_publishing_parameters (GValue* value, gpointe
value->data[0].v_pointer = v_object;
#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_publishing_parameters_ref (value->data[0].v_pointer);
-#line 1967 "FacebookPublishing.c"
+#line 2298 "FacebookPublishing.c"
} else {
#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 1971 "FacebookPublishing.c"
+#line 2302 "FacebookPublishing.c"
}
#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
if (old) {
#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_publishing_parameters_unref (old);
-#line 1977 "FacebookPublishing.c"
+#line 2308 "FacebookPublishing.c"
}
}
-void publishing_facebook_value_take_publishing_parameters (GValue* value, gpointer v_object) {
+void
+publishing_facebook_value_take_publishing_parameters (GValue* value,
+ gpointer v_object)
+{
PublishingFacebookPublishingParameters * old;
#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_PUBLISHING_PARAMETERS));
@@ -1992,38 +2326,44 @@ void publishing_facebook_value_take_publishing_parameters (GValue* value, gpoint
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
value->data[0].v_pointer = v_object;
-#line 1996 "FacebookPublishing.c"
+#line 2330 "FacebookPublishing.c"
} else {
#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 2000 "FacebookPublishing.c"
+#line 2334 "FacebookPublishing.c"
}
#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
if (old) {
#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_publishing_parameters_unref (old);
-#line 2006 "FacebookPublishing.c"
+#line 2340 "FacebookPublishing.c"
}
}
-static void publishing_facebook_publishing_parameters_class_init (PublishingFacebookPublishingParametersClass * klass) {
+static void
+publishing_facebook_publishing_parameters_class_init (PublishingFacebookPublishingParametersClass * klass)
+{
#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_publishing_parameters_parent_class = g_type_class_peek_parent (klass);
#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
((PublishingFacebookPublishingParametersClass *) klass)->finalize = publishing_facebook_publishing_parameters_finalize;
-#line 2016 "FacebookPublishing.c"
+#line 2352 "FacebookPublishing.c"
}
-static void publishing_facebook_publishing_parameters_instance_init (PublishingFacebookPublishingParameters * self) {
+static void
+publishing_facebook_publishing_parameters_instance_init (PublishingFacebookPublishingParameters * self)
+{
#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
self->ref_count = 1;
-#line 2023 "FacebookPublishing.c"
+#line 2361 "FacebookPublishing.c"
}
-static void publishing_facebook_publishing_parameters_finalize (PublishingFacebookPublishingParameters * obj) {
+static void
+publishing_facebook_publishing_parameters_finalize (PublishingFacebookPublishingParameters * obj)
+{
PublishingFacebookPublishingParameters * self;
#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FACEBOOK_TYPE_PUBLISHING_PARAMETERS, PublishingFacebookPublishingParameters);
@@ -2035,11 +2375,13 @@ static void publishing_facebook_publishing_parameters_finalize (PublishingFacebo
_g_free0 (self->new_album_name);
#line 115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_g_free0 (self->privacy_object);
-#line 2039 "FacebookPublishing.c"
+#line 2379 "FacebookPublishing.c"
}
-GType publishing_facebook_publishing_parameters_get_type (void) {
+GType
+publishing_facebook_publishing_parameters_get_type (void)
+{
static volatile gsize publishing_facebook_publishing_parameters_type_id__volatile = 0;
if (g_once_init_enter (&publishing_facebook_publishing_parameters_type_id__volatile)) {
static const GTypeValueTable g_define_type_value_table = { publishing_facebook_value_publishing_parameters_init, publishing_facebook_value_publishing_parameters_free_value, publishing_facebook_value_publishing_parameters_copy_value, publishing_facebook_value_publishing_parameters_peek_pointer, "p", publishing_facebook_value_publishing_parameters_collect_value, "p", publishing_facebook_value_publishing_parameters_lcopy_value };
@@ -2053,18 +2395,22 @@ GType publishing_facebook_publishing_parameters_get_type (void) {
}
-gpointer publishing_facebook_publishing_parameters_ref (gpointer instance) {
+gpointer
+publishing_facebook_publishing_parameters_ref (gpointer instance)
+{
PublishingFacebookPublishingParameters * self;
self = instance;
#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_atomic_int_inc (&self->ref_count);
#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return instance;
-#line 2064 "FacebookPublishing.c"
+#line 2408 "FacebookPublishing.c"
}
-void publishing_facebook_publishing_parameters_unref (gpointer instance) {
+void
+publishing_facebook_publishing_parameters_unref (gpointer instance)
+{
PublishingFacebookPublishingParameters * self;
self = instance;
#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -2073,29 +2419,33 @@ void publishing_facebook_publishing_parameters_unref (gpointer instance) {
PUBLISHING_FACEBOOK_PUBLISHING_PARAMETERS_GET_CLASS (self)->finalize (self);
#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 2077 "FacebookPublishing.c"
+#line 2423 "FacebookPublishing.c"
}
}
-static void _publishing_facebook_facebook_publisher_on_session_authenticated_publishing_facebook_graph_session_authenticated (PublishingFacebookGraphSession* _sender, gpointer self) {
+static void
+_publishing_facebook_facebook_publisher_on_session_authenticated_publishing_facebook_graph_session_authenticated (PublishingFacebookGraphSession* _sender,
+ gpointer self)
+{
#line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_facebook_publisher_on_session_authenticated ((PublishingFacebookFacebookPublisher*) self);
-#line 2085 "FacebookPublishing.c"
+#line 2434 "FacebookPublishing.c"
}
-PublishingFacebookFacebookPublisher* publishing_facebook_facebook_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host) {
+PublishingFacebookFacebookPublisher*
+publishing_facebook_facebook_publisher_construct (GType object_type,
+ SpitPublishingService* service,
+ SpitPublishingPluginHost* host)
+{
PublishingFacebookFacebookPublisher * self = NULL;
- SpitPublishingService* _tmp0_;
- SpitPublishingPluginHost* _tmp1_;
- PublishingFacebookPublishingParameters* _tmp2_;
- PublishingAuthenticatorFactory* _tmp3_;
- PublishingAuthenticatorFactory* _tmp4_;
- SpitPublishingPluginHost* _tmp5_;
- SpitPublishingAuthenticator* _tmp6_;
- PublishingFacebookGraphSession* _tmp7_;
- PublishingFacebookGraphSession* _tmp8_;
+ PublishingFacebookPublishingParameters* _tmp0_;
+ PublishingAuthenticatorFactory* _tmp1_;
+ PublishingAuthenticatorFactory* _tmp2_;
+ SpitPublishingAuthenticator* _tmp3_;
+ PublishingFacebookGraphSession* _tmp4_;
+ PublishingFacebookGraphSession* _tmp5_;
#line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_val_if_fail (SPIT_PUBLISHING_IS_SERVICE (service), NULL);
#line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -2105,137 +2455,141 @@ PublishingFacebookFacebookPublisher* publishing_facebook_facebook_publisher_cons
#line 183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_debug ("FacebookPublishing.vala:183: FacebookPublisher instantiated.");
#line 185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp0_ = service;
-#line 185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- self->priv->service = _tmp0_;
-#line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp1_ = host;
+ self->priv->service = service;
#line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- self->priv->host = _tmp1_;
+ self->priv->host = host;
#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp2_ = publishing_facebook_publishing_parameters_new ();
+ _tmp0_ = publishing_facebook_publishing_parameters_new ();
#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_publishing_facebook_publishing_parameters_unref0 (self->priv->publishing_params);
#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- self->priv->publishing_params = _tmp2_;
-#line 189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp3_ = publishing_authenticator_factory_get_instance ();
+ self->priv->publishing_params = _tmp0_;
#line 189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp4_ = _tmp3_;
+ _tmp1_ = publishing_authenticator_factory_get_instance ();
#line 189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp5_ = host;
+ _tmp2_ = _tmp1_;
#line 189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp6_ = spit_publishing_authenticator_factory_create (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SPIT_PUBLISHING_TYPE_AUTHENTICATOR_FACTORY, SpitPublishingAuthenticatorFactory), "facebook", _tmp5_);
+ _tmp3_ = spit_publishing_authenticator_factory_create (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SPIT_PUBLISHING_TYPE_AUTHENTICATOR_FACTORY, SpitPublishingAuthenticatorFactory), "facebook", host);
#line 189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_g_object_unref0 (self->priv->authenticator);
#line 189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- self->priv->authenticator = _tmp6_;
+ self->priv->authenticator = _tmp3_;
#line 189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _g_object_unref0 (_tmp4_);
+ _g_object_unref0 (_tmp2_);
#line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp7_ = publishing_facebook_graph_session_new ();
+ _tmp4_ = publishing_facebook_graph_session_new ();
#line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_publishing_facebook_graph_session_unref0 (self->priv->graph_session);
#line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- self->priv->graph_session = _tmp7_;
+ self->priv->graph_session = _tmp4_;
#line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp8_ = self->priv->graph_session;
+ _tmp5_ = self->priv->graph_session;
#line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_signal_connect_object (_tmp8_, "authenticated", (GCallback) _publishing_facebook_facebook_publisher_on_session_authenticated_publishing_facebook_graph_session_authenticated, self, 0);
+ g_signal_connect_object (_tmp5_, "authenticated", (GCallback) _publishing_facebook_facebook_publisher_on_session_authenticated_publishing_facebook_graph_session_authenticated, self, 0);
#line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return self;
-#line 2148 "FacebookPublishing.c"
+#line 2492 "FacebookPublishing.c"
}
-PublishingFacebookFacebookPublisher* publishing_facebook_facebook_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host) {
+PublishingFacebookFacebookPublisher*
+publishing_facebook_facebook_publisher_new (SpitPublishingService* service,
+ SpitPublishingPluginHost* host)
+{
#line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return publishing_facebook_facebook_publisher_construct (PUBLISHING_FACEBOOK_TYPE_FACEBOOK_PUBLISHER, service, host);
-#line 2155 "FacebookPublishing.c"
+#line 2502 "FacebookPublishing.c"
}
-static gboolean publishing_facebook_facebook_publisher_get_persistent_strip_metadata (PublishingFacebookFacebookPublisher* self) {
+static gboolean
+publishing_facebook_facebook_publisher_get_persistent_strip_metadata (PublishingFacebookFacebookPublisher* self)
+{
gboolean result = FALSE;
SpitPublishingPluginHost* _tmp0_;
- gboolean _tmp1_;
#line 197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self), FALSE);
#line 198 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_tmp0_ = self->priv->host;
#line 198 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp1_ = spit_host_interface_get_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "strip_metadata", FALSE);
-#line 198 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- result = _tmp1_;
+ result = spit_host_interface_get_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "strip_metadata", FALSE);
#line 198 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return result;
-#line 2173 "FacebookPublishing.c"
+#line 2519 "FacebookPublishing.c"
}
-static void publishing_facebook_facebook_publisher_set_persistent_strip_metadata (PublishingFacebookFacebookPublisher* self, gboolean strip_metadata) {
+static void
+publishing_facebook_facebook_publisher_set_persistent_strip_metadata (PublishingFacebookFacebookPublisher* self,
+ gboolean strip_metadata)
+{
SpitPublishingPluginHost* _tmp0_;
- gboolean _tmp1_;
#line 201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
#line 202 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_tmp0_ = self->priv->host;
#line 202 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp1_ = strip_metadata;
-#line 202 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "strip_metadata", _tmp1_);
-#line 2188 "FacebookPublishing.c"
+ spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "strip_metadata", strip_metadata);
+#line 2534 "FacebookPublishing.c"
}
-gint publishing_facebook_facebook_publisher_get_persistent_default_size (PublishingFacebookFacebookPublisher* self) {
+gint
+publishing_facebook_facebook_publisher_get_persistent_default_size (PublishingFacebookFacebookPublisher* self)
+{
gint result = 0;
SpitPublishingPluginHost* _tmp0_;
- gint _tmp1_;
#line 207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self), 0);
#line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_tmp0_ = self->priv->host;
#line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp1_ = spit_host_interface_get_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "default_size", 0);
-#line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- result = _tmp1_;
+ result = spit_host_interface_get_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "default_size", 0);
#line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return result;
-#line 2206 "FacebookPublishing.c"
+#line 2551 "FacebookPublishing.c"
}
-void publishing_facebook_facebook_publisher_set_persistent_default_size (PublishingFacebookFacebookPublisher* self, gint size) {
+void
+publishing_facebook_facebook_publisher_set_persistent_default_size (PublishingFacebookFacebookPublisher* self,
+ gint size)
+{
SpitPublishingPluginHost* _tmp0_;
- gint _tmp1_;
#line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_tmp0_ = self->priv->host;
#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp1_ = size;
-#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "default_size", _tmp1_);
-#line 2221 "FacebookPublishing.c"
+ spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "default_size", size);
+#line 2566 "FacebookPublishing.c"
}
-static void _publishing_facebook_facebook_publisher_on_fetch_user_info_completed_publishing_facebook_graph_message_completed (PublishingFacebookGraphMessage* _sender, gpointer self) {
+static void
+_publishing_facebook_facebook_publisher_on_fetch_user_info_completed_publishing_facebook_graph_message_completed (PublishingFacebookGraphMessage* _sender,
+ gpointer self)
+{
#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_facebook_publisher_on_fetch_user_info_completed ((PublishingFacebookFacebookPublisher*) self, _sender);
-#line 2228 "FacebookPublishing.c"
+#line 2576 "FacebookPublishing.c"
}
-static void _publishing_facebook_facebook_publisher_on_fetch_user_info_error_publishing_facebook_graph_message_failed (PublishingFacebookGraphMessage* _sender, GError* err, gpointer self) {
+static void
+_publishing_facebook_facebook_publisher_on_fetch_user_info_error_publishing_facebook_graph_message_failed (PublishingFacebookGraphMessage* _sender,
+ GError* err,
+ gpointer self)
+{
#line 239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_facebook_publisher_on_fetch_user_info_error ((PublishingFacebookFacebookPublisher*) self, _sender, err);
-#line 2235 "FacebookPublishing.c"
+#line 2587 "FacebookPublishing.c"
}
-static void publishing_facebook_facebook_publisher_do_fetch_user_info (PublishingFacebookFacebookPublisher* self) {
+static void
+publishing_facebook_facebook_publisher_do_fetch_user_info (PublishingFacebookFacebookPublisher* self)
+{
SpitPublishingPluginHost* _tmp0_;
SpitPublishingPluginHost* _tmp1_;
PublishingFacebookGraphMessage* user_info_message = NULL;
@@ -2270,25 +2624,34 @@ static void publishing_facebook_facebook_publisher_do_fetch_user_info (Publishin
publishing_facebook_graph_session_send_message (_tmp4_, user_info_message);
#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_publishing_facebook_graph_message_unref0 (user_info_message);
-#line 2274 "FacebookPublishing.c"
+#line 2628 "FacebookPublishing.c"
}
-static void _publishing_facebook_facebook_publisher_on_fetch_albums_completed_publishing_facebook_graph_message_completed (PublishingFacebookGraphMessage* _sender, gpointer self) {
+static void
+_publishing_facebook_facebook_publisher_on_fetch_albums_completed_publishing_facebook_graph_message_completed (PublishingFacebookGraphMessage* _sender,
+ gpointer self)
+{
#line 252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_facebook_publisher_on_fetch_albums_completed ((PublishingFacebookFacebookPublisher*) self, _sender);
-#line 2281 "FacebookPublishing.c"
+#line 2638 "FacebookPublishing.c"
}
-static void _publishing_facebook_facebook_publisher_on_fetch_albums_error_publishing_facebook_graph_message_failed (PublishingFacebookGraphMessage* _sender, GError* err, gpointer self) {
+static void
+_publishing_facebook_facebook_publisher_on_fetch_albums_error_publishing_facebook_graph_message_failed (PublishingFacebookGraphMessage* _sender,
+ GError* err,
+ gpointer self)
+{
#line 253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_facebook_publisher_on_fetch_albums_error ((PublishingFacebookFacebookPublisher*) self, _sender, err);
-#line 2288 "FacebookPublishing.c"
+#line 2649 "FacebookPublishing.c"
}
-static void publishing_facebook_facebook_publisher_do_fetch_album_descriptions (PublishingFacebookFacebookPublisher* self) {
+static void
+publishing_facebook_facebook_publisher_do_fetch_album_descriptions (PublishingFacebookFacebookPublisher* self)
+{
SpitPublishingPluginHost* _tmp0_;
SpitPublishingPluginHost* _tmp1_;
PublishingFacebookGraphMessage* albums_message = NULL;
@@ -2337,39 +2700,50 @@ static void publishing_facebook_facebook_publisher_do_fetch_album_descriptions (
publishing_facebook_graph_session_send_message (_tmp8_, albums_message);
#line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_publishing_facebook_graph_message_unref0 (albums_message);
-#line 2341 "FacebookPublishing.c"
+#line 2704 "FacebookPublishing.c"
}
-static JsonNode* _vala_JsonNode_copy (JsonNode* self) {
+static JsonNode*
+_vala_JsonNode_copy (JsonNode* self)
+{
#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return g_boxed_copy (json_node_get_type (), self);
-#line 2348 "FacebookPublishing.c"
+#line 2713 "FacebookPublishing.c"
}
-static gpointer __vala_JsonNode_copy0 (gpointer self) {
+static gpointer
+__vala_JsonNode_copy0 (gpointer self)
+{
#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return self ? _vala_JsonNode_copy (self) : NULL;
-#line 2355 "FacebookPublishing.c"
+#line 2722 "FacebookPublishing.c"
}
-static gpointer _json_object_ref0 (gpointer self) {
+static gpointer
+_json_object_ref0 (gpointer self)
+{
#line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return self ? json_object_ref (self) : NULL;
-#line 2362 "FacebookPublishing.c"
+#line 2731 "FacebookPublishing.c"
}
-static void _vala_JsonNode_free (JsonNode* self) {
+static void
+_vala_JsonNode_free (JsonNode* self)
+{
#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_boxed_free (json_node_get_type (), self);
-#line 2369 "FacebookPublishing.c"
+#line 2740 "FacebookPublishing.c"
}
-static void publishing_facebook_facebook_publisher_do_extract_user_info_from_json (PublishingFacebookFacebookPublisher* self, const gchar* json) {
+static void
+publishing_facebook_facebook_publisher_do_extract_user_info_from_json (PublishingFacebookFacebookPublisher* self,
+ const gchar* json)
+{
GError * _inner_error_ = NULL;
#line 258 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
@@ -2378,26 +2752,25 @@ static void publishing_facebook_facebook_publisher_do_extract_user_info_from_jso
#line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_debug ("FacebookPublishing.vala:259: ACTION: extracting user info from JSON re" \
"sponse.");
-#line 2381 "FacebookPublishing.c"
+#line 2755 "FacebookPublishing.c"
{
JsonParser* parser = NULL;
JsonParser* _tmp0_;
JsonParser* _tmp1_;
- const gchar* _tmp2_;
JsonNode* root = NULL;
- JsonParser* _tmp3_;
+ JsonParser* _tmp2_;
+ JsonNode* _tmp3_;
JsonNode* _tmp4_;
- JsonNode* _tmp5_;
JsonObject* response_object = NULL;
- JsonNode* _tmp6_;
+ JsonNode* _tmp5_;
+ JsonObject* _tmp6_;
JsonObject* _tmp7_;
JsonObject* _tmp8_;
- JsonObject* _tmp9_;
- const gchar* _tmp10_;
- gchar* _tmp11_;
- JsonObject* _tmp12_;
- const gchar* _tmp13_;
- gchar* _tmp14_;
+ const gchar* _tmp9_;
+ gchar* _tmp10_;
+ JsonObject* _tmp11_;
+ const gchar* _tmp12_;
+ gchar* _tmp13_;
#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_tmp0_ = json_parser_new ();
#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -2405,92 +2778,90 @@ static void publishing_facebook_facebook_publisher_do_extract_user_info_from_jso
#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_tmp1_ = parser;
#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp2_ = json;
-#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- json_parser_load_from_data (_tmp1_, _tmp2_, (gssize) -1, &_inner_error_);
+ json_parser_load_from_data (_tmp1_, json, (gssize) -1, &_inner_error_);
#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_g_object_unref0 (parser);
-#line 2415 "FacebookPublishing.c"
+#line 2786 "FacebookPublishing.c"
goto __catch0_g_error;
}
#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp3_ = parser;
+ _tmp2_ = parser;
#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp4_ = json_parser_get_root (_tmp3_);
+ _tmp3_ = json_parser_get_root (_tmp2_);
#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp5_ = __vala_JsonNode_copy0 (_tmp4_);
+ _tmp4_ = __vala_JsonNode_copy0 (_tmp3_);
#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- root = _tmp5_;
+ root = _tmp4_;
#line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp6_ = root;
+ _tmp5_ = root;
#line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp7_ = json_node_get_object (_tmp6_);
+ _tmp6_ = json_node_get_object (_tmp5_);
#line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp8_ = _json_object_ref0 (_tmp7_);
+ _tmp7_ = _json_object_ref0 (_tmp6_);
#line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- response_object = _tmp8_;
+ response_object = _tmp7_;
#line 267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp9_ = response_object;
+ _tmp8_ = response_object;
#line 267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp10_ = json_object_get_string_member (_tmp9_, "id");
+ _tmp9_ = json_object_get_string_member (_tmp8_, "id");
#line 267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp11_ = g_strdup (_tmp10_);
+ _tmp10_ = g_strdup (_tmp9_);
#line 267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_g_free0 (self->priv->uid);
#line 267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- self->priv->uid = _tmp11_;
+ self->priv->uid = _tmp10_;
#line 268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp12_ = response_object;
+ _tmp11_ = response_object;
#line 268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp13_ = json_object_get_string_member (_tmp12_, "name");
+ _tmp12_ = json_object_get_string_member (_tmp11_, "name");
#line 268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp14_ = g_strdup (_tmp13_);
+ _tmp13_ = g_strdup (_tmp12_);
#line 268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_g_free0 (self->priv->username);
#line 268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- self->priv->username = _tmp14_;
+ self->priv->username = _tmp13_;
#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_json_object_unref0 (response_object);
#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
__vala_JsonNode_free0 (root);
#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_g_object_unref0 (parser);
-#line 2460 "FacebookPublishing.c"
+#line 2831 "FacebookPublishing.c"
}
goto __finally0;
__catch0_g_error:
{
GError* _error_ = NULL;
- SpitPublishingPluginHost* _tmp15_;
- GError* _tmp16_;
- const gchar* _tmp17_;
+ SpitPublishingPluginHost* _tmp14_;
+ GError* _tmp15_;
+ const gchar* _tmp16_;
+ GError* _tmp17_;
GError* _tmp18_;
- GError* _tmp19_;
#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_error_ = _inner_error_;
#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_inner_error_ = NULL;
#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp15_ = self->priv->host;
+ _tmp14_ = self->priv->host;
#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp16_ = _error_;
+ _tmp15_ = _error_;
#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp17_ = _tmp16_->message;
+ _tmp16_ = _tmp15_->message;
#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp18_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, _tmp17_);
+ _tmp17_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, _tmp16_);
#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp19_ = _tmp18_;
+ _tmp18_ = _tmp17_;
#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- spit_publishing_plugin_host_post_error (_tmp15_, _tmp19_);
+ spit_publishing_plugin_host_post_error (_tmp14_, _tmp18_);
#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _g_error_free0 (_tmp19_);
+ _g_error_free0 (_tmp18_);
#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_g_error_free0 (_error_);
#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return;
-#line 2493 "FacebookPublishing.c"
+#line 2864 "FacebookPublishing.c"
}
__finally0:
#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -2501,22 +2872,27 @@ static void publishing_facebook_facebook_publisher_do_extract_user_info_from_jso
g_clear_error (&_inner_error_);
#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return;
-#line 2504 "FacebookPublishing.c"
+#line 2875 "FacebookPublishing.c"
}
#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_facebook_publisher_on_user_info_extracted (self);
-#line 2508 "FacebookPublishing.c"
+#line 2879 "FacebookPublishing.c"
}
-static gpointer _json_array_ref0 (gpointer self) {
+static gpointer
+_json_array_ref0 (gpointer self)
+{
#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return self ? json_array_ref (self) : NULL;
-#line 2515 "FacebookPublishing.c"
+#line 2888 "FacebookPublishing.c"
}
-static void publishing_facebook_facebook_publisher_do_extract_albums_from_json (PublishingFacebookFacebookPublisher* self, const gchar* json) {
+static void
+publishing_facebook_facebook_publisher_do_extract_albums_from_json (PublishingFacebookFacebookPublisher* self,
+ const gchar* json)
+{
GError * _inner_error_ = NULL;
#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
@@ -2525,26 +2901,25 @@ static void publishing_facebook_facebook_publisher_do_extract_albums_from_json (
#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_debug ("FacebookPublishing.vala:278: ACTION: extracting album info from JSON r" \
"esponse.");
-#line 2527 "FacebookPublishing.c"
+#line 2903 "FacebookPublishing.c"
{
JsonParser* parser = NULL;
JsonParser* _tmp0_;
JsonParser* _tmp1_;
- const gchar* _tmp2_;
JsonNode* root = NULL;
- JsonParser* _tmp3_;
+ JsonParser* _tmp2_;
+ JsonNode* _tmp3_;
JsonNode* _tmp4_;
- JsonNode* _tmp5_;
JsonObject* response_object = NULL;
- JsonNode* _tmp6_;
+ JsonNode* _tmp5_;
+ JsonObject* _tmp6_;
JsonObject* _tmp7_;
- JsonObject* _tmp8_;
JsonArray* album_list = NULL;
- JsonObject* _tmp9_;
+ JsonObject* _tmp8_;
+ JsonArray* _tmp9_;
JsonArray* _tmp10_;
- JsonArray* _tmp11_;
- PublishingFacebookPublishingParameters* _tmp12_;
- PublishingFacebookAlbum** _tmp13_;
+ PublishingFacebookPublishingParameters* _tmp11_;
+ PublishingFacebookAlbum** _tmp12_;
#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_tmp0_ = json_parser_new ();
#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -2552,149 +2927,144 @@ static void publishing_facebook_facebook_publisher_do_extract_albums_from_json (
#line 282 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_tmp1_ = parser;
#line 282 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp2_ = json;
-#line 282 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- json_parser_load_from_data (_tmp1_, _tmp2_, (gssize) -1, &_inner_error_);
+ json_parser_load_from_data (_tmp1_, json, (gssize) -1, &_inner_error_);
#line 282 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 282 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_g_object_unref0 (parser);
-#line 2561 "FacebookPublishing.c"
+#line 2934 "FacebookPublishing.c"
goto __catch1_g_error;
}
#line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp3_ = parser;
+ _tmp2_ = parser;
#line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp4_ = json_parser_get_root (_tmp3_);
+ _tmp3_ = json_parser_get_root (_tmp2_);
#line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp5_ = __vala_JsonNode_copy0 (_tmp4_);
+ _tmp4_ = __vala_JsonNode_copy0 (_tmp3_);
#line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- root = _tmp5_;
+ root = _tmp4_;
#line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp6_ = root;
+ _tmp5_ = root;
#line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp7_ = json_node_get_object (_tmp6_);
+ _tmp6_ = json_node_get_object (_tmp5_);
#line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp8_ = _json_object_ref0 (_tmp7_);
+ _tmp7_ = _json_object_ref0 (_tmp6_);
#line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- response_object = _tmp8_;
+ response_object = _tmp7_;
#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp9_ = response_object;
+ _tmp8_ = response_object;
#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp10_ = json_object_get_array_member (_tmp9_, "data");
+ _tmp9_ = json_object_get_array_member (_tmp8_, "data");
#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp11_ = _json_array_ref0 (_tmp10_);
+ _tmp10_ = _json_array_ref0 (_tmp9_);
#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- album_list = _tmp11_;
+ album_list = _tmp10_;
#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp12_ = self->priv->publishing_params;
+ _tmp11_ = self->priv->publishing_params;
#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp13_ = g_new0 (PublishingFacebookAlbum*, 0 + 1);
+ _tmp12_ = g_new0 (PublishingFacebookAlbum*, 0 + 1);
#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp12_->albums = (_vala_array_free (_tmp12_->albums, _tmp12_->albums_length1, (GDestroyNotify) publishing_facebook_album_unref), NULL);
+ _tmp11_->albums = (_vala_array_free (_tmp11_->albums, _tmp11_->albums_length1, (GDestroyNotify) publishing_facebook_album_unref), NULL);
#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp12_->albums = _tmp13_;
+ _tmp11_->albums = _tmp12_;
#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp12_->albums_length1 = 0;
+ _tmp11_->albums_length1 = 0;
#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp12_->_albums_size_ = _tmp12_->albums_length1;
-#line 2600 "FacebookPublishing.c"
+ _tmp11_->_albums_size_ = _tmp11_->albums_length1;
+#line 2973 "FacebookPublishing.c"
{
gint i = 0;
#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
i = 0;
-#line 2605 "FacebookPublishing.c"
+#line 2978 "FacebookPublishing.c"
{
- gboolean _tmp14_ = FALSE;
+ gboolean _tmp13_ = FALSE;
#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp14_ = TRUE;
+ _tmp13_ = TRUE;
#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
while (TRUE) {
-#line 2612 "FacebookPublishing.c"
- gint _tmp16_;
- JsonArray* _tmp17_;
- guint _tmp18_;
+#line 2985 "FacebookPublishing.c"
+ gint _tmp15_;
+ JsonArray* _tmp16_;
JsonObject* current_album = NULL;
- JsonArray* _tmp19_;
- gint _tmp20_;
- JsonObject* _tmp21_;
- JsonObject* _tmp22_;
+ JsonArray* _tmp17_;
+ gint _tmp18_;
+ JsonObject* _tmp19_;
+ JsonObject* _tmp20_;
gchar* album_id = NULL;
- JsonObject* _tmp23_;
- const gchar* _tmp24_;
- gchar* _tmp25_;
+ JsonObject* _tmp21_;
+ const gchar* _tmp22_;
+ gchar* _tmp23_;
gchar* album_name = NULL;
- JsonObject* _tmp26_;
- const gchar* _tmp27_;
- gchar* _tmp28_;
- PublishingFacebookPublishingParameters* _tmp29_;
- const gchar* _tmp30_;
- const gchar* _tmp31_;
+ JsonObject* _tmp24_;
+ const gchar* _tmp25_;
+ gchar* _tmp26_;
+ PublishingFacebookPublishingParameters* _tmp27_;
+ const gchar* _tmp28_;
+ const gchar* _tmp29_;
#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- if (!_tmp14_) {
-#line 2634 "FacebookPublishing.c"
- gint _tmp15_;
+ if (!_tmp13_) {
+#line 3006 "FacebookPublishing.c"
+ gint _tmp14_;
#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp15_ = i;
+ _tmp14_ = i;
#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- i = _tmp15_ + 1;
-#line 2640 "FacebookPublishing.c"
+ i = _tmp14_ + 1;
+#line 3012 "FacebookPublishing.c"
}
#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp14_ = FALSE;
-#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp16_ = i;
+ _tmp13_ = FALSE;
#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp17_ = album_list;
+ _tmp15_ = i;
#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp18_ = json_array_get_length (_tmp17_);
+ _tmp16_ = album_list;
#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- if (!(((guint) _tmp16_) < _tmp18_)) {
+ if (!(((guint) _tmp15_) < json_array_get_length (_tmp16_))) {
#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
break;
-#line 2654 "FacebookPublishing.c"
+#line 3024 "FacebookPublishing.c"
}
#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp19_ = album_list;
+ _tmp17_ = album_list;
#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp20_ = i;
+ _tmp18_ = i;
#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp21_ = json_array_get_object_element (_tmp19_, (guint) _tmp20_);
+ _tmp19_ = json_array_get_object_element (_tmp17_, (guint) _tmp18_);
#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp22_ = _json_object_ref0 (_tmp21_);
+ _tmp20_ = _json_object_ref0 (_tmp19_);
#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- current_album = _tmp22_;
+ current_album = _tmp20_;
#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp23_ = current_album;
+ _tmp21_ = current_album;
#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp24_ = json_object_get_string_member (_tmp23_, "id");
+ _tmp22_ = json_object_get_string_member (_tmp21_, "id");
#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp25_ = g_strdup (_tmp24_);
+ _tmp23_ = g_strdup (_tmp22_);
#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- album_id = _tmp25_;
+ album_id = _tmp23_;
#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp26_ = current_album;
+ _tmp24_ = current_album;
#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp27_ = json_object_get_string_member (_tmp26_, "name");
+ _tmp25_ = json_object_get_string_member (_tmp24_, "name");
#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp28_ = g_strdup (_tmp27_);
+ _tmp26_ = g_strdup (_tmp25_);
#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- album_name = _tmp28_;
+ album_name = _tmp26_;
#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp29_ = self->priv->publishing_params;
+ _tmp27_ = self->priv->publishing_params;
#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp30_ = album_name;
+ _tmp28_ = album_name;
#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp31_ = album_id;
+ _tmp29_ = album_id;
#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- publishing_facebook_publishing_parameters_add_album (_tmp29_, _tmp30_, _tmp31_);
+ publishing_facebook_publishing_parameters_add_album (_tmp27_, _tmp28_, _tmp29_);
#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_g_free0 (album_name);
#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_g_free0 (album_id);
#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_json_object_unref0 (current_album);
-#line 2696 "FacebookPublishing.c"
+#line 3066 "FacebookPublishing.c"
}
}
}
@@ -2706,40 +3076,40 @@ static void publishing_facebook_facebook_publisher_do_extract_albums_from_json (
__vala_JsonNode_free0 (root);
#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_g_object_unref0 (parser);
-#line 2708 "FacebookPublishing.c"
+#line 3078 "FacebookPublishing.c"
}
goto __finally1;
__catch1_g_error:
{
GError* _error_ = NULL;
- SpitPublishingPluginHost* _tmp32_;
+ SpitPublishingPluginHost* _tmp30_;
+ GError* _tmp31_;
+ const gchar* _tmp32_;
GError* _tmp33_;
- const gchar* _tmp34_;
- GError* _tmp35_;
- GError* _tmp36_;
+ GError* _tmp34_;
#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_error_ = _inner_error_;
#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_inner_error_ = NULL;
#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp32_ = self->priv->host;
+ _tmp30_ = self->priv->host;
#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp33_ = _error_;
+ _tmp31_ = _error_;
#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp34_ = _tmp33_->message;
+ _tmp32_ = _tmp31_->message;
#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp35_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, _tmp34_);
+ _tmp33_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, _tmp32_);
#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp36_ = _tmp35_;
+ _tmp34_ = _tmp33_;
#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- spit_publishing_plugin_host_post_error (_tmp32_, _tmp36_);
+ spit_publishing_plugin_host_post_error (_tmp30_, _tmp34_);
#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _g_error_free0 (_tmp36_);
+ _g_error_free0 (_tmp34_);
#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_g_error_free0 (_error_);
#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return;
-#line 2741 "FacebookPublishing.c"
+#line 3111 "FacebookPublishing.c"
}
__finally1:
#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -2750,29 +3120,38 @@ static void publishing_facebook_facebook_publisher_do_extract_albums_from_json (
g_clear_error (&_inner_error_);
#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return;
-#line 2752 "FacebookPublishing.c"
+#line 3122 "FacebookPublishing.c"
}
#line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_facebook_publisher_on_albums_extracted (self);
-#line 2756 "FacebookPublishing.c"
+#line 3126 "FacebookPublishing.c"
}
-static void _publishing_facebook_facebook_publisher_on_create_album_completed_publishing_facebook_graph_message_completed (PublishingFacebookGraphMessage* _sender, gpointer self) {
+static void
+_publishing_facebook_facebook_publisher_on_create_album_completed_publishing_facebook_graph_message_completed (PublishingFacebookGraphMessage* _sender,
+ gpointer self)
+{
#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_facebook_publisher_on_create_album_completed ((PublishingFacebookFacebookPublisher*) self, _sender);
-#line 2763 "FacebookPublishing.c"
+#line 3136 "FacebookPublishing.c"
}
-static void _publishing_facebook_facebook_publisher_on_create_album_error_publishing_facebook_graph_message_failed (PublishingFacebookGraphMessage* _sender, GError* err, gpointer self) {
+static void
+_publishing_facebook_facebook_publisher_on_create_album_error_publishing_facebook_graph_message_failed (PublishingFacebookGraphMessage* _sender,
+ GError* err,
+ gpointer self)
+{
#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_facebook_publisher_on_create_album_error ((PublishingFacebookFacebookPublisher*) self, _sender, err);
-#line 2770 "FacebookPublishing.c"
+#line 3147 "FacebookPublishing.c"
}
-static void publishing_facebook_facebook_publisher_do_create_new_album (PublishingFacebookFacebookPublisher* self) {
+static void
+publishing_facebook_facebook_publisher_do_create_new_album (PublishingFacebookFacebookPublisher* self)
+{
PublishingFacebookPublishingParameters* _tmp0_;
const gchar* _tmp1_;
SpitPublishingPluginHost* _tmp2_;
@@ -2826,25 +3205,37 @@ static void publishing_facebook_facebook_publisher_do_create_new_album (Publishi
publishing_facebook_graph_session_send_message (_tmp10_, create_album_message);
#line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_publishing_facebook_graph_message_unref0 (create_album_message);
-#line 2827 "FacebookPublishing.c"
+#line 3206 "FacebookPublishing.c"
}
-static void _publishing_facebook_facebook_publisher_on_publishing_options_pane_logout_publishing_facebook_publishing_options_pane_logout (PublishingFacebookPublishingOptionsPane* _sender, gpointer self) {
+static void
+_publishing_facebook_facebook_publisher_on_publishing_options_pane_logout_publishing_facebook_publishing_options_pane_logout (PublishingFacebookPublishingOptionsPane* _sender,
+ gpointer self)
+{
#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_facebook_publisher_on_publishing_options_pane_logout ((PublishingFacebookFacebookPublisher*) self);
-#line 2834 "FacebookPublishing.c"
+#line 3216 "FacebookPublishing.c"
}
-static void _publishing_facebook_facebook_publisher_on_publishing_options_pane_publish_publishing_facebook_publishing_options_pane_publish (PublishingFacebookPublishingOptionsPane* _sender, const gchar* target_album, const gchar* privacy_setting, PublishingFacebookResolution target_resolution, gboolean strip_metadata, gpointer self) {
+static void
+_publishing_facebook_facebook_publisher_on_publishing_options_pane_publish_publishing_facebook_publishing_options_pane_publish (PublishingFacebookPublishingOptionsPane* _sender,
+ const gchar* target_album,
+ const gchar* privacy_setting,
+ PublishingFacebookResolution target_resolution,
+ gboolean strip_metadata,
+ gpointer self)
+{
#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_facebook_publisher_on_publishing_options_pane_publish ((PublishingFacebookFacebookPublisher*) self, target_album, privacy_setting, target_resolution, strip_metadata);
-#line 2841 "FacebookPublishing.c"
+#line 3230 "FacebookPublishing.c"
}
-static void publishing_facebook_facebook_publisher_do_show_publishing_options_pane (PublishingFacebookFacebookPublisher* self) {
+static void
+publishing_facebook_facebook_publisher_do_show_publishing_options_pane (PublishingFacebookFacebookPublisher* self)
+{
SpitPublishingPluginHost* _tmp0_;
GtkBuilder* builder = NULL;
GtkBuilder* _tmp1_;
@@ -2853,16 +3244,13 @@ static void publishing_facebook_facebook_publisher_do_show_publishing_options_pa
PublishingFacebookAlbum** _tmp10_;
gint _tmp10__length1;
SpitPublishingPluginHost* _tmp11_;
- SpitPublishingPublisherMediaType _tmp12_;
- GtkBuilder* _tmp13_;
- gboolean _tmp14_;
- SpitPublishingAuthenticator* _tmp15_;
- gboolean _tmp16_;
- PublishingFacebookPublishingOptionsPane* _tmp17_;
+ GtkBuilder* _tmp12_;
+ SpitPublishingAuthenticator* _tmp13_;
+ PublishingFacebookPublishingOptionsPane* _tmp14_;
+ PublishingFacebookPublishingOptionsPane* _tmp15_;
+ PublishingFacebookPublishingOptionsPane* _tmp16_;
+ SpitPublishingPluginHost* _tmp17_;
PublishingFacebookPublishingOptionsPane* _tmp18_;
- PublishingFacebookPublishingOptionsPane* _tmp19_;
- SpitPublishingPluginHost* _tmp20_;
- PublishingFacebookPublishingOptionsPane* _tmp21_;
GError * _inner_error_ = NULL;
#line 325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
@@ -2876,7 +3264,7 @@ static void publishing_facebook_facebook_publisher_do_show_publishing_options_pa
_tmp1_ = gtk_builder_new ();
#line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
builder = _tmp1_;
-#line 2877 "FacebookPublishing.c"
+#line 3265 "FacebookPublishing.c"
{
GtkBuilder* _tmp2_;
#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -2885,7 +3273,7 @@ static void publishing_facebook_facebook_publisher_do_show_publishing_options_pa
gtk_builder_add_from_resource (_tmp2_, PLUGIN_RESOURCE_PATH "/" "facebook_publishing_options_pane.ui", &_inner_error_);
#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2886 "FacebookPublishing.c"
+#line 3274 "FacebookPublishing.c"
goto __catch2_g_error;
}
}
@@ -2925,7 +3313,7 @@ static void publishing_facebook_facebook_publisher_do_show_publishing_options_pa
_g_object_unref0 (builder);
#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return;
-#line 2925 "FacebookPublishing.c"
+#line 3313 "FacebookPublishing.c"
}
__finally2:
#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -2938,7 +3326,7 @@ static void publishing_facebook_facebook_publisher_do_show_publishing_options_pa
g_clear_error (&_inner_error_);
#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return;
-#line 2938 "FacebookPublishing.c"
+#line 3326 "FacebookPublishing.c"
}
#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_tmp8_ = self->priv->username;
@@ -2951,42 +3339,38 @@ static void publishing_facebook_facebook_publisher_do_show_publishing_options_pa
#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_tmp11_ = self->priv->host;
#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp12_ = spit_publishing_plugin_host_get_publishable_media_type (_tmp11_);
-#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp13_ = builder;
-#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp14_ = publishing_facebook_facebook_publisher_get_persistent_strip_metadata (self);
+ _tmp12_ = builder;
#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp15_ = self->priv->authenticator;
+ _tmp13_ = self->priv->authenticator;
#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp16_ = spit_publishing_authenticator_can_logout (_tmp15_);
-#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp17_ = publishing_facebook_publishing_options_pane_new (_tmp8_, _tmp10_, _tmp10__length1, _tmp12_, self, _tmp13_, _tmp14_, _tmp16_);
+ _tmp14_ = publishing_facebook_publishing_options_pane_new (_tmp8_, _tmp10_, _tmp10__length1, spit_publishing_plugin_host_get_publishable_media_type (_tmp11_), self, _tmp12_, publishing_facebook_facebook_publisher_get_persistent_strip_metadata (self), spit_publishing_authenticator_can_logout (_tmp13_));
#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_g_object_unref0 (self->priv->publishing_options_pane);
#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- self->priv->publishing_options_pane = _tmp17_;
+ self->priv->publishing_options_pane = _tmp14_;
#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp18_ = self->priv->publishing_options_pane;
+ _tmp15_ = self->priv->publishing_options_pane;
#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_signal_connect_object (_tmp18_, "logout", (GCallback) _publishing_facebook_facebook_publisher_on_publishing_options_pane_logout_publishing_facebook_publishing_options_pane_logout, self, 0);
+ g_signal_connect_object (_tmp15_, "logout", (GCallback) _publishing_facebook_facebook_publisher_on_publishing_options_pane_logout_publishing_facebook_publishing_options_pane_logout, self, 0);
#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp19_ = self->priv->publishing_options_pane;
+ _tmp16_ = self->priv->publishing_options_pane;
#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_signal_connect_object (_tmp19_, "publish", (GCallback) _publishing_facebook_facebook_publisher_on_publishing_options_pane_publish_publishing_facebook_publishing_options_pane_publish, self, 0);
+ g_signal_connect_object (_tmp16_, "publish", (GCallback) _publishing_facebook_facebook_publisher_on_publishing_options_pane_publish_publishing_facebook_publishing_options_pane_publish, self, 0);
#line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp20_ = self->priv->host;
+ _tmp17_ = self->priv->host;
#line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp21_ = self->priv->publishing_options_pane;
+ _tmp18_ = self->priv->publishing_options_pane;
#line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- spit_publishing_plugin_host_install_dialog_pane (_tmp20_, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
+ spit_publishing_plugin_host_install_dialog_pane (_tmp17_, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
#line 325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_g_object_unref0 (builder);
-#line 2982 "FacebookPublishing.c"
+#line 3364 "FacebookPublishing.c"
}
-static void publishing_facebook_facebook_publisher_do_logout (PublishingFacebookFacebookPublisher* self) {
+static void
+publishing_facebook_facebook_publisher_do_logout (PublishingFacebookFacebookPublisher* self)
+{
SpitPublishingAuthenticator* _tmp0_;
#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
@@ -3001,13 +3385,16 @@ static void publishing_facebook_facebook_publisher_do_logout (PublishingFacebook
self->priv->running = FALSE;
#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
spit_publishing_publisher_start (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 3000 "FacebookPublishing.c"
+#line 3384 "FacebookPublishing.c"
}
-static void publishing_facebook_facebook_publisher_do_add_new_local_album_from_json (PublishingFacebookFacebookPublisher* self, const gchar* album_name, const gchar* json) {
- PublishingFacebookPublishingParameters* _tmp20_;
- const gchar* _tmp21_;
+static void
+publishing_facebook_facebook_publisher_do_add_new_local_album_from_json (PublishingFacebookFacebookPublisher* self,
+ const gchar* album_name,
+ const gchar* json)
+{
+ PublishingFacebookPublishingParameters* _tmp18_;
GError * _inner_error_ = NULL;
#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
@@ -3015,27 +3402,25 @@ static void publishing_facebook_facebook_publisher_do_add_new_local_album_from_j
g_return_if_fail (album_name != NULL);
#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_if_fail (json != NULL);
-#line 3014 "FacebookPublishing.c"
+#line 3401 "FacebookPublishing.c"
{
JsonParser* parser = NULL;
JsonParser* _tmp0_;
JsonParser* _tmp1_;
- const gchar* _tmp2_;
JsonNode* root = NULL;
- JsonParser* _tmp3_;
+ JsonParser* _tmp2_;
+ JsonNode* _tmp3_;
JsonNode* _tmp4_;
- JsonNode* _tmp5_;
JsonObject* response_object = NULL;
- JsonNode* _tmp6_;
+ JsonNode* _tmp5_;
+ JsonObject* _tmp6_;
JsonObject* _tmp7_;
- JsonObject* _tmp8_;
gchar* album_id = NULL;
- JsonObject* _tmp9_;
- const gchar* _tmp10_;
- gchar* _tmp11_;
- PublishingFacebookPublishingParameters* _tmp12_;
- const gchar* _tmp13_;
- const gchar* _tmp14_;
+ JsonObject* _tmp8_;
+ const gchar* _tmp9_;
+ gchar* _tmp10_;
+ PublishingFacebookPublishingParameters* _tmp11_;
+ const gchar* _tmp12_;
#line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_tmp0_ = json_parser_new ();
#line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -3043,48 +3428,44 @@ static void publishing_facebook_facebook_publisher_do_add_new_local_album_from_j
#line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_tmp1_ = parser;
#line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp2_ = json;
-#line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- json_parser_load_from_data (_tmp1_, _tmp2_, (gssize) -1, &_inner_error_);
+ json_parser_load_from_data (_tmp1_, json, (gssize) -1, &_inner_error_);
#line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_g_object_unref0 (parser);
-#line 3049 "FacebookPublishing.c"
+#line 3432 "FacebookPublishing.c"
goto __catch3_g_error;
}
#line 366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp3_ = parser;
+ _tmp2_ = parser;
#line 366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp4_ = json_parser_get_root (_tmp3_);
+ _tmp3_ = json_parser_get_root (_tmp2_);
#line 366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp5_ = __vala_JsonNode_copy0 (_tmp4_);
+ _tmp4_ = __vala_JsonNode_copy0 (_tmp3_);
#line 366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- root = _tmp5_;
+ root = _tmp4_;
#line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp6_ = root;
+ _tmp5_ = root;
#line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp7_ = json_node_get_object (_tmp6_);
+ _tmp6_ = json_node_get_object (_tmp5_);
#line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp8_ = _json_object_ref0 (_tmp7_);
+ _tmp7_ = _json_object_ref0 (_tmp6_);
#line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- response_object = _tmp8_;
+ response_object = _tmp7_;
#line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp9_ = response_object;
+ _tmp8_ = response_object;
#line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp10_ = json_object_get_string_member (_tmp9_, "id");
+ _tmp9_ = json_object_get_string_member (_tmp8_, "id");
#line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp11_ = g_strdup (_tmp10_);
+ _tmp10_ = g_strdup (_tmp9_);
#line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- album_id = _tmp11_;
-#line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp12_ = self->priv->publishing_params;
+ album_id = _tmp10_;
#line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp13_ = album_name;
+ _tmp11_ = self->priv->publishing_params;
#line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp14_ = album_id;
+ _tmp12_ = album_id;
#line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- publishing_facebook_publishing_parameters_add_album (_tmp12_, _tmp13_, _tmp14_);
+ publishing_facebook_publishing_parameters_add_album (_tmp11_, album_name, _tmp12_);
#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_g_free0 (album_id);
#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -3093,40 +3474,40 @@ static void publishing_facebook_facebook_publisher_do_add_new_local_album_from_j
__vala_JsonNode_free0 (root);
#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_g_object_unref0 (parser);
-#line 3092 "FacebookPublishing.c"
+#line 3473 "FacebookPublishing.c"
}
goto __finally3;
__catch3_g_error:
{
GError* _error_ = NULL;
- SpitPublishingPluginHost* _tmp15_;
+ SpitPublishingPluginHost* _tmp13_;
+ GError* _tmp14_;
+ const gchar* _tmp15_;
GError* _tmp16_;
- const gchar* _tmp17_;
- GError* _tmp18_;
- GError* _tmp19_;
+ GError* _tmp17_;
#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_error_ = _inner_error_;
#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_inner_error_ = NULL;
#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp15_ = self->priv->host;
+ _tmp13_ = self->priv->host;
#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp16_ = _error_;
+ _tmp14_ = _error_;
#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp17_ = _tmp16_->message;
+ _tmp15_ = _tmp14_->message;
#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp18_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, _tmp17_);
+ _tmp16_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, _tmp15_);
#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp19_ = _tmp18_;
+ _tmp17_ = _tmp16_;
#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- spit_publishing_plugin_host_post_error (_tmp15_, _tmp19_);
+ spit_publishing_plugin_host_post_error (_tmp13_, _tmp17_);
#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _g_error_free0 (_tmp19_);
+ _g_error_free0 (_tmp17_);
#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_g_error_free0 (_error_);
#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return;
-#line 3125 "FacebookPublishing.c"
+#line 3506 "FacebookPublishing.c"
}
__finally3:
#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -3137,46 +3518,52 @@ static void publishing_facebook_facebook_publisher_do_add_new_local_album_from_j
g_clear_error (&_inner_error_);
#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return;
-#line 3136 "FacebookPublishing.c"
+#line 3517 "FacebookPublishing.c"
}
#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp20_ = self->priv->publishing_params;
+ _tmp18_ = self->priv->publishing_params;
#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp21_ = album_name;
-#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- publishing_facebook_publishing_parameters_set_target_album_by_name (_tmp20_, _tmp21_);
+ publishing_facebook_publishing_parameters_set_target_album_by_name (_tmp18_, album_name);
#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_facebook_publisher_do_upload (self);
-#line 3146 "FacebookPublishing.c"
+#line 3525 "FacebookPublishing.c"
}
-static void publishing_facebook_facebook_publisher_on_authenticator_succeeded (PublishingFacebookFacebookPublisher* self) {
+static void
+publishing_facebook_facebook_publisher_on_authenticator_succeeded (PublishingFacebookFacebookPublisher* self)
+{
#line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_debug ("FacebookPublishing.vala:382: EVENT: Authenticator login succeeded.");
#line 384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_facebook_publisher_do_authenticate_session (self);
-#line 3157 "FacebookPublishing.c"
+#line 3538 "FacebookPublishing.c"
}
-static void publishing_facebook_facebook_publisher_on_authenticator_failed (PublishingFacebookFacebookPublisher* self) {
+static void
+publishing_facebook_facebook_publisher_on_authenticator_failed (PublishingFacebookFacebookPublisher* self)
+{
#line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 3164 "FacebookPublishing.c"
+#line 3547 "FacebookPublishing.c"
}
-static gpointer _g_variant_ref0 (gpointer self) {
+static gpointer
+_g_variant_ref0 (gpointer self)
+{
#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return self ? g_variant_ref (self) : NULL;
-#line 3171 "FacebookPublishing.c"
+#line 3556 "FacebookPublishing.c"
}
-static void publishing_facebook_facebook_publisher_do_authenticate_session (PublishingFacebookFacebookPublisher* self) {
+static void
+publishing_facebook_facebook_publisher_do_authenticate_session (PublishingFacebookFacebookPublisher* self)
+{
GHashTable* parameter = NULL;
SpitPublishingAuthenticator* _tmp0_;
GHashTable* _tmp1_;
@@ -3210,7 +3597,7 @@ static void publishing_facebook_facebook_publisher_do_authenticate_session (Publ
" not provide access token");
#line 395 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_assert_not_reached ();
-#line 3208 "FacebookPublishing.c"
+#line 3595 "FacebookPublishing.c"
}
#line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_tmp5_ = self->priv->graph_session;
@@ -3226,32 +3613,46 @@ static void publishing_facebook_facebook_publisher_do_authenticate_session (Publ
_g_variant_unref0 (access_token);
#line 390 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_g_hash_table_unref0 (parameter);
-#line 3224 "FacebookPublishing.c"
+#line 3611 "FacebookPublishing.c"
}
-static void _publishing_facebook_facebook_publisher_on_upload_complete_publishing_facebook_uploader_upload_complete (PublishingFacebookUploader* _sender, gint num_photos_published, gpointer self) {
+static void
+_publishing_facebook_facebook_publisher_on_upload_complete_publishing_facebook_uploader_upload_complete (PublishingFacebookUploader* _sender,
+ gint num_photos_published,
+ gpointer self)
+{
#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_facebook_publisher_on_upload_complete ((PublishingFacebookFacebookPublisher*) self, _sender, num_photos_published);
-#line 3231 "FacebookPublishing.c"
+#line 3622 "FacebookPublishing.c"
}
-static void _publishing_facebook_facebook_publisher_on_upload_error_publishing_facebook_uploader_upload_error (PublishingFacebookUploader* _sender, GError* err, gpointer self) {
+static void
+_publishing_facebook_facebook_publisher_on_upload_error_publishing_facebook_uploader_upload_error (PublishingFacebookUploader* _sender,
+ GError* err,
+ gpointer self)
+{
#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_facebook_publisher_on_upload_error ((PublishingFacebookFacebookPublisher*) self, _sender, err);
-#line 3238 "FacebookPublishing.c"
+#line 3633 "FacebookPublishing.c"
}
-static void _publishing_facebook_facebook_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self) {
+static void
+_publishing_facebook_facebook_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number,
+ gdouble fraction_complete,
+ gpointer self)
+{
#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_facebook_publisher_on_upload_status_updated ((PublishingFacebookFacebookPublisher*) self, file_number, fraction_complete);
-#line 3245 "FacebookPublishing.c"
+#line 3644 "FacebookPublishing.c"
}
-static void publishing_facebook_facebook_publisher_do_upload (PublishingFacebookFacebookPublisher* self) {
+static void
+publishing_facebook_facebook_publisher_do_upload (PublishingFacebookFacebookPublisher* self)
+{
gchar* _tmp0_ = NULL;
PublishingFacebookPublishingParameters* _tmp1_;
gint _tmp2_;
@@ -3259,27 +3660,25 @@ static void publishing_facebook_facebook_publisher_do_upload (PublishingFacebook
SpitPublishingPluginHost* _tmp7_;
PublishingFacebookPublishingParameters* _tmp8_;
PublishingFacebookResolution _tmp9_;
- gint _tmp10_;
- PublishingFacebookPublishingParameters* _tmp11_;
- gboolean _tmp12_;
- void* _tmp13_;
- GDestroyNotify _tmp14_;
- SpitPublishingProgressCallback _tmp15_;
- gboolean _tmp16_;
+ PublishingFacebookPublishingParameters* _tmp10_;
+ gboolean _tmp11_;
+ void* _tmp12_;
+ GDestroyNotify _tmp13_;
+ SpitPublishingProgressCallback _tmp14_;
SpitPublishingPublishable** publishables = NULL;
- SpitPublishingPluginHost* _tmp17_;
- gint _tmp18_;
- SpitPublishingPublishable** _tmp19_;
+ SpitPublishingPluginHost* _tmp15_;
+ gint _tmp16_;
+ SpitPublishingPublishable** _tmp17_;
gint publishables_length1;
gint _publishables_size_;
- PublishingFacebookGraphSession* _tmp20_;
- PublishingFacebookPublishingParameters* _tmp21_;
- SpitPublishingPublishable** _tmp22_;
- gint _tmp22__length1;
+ PublishingFacebookGraphSession* _tmp18_;
+ PublishingFacebookPublishingParameters* _tmp19_;
+ SpitPublishingPublishable** _tmp20_;
+ gint _tmp20__length1;
+ PublishingFacebookUploader* _tmp21_;
+ PublishingFacebookUploader* _tmp22_;
PublishingFacebookUploader* _tmp23_;
PublishingFacebookUploader* _tmp24_;
- PublishingFacebookUploader* _tmp25_;
- PublishingFacebookUploader* _tmp26_;
#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
#line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -3288,7 +3687,7 @@ static void publishing_facebook_facebook_publisher_do_upload (PublishingFacebook
_tmp2_ = _tmp1_->target_album;
#line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
if (_tmp2_ == PUBLISHING_FACEBOOK_PUBLISHING_PARAMETERS_UNKNOWN_ALBUM) {
-#line 3286 "FacebookPublishing.c"
+#line 3685 "FacebookPublishing.c"
gchar* _tmp3_;
#line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_tmp3_ = g_strdup ("(none)");
@@ -3296,7 +3695,7 @@ static void publishing_facebook_facebook_publisher_do_upload (PublishingFacebook
_g_free0 (_tmp0_);
#line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_tmp0_ = _tmp3_;
-#line 3294 "FacebookPublishing.c"
+#line 3693 "FacebookPublishing.c"
} else {
PublishingFacebookPublishingParameters* _tmp4_;
gchar* _tmp5_;
@@ -3308,7 +3707,7 @@ static void publishing_facebook_facebook_publisher_do_upload (PublishingFacebook
_g_free0 (_tmp0_);
#line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_tmp0_ = _tmp5_;
-#line 3306 "FacebookPublishing.c"
+#line 3705 "FacebookPublishing.c"
}
#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_debug ("FacebookPublishing.vala:402: ACTION: uploading photos to album '%s'", _tmp0_);
@@ -3323,13 +3722,11 @@ static void publishing_facebook_facebook_publisher_do_upload (PublishingFacebook
#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_tmp9_ = _tmp8_->resolution;
#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp10_ = publishing_facebook_resolution_get_pixels (_tmp9_);
-#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp11_ = self->priv->publishing_params;
+ _tmp10_ = self->priv->publishing_params;
#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp12_ = _tmp11_->strip_metadata;
+ _tmp11_ = _tmp10_->strip_metadata;
#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp15_ = spit_publishing_plugin_host_serialize_publishables (_tmp7_, _tmp10_, _tmp12_, &_tmp13_, &_tmp14_);
+ _tmp14_ = spit_publishing_plugin_host_serialize_publishables (_tmp7_, publishing_facebook_resolution_get_pixels (_tmp9_), _tmp11_, &_tmp12_, &_tmp13_);
#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
(self->priv->progress_reporter_target_destroy_notify == NULL) ? NULL : (self->priv->progress_reporter_target_destroy_notify (self->priv->progress_reporter_target), NULL);
#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -3339,66 +3736,66 @@ static void publishing_facebook_facebook_publisher_do_upload (PublishingFacebook
#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
self->priv->progress_reporter_target_destroy_notify = NULL;
#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- self->priv->progress_reporter = _tmp15_;
+ self->priv->progress_reporter = _tmp14_;
#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- self->priv->progress_reporter_target = _tmp13_;
+ self->priv->progress_reporter_target = _tmp12_;
#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- self->priv->progress_reporter_target_destroy_notify = _tmp14_;
+ self->priv->progress_reporter_target_destroy_notify = _tmp13_;
#line 415 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp16_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 415 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- if (!_tmp16_) {
+ if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_g_free0 (_tmp0_);
#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return;
-#line 3350 "FacebookPublishing.c"
+#line 3745 "FacebookPublishing.c"
}
#line 418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp17_ = self->priv->host;
+ _tmp15_ = self->priv->host;
#line 418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp19_ = spit_publishing_plugin_host_get_publishables (_tmp17_, &_tmp18_);
+ _tmp17_ = spit_publishing_plugin_host_get_publishables (_tmp15_, &_tmp16_);
#line 418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- publishables = _tmp19_;
+ publishables = _tmp17_;
#line 418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- publishables_length1 = _tmp18_;
+ publishables_length1 = _tmp16_;
#line 418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_publishables_size_ = publishables_length1;
#line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp20_ = self->priv->graph_session;
+ _tmp18_ = self->priv->graph_session;
#line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp21_ = self->priv->publishing_params;
+ _tmp19_ = self->priv->publishing_params;
#line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp22_ = publishables;
+ _tmp20_ = publishables;
#line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp22__length1 = publishables_length1;
+ _tmp20__length1 = publishables_length1;
#line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp23_ = publishing_facebook_uploader_new (_tmp20_, _tmp21_, _tmp22_, _tmp22__length1);
+ _tmp21_ = publishing_facebook_uploader_new (_tmp18_, _tmp19_, _tmp20_, _tmp20__length1);
#line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_publishing_facebook_uploader_unref0 (self->priv->uploader);
#line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- self->priv->uploader = _tmp23_;
+ self->priv->uploader = _tmp21_;
#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp24_ = self->priv->uploader;
+ _tmp22_ = self->priv->uploader;
#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_signal_connect_object (_tmp24_, "upload-complete", (GCallback) _publishing_facebook_facebook_publisher_on_upload_complete_publishing_facebook_uploader_upload_complete, self, 0);
+ g_signal_connect_object (_tmp22_, "upload-complete", (GCallback) _publishing_facebook_facebook_publisher_on_upload_complete_publishing_facebook_uploader_upload_complete, self, 0);
#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp25_ = self->priv->uploader;
+ _tmp23_ = self->priv->uploader;
#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_signal_connect_object (_tmp25_, "upload-error", (GCallback) _publishing_facebook_facebook_publisher_on_upload_error_publishing_facebook_uploader_upload_error, self, 0);
+ g_signal_connect_object (_tmp23_, "upload-error", (GCallback) _publishing_facebook_facebook_publisher_on_upload_error_publishing_facebook_uploader_upload_error, self, 0);
#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp26_ = self->priv->uploader;
+ _tmp24_ = self->priv->uploader;
#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- publishing_facebook_uploader_upload (_tmp26_, _publishing_facebook_facebook_publisher_on_upload_status_updated_spit_publishing_progress_callback, self);
+ publishing_facebook_uploader_upload (_tmp24_, _publishing_facebook_facebook_publisher_on_upload_status_updated_spit_publishing_progress_callback, self);
#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishables = (_vala_array_free (publishables, publishables_length1, (GDestroyNotify) g_object_unref), NULL);
#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_g_free0 (_tmp0_);
-#line 3392 "FacebookPublishing.c"
+#line 3787 "FacebookPublishing.c"
}
-static void publishing_facebook_facebook_publisher_do_show_success_pane (PublishingFacebookFacebookPublisher* self) {
+static void
+publishing_facebook_facebook_publisher_do_show_success_pane (PublishingFacebookFacebookPublisher* self)
+{
SpitPublishingPluginHost* _tmp0_;
SpitPublishingPluginHost* _tmp1_;
#line 427 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -3413,41 +3810,38 @@ static void publishing_facebook_facebook_publisher_do_show_success_pane (Publish
_tmp1_ = self->priv->host;
#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
spit_publishing_plugin_host_install_success_pane (_tmp1_);
-#line 3411 "FacebookPublishing.c"
+#line 3808 "FacebookPublishing.c"
}
-static void publishing_facebook_facebook_publisher_on_generic_error (PublishingFacebookFacebookPublisher* self, GError* _error_) {
- GError* _tmp0_;
+static void
+publishing_facebook_facebook_publisher_on_generic_error (PublishingFacebookFacebookPublisher* self,
+ GError* _error_)
+{
#line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
#line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp0_ = _error_;
-#line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- if (g_error_matches (_tmp0_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_EXPIRED_SESSION)) {
+ if (g_error_matches (_error_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_EXPIRED_SESSION)) {
#line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_facebook_publisher_do_logout (self);
-#line 3425 "FacebookPublishing.c"
+#line 3822 "FacebookPublishing.c"
} else {
- SpitPublishingPluginHost* _tmp1_;
- GError* _tmp2_;
-#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp1_ = self->priv->host;
+ SpitPublishingPluginHost* _tmp0_;
#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp2_ = _error_;
+ _tmp0_ = self->priv->host;
#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- spit_publishing_plugin_host_post_error (_tmp1_, _tmp2_);
-#line 3435 "FacebookPublishing.c"
+ spit_publishing_plugin_host_post_error (_tmp0_, _error_);
+#line 3829 "FacebookPublishing.c"
}
}
-static void publishing_facebook_facebook_publisher_on_session_authenticated (PublishingFacebookFacebookPublisher* self) {
+static void
+publishing_facebook_facebook_publisher_on_session_authenticated (PublishingFacebookFacebookPublisher* self)
+{
PublishingFacebookGraphSession* _tmp0_;
guint _tmp1_;
- gboolean _tmp2_;
- PublishingFacebookGraphSession* _tmp3_;
- gboolean _tmp4_;
+ PublishingFacebookGraphSession* _tmp2_;
#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -3457,297 +3851,252 @@ static void publishing_facebook_facebook_publisher_on_session_authenticated (Pub
#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_facebook_facebook_publisher_on_session_authenticated_publishing_facebook_graph_session_authenticated, self);
#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp2_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- if (!_tmp2_) {
+ if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return;
-#line 3460 "FacebookPublishing.c"
+#line 3852 "FacebookPublishing.c"
}
#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp3_ = self->priv->graph_session;
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp4_ = publishing_facebook_graph_session_is_authenticated (_tmp3_);
+ _tmp2_ = self->priv->graph_session;
#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _vala_assert (_tmp4_, "graph_session.is_authenticated()");
+ _vala_assert (publishing_facebook_graph_session_is_authenticated (_tmp2_), "graph_session.is_authenticated()");
#line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_debug ("FacebookPublishing.vala:476: EVENT: an authenticated session has becom" \
"e available.");
#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_facebook_publisher_do_fetch_user_info (self);
-#line 3472 "FacebookPublishing.c"
+#line 3862 "FacebookPublishing.c"
}
-static void publishing_facebook_facebook_publisher_on_fetch_user_info_completed (PublishingFacebookFacebookPublisher* self, PublishingFacebookGraphMessage* message) {
- PublishingFacebookGraphMessage* _tmp0_;
+static void
+publishing_facebook_facebook_publisher_on_fetch_user_info_completed (PublishingFacebookFacebookPublisher* self,
+ PublishingFacebookGraphMessage* message)
+{
+ guint _tmp0_;
guint _tmp1_;
- PublishingFacebookGraphMessage* _tmp2_;
- guint _tmp3_;
- gboolean _tmp4_;
- PublishingFacebookGraphMessage* _tmp5_;
- gchar* _tmp6_;
- gchar* _tmp7_;
- PublishingFacebookGraphMessage* _tmp8_;
- gchar* _tmp9_;
- gchar* _tmp10_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
+ gchar* _tmp4_;
+ gchar* _tmp5_;
#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_MESSAGE (message));
#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp0_ = message;
+ g_signal_parse_name ("completed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp0_, NULL, FALSE);
#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_signal_parse_name ("completed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp1_, NULL, FALSE);
-#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_facebook_facebook_publisher_on_fetch_user_info_completed_publishing_facebook_graph_message_completed, self);
-#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp2_ = message;
+ g_signal_handlers_disconnect_matched (message, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_facebook_facebook_publisher_on_fetch_user_info_completed_publishing_facebook_graph_message_completed, self);
#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_signal_parse_name ("failed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp3_, NULL, FALSE);
+ g_signal_parse_name ("failed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp1_, NULL, FALSE);
#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_facebook_facebook_publisher_on_fetch_user_info_error_publishing_facebook_graph_message_failed, self);
+ g_signal_handlers_disconnect_matched (message, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_facebook_facebook_publisher_on_fetch_user_info_error_publishing_facebook_graph_message_failed, self);
#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- if (!_tmp4_) {
+ if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return;
-#line 3510 "FacebookPublishing.c"
+#line 3892 "FacebookPublishing.c"
}
#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp5_ = message;
-#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp6_ = publishing_facebook_graph_message_get_response_body (_tmp5_);
+ _tmp2_ = publishing_facebook_graph_message_get_response_body (message);
#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp7_ = _tmp6_;
+ _tmp3_ = _tmp2_;
#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_debug ("FacebookPublishing.vala:488: EVENT: user info fetch completed; respons" \
-"e = '%s'.", _tmp7_);
+"e = '%s'.", _tmp3_);
#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _g_free0 (_tmp7_);
-#line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp8_ = message;
+ _g_free0 (_tmp3_);
#line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp9_ = publishing_facebook_graph_message_get_response_body (_tmp8_);
+ _tmp4_ = publishing_facebook_graph_message_get_response_body (message);
#line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp10_ = _tmp9_;
+ _tmp5_ = _tmp4_;
#line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- publishing_facebook_facebook_publisher_do_extract_user_info_from_json (self, _tmp10_);
+ publishing_facebook_facebook_publisher_do_extract_user_info_from_json (self, _tmp5_);
#line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _g_free0 (_tmp10_);
-#line 3532 "FacebookPublishing.c"
+ _g_free0 (_tmp5_);
+#line 3910 "FacebookPublishing.c"
}
-static void publishing_facebook_facebook_publisher_on_fetch_user_info_error (PublishingFacebookFacebookPublisher* self, PublishingFacebookGraphMessage* message, GError* _error_) {
- PublishingFacebookGraphMessage* _tmp0_;
+static void
+publishing_facebook_facebook_publisher_on_fetch_user_info_error (PublishingFacebookFacebookPublisher* self,
+ PublishingFacebookGraphMessage* message,
+ GError* _error_)
+{
+ guint _tmp0_;
guint _tmp1_;
- PublishingFacebookGraphMessage* _tmp2_;
- guint _tmp3_;
- gboolean _tmp4_;
- GError* _tmp5_;
#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_MESSAGE (message));
#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp0_ = message;
-#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_signal_parse_name ("completed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp1_, NULL, FALSE);
+ g_signal_parse_name ("completed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp0_, NULL, FALSE);
#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_facebook_facebook_publisher_on_fetch_user_info_completed_publishing_facebook_graph_message_completed, self);
+ g_signal_handlers_disconnect_matched (message, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_facebook_facebook_publisher_on_fetch_user_info_completed_publishing_facebook_graph_message_completed, self);
#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp2_ = message;
+ g_signal_parse_name ("failed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp1_, NULL, FALSE);
#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_signal_parse_name ("failed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp3_, NULL, FALSE);
-#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_facebook_facebook_publisher_on_fetch_user_info_error_publishing_facebook_graph_message_failed, self);
-#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
+ g_signal_handlers_disconnect_matched (message, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_facebook_facebook_publisher_on_fetch_user_info_error_publishing_facebook_graph_message_failed, self);
#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- if (!_tmp4_) {
+ if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
#line 499 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return;
-#line 3565 "FacebookPublishing.c"
+#line 3937 "FacebookPublishing.c"
}
#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_debug ("FacebookPublishing.vala:501: EVENT: fetching user info generated and e" \
"rror.");
#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp5_ = _error_;
-#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- publishing_facebook_facebook_publisher_on_generic_error (self, _tmp5_);
-#line 3573 "FacebookPublishing.c"
+ publishing_facebook_facebook_publisher_on_generic_error (self, _error_);
+#line 3943 "FacebookPublishing.c"
}
-static void publishing_facebook_facebook_publisher_on_user_info_extracted (PublishingFacebookFacebookPublisher* self) {
- gboolean _tmp0_;
+static void
+publishing_facebook_facebook_publisher_on_user_info_extracted (PublishingFacebookFacebookPublisher* self)
+{
+ const gchar* _tmp0_;
const gchar* _tmp1_;
- const gchar* _tmp2_;
#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- if (!_tmp0_) {
+ if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
#line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return;
-#line 3589 "FacebookPublishing.c"
+#line 3958 "FacebookPublishing.c"
}
#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp1_ = self->priv->uid;
+ _tmp0_ = self->priv->uid;
#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp2_ = self->priv->username;
+ _tmp1_ = self->priv->username;
#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_debug ("FacebookPublishing.vala:510: EVENT: user info extracted from JSON resp" \
-"onse: uid = %s; name = %s.", _tmp1_, _tmp2_);
+"onse: uid = %s; name = %s.", _tmp0_, _tmp1_);
#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_facebook_publisher_do_fetch_album_descriptions (self);
-#line 3599 "FacebookPublishing.c"
+#line 3968 "FacebookPublishing.c"
}
-static void publishing_facebook_facebook_publisher_on_fetch_albums_completed (PublishingFacebookFacebookPublisher* self, PublishingFacebookGraphMessage* message) {
- PublishingFacebookGraphMessage* _tmp0_;
+static void
+publishing_facebook_facebook_publisher_on_fetch_albums_completed (PublishingFacebookFacebookPublisher* self,
+ PublishingFacebookGraphMessage* message)
+{
+ guint _tmp0_;
guint _tmp1_;
- PublishingFacebookGraphMessage* _tmp2_;
- guint _tmp3_;
- gboolean _tmp4_;
- PublishingFacebookGraphMessage* _tmp5_;
- gchar* _tmp6_;
- gchar* _tmp7_;
- PublishingFacebookGraphMessage* _tmp8_;
- gchar* _tmp9_;
- gchar* _tmp10_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
+ gchar* _tmp4_;
+ gchar* _tmp5_;
#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_MESSAGE (message));
#line 516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp0_ = message;
-#line 516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_signal_parse_name ("completed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp1_, NULL, FALSE);
+ g_signal_parse_name ("completed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp0_, NULL, FALSE);
#line 516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_facebook_facebook_publisher_on_fetch_albums_completed_publishing_facebook_graph_message_completed, self);
-#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp2_ = message;
+ g_signal_handlers_disconnect_matched (message, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_facebook_facebook_publisher_on_fetch_albums_completed_publishing_facebook_graph_message_completed, self);
#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_signal_parse_name ("failed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp3_, NULL, FALSE);
+ g_signal_parse_name ("failed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp1_, NULL, FALSE);
#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_facebook_facebook_publisher_on_fetch_albums_error_publishing_facebook_graph_message_failed, self);
-#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
+ g_signal_handlers_disconnect_matched (message, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_facebook_facebook_publisher_on_fetch_albums_error_publishing_facebook_graph_message_failed, self);
#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- if (!_tmp4_) {
+ if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return;
-#line 3637 "FacebookPublishing.c"
+#line 3998 "FacebookPublishing.c"
}
#line 522 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp5_ = message;
+ _tmp2_ = publishing_facebook_graph_message_get_response_body (message);
#line 522 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp6_ = publishing_facebook_graph_message_get_response_body (_tmp5_);
-#line 522 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp7_ = _tmp6_;
+ _tmp3_ = _tmp2_;
#line 522 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_debug ("FacebookPublishing.vala:522: EVENT: album descriptions fetch transacti" \
-"on completed; response = '%s'.", _tmp7_);
+"on completed; response = '%s'.", _tmp3_);
#line 522 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _g_free0 (_tmp7_);
-#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp8_ = message;
+ _g_free0 (_tmp3_);
#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp9_ = publishing_facebook_graph_message_get_response_body (_tmp8_);
+ _tmp4_ = publishing_facebook_graph_message_get_response_body (message);
#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp10_ = _tmp9_;
+ _tmp5_ = _tmp4_;
#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- publishing_facebook_facebook_publisher_do_extract_albums_from_json (self, _tmp10_);
+ publishing_facebook_facebook_publisher_do_extract_albums_from_json (self, _tmp5_);
#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _g_free0 (_tmp10_);
-#line 3659 "FacebookPublishing.c"
+ _g_free0 (_tmp5_);
+#line 4016 "FacebookPublishing.c"
}
-static void publishing_facebook_facebook_publisher_on_fetch_albums_error (PublishingFacebookFacebookPublisher* self, PublishingFacebookGraphMessage* message, GError* err) {
- PublishingFacebookGraphMessage* _tmp0_;
+static void
+publishing_facebook_facebook_publisher_on_fetch_albums_error (PublishingFacebookFacebookPublisher* self,
+ PublishingFacebookGraphMessage* message,
+ GError* err)
+{
+ guint _tmp0_;
guint _tmp1_;
- PublishingFacebookGraphMessage* _tmp2_;
- guint _tmp3_;
- gboolean _tmp4_;
- GError* _tmp5_;
#line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
#line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_MESSAGE (message));
#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp0_ = message;
-#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_signal_parse_name ("completed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp1_, NULL, FALSE);
+ g_signal_parse_name ("completed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp0_, NULL, FALSE);
#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_facebook_facebook_publisher_on_fetch_albums_completed_publishing_facebook_graph_message_completed, self);
+ g_signal_handlers_disconnect_matched (message, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_facebook_facebook_publisher_on_fetch_albums_completed_publishing_facebook_graph_message_completed, self);
#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp2_ = message;
+ g_signal_parse_name ("failed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp1_, NULL, FALSE);
#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_signal_parse_name ("failed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp3_, NULL, FALSE);
-#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_facebook_facebook_publisher_on_fetch_albums_error_publishing_facebook_graph_message_failed, self);
-#line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
+ g_signal_handlers_disconnect_matched (message, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_facebook_facebook_publisher_on_fetch_albums_error_publishing_facebook_graph_message_failed, self);
#line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- if (!_tmp4_) {
+ if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
#line 534 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return;
-#line 3692 "FacebookPublishing.c"
+#line 4043 "FacebookPublishing.c"
}
#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_debug ("FacebookPublishing.vala:536: EVENT: album description fetch attempt ge" \
"nerated an error.");
#line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp5_ = err;
-#line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- publishing_facebook_facebook_publisher_on_generic_error (self, _tmp5_);
-#line 3700 "FacebookPublishing.c"
+ publishing_facebook_facebook_publisher_on_generic_error (self, err);
+#line 4049 "FacebookPublishing.c"
}
-static void publishing_facebook_facebook_publisher_on_albums_extracted (PublishingFacebookFacebookPublisher* self) {
- gboolean _tmp0_;
- PublishingFacebookPublishingParameters* _tmp1_;
- PublishingFacebookAlbum** _tmp2_;
- gint _tmp2__length1;
+static void
+publishing_facebook_facebook_publisher_on_albums_extracted (PublishingFacebookFacebookPublisher* self)
+{
+ PublishingFacebookPublishingParameters* _tmp0_;
+ PublishingFacebookAlbum** _tmp1_;
+ gint _tmp1__length1;
#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
#line 542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- if (!_tmp0_) {
+ if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return;
-#line 3717 "FacebookPublishing.c"
+#line 4065 "FacebookPublishing.c"
}
#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp1_ = self->priv->publishing_params;
+ _tmp0_ = self->priv->publishing_params;
#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp2_ = _tmp1_->albums;
+ _tmp1_ = _tmp0_->albums;
#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp2__length1 = _tmp1_->albums_length1;
+ _tmp1__length1 = _tmp0_->albums_length1;
#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_debug ("FacebookPublishing.vala:545: EVENT: successfully extracted %d albums f" \
-"rom JSON response", _tmp2__length1);
+"rom JSON response", _tmp1__length1);
#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_facebook_publisher_do_show_publishing_options_pane (self);
-#line 3729 "FacebookPublishing.c"
+#line 4077 "FacebookPublishing.c"
}
-static void publishing_facebook_facebook_publisher_on_publishing_options_pane_logout (PublishingFacebookFacebookPublisher* self) {
+static void
+publishing_facebook_facebook_publisher_on_publishing_options_pane_logout (PublishingFacebookFacebookPublisher* self)
+{
PublishingFacebookPublishingOptionsPane* _tmp0_;
guint _tmp1_;
PublishingFacebookPublishingOptionsPane* _tmp2_;
guint _tmp3_;
- gboolean _tmp4_;
#line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
#line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -3763,38 +4112,35 @@ static void publishing_facebook_facebook_publisher_on_publishing_options_pane_lo
#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_facebook_facebook_publisher_on_publishing_options_pane_logout_publishing_facebook_publishing_options_pane_logout, self);
#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- if (!_tmp4_) {
+ if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
#line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return;
-#line 3759 "FacebookPublishing.c"
+#line 4106 "FacebookPublishing.c"
}
#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_debug ("FacebookPublishing.vala:558: EVENT: user clicked 'Logout' in publishin" \
"g options pane.");
#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_facebook_publisher_do_logout (self);
-#line 3765 "FacebookPublishing.c"
+#line 4112 "FacebookPublishing.c"
}
-static void publishing_facebook_facebook_publisher_on_publishing_options_pane_publish (PublishingFacebookFacebookPublisher* self, const gchar* target_album, const gchar* privacy_setting, PublishingFacebookResolution resolution, gboolean strip_metadata) {
+static void
+publishing_facebook_facebook_publisher_on_publishing_options_pane_publish (PublishingFacebookFacebookPublisher* self,
+ const gchar* target_album,
+ const gchar* privacy_setting,
+ PublishingFacebookResolution resolution,
+ gboolean strip_metadata)
+{
PublishingFacebookPublishingOptionsPane* _tmp0_;
guint _tmp1_;
PublishingFacebookPublishingOptionsPane* _tmp2_;
guint _tmp3_;
- gboolean _tmp4_;
+ PublishingFacebookPublishingParameters* _tmp4_;
PublishingFacebookPublishingParameters* _tmp5_;
- gboolean _tmp6_;
- gboolean _tmp7_;
- PublishingFacebookPublishingParameters* _tmp8_;
- PublishingFacebookResolution _tmp9_;
- PublishingFacebookResolution _tmp10_;
- PublishingFacebookPublishingParameters* _tmp11_;
- const gchar* _tmp12_;
- gchar* _tmp13_;
- const gchar* _tmp14_;
+ PublishingFacebookPublishingParameters* _tmp6_;
+ gchar* _tmp7_;
#line 563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
#line 563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -3812,351 +4158,286 @@ static void publishing_facebook_facebook_publisher_on_publishing_options_pane_pu
#line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_facebook_facebook_publisher_on_publishing_options_pane_logout_publishing_facebook_publishing_options_pane_logout, self);
#line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- if (!_tmp4_) {
+ if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return;
-#line 3807 "FacebookPublishing.c"
+#line 4151 "FacebookPublishing.c"
}
#line 571 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_debug ("FacebookPublishing.vala:571: EVENT: user clicked 'Publish' in publishi" \
"ng options pane.");
#line 573 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp5_ = self->priv->publishing_params;
-#line 573 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp6_ = strip_metadata;
+ _tmp4_ = self->priv->publishing_params;
#line 573 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp5_->strip_metadata = _tmp6_;
-#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp7_ = strip_metadata;
+ _tmp4_->strip_metadata = strip_metadata;
#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- publishing_facebook_facebook_publisher_set_persistent_strip_metadata (self, _tmp7_);
+ publishing_facebook_facebook_publisher_set_persistent_strip_metadata (self, strip_metadata);
#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp8_ = self->priv->publishing_params;
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp9_ = resolution;
+ _tmp5_ = self->priv->publishing_params;
#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp8_->resolution = _tmp9_;
+ _tmp5_->resolution = resolution;
#line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp10_ = resolution;
-#line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- publishing_facebook_facebook_publisher_set_persistent_default_size (self, (gint) _tmp10_);
-#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp11_ = self->priv->publishing_params;
+ publishing_facebook_facebook_publisher_set_persistent_default_size (self, (gint) resolution);
#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp12_ = privacy_setting;
+ _tmp6_ = self->priv->publishing_params;
#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp13_ = g_strdup (_tmp12_);
+ _tmp7_ = g_strdup (privacy_setting);
#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _g_free0 (_tmp11_->privacy_object);
+ _g_free0 (_tmp6_->privacy_object);
#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp11_->privacy_object = _tmp13_;
-#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp14_ = target_album;
+ _tmp6_->privacy_object = _tmp7_;
#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- if (_tmp14_ != NULL) {
-#line 3845 "FacebookPublishing.c"
- PublishingFacebookPublishingParameters* _tmp15_;
- const gchar* _tmp16_;
- PublishingFacebookPublishingParameters* _tmp17_;
- gint _tmp18_;
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp15_ = self->priv->publishing_params;
+ if (target_album != NULL) {
+#line 4177 "FacebookPublishing.c"
+ PublishingFacebookPublishingParameters* _tmp8_;
+ PublishingFacebookPublishingParameters* _tmp9_;
+ gint _tmp10_;
#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp16_ = target_album;
+ _tmp8_ = self->priv->publishing_params;
#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- publishing_facebook_publishing_parameters_set_target_album_by_name (_tmp15_, _tmp16_);
+ publishing_facebook_publishing_parameters_set_target_album_by_name (_tmp8_, target_album);
#line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp17_ = self->priv->publishing_params;
+ _tmp9_ = self->priv->publishing_params;
#line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp18_ = _tmp17_->target_album;
+ _tmp10_ = _tmp9_->target_album;
#line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- if (_tmp18_ != PUBLISHING_FACEBOOK_PUBLISHING_PARAMETERS_UNKNOWN_ALBUM) {
+ if (_tmp10_ != PUBLISHING_FACEBOOK_PUBLISHING_PARAMETERS_UNKNOWN_ALBUM) {
#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_facebook_publisher_do_upload (self);
-#line 3864 "FacebookPublishing.c"
+#line 4193 "FacebookPublishing.c"
} else {
- PublishingFacebookPublishingParameters* _tmp19_;
- const gchar* _tmp20_;
- gchar* _tmp21_;
-#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp19_ = self->priv->publishing_params;
+ PublishingFacebookPublishingParameters* _tmp11_;
+ gchar* _tmp12_;
#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp20_ = target_album;
+ _tmp11_ = self->priv->publishing_params;
#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp21_ = g_strdup (_tmp20_);
+ _tmp12_ = g_strdup (target_album);
#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _g_free0 (_tmp19_->new_album_name);
+ _g_free0 (_tmp11_->new_album_name);
#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp19_->new_album_name = _tmp21_;
+ _tmp11_->new_album_name = _tmp12_;
#line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_facebook_publisher_do_create_new_album (self);
-#line 3881 "FacebookPublishing.c"
+#line 4207 "FacebookPublishing.c"
}
} else {
#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_facebook_publisher_do_upload (self);
-#line 3886 "FacebookPublishing.c"
+#line 4212 "FacebookPublishing.c"
}
}
-static void publishing_facebook_facebook_publisher_on_create_album_completed (PublishingFacebookFacebookPublisher* self, PublishingFacebookGraphMessage* message) {
- PublishingFacebookGraphMessage* _tmp0_;
+static void
+publishing_facebook_facebook_publisher_on_create_album_completed (PublishingFacebookFacebookPublisher* self,
+ PublishingFacebookGraphMessage* message)
+{
+ guint _tmp0_;
guint _tmp1_;
- PublishingFacebookGraphMessage* _tmp2_;
- guint _tmp3_;
- PublishingFacebookPublishingParameters* _tmp4_;
- const gchar* _tmp5_;
- gboolean _tmp6_;
- PublishingFacebookGraphMessage* _tmp7_;
+ PublishingFacebookPublishingParameters* _tmp2_;
+ const gchar* _tmp3_;
+ gchar* _tmp4_;
+ gchar* _tmp5_;
+ PublishingFacebookPublishingParameters* _tmp6_;
+ const gchar* _tmp7_;
gchar* _tmp8_;
gchar* _tmp9_;
- PublishingFacebookPublishingParameters* _tmp10_;
- const gchar* _tmp11_;
- PublishingFacebookGraphMessage* _tmp12_;
- gchar* _tmp13_;
- gchar* _tmp14_;
#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_MESSAGE (message));
#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp0_ = message;
+ g_signal_parse_name ("completed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp0_, NULL, FALSE);
#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_signal_parse_name ("completed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp1_, NULL, FALSE);
-#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_facebook_facebook_publisher_on_create_album_completed_publishing_facebook_graph_message_completed, self);
-#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp2_ = message;
+ g_signal_handlers_disconnect_matched (message, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_facebook_facebook_publisher_on_create_album_completed_publishing_facebook_graph_message_completed, self);
#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_signal_parse_name ("failed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp3_, NULL, FALSE);
+ g_signal_parse_name ("failed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp1_, NULL, FALSE);
#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_facebook_facebook_publisher_on_create_album_error_publishing_facebook_graph_message_failed, self);
+ g_signal_handlers_disconnect_matched (message, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_facebook_facebook_publisher_on_create_album_error_publishing_facebook_graph_message_failed, self);
#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp4_ = self->priv->publishing_params;
+ _tmp2_ = self->priv->publishing_params;
#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp5_ = _tmp4_->new_album_name;
+ _tmp3_ = _tmp2_->new_album_name;
#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _vala_assert (_tmp5_ != NULL, "publishing_params.new_album_name != null");
-#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp6_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
+ _vala_assert (_tmp3_ != NULL, "publishing_params.new_album_name != null");
#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- if (!_tmp6_) {
+ if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return;
-#line 3935 "FacebookPublishing.c"
+#line 4253 "FacebookPublishing.c"
}
#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp7_ = message;
-#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp8_ = publishing_facebook_graph_message_get_response_body (_tmp7_);
+ _tmp4_ = publishing_facebook_graph_message_get_response_body (message);
#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp9_ = _tmp8_;
+ _tmp5_ = _tmp4_;
#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_debug ("FacebookPublishing.vala:604: EVENT: created new album resource on remo" \
-"te host; response body = %s.\n", _tmp9_);
+"te host; response body = %s.\n", _tmp5_);
#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _g_free0 (_tmp9_);
-#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp10_ = self->priv->publishing_params;
+ _g_free0 (_tmp5_);
#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp11_ = _tmp10_->new_album_name;
+ _tmp6_ = self->priv->publishing_params;
#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp12_ = message;
+ _tmp7_ = _tmp6_->new_album_name;
#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp13_ = publishing_facebook_graph_message_get_response_body (_tmp12_);
+ _tmp8_ = publishing_facebook_graph_message_get_response_body (message);
#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp14_ = _tmp13_;
+ _tmp9_ = _tmp8_;
#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- publishing_facebook_facebook_publisher_do_add_new_local_album_from_json (self, _tmp11_, _tmp14_);
+ publishing_facebook_facebook_publisher_do_add_new_local_album_from_json (self, _tmp7_, _tmp9_);
#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _g_free0 (_tmp14_);
-#line 3961 "FacebookPublishing.c"
+ _g_free0 (_tmp9_);
+#line 4275 "FacebookPublishing.c"
}
-static void publishing_facebook_facebook_publisher_on_create_album_error (PublishingFacebookFacebookPublisher* self, PublishingFacebookGraphMessage* message, GError* err) {
- PublishingFacebookGraphMessage* _tmp0_;
+static void
+publishing_facebook_facebook_publisher_on_create_album_error (PublishingFacebookFacebookPublisher* self,
+ PublishingFacebookGraphMessage* message,
+ GError* err)
+{
+ guint _tmp0_;
guint _tmp1_;
- PublishingFacebookGraphMessage* _tmp2_;
- guint _tmp3_;
- gboolean _tmp4_;
- GError* _tmp5_;
#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_MESSAGE (message));
#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp0_ = message;
-#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_signal_parse_name ("completed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp1_, NULL, FALSE);
+ g_signal_parse_name ("completed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp0_, NULL, FALSE);
#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_facebook_facebook_publisher_on_create_album_completed_publishing_facebook_graph_message_completed, self);
-#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp2_ = message;
+ g_signal_handlers_disconnect_matched (message, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_facebook_facebook_publisher_on_create_album_completed_publishing_facebook_graph_message_completed, self);
#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_signal_parse_name ("failed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp3_, NULL, FALSE);
+ g_signal_parse_name ("failed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp1_, NULL, FALSE);
#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_facebook_facebook_publisher_on_create_album_error_publishing_facebook_graph_message_failed, self);
-#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
+ g_signal_handlers_disconnect_matched (message, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_facebook_facebook_publisher_on_create_album_error_publishing_facebook_graph_message_failed, self);
#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- if (!_tmp4_) {
+ if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return;
-#line 3994 "FacebookPublishing.c"
+#line 4302 "FacebookPublishing.c"
}
#line 618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_debug ("FacebookPublishing.vala:618: EVENT: attempt to create new album genera" \
"ted an error.");
#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp5_ = err;
-#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- publishing_facebook_facebook_publisher_on_generic_error (self, _tmp5_);
-#line 4002 "FacebookPublishing.c"
+ publishing_facebook_facebook_publisher_on_generic_error (self, err);
+#line 4308 "FacebookPublishing.c"
}
-static void publishing_facebook_facebook_publisher_on_upload_status_updated (PublishingFacebookFacebookPublisher* self, gint file_number, gdouble completed_fraction) {
- gboolean _tmp0_;
- gdouble _tmp1_;
- SpitPublishingProgressCallback _tmp2_;
- void* _tmp2__target;
- SpitPublishingProgressCallback _tmp3_;
- void* _tmp3__target;
- gint _tmp4_;
- gdouble _tmp5_;
+static void
+publishing_facebook_facebook_publisher_on_upload_status_updated (PublishingFacebookFacebookPublisher* self,
+ gint file_number,
+ gdouble completed_fraction)
+{
+ SpitPublishingProgressCallback _tmp0_;
+ void* _tmp0__target;
+ SpitPublishingProgressCallback _tmp1_;
+ void* _tmp1__target;
#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
#line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- if (!_tmp0_) {
+ if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return;
-#line 4023 "FacebookPublishing.c"
+#line 4327 "FacebookPublishing.c"
}
#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp1_ = completed_fraction;
-#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_debug ("FacebookPublishing.vala:627: EVENT: uploader reports upload %.2f perce" \
-"nt complete.", 100.0 * _tmp1_);
+"nt complete.", 100.0 * completed_fraction);
#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp2_ = self->priv->progress_reporter;
+ _tmp0_ = self->priv->progress_reporter;
#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp2__target = self->priv->progress_reporter_target;
+ _tmp0__target = self->priv->progress_reporter_target;
#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _vala_assert (_tmp2_ != NULL, "progress_reporter != null");
-#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp3_ = self->priv->progress_reporter;
-#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp3__target = self->priv->progress_reporter_target;
+ _vala_assert (_tmp0_ != NULL, "progress_reporter != null");
#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp4_ = file_number;
+ _tmp1_ = self->priv->progress_reporter;
#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp5_ = completed_fraction;
+ _tmp1__target = self->priv->progress_reporter_target;
#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp3_ (_tmp4_, _tmp5_, _tmp3__target);
-#line 4045 "FacebookPublishing.c"
+ _tmp1_ (file_number, completed_fraction, _tmp1__target);
+#line 4343 "FacebookPublishing.c"
}
-static void publishing_facebook_facebook_publisher_on_upload_complete (PublishingFacebookFacebookPublisher* self, PublishingFacebookUploader* uploader, gint num_published) {
- PublishingFacebookUploader* _tmp0_;
+static void
+publishing_facebook_facebook_publisher_on_upload_complete (PublishingFacebookFacebookPublisher* self,
+ PublishingFacebookUploader* uploader,
+ gint num_published)
+{
+ guint _tmp0_;
guint _tmp1_;
- PublishingFacebookUploader* _tmp2_;
- guint _tmp3_;
- gboolean _tmp4_;
- gint _tmp5_;
#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_if_fail (PUBLISHING_FACEBOOK_IS_UPLOADER (uploader));
#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp0_ = uploader;
-#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_signal_parse_name ("upload-complete", PUBLISHING_FACEBOOK_TYPE_UPLOADER, &_tmp1_, NULL, FALSE);
+ g_signal_parse_name ("upload-complete", PUBLISHING_FACEBOOK_TYPE_UPLOADER, &_tmp0_, NULL, FALSE);
#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_facebook_facebook_publisher_on_upload_complete_publishing_facebook_uploader_upload_complete, self);
+ g_signal_handlers_disconnect_matched (uploader, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_facebook_facebook_publisher_on_upload_complete_publishing_facebook_uploader_upload_complete, self);
#line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp2_ = uploader;
+ g_signal_parse_name ("upload-error", PUBLISHING_FACEBOOK_TYPE_UPLOADER, &_tmp1_, NULL, FALSE);
#line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_signal_parse_name ("upload-error", PUBLISHING_FACEBOOK_TYPE_UPLOADER, &_tmp3_, NULL, FALSE);
-#line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_facebook_facebook_publisher_on_upload_error_publishing_facebook_uploader_upload_error, self);
-#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
+ g_signal_handlers_disconnect_matched (uploader, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_facebook_facebook_publisher_on_upload_error_publishing_facebook_uploader_upload_error, self);
#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- if (!_tmp4_) {
+ if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
#line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return;
-#line 4078 "FacebookPublishing.c"
+#line 4370 "FacebookPublishing.c"
}
#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp5_ = num_published;
-#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_debug ("FacebookPublishing.vala:641: EVENT: uploader reports upload complete; " \
-"%d items published.", _tmp5_);
+"%d items published.", num_published);
#line 643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_facebook_publisher_do_show_success_pane (self);
-#line 4086 "FacebookPublishing.c"
+#line 4376 "FacebookPublishing.c"
}
-static void publishing_facebook_facebook_publisher_on_upload_error (PublishingFacebookFacebookPublisher* self, PublishingFacebookUploader* uploader, GError* err) {
- PublishingFacebookUploader* _tmp0_;
+static void
+publishing_facebook_facebook_publisher_on_upload_error (PublishingFacebookFacebookPublisher* self,
+ PublishingFacebookUploader* uploader,
+ GError* err)
+{
+ guint _tmp0_;
guint _tmp1_;
- PublishingFacebookUploader* _tmp2_;
- guint _tmp3_;
- gboolean _tmp4_;
- GError* _tmp5_;
- const gchar* _tmp6_;
- SpitPublishingPluginHost* _tmp7_;
- GError* _tmp8_;
+ const gchar* _tmp2_;
+ SpitPublishingPluginHost* _tmp3_;
#line 646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
#line 646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_if_fail (PUBLISHING_FACEBOOK_IS_UPLOADER (uploader));
#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp0_ = uploader;
+ g_signal_parse_name ("upload-complete", PUBLISHING_FACEBOOK_TYPE_UPLOADER, &_tmp0_, NULL, FALSE);
#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_signal_parse_name ("upload-complete", PUBLISHING_FACEBOOK_TYPE_UPLOADER, &_tmp1_, NULL, FALSE);
-#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_facebook_facebook_publisher_on_upload_complete_publishing_facebook_uploader_upload_complete, self);
-#line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp2_ = uploader;
+ g_signal_handlers_disconnect_matched (uploader, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_facebook_facebook_publisher_on_upload_complete_publishing_facebook_uploader_upload_complete, self);
#line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_signal_parse_name ("upload-error", PUBLISHING_FACEBOOK_TYPE_UPLOADER, &_tmp3_, NULL, FALSE);
+ g_signal_parse_name ("upload-error", PUBLISHING_FACEBOOK_TYPE_UPLOADER, &_tmp1_, NULL, FALSE);
#line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_facebook_facebook_publisher_on_upload_error_publishing_facebook_uploader_upload_error, self);
-#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
+ g_signal_handlers_disconnect_matched (uploader, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_facebook_facebook_publisher_on_upload_error_publishing_facebook_uploader_upload_error, self);
#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- if (!_tmp4_) {
+ if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return;
-#line 4122 "FacebookPublishing.c"
+#line 4405 "FacebookPublishing.c"
}
#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp5_ = err;
-#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp6_ = _tmp5_->message;
+ _tmp2_ = err->message;
#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_debug ("FacebookPublishing.vala:653: EVENT: uploader reports upload error = '%" \
-"s'.", _tmp6_);
-#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp7_ = self->priv->host;
+"s'.", _tmp2_);
#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp8_ = err;
+ _tmp3_ = self->priv->host;
#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- spit_publishing_plugin_host_post_error (_tmp7_, _tmp8_);
-#line 4136 "FacebookPublishing.c"
+ spit_publishing_plugin_host_post_error (_tmp3_, err);
+#line 4415 "FacebookPublishing.c"
}
-static SpitPublishingService* publishing_facebook_facebook_publisher_real_get_service (SpitPublishingPublisher* base) {
+static SpitPublishingService*
+publishing_facebook_facebook_publisher_real_get_service (SpitPublishingPublisher* base)
+{
PublishingFacebookFacebookPublisher * self;
SpitPublishingService* result = NULL;
SpitPublishingService* _tmp0_;
@@ -4171,11 +4452,13 @@ static SpitPublishingService* publishing_facebook_facebook_publisher_real_get_se
result = _tmp1_;
#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return result;
-#line 4155 "FacebookPublishing.c"
+#line 4436 "FacebookPublishing.c"
}
-gchar* publishing_facebook_facebook_publisher_get_service_name (PublishingFacebookFacebookPublisher* self) {
+gchar*
+publishing_facebook_facebook_publisher_get_service_name (PublishingFacebookFacebookPublisher* self)
+{
gchar* result = NULL;
gchar* _tmp0_;
#line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -4186,11 +4469,13 @@ gchar* publishing_facebook_facebook_publisher_get_service_name (PublishingFacebo
result = _tmp0_;
#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return result;
-#line 4170 "FacebookPublishing.c"
+#line 4453 "FacebookPublishing.c"
}
-gchar* publishing_facebook_facebook_publisher_get_user_visible_name (PublishingFacebookFacebookPublisher* self) {
+gchar*
+publishing_facebook_facebook_publisher_get_user_visible_name (PublishingFacebookFacebookPublisher* self)
+{
gchar* result = NULL;
gchar* _tmp0_;
#line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -4201,68 +4486,75 @@ gchar* publishing_facebook_facebook_publisher_get_user_visible_name (PublishingF
result = _tmp0_;
#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return result;
-#line 4185 "FacebookPublishing.c"
+#line 4470 "FacebookPublishing.c"
}
-static void _publishing_facebook_facebook_publisher_on_authenticator_succeeded_spit_publishing_authenticator_authenticated (SpitPublishingAuthenticator* _sender, gpointer self) {
+static void
+_publishing_facebook_facebook_publisher_on_authenticator_succeeded_spit_publishing_authenticator_authenticated (SpitPublishingAuthenticator* _sender,
+ gpointer self)
+{
#line 682 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_facebook_publisher_on_authenticator_succeeded ((PublishingFacebookFacebookPublisher*) self);
-#line 4192 "FacebookPublishing.c"
+#line 4480 "FacebookPublishing.c"
}
-static void _publishing_facebook_facebook_publisher_on_authenticator_failed_spit_publishing_authenticator_authentication_failed (SpitPublishingAuthenticator* _sender, gpointer self) {
+static void
+_publishing_facebook_facebook_publisher_on_authenticator_failed_spit_publishing_authenticator_authentication_failed (SpitPublishingAuthenticator* _sender,
+ gpointer self)
+{
#line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_facebook_publisher_on_authenticator_failed ((PublishingFacebookFacebookPublisher*) self);
-#line 4199 "FacebookPublishing.c"
+#line 4490 "FacebookPublishing.c"
}
-static void publishing_facebook_facebook_publisher_real_start (SpitPublishingPublisher* base) {
+static void
+publishing_facebook_facebook_publisher_real_start (SpitPublishingPublisher* base)
+{
PublishingFacebookFacebookPublisher * self;
- gboolean _tmp0_;
- PublishingFacebookPublishingParameters* _tmp1_;
+ PublishingFacebookPublishingParameters* _tmp0_;
+ SpitPublishingAuthenticator* _tmp1_;
SpitPublishingAuthenticator* _tmp2_;
SpitPublishingAuthenticator* _tmp3_;
- SpitPublishingAuthenticator* _tmp4_;
#line 670 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FACEBOOK_TYPE_FACEBOOK_PUBLISHER, PublishingFacebookFacebookPublisher);
#line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- if (_tmp0_) {
+ if (spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
#line 672 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return;
-#line 4218 "FacebookPublishing.c"
+#line 4508 "FacebookPublishing.c"
}
#line 674 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_debug ("FacebookPublishing.vala:674: FacebookPublisher: starting interaction.");
#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
self->priv->running = TRUE;
#line 680 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp1_ = publishing_facebook_publishing_parameters_new ();
+ _tmp0_ = publishing_facebook_publishing_parameters_new ();
#line 680 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_publishing_facebook_publishing_parameters_unref0 (self->priv->publishing_params);
#line 680 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- self->priv->publishing_params = _tmp1_;
+ self->priv->publishing_params = _tmp0_;
#line 682 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp2_ = self->priv->authenticator;
+ _tmp1_ = self->priv->authenticator;
#line 682 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_signal_connect_object (_tmp2_, "authenticated", (GCallback) _publishing_facebook_facebook_publisher_on_authenticator_succeeded_spit_publishing_authenticator_authenticated, self, 0);
+ g_signal_connect_object (_tmp1_, "authenticated", (GCallback) _publishing_facebook_facebook_publisher_on_authenticator_succeeded_spit_publishing_authenticator_authenticated, self, 0);
#line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp3_ = self->priv->authenticator;
+ _tmp2_ = self->priv->authenticator;
#line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_signal_connect_object (_tmp3_, "authentication-failed", (GCallback) _publishing_facebook_facebook_publisher_on_authenticator_failed_spit_publishing_authenticator_authentication_failed, self, 0);
+ g_signal_connect_object (_tmp2_, "authentication-failed", (GCallback) _publishing_facebook_facebook_publisher_on_authenticator_failed_spit_publishing_authenticator_authentication_failed, self, 0);
#line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp4_ = self->priv->authenticator;
+ _tmp3_ = self->priv->authenticator;
#line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- spit_publishing_authenticator_authenticate (_tmp4_);
-#line 4242 "FacebookPublishing.c"
+ spit_publishing_authenticator_authenticate (_tmp3_);
+#line 4532 "FacebookPublishing.c"
}
-static void publishing_facebook_facebook_publisher_real_stop (SpitPublishingPublisher* base) {
+static void
+publishing_facebook_facebook_publisher_real_stop (SpitPublishingPublisher* base)
+{
PublishingFacebookFacebookPublisher * self;
PublishingFacebookGraphSession* _tmp0_;
#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -4273,23 +4565,25 @@ static void publishing_facebook_facebook_publisher_real_stop (SpitPublishingPubl
_tmp0_ = self->priv->graph_session;
#line 690 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
if (_tmp0_ != NULL) {
-#line 4257 "FacebookPublishing.c"
+#line 4549 "FacebookPublishing.c"
PublishingFacebookGraphSession* _tmp1_;
#line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_tmp1_ = self->priv->graph_session;
#line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_graph_session_stop_transactions (_tmp1_);
-#line 4263 "FacebookPublishing.c"
+#line 4555 "FacebookPublishing.c"
}
#line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
self->priv->host = NULL;
#line 694 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
self->priv->running = FALSE;
-#line 4269 "FacebookPublishing.c"
+#line 4561 "FacebookPublishing.c"
}
-static gboolean publishing_facebook_facebook_publisher_real_is_running (SpitPublishingPublisher* base) {
+static gboolean
+publishing_facebook_facebook_publisher_real_is_running (SpitPublishingPublisher* base)
+{
PublishingFacebookFacebookPublisher * self;
gboolean result = FALSE;
gboolean _tmp0_;
@@ -4301,22 +4595,26 @@ static gboolean publishing_facebook_facebook_publisher_real_is_running (SpitPubl
result = _tmp0_;
#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return result;
-#line 4285 "FacebookPublishing.c"
+#line 4579 "FacebookPublishing.c"
}
-static void publishing_facebook_facebook_publisher_class_init (PublishingFacebookFacebookPublisherClass * klass) {
+static void
+publishing_facebook_facebook_publisher_class_init (PublishingFacebookFacebookPublisherClass * klass)
+{
#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_facebook_publisher_parent_class = g_type_class_peek_parent (klass);
#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_type_class_add_private (klass, sizeof (PublishingFacebookFacebookPublisherPrivate));
#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
G_OBJECT_CLASS (klass)->finalize = publishing_facebook_facebook_publisher_finalize;
-#line 4296 "FacebookPublishing.c"
+#line 4592 "FacebookPublishing.c"
}
-static void publishing_facebook_facebook_publisher_spit_publishing_publisher_interface_init (SpitPublishingPublisherIface * iface) {
+static void
+publishing_facebook_facebook_publisher_spit_publishing_publisher_interface_init (SpitPublishingPublisherIface * iface)
+{
#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_facebook_publisher_spit_publishing_publisher_parent_iface = g_type_interface_peek_parent (iface);
#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -4327,11 +4625,13 @@ static void publishing_facebook_facebook_publisher_spit_publishing_publisher_int
iface->stop = (void (*) (SpitPublishingPublisher *)) publishing_facebook_facebook_publisher_real_stop;
#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
iface->is_running = (gboolean (*) (SpitPublishingPublisher *)) publishing_facebook_facebook_publisher_real_is_running;
-#line 4311 "FacebookPublishing.c"
+#line 4609 "FacebookPublishing.c"
}
-static void publishing_facebook_facebook_publisher_instance_init (PublishingFacebookFacebookPublisher * self) {
+static void
+publishing_facebook_facebook_publisher_instance_init (PublishingFacebookFacebookPublisher * self)
+{
#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
self->priv = PUBLISHING_FACEBOOK_FACEBOOK_PUBLISHER_GET_PRIVATE (self);
#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -4356,11 +4656,13 @@ static void publishing_facebook_facebook_publisher_instance_init (PublishingFace
self->priv->uid = NULL;
#line 179 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
self->priv->username = NULL;
-#line 4340 "FacebookPublishing.c"
+#line 4640 "FacebookPublishing.c"
}
-static void publishing_facebook_facebook_publisher_finalize (GObject * obj) {
+static void
+publishing_facebook_facebook_publisher_finalize (GObject * obj)
+{
PublishingFacebookFacebookPublisher * self;
#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FACEBOOK_TYPE_FACEBOOK_PUBLISHER, PublishingFacebookFacebookPublisher);
@@ -4388,11 +4690,13 @@ static void publishing_facebook_facebook_publisher_finalize (GObject * obj) {
_g_free0 (self->priv->username);
#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
G_OBJECT_CLASS (publishing_facebook_facebook_publisher_parent_class)->finalize (obj);
-#line 4372 "FacebookPublishing.c"
+#line 4674 "FacebookPublishing.c"
}
-GType publishing_facebook_facebook_publisher_get_type (void) {
+GType
+publishing_facebook_facebook_publisher_get_type (void)
+{
static volatile gsize publishing_facebook_facebook_publisher_type_id__volatile = 0;
if (g_once_init_enter (&publishing_facebook_facebook_publisher_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingFacebookFacebookPublisherClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_facebook_facebook_publisher_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingFacebookFacebookPublisher), 0, (GInstanceInitFunc) publishing_facebook_facebook_publisher_instance_init, NULL };
@@ -4406,139 +4710,151 @@ GType publishing_facebook_facebook_publisher_get_type (void) {
}
-static PublishingFacebookAlbum** _vala_array_dup2 (PublishingFacebookAlbum** self, int length) {
+static PublishingFacebookAlbum**
+_vala_array_dup2 (PublishingFacebookAlbum** self,
+ int length)
+{
PublishingFacebookAlbum** result;
int i;
#line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
result = g_new0 (PublishingFacebookAlbum*, length + 1);
#line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
for (i = 0; i < length; i++) {
-#line 4397 "FacebookPublishing.c"
+#line 4704 "FacebookPublishing.c"
PublishingFacebookAlbum* _tmp0_;
#line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_tmp0_ = _publishing_facebook_album_ref0 (self[i]);
#line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
result[i] = _tmp0_;
-#line 4403 "FacebookPublishing.c"
+#line 4710 "FacebookPublishing.c"
}
#line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return result;
-#line 4407 "FacebookPublishing.c"
+#line 4714 "FacebookPublishing.c"
}
-static void _publishing_facebook_publishing_options_pane_on_create_new_toggled_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+_publishing_facebook_publishing_options_pane_on_create_new_toggled_gtk_button_clicked (GtkButton* _sender,
+ gpointer self)
+{
#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_publishing_options_pane_on_create_new_toggled ((PublishingFacebookPublishingOptionsPane*) self);
-#line 4414 "FacebookPublishing.c"
+#line 4724 "FacebookPublishing.c"
}
-static void _publishing_facebook_publishing_options_pane_on_use_existing_toggled_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+_publishing_facebook_publishing_options_pane_on_use_existing_toggled_gtk_button_clicked (GtkButton* _sender,
+ gpointer self)
+{
#line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_publishing_options_pane_on_use_existing_toggled ((PublishingFacebookPublishingOptionsPane*) self);
-#line 4421 "FacebookPublishing.c"
+#line 4734 "FacebookPublishing.c"
}
-static void _publishing_facebook_publishing_options_pane_on_publish_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+_publishing_facebook_publishing_options_pane_on_publish_button_clicked_gtk_button_clicked (GtkButton* _sender,
+ gpointer self)
+{
#line 789 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_publishing_options_pane_on_publish_button_clicked ((PublishingFacebookPublishingOptionsPane*) self);
-#line 4428 "FacebookPublishing.c"
+#line 4744 "FacebookPublishing.c"
}
-static void _publishing_facebook_publishing_options_pane_on_logout_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+_publishing_facebook_publishing_options_pane_on_logout_button_clicked_gtk_button_clicked (GtkButton* _sender,
+ gpointer self)
+{
#line 790 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_publishing_options_pane_on_logout_button_clicked ((PublishingFacebookPublishingOptionsPane*) self);
-#line 4435 "FacebookPublishing.c"
+#line 4754 "FacebookPublishing.c"
}
-static void _publishing_facebook_publishing_options_pane_on_size_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
+static void
+_publishing_facebook_publishing_options_pane_on_size_changed_gtk_combo_box_changed (GtkComboBox* _sender,
+ gpointer self)
+{
#line 794 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_publishing_options_pane_on_size_changed ((PublishingFacebookPublishingOptionsPane*) self);
-#line 4442 "FacebookPublishing.c"
+#line 4764 "FacebookPublishing.c"
}
-PublishingFacebookPublishingOptionsPane* publishing_facebook_publishing_options_pane_construct (GType object_type, const gchar* username, PublishingFacebookAlbum** albums, int albums_length1, SpitPublishingPublisherMediaType media_type, PublishingFacebookFacebookPublisher* publisher, GtkBuilder* builder, gboolean strip_metadata, gboolean can_logout) {
+PublishingFacebookPublishingOptionsPane*
+publishing_facebook_publishing_options_pane_construct (GType object_type,
+ const gchar* username,
+ PublishingFacebookAlbum** albums,
+ int albums_length1,
+ SpitPublishingPublisherMediaType media_type,
+ PublishingFacebookFacebookPublisher* publisher,
+ GtkBuilder* builder,
+ gboolean strip_metadata,
+ gboolean can_logout)
+{
PublishingFacebookPublishingOptionsPane * self = NULL;
GtkBuilder* _tmp0_;
- GtkBuilder* _tmp1_;
- GtkBuilder* _tmp2_;
- GtkBuilder* _tmp3_;
- GSList* _tmp4_;
- GSList* _tmp5_;
- guint _tmp6_;
- PublishingFacebookAlbum** _tmp7_;
- gint _tmp7__length1;
- PublishingFacebookAlbum** _tmp8_;
- gint _tmp8__length1;
- gint _tmp9_;
- PublishingFacebookPublishingOptionsPanePrivacyDescription** _tmp10_;
- gint _tmp11_;
- PublishingFacebookResolution* _tmp12_;
- PublishingFacebookFacebookPublisher* _tmp13_;
- PublishingFacebookFacebookPublisher* _tmp14_;
- SpitPublishingPublisherMediaType _tmp15_;
- GtkBuilder* _tmp16_;
- GObject* _tmp17_;
- GtkBox* _tmp18_;
- GtkBox* _tmp19_;
- GtkBuilder* _tmp20_;
- GObject* _tmp21_;
- GtkRadioButton* _tmp22_;
- GtkBuilder* _tmp23_;
- GObject* _tmp24_;
- GtkRadioButton* _tmp25_;
- GtkBuilder* _tmp26_;
- GObject* _tmp27_;
- GtkComboBoxText* _tmp28_;
- GtkBuilder* _tmp29_;
- GObject* _tmp30_;
- GtkComboBoxText* _tmp31_;
- GtkBuilder* _tmp32_;
- GObject* _tmp33_;
- GtkButton* _tmp34_;
- GtkBuilder* _tmp35_;
- GObject* _tmp36_;
- GtkButton* _tmp37_;
- gboolean _tmp38_;
+ GSList* _tmp1_;
+ GSList* _tmp2_;
+ PublishingFacebookAlbum** _tmp3_;
+ gint _tmp3__length1;
+ gint _tmp4_;
+ PublishingFacebookPublishingOptionsPanePrivacyDescription** _tmp5_;
+ gint _tmp6_;
+ PublishingFacebookResolution* _tmp7_;
+ PublishingFacebookFacebookPublisher* _tmp8_;
+ GObject* _tmp9_;
+ GtkBox* _tmp10_;
+ GtkBox* _tmp11_;
+ GtkBuilder* _tmp12_;
+ GObject* _tmp13_;
+ GtkRadioButton* _tmp14_;
+ GtkBuilder* _tmp15_;
+ GObject* _tmp16_;
+ GtkRadioButton* _tmp17_;
+ GtkBuilder* _tmp18_;
+ GObject* _tmp19_;
+ GtkComboBoxText* _tmp20_;
+ GtkBuilder* _tmp21_;
+ GObject* _tmp22_;
+ GtkComboBoxText* _tmp23_;
+ GtkBuilder* _tmp24_;
+ GObject* _tmp25_;
+ GtkButton* _tmp26_;
+ GtkBuilder* _tmp27_;
+ GObject* _tmp28_;
+ GtkButton* _tmp29_;
+ GtkBuilder* _tmp34_;
+ GObject* _tmp35_;
+ GtkEntry* _tmp36_;
+ GtkBuilder* _tmp37_;
+ GObject* _tmp38_;
+ GtkComboBoxText* _tmp39_;
+ GtkBuilder* _tmp40_;
+ GObject* _tmp41_;
+ GtkLabel* _tmp42_;
GtkBuilder* _tmp43_;
GObject* _tmp44_;
- GtkEntry* _tmp45_;
- GtkBuilder* _tmp46_;
- GObject* _tmp47_;
- GtkComboBoxText* _tmp48_;
- GtkBuilder* _tmp49_;
- GObject* _tmp50_;
- GtkLabel* _tmp51_;
- GtkBuilder* _tmp52_;
- GObject* _tmp53_;
- GtkCheckButton* _tmp54_;
- GtkRadioButton* _tmp55_;
- GtkRadioButton* _tmp56_;
+ GtkCheckButton* _tmp45_;
+ GtkRadioButton* _tmp46_;
+ GtkRadioButton* _tmp47_;
gchar* label_text = NULL;
- const gchar* _tmp57_;
- gchar* _tmp58_;
- SpitPublishingPublisherMediaType _tmp59_;
- GtkLabel* _tmp62_;
- const gchar* _tmp63_;
- GtkCheckButton* _tmp64_;
- gboolean _tmp65_;
- GtkComboBoxText* _tmp66_;
- GtkButton* _tmp67_;
- GtkButton* _tmp68_;
- GtkComboBoxText* _tmp69_;
- PublishingFacebookFacebookPublisher* _tmp70_;
- gint _tmp71_;
- GtkComboBoxText* _tmp72_;
- gboolean _tmp73_ = FALSE;
- gboolean _tmp74_ = FALSE;
- GtkRadioButton* _tmp75_;
- GtkComboBoxText* _tmp80_;
- SpitPublishingPublisherMediaType _tmp81_;
+ gchar* _tmp48_;
+ GtkLabel* _tmp51_;
+ const gchar* _tmp52_;
+ GtkCheckButton* _tmp53_;
+ GtkComboBoxText* _tmp54_;
+ GtkButton* _tmp55_;
+ GtkButton* _tmp56_;
+ GtkComboBoxText* _tmp57_;
+ GtkComboBoxText* _tmp58_;
+ gboolean _tmp59_ = FALSE;
+ gboolean _tmp60_ = FALSE;
+ GtkRadioButton* _tmp61_;
+ GtkComboBoxText* _tmp65_;
#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_val_if_fail (username != NULL, NULL);
#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -4548,380 +4864,356 @@ PublishingFacebookPublishingOptionsPane* publishing_facebook_publishing_options_
#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
self = (PublishingFacebookPublishingOptionsPane*) g_object_new (object_type, NULL);
#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp0_ = builder;
-#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp1_ = _g_object_ref0 (_tmp0_);
+ _tmp0_ = _g_object_ref0 (builder);
#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_g_object_unref0 (self->priv->builder);
#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- self->priv->builder = _tmp1_;
-#line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp2_ = builder;
+ self->priv->builder = _tmp0_;
#line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _vala_assert (_tmp2_ != NULL, "builder != null");
-#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp3_ = builder;
+ _vala_assert (builder != NULL, "builder != null");
#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp4_ = gtk_builder_get_objects (_tmp3_);
+ _tmp1_ = gtk_builder_get_objects (builder);
#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp5_ = _tmp4_;
-#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp6_ = g_slist_length (_tmp5_);
+ _tmp2_ = _tmp1_;
#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _vala_assert (_tmp6_ > ((guint) 0), "builder.get_objects().length() > 0");
+ _vala_assert (g_slist_length (_tmp2_) > ((guint) 0), "builder.get_objects().length() > 0");
#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _g_slist_free0 (_tmp5_);
+ _g_slist_free0 (_tmp2_);
#line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp7_ = albums;
+ _tmp3_ = (albums != NULL) ? _vala_array_dup2 (albums, albums_length1) : ((gpointer) albums);
#line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp7__length1 = albums_length1;
-#line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp8_ = (_tmp7_ != NULL) ? _vala_array_dup2 (_tmp7_, _tmp7__length1) : ((gpointer) _tmp7_);
-#line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp8__length1 = _tmp7__length1;
+ _tmp3__length1 = albums_length1;
#line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
self->priv->albums = (_vala_array_free (self->priv->albums, self->priv->albums_length1, (GDestroyNotify) publishing_facebook_album_unref), NULL);
#line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- self->priv->albums = _tmp8_;
+ self->priv->albums = _tmp3_;
#line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- self->priv->albums_length1 = _tmp8__length1;
+ self->priv->albums_length1 = _tmp3__length1;
#line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
self->priv->_albums_size_ = self->priv->albums_length1;
#line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp10_ = publishing_facebook_publishing_options_pane_create_privacy_descriptions (self, &_tmp9_);
+ _tmp5_ = publishing_facebook_publishing_options_pane_create_privacy_descriptions (self, &_tmp4_);
#line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
self->priv->privacy_descriptions = (_vala_array_free (self->priv->privacy_descriptions, self->priv->privacy_descriptions_length1, (GDestroyNotify) publishing_facebook_publishing_options_pane_privacy_description_unref), NULL);
#line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- self->priv->privacy_descriptions = _tmp10_;
+ self->priv->privacy_descriptions = _tmp5_;
#line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- self->priv->privacy_descriptions_length1 = _tmp9_;
+ self->priv->privacy_descriptions_length1 = _tmp4_;
#line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
self->priv->_privacy_descriptions_size_ = self->priv->privacy_descriptions_length1;
#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp12_ = publishing_facebook_publishing_options_pane_create_resolution_list (self, &_tmp11_);
+ _tmp7_ = publishing_facebook_publishing_options_pane_create_resolution_list (self, &_tmp6_);
#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
self->priv->possible_resolutions = (g_free (self->priv->possible_resolutions), NULL);
#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- self->priv->possible_resolutions = _tmp12_;
+ self->priv->possible_resolutions = _tmp7_;
#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- self->priv->possible_resolutions_length1 = _tmp11_;
+ self->priv->possible_resolutions_length1 = _tmp6_;
#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
self->priv->_possible_resolutions_size_ = self->priv->possible_resolutions_length1;
#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp13_ = publisher;
-#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp14_ = _g_object_ref0 (_tmp13_);
+ _tmp8_ = _g_object_ref0 (publisher);
#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_g_object_unref0 (self->priv->publisher);
#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- self->priv->publisher = _tmp14_;
-#line 758 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp15_ = media_type;
+ self->priv->publisher = _tmp8_;
#line 758 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- self->priv->media_type = _tmp15_;
-#line 760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp16_ = builder;
+ self->priv->media_type = media_type;
#line 760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp17_ = gtk_builder_get_object (_tmp16_, "facebook_pane_box");
+ _tmp9_ = gtk_builder_get_object (builder, "facebook_pane_box");
#line 760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp18_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_box_get_type (), GtkBox));
+ _tmp10_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_box_get_type (), GtkBox));
#line 760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_g_object_unref0 (self->priv->pane_widget);
#line 760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- self->priv->pane_widget = _tmp18_;
+ self->priv->pane_widget = _tmp10_;
#line 761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp19_ = self->priv->pane_widget;
+ _tmp11_ = self->priv->pane_widget;
#line 761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_container_get_type (), GtkContainer), (guint) 16);
+ gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_container_get_type (), GtkContainer), (guint) 16);
#line 763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp20_ = self->priv->builder;
+ _tmp12_ = self->priv->builder;
#line 763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp21_ = gtk_builder_get_object (_tmp20_, "use_existing_radio");
+ _tmp13_ = gtk_builder_get_object (_tmp12_, "use_existing_radio");
#line 763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp22_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_radio_button_get_type (), GtkRadioButton));
+ _tmp14_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_radio_button_get_type (), GtkRadioButton));
#line 763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_g_object_unref0 (self->priv->use_existing_radio);
#line 763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- self->priv->use_existing_radio = _tmp22_;
+ self->priv->use_existing_radio = _tmp14_;
#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp23_ = self->priv->builder;
+ _tmp15_ = self->priv->builder;
#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp24_ = gtk_builder_get_object (_tmp23_, "create_new_radio");
+ _tmp16_ = gtk_builder_get_object (_tmp15_, "create_new_radio");
#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp25_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_radio_button_get_type (), GtkRadioButton));
+ _tmp17_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_radio_button_get_type (), GtkRadioButton));
#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_g_object_unref0 (self->priv->create_new_radio);
#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- self->priv->create_new_radio = _tmp25_;
+ self->priv->create_new_radio = _tmp17_;
#line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp26_ = self->priv->builder;
+ _tmp18_ = self->priv->builder;
#line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp27_ = gtk_builder_get_object (_tmp26_, "existing_albums_combo");
+ _tmp19_ = gtk_builder_get_object (_tmp18_, "existing_albums_combo");
#line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp28_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_combo_box_text_get_type (), GtkComboBoxText));
+ _tmp20_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_combo_box_text_get_type (), GtkComboBoxText));
#line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_g_object_unref0 (self->priv->existing_albums_combo);
#line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- self->priv->existing_albums_combo = _tmp28_;
+ self->priv->existing_albums_combo = _tmp20_;
#line 766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp29_ = self->priv->builder;
+ _tmp21_ = self->priv->builder;
#line 766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp30_ = gtk_builder_get_object (_tmp29_, "visibility_combo");
+ _tmp22_ = gtk_builder_get_object (_tmp21_, "visibility_combo");
#line 766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp31_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_combo_box_text_get_type (), GtkComboBoxText));
+ _tmp23_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_combo_box_text_get_type (), GtkComboBoxText));
#line 766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_g_object_unref0 (self->priv->visibility_combo);
#line 766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- self->priv->visibility_combo = _tmp31_;
+ self->priv->visibility_combo = _tmp23_;
#line 767 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp32_ = self->priv->builder;
+ _tmp24_ = self->priv->builder;
#line 767 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp33_ = gtk_builder_get_object (_tmp32_, "publish_button");
+ _tmp25_ = gtk_builder_get_object (_tmp24_, "publish_button");
#line 767 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp34_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_button_get_type (), GtkButton));
+ _tmp26_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_button_get_type (), GtkButton));
#line 767 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_g_object_unref0 (self->priv->publish_button);
#line 767 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- self->priv->publish_button = _tmp34_;
+ self->priv->publish_button = _tmp26_;
#line 768 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp35_ = self->priv->builder;
+ _tmp27_ = self->priv->builder;
#line 768 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp36_ = gtk_builder_get_object (_tmp35_, "logout_button");
+ _tmp28_ = gtk_builder_get_object (_tmp27_, "logout_button");
#line 768 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp37_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_button_get_type (), GtkButton));
+ _tmp29_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_button_get_type (), GtkButton));
#line 768 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_g_object_unref0 (self->priv->logout_button);
#line 768 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- self->priv->logout_button = _tmp37_;
+ self->priv->logout_button = _tmp29_;
#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp38_ = can_logout;
-#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- if (!_tmp38_) {
-#line 4681 "FacebookPublishing.c"
- GtkButton* _tmp39_;
- GtkContainer* _tmp40_;
- GtkContainer* _tmp41_;
- GtkButton* _tmp42_;
+ if (!can_logout) {
+#line 4977 "FacebookPublishing.c"
+ GtkButton* _tmp30_;
+ GtkContainer* _tmp31_;
+ GtkContainer* _tmp32_;
+ GtkButton* _tmp33_;
#line 770 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp39_ = self->priv->logout_button;
+ _tmp30_ = self->priv->logout_button;
#line 770 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp40_ = gtk_widget_get_parent (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_widget_get_type (), GtkWidget));
+ _tmp31_ = gtk_widget_get_parent (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_widget_get_type (), GtkWidget));
#line 770 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp41_ = _tmp40_;
+ _tmp32_ = _tmp31_;
#line 770 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp42_ = self->priv->logout_button;
+ _tmp33_ = self->priv->logout_button;
#line 770 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- gtk_container_remove (_tmp41_, G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_widget_get_type (), GtkWidget));
-#line 4696 "FacebookPublishing.c"
+ gtk_container_remove (_tmp32_, G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_widget_get_type (), GtkWidget));
+#line 4992 "FacebookPublishing.c"
}
#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp43_ = self->priv->builder;
+ _tmp34_ = self->priv->builder;
#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp44_ = gtk_builder_get_object (_tmp43_, "new_album_entry");
+ _tmp35_ = gtk_builder_get_object (_tmp34_, "new_album_entry");
#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp45_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_entry_get_type (), GtkEntry));
+ _tmp36_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_entry_get_type (), GtkEntry));
#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_g_object_unref0 (self->priv->new_album_entry);
#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- self->priv->new_album_entry = _tmp45_;
+ self->priv->new_album_entry = _tmp36_;
#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp46_ = self->priv->builder;
+ _tmp37_ = self->priv->builder;
#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp47_ = gtk_builder_get_object (_tmp46_, "resolution_combo");
+ _tmp38_ = gtk_builder_get_object (_tmp37_, "resolution_combo");
#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp48_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, gtk_combo_box_text_get_type (), GtkComboBoxText));
+ _tmp39_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_combo_box_text_get_type (), GtkComboBoxText));
#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_g_object_unref0 (self->priv->resolution_combo);
#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- self->priv->resolution_combo = _tmp48_;
+ self->priv->resolution_combo = _tmp39_;
#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp49_ = self->priv->builder;
+ _tmp40_ = self->priv->builder;
#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp50_ = gtk_builder_get_object (_tmp49_, "how_to_label");
+ _tmp41_ = gtk_builder_get_object (_tmp40_, "how_to_label");
#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp51_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_label_get_type (), GtkLabel));
+ _tmp42_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_label_get_type (), GtkLabel));
#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_g_object_unref0 (self->priv->how_to_label);
#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- self->priv->how_to_label = _tmp51_;
+ self->priv->how_to_label = _tmp42_;
#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp52_ = self->priv->builder;
+ _tmp43_ = self->priv->builder;
#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp53_ = gtk_builder_get_object (_tmp52_, "strip_metadata_check");
+ _tmp44_ = gtk_builder_get_object (_tmp43_, "strip_metadata_check");
#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp54_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, gtk_check_button_get_type (), GtkCheckButton));
+ _tmp45_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_check_button_get_type (), GtkCheckButton));
#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_g_object_unref0 (self->priv->strip_metadata_check);
#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- self->priv->strip_metadata_check = _tmp54_;
+ self->priv->strip_metadata_check = _tmp45_;
#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp55_ = self->priv->create_new_radio;
+ _tmp46_ = self->priv->create_new_radio;
#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _publishing_facebook_publishing_options_pane_on_create_new_toggled_gtk_button_clicked, self, 0);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _publishing_facebook_publishing_options_pane_on_create_new_toggled_gtk_button_clicked, self, 0);
#line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp56_ = self->priv->use_existing_radio;
+ _tmp47_ = self->priv->use_existing_radio;
#line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _publishing_facebook_publishing_options_pane_on_use_existing_toggled_gtk_button_clicked, self, 0);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _publishing_facebook_publishing_options_pane_on_use_existing_toggled_gtk_button_clicked, self, 0);
#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp57_ = username;
+ _tmp48_ = g_strdup_printf (PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_HEADER_LABEL_TEXT, username);
#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp58_ = g_strdup_printf (PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_HEADER_LABEL_TEXT, _tmp57_);
-#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- label_text = _tmp58_;
-#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp59_ = media_type;
+ label_text = _tmp48_;
#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- if ((_tmp59_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) != 0) {
-#line 4756 "FacebookPublishing.c"
- const gchar* _tmp60_;
- gchar* _tmp61_;
+ if ((media_type & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) != 0) {
+#line 5048 "FacebookPublishing.c"
+ const gchar* _tmp49_;
+ gchar* _tmp50_;
#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp60_ = label_text;
+ _tmp49_ = label_text;
#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp61_ = g_strconcat (_tmp60_, PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_PHOTOS_LABEL_TEXT, NULL);
+ _tmp50_ = g_strconcat (_tmp49_, PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_PHOTOS_LABEL_TEXT, NULL);
#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_g_free0 (label_text);
#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- label_text = _tmp61_;
-#line 4767 "FacebookPublishing.c"
+ label_text = _tmp50_;
+#line 5059 "FacebookPublishing.c"
}
#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp62_ = self->priv->how_to_label;
+ _tmp51_ = self->priv->how_to_label;
#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp63_ = label_text;
+ _tmp52_ = label_text;
#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- gtk_label_set_label (_tmp62_, _tmp63_);
+ gtk_label_set_label (_tmp51_, _tmp52_);
#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp64_ = self->priv->strip_metadata_check;
+ _tmp53_ = self->priv->strip_metadata_check;
#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp65_ = strip_metadata;
-#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp65_);
+ gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, gtk_toggle_button_get_type (), GtkToggleButton), strip_metadata);
#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_publishing_options_pane_setup_visibility_combo (self);
#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp66_ = self->priv->visibility_combo;
+ _tmp54_ = self->priv->visibility_combo;
#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, gtk_combo_box_get_type (), GtkComboBox), 0);
+ gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, gtk_combo_box_get_type (), GtkComboBox), 0);
#line 789 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp67_ = self->priv->publish_button;
+ _tmp55_ = self->priv->publish_button;
#line 789 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_signal_connect_object (_tmp67_, "clicked", (GCallback) _publishing_facebook_publishing_options_pane_on_publish_button_clicked_gtk_button_clicked, self, 0);
+ g_signal_connect_object (_tmp55_, "clicked", (GCallback) _publishing_facebook_publishing_options_pane_on_publish_button_clicked_gtk_button_clicked, self, 0);
#line 790 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp68_ = self->priv->logout_button;
+ _tmp56_ = self->priv->logout_button;
#line 790 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_signal_connect_object (_tmp68_, "clicked", (GCallback) _publishing_facebook_publishing_options_pane_on_logout_button_clicked_gtk_button_clicked, self, 0);
+ g_signal_connect_object (_tmp56_, "clicked", (GCallback) _publishing_facebook_publishing_options_pane_on_logout_button_clicked_gtk_button_clicked, self, 0);
#line 792 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_publishing_options_pane_setup_resolution_combo (self);
#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp69_ = self->priv->resolution_combo;
-#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp70_ = publisher;
-#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp71_ = publishing_facebook_facebook_publisher_get_persistent_default_size (_tmp70_);
+ _tmp57_ = self->priv->resolution_combo;
#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, gtk_combo_box_get_type (), GtkComboBox), _tmp71_);
+ gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, gtk_combo_box_get_type (), GtkComboBox), publishing_facebook_facebook_publisher_get_persistent_default_size (publisher));
#line 794 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp72_ = self->priv->resolution_combo;
+ _tmp58_ = self->priv->resolution_combo;
#line 794 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _publishing_facebook_publishing_options_pane_on_size_changed_gtk_combo_box_changed, self, 0);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _publishing_facebook_publishing_options_pane_on_size_changed_gtk_combo_box_changed, self, 0);
#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp75_ = self->priv->create_new_radio;
+ _tmp61_ = self->priv->create_new_radio;
#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- if (_tmp75_ != NULL) {
-#line 4813 "FacebookPublishing.c"
- GtkRadioButton* _tmp76_;
- gboolean _tmp77_;
- gboolean _tmp78_;
+ if (_tmp61_ != NULL) {
+#line 5099 "FacebookPublishing.c"
+ GtkRadioButton* _tmp62_;
+ gboolean _tmp63_;
+ gboolean _tmp64_;
#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp76_ = self->priv->create_new_radio;
+ _tmp62_ = self->priv->create_new_radio;
#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp77_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, gtk_toggle_button_get_type (), GtkToggleButton));
+ _tmp63_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, gtk_toggle_button_get_type (), GtkToggleButton));
#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp78_ = _tmp77_;
+ _tmp64_ = _tmp63_;
#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp74_ = _tmp78_;
-#line 4825 "FacebookPublishing.c"
+ _tmp60_ = _tmp64_;
+#line 5111 "FacebookPublishing.c"
} else {
#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp74_ = FALSE;
-#line 4829 "FacebookPublishing.c"
+ _tmp60_ = FALSE;
+#line 5115 "FacebookPublishing.c"
}
#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- if (_tmp74_) {
+ if (_tmp60_) {
#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp73_ = TRUE;
-#line 4835 "FacebookPublishing.c"
+ _tmp59_ = TRUE;
+#line 5121 "FacebookPublishing.c"
} else {
- SpitPublishingPublisherMediaType _tmp79_;
#line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp79_ = media_type;
-#line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp73_ = (_tmp79_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) != 0;
-#line 4842 "FacebookPublishing.c"
+ _tmp59_ = (media_type & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) != 0;
+#line 5125 "FacebookPublishing.c"
}
#line 799 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp80_ = self->priv->visibility_combo;
+ _tmp65_ = self->priv->visibility_combo;
#line 799 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, gtk_widget_get_type (), GtkWidget), _tmp73_);
-#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp81_ = media_type;
+ gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, gtk_widget_get_type (), GtkWidget), _tmp59_);
#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- if (_tmp81_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 4852 "FacebookPublishing.c"
- GtkCheckButton* _tmp82_;
- GtkCheckButton* _tmp83_;
- GtkComboBoxText* _tmp84_;
- GtkRadioButton* _tmp85_;
- GtkRadioButton* _tmp86_;
- GtkComboBoxText* _tmp87_;
- GtkEntry* _tmp88_;
+ if (media_type == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
+#line 5133 "FacebookPublishing.c"
+ GtkCheckButton* _tmp66_;
+ GtkCheckButton* _tmp67_;
+ GtkComboBoxText* _tmp68_;
+ GtkRadioButton* _tmp69_;
+ GtkRadioButton* _tmp70_;
+ GtkComboBoxText* _tmp71_;
+ GtkEntry* _tmp72_;
#line 805 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp82_ = self->priv->strip_metadata_check;
+ _tmp66_ = self->priv->strip_metadata_check;
#line 805 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, gtk_toggle_button_get_type (), GtkToggleButton), FALSE);
+ gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, gtk_toggle_button_get_type (), GtkToggleButton), FALSE);
#line 806 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp83_ = self->priv->strip_metadata_check;
+ _tmp67_ = self->priv->strip_metadata_check;
#line 806 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp83_, gtk_widget_get_type (), GtkWidget), FALSE);
+ gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, gtk_widget_get_type (), GtkWidget), FALSE);
#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp84_ = self->priv->resolution_combo;
+ _tmp68_ = self->priv->resolution_combo;
#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp84_, gtk_widget_get_type (), GtkWidget), FALSE);
+ gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, gtk_widget_get_type (), GtkWidget), FALSE);
#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp85_ = self->priv->use_existing_radio;
+ _tmp69_ = self->priv->use_existing_radio;
#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp85_, gtk_widget_get_type (), GtkWidget), FALSE);
+ gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, gtk_widget_get_type (), GtkWidget), FALSE);
#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp86_ = self->priv->create_new_radio;
+ _tmp70_ = self->priv->create_new_radio;
#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp86_, gtk_widget_get_type (), GtkWidget), FALSE);
+ gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, gtk_widget_get_type (), GtkWidget), FALSE);
#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp87_ = self->priv->existing_albums_combo;
+ _tmp71_ = self->priv->existing_albums_combo;
#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp87_, gtk_widget_get_type (), GtkWidget), FALSE);
+ gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, gtk_widget_get_type (), GtkWidget), FALSE);
#line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp88_ = self->priv->new_album_entry;
+ _tmp72_ = self->priv->new_album_entry;
#line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp88_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 4888 "FacebookPublishing.c"
+ gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 5169 "FacebookPublishing.c"
}
#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_g_free0 (label_text);
#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return self;
-#line 4894 "FacebookPublishing.c"
+#line 5175 "FacebookPublishing.c"
}
-PublishingFacebookPublishingOptionsPane* publishing_facebook_publishing_options_pane_new (const gchar* username, PublishingFacebookAlbum** albums, int albums_length1, SpitPublishingPublisherMediaType media_type, PublishingFacebookFacebookPublisher* publisher, GtkBuilder* builder, gboolean strip_metadata, gboolean can_logout) {
+PublishingFacebookPublishingOptionsPane*
+publishing_facebook_publishing_options_pane_new (const gchar* username,
+ PublishingFacebookAlbum** albums,
+ int albums_length1,
+ SpitPublishingPublisherMediaType media_type,
+ PublishingFacebookFacebookPublisher* publisher,
+ GtkBuilder* builder,
+ gboolean strip_metadata,
+ gboolean can_logout)
+{
#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return publishing_facebook_publishing_options_pane_construct (PUBLISHING_FACEBOOK_TYPE_PUBLISHING_OPTIONS_PANE, username, albums, albums_length1, media_type, publisher, builder, strip_metadata, can_logout);
-#line 4901 "FacebookPublishing.c"
+#line 5191 "FacebookPublishing.c"
}
-static gboolean publishing_facebook_publishing_options_pane_publishing_photos (PublishingFacebookPublishingOptionsPane* self) {
+static gboolean
+publishing_facebook_publishing_options_pane_publishing_photos (PublishingFacebookPublishingOptionsPane* self)
+{
gboolean result = FALSE;
SpitPublishingPublisherMediaType _tmp0_;
#line 815 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -4932,18 +5224,22 @@ static gboolean publishing_facebook_publishing_options_pane_publishing_photos (P
result = (_tmp0_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) != 0;
#line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return result;
-#line 4916 "FacebookPublishing.c"
+#line 5208 "FacebookPublishing.c"
}
-static gpointer _publishing_facebook_publishing_options_pane_privacy_description_ref0 (gpointer self) {
+static gpointer
+_publishing_facebook_publishing_options_pane_privacy_description_ref0 (gpointer self)
+{
#line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return self ? publishing_facebook_publishing_options_pane_privacy_description_ref (self) : NULL;
-#line 4923 "FacebookPublishing.c"
+#line 5217 "FacebookPublishing.c"
}
-static void publishing_facebook_publishing_options_pane_setup_visibility_combo (PublishingFacebookPublishingOptionsPane* self) {
+static void
+publishing_facebook_publishing_options_pane_setup_visibility_combo (PublishingFacebookPublishingOptionsPane* self)
+{
PublishingFacebookPublishingOptionsPanePrivacyDescription** _tmp0_;
gint _tmp0__length1;
#line 819 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -4952,7 +5248,7 @@ static void publishing_facebook_publishing_options_pane_setup_visibility_combo (
_tmp0_ = self->priv->privacy_descriptions;
#line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_tmp0__length1 = self->priv->privacy_descriptions_length1;
-#line 4936 "FacebookPublishing.c"
+#line 5232 "FacebookPublishing.c"
{
PublishingFacebookPublishingOptionsPanePrivacyDescription** p_collection = NULL;
gint p_collection_length1 = 0;
@@ -4964,14 +5260,14 @@ static void publishing_facebook_publishing_options_pane_setup_visibility_combo (
p_collection_length1 = _tmp0__length1;
#line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
for (p_it = 0; p_it < _tmp0__length1; p_it = p_it + 1) {
-#line 4948 "FacebookPublishing.c"
+#line 5244 "FacebookPublishing.c"
PublishingFacebookPublishingOptionsPanePrivacyDescription* _tmp1_;
PublishingFacebookPublishingOptionsPanePrivacyDescription* p = NULL;
#line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_tmp1_ = _publishing_facebook_publishing_options_pane_privacy_description_ref0 (p_collection[p_it]);
#line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
p = _tmp1_;
-#line 4955 "FacebookPublishing.c"
+#line 5251 "FacebookPublishing.c"
{
GtkComboBoxText* _tmp2_;
PublishingFacebookPublishingOptionsPanePrivacyDescription* _tmp3_;
@@ -4986,14 +5282,16 @@ static void publishing_facebook_publishing_options_pane_setup_visibility_combo (
gtk_combo_box_text_append_text (_tmp2_, _tmp4_);
#line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_publishing_facebook_publishing_options_pane_privacy_description_unref0 (p);
-#line 4970 "FacebookPublishing.c"
+#line 5266 "FacebookPublishing.c"
}
}
}
}
-static void publishing_facebook_publishing_options_pane_setup_resolution_combo (PublishingFacebookPublishingOptionsPane* self) {
+static void
+publishing_facebook_publishing_options_pane_setup_resolution_combo (PublishingFacebookPublishingOptionsPane* self)
+{
PublishingFacebookResolution* _tmp0_;
gint _tmp0__length1;
#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -5002,7 +5300,7 @@ static void publishing_facebook_publishing_options_pane_setup_resolution_combo (
_tmp0_ = self->priv->possible_resolutions;
#line 825 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_tmp0__length1 = self->priv->possible_resolutions_length1;
-#line 4986 "FacebookPublishing.c"
+#line 5284 "FacebookPublishing.c"
{
PublishingFacebookResolution* res_collection = NULL;
gint res_collection_length1 = 0;
@@ -5014,11 +5312,11 @@ static void publishing_facebook_publishing_options_pane_setup_resolution_combo (
res_collection_length1 = _tmp0__length1;
#line 825 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
for (res_it = 0; res_it < _tmp0__length1; res_it = res_it + 1) {
-#line 4998 "FacebookPublishing.c"
+#line 5296 "FacebookPublishing.c"
PublishingFacebookResolution res = 0;
#line 825 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
res = res_collection[res_it];
-#line 5002 "FacebookPublishing.c"
+#line 5300 "FacebookPublishing.c"
{
GtkComboBoxText* _tmp1_;
PublishingFacebookResolution _tmp2_;
@@ -5036,14 +5334,16 @@ static void publishing_facebook_publishing_options_pane_setup_resolution_combo (
gtk_combo_box_text_append_text (_tmp1_, _tmp4_);
#line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_g_free0 (_tmp4_);
-#line 5020 "FacebookPublishing.c"
+#line 5318 "FacebookPublishing.c"
}
}
}
}
-static void publishing_facebook_publishing_options_pane_on_use_existing_toggled (PublishingFacebookPublishingOptionsPane* self) {
+static void
+publishing_facebook_publishing_options_pane_on_use_existing_toggled (PublishingFacebookPublishingOptionsPane* self)
+{
GtkRadioButton* _tmp0_;
gboolean _tmp1_;
gboolean _tmp2_;
@@ -5057,7 +5357,7 @@ static void publishing_facebook_publishing_options_pane_on_use_existing_toggled
_tmp2_ = _tmp1_;
#line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
if (_tmp2_) {
-#line 5041 "FacebookPublishing.c"
+#line 5341 "FacebookPublishing.c"
GtkComboBoxText* _tmp3_;
GtkEntry* _tmp4_;
GtkComboBoxText* _tmp5_;
@@ -5081,12 +5381,14 @@ static void publishing_facebook_publishing_options_pane_on_use_existing_toggled
_tmp7_ = self->priv->existing_albums_combo;
#line 839 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget));
-#line 5065 "FacebookPublishing.c"
+#line 5365 "FacebookPublishing.c"
}
}
-static void publishing_facebook_publishing_options_pane_on_create_new_toggled (PublishingFacebookPublishingOptionsPane* self) {
+static void
+publishing_facebook_publishing_options_pane_on_create_new_toggled (PublishingFacebookPublishingOptionsPane* self)
+{
GtkRadioButton* _tmp0_;
gboolean _tmp1_;
gboolean _tmp2_;
@@ -5100,7 +5402,7 @@ static void publishing_facebook_publishing_options_pane_on_create_new_toggled (P
_tmp2_ = _tmp1_;
#line 844 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
if (_tmp2_) {
-#line 5084 "FacebookPublishing.c"
+#line 5386 "FacebookPublishing.c"
GtkComboBoxText* _tmp3_;
GtkEntry* _tmp4_;
GtkEntry* _tmp5_;
@@ -5121,15 +5423,16 @@ static void publishing_facebook_publishing_options_pane_on_create_new_toggled (P
_tmp6_ = self->priv->visibility_combo;
#line 851 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 5105 "FacebookPublishing.c"
+#line 5407 "FacebookPublishing.c"
}
}
-static void publishing_facebook_publishing_options_pane_on_size_changed (PublishingFacebookPublishingOptionsPane* self) {
+static void
+publishing_facebook_publishing_options_pane_on_size_changed (PublishingFacebookPublishingOptionsPane* self)
+{
PublishingFacebookFacebookPublisher* _tmp0_;
GtkComboBoxText* _tmp1_;
- gint _tmp2_;
#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self));
#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -5137,39 +5440,38 @@ static void publishing_facebook_publishing_options_pane_on_size_changed (Publish
#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_tmp1_ = self->priv->resolution_combo;
#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp2_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox));
-#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- publishing_facebook_facebook_publisher_set_persistent_default_size (_tmp0_, _tmp2_);
-#line 5124 "FacebookPublishing.c"
+ publishing_facebook_facebook_publisher_set_persistent_default_size (_tmp0_, gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox)));
+#line 5425 "FacebookPublishing.c"
}
-static void publishing_facebook_publishing_options_pane_on_logout_button_clicked (PublishingFacebookPublishingOptionsPane* self) {
+static void
+publishing_facebook_publishing_options_pane_on_logout_button_clicked (PublishingFacebookPublishingOptionsPane* self)
+{
#line 859 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self));
#line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_signal_emit (self, publishing_facebook_publishing_options_pane_signals[PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL], 0);
-#line 5133 "FacebookPublishing.c"
+#line 5436 "FacebookPublishing.c"
}
-static void publishing_facebook_publishing_options_pane_on_publish_button_clicked (PublishingFacebookPublishingOptionsPane* self) {
+static void
+publishing_facebook_publishing_options_pane_on_publish_button_clicked (PublishingFacebookPublishingOptionsPane* self)
+{
gchar* album_name = NULL;
gchar* privacy_setting = NULL;
PublishingFacebookPublishingOptionsPanePrivacyDescription** _tmp0_;
gint _tmp0__length1;
GtkComboBoxText* _tmp1_;
- gint _tmp2_;
- PublishingFacebookPublishingOptionsPanePrivacyDescription* _tmp3_;
- const gchar* _tmp4_;
- gchar* _tmp5_;
+ PublishingFacebookPublishingOptionsPanePrivacyDescription* _tmp2_;
+ const gchar* _tmp3_;
+ gchar* _tmp4_;
PublishingFacebookResolution resolution_setting = 0;
- gboolean _tmp6_;
- const gchar* _tmp19_;
- const gchar* _tmp20_;
- PublishingFacebookResolution _tmp21_;
- GtkCheckButton* _tmp22_;
- gboolean _tmp23_;
+ const gchar* _tmp16_;
+ const gchar* _tmp17_;
+ PublishingFacebookResolution _tmp18_;
+ GtkCheckButton* _tmp19_;
#line 863 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self));
#line 865 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -5179,75 +5481,68 @@ static void publishing_facebook_publishing_options_pane_on_publish_button_clicke
#line 865 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_tmp1_ = self->priv->visibility_combo;
#line 865 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp2_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox));
+ _tmp2_ = _tmp0_[gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox))];
#line 865 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp3_ = _tmp0_[_tmp2_];
+ _tmp3_ = _tmp2_->privacy_setting;
#line 865 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp4_ = _tmp3_->privacy_setting;
+ _tmp4_ = g_strdup (_tmp3_);
#line 865 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp5_ = g_strdup (_tmp4_);
-#line 865 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- privacy_setting = _tmp5_;
-#line 869 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp6_ = publishing_facebook_publishing_options_pane_publishing_photos (self);
+ privacy_setting = _tmp4_;
#line 869 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- if (_tmp6_) {
-#line 5176 "FacebookPublishing.c"
- PublishingFacebookResolution* _tmp7_;
- gint _tmp7__length1;
- GtkComboBoxText* _tmp8_;
- gint _tmp9_;
- PublishingFacebookResolution _tmp10_;
- GtkRadioButton* _tmp11_;
- gboolean _tmp12_;
- gboolean _tmp13_;
-#line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp7_ = self->priv->possible_resolutions;
+ if (publishing_facebook_publishing_options_pane_publishing_photos (self)) {
+#line 5474 "FacebookPublishing.c"
+ PublishingFacebookResolution* _tmp5_;
+ gint _tmp5__length1;
+ GtkComboBoxText* _tmp6_;
+ PublishingFacebookResolution _tmp7_;
+ GtkRadioButton* _tmp8_;
+ gboolean _tmp9_;
+ gboolean _tmp10_;
#line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp7__length1 = self->priv->possible_resolutions_length1;
+ _tmp5_ = self->priv->possible_resolutions;
#line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp8_ = self->priv->resolution_combo;
+ _tmp5__length1 = self->priv->possible_resolutions_length1;
#line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp9_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_combo_box_get_type (), GtkComboBox));
+ _tmp6_ = self->priv->resolution_combo;
#line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp10_ = _tmp7_[_tmp9_];
+ _tmp7_ = _tmp5_[gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_combo_box_get_type (), GtkComboBox))];
#line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- resolution_setting = _tmp10_;
+ resolution_setting = _tmp7_;
#line 871 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp11_ = self->priv->use_existing_radio;
+ _tmp8_ = self->priv->use_existing_radio;
#line 871 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp12_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_toggle_button_get_type (), GtkToggleButton));
+ _tmp9_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_toggle_button_get_type (), GtkToggleButton));
#line 871 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp13_ = _tmp12_;
+ _tmp10_ = _tmp9_;
#line 871 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- if (_tmp13_) {
-#line 5205 "FacebookPublishing.c"
- GtkComboBoxText* _tmp14_;
- gchar* _tmp15_;
+ if (_tmp10_) {
+#line 5500 "FacebookPublishing.c"
+ GtkComboBoxText* _tmp11_;
+ gchar* _tmp12_;
#line 872 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp14_ = self->priv->existing_albums_combo;
+ _tmp11_ = self->priv->existing_albums_combo;
#line 872 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp15_ = gtk_combo_box_text_get_active_text (_tmp14_);
+ _tmp12_ = gtk_combo_box_text_get_active_text (_tmp11_);
#line 872 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_g_free0 (album_name);
#line 872 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- album_name = _tmp15_;
-#line 5216 "FacebookPublishing.c"
+ album_name = _tmp12_;
+#line 5511 "FacebookPublishing.c"
} else {
- GtkEntry* _tmp16_;
- const gchar* _tmp17_;
- gchar* _tmp18_;
+ GtkEntry* _tmp13_;
+ const gchar* _tmp14_;
+ gchar* _tmp15_;
#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp16_ = self->priv->new_album_entry;
+ _tmp13_ = self->priv->new_album_entry;
#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp17_ = gtk_entry_get_text (_tmp16_);
+ _tmp14_ = gtk_entry_get_text (_tmp13_);
#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp18_ = g_strdup (_tmp17_);
+ _tmp15_ = g_strdup (_tmp14_);
#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_g_free0 (album_name);
#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- album_name = _tmp18_;
-#line 5231 "FacebookPublishing.c"
+ album_name = _tmp15_;
+#line 5526 "FacebookPublishing.c"
}
} else {
#line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -5256,80 +5551,96 @@ static void publishing_facebook_publishing_options_pane_on_publish_button_clicke
_g_free0 (album_name);
#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
album_name = NULL;
-#line 5240 "FacebookPublishing.c"
+#line 5535 "FacebookPublishing.c"
}
#line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp19_ = album_name;
-#line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp20_ = privacy_setting;
+ _tmp16_ = album_name;
#line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp21_ = resolution_setting;
+ _tmp17_ = privacy_setting;
#line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp22_ = self->priv->strip_metadata_check;
+ _tmp18_ = resolution_setting;
#line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp23_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_toggle_button_get_type (), GtkToggleButton));
+ _tmp19_ = self->priv->strip_metadata_check;
#line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_signal_emit (self, publishing_facebook_publishing_options_pane_signals[PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0, _tmp19_, _tmp20_, _tmp21_, _tmp23_);
+ g_signal_emit (self, publishing_facebook_publishing_options_pane_signals[PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0, _tmp16_, _tmp17_, _tmp18_, gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_toggle_button_get_type (), GtkToggleButton)));
#line 863 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_g_free0 (privacy_setting);
#line 863 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_g_free0 (album_name);
-#line 5258 "FacebookPublishing.c"
+#line 5551 "FacebookPublishing.c"
}
-static void _vala_array_add8 (PublishingFacebookPublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingFacebookPublishingOptionsPanePrivacyDescription* value) {
+static void
+_vala_array_add8 (PublishingFacebookPublishingOptionsPanePrivacyDescription** * array,
+ int* length,
+ int* size,
+ PublishingFacebookPublishingOptionsPanePrivacyDescription* value)
+{
#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
if ((*length) == (*size)) {
#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
*array = g_renew (PublishingFacebookPublishingOptionsPanePrivacyDescription*, *array, (*size) + 1);
-#line 5269 "FacebookPublishing.c"
+#line 5567 "FacebookPublishing.c"
}
#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
(*array)[(*length)++] = value;
#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
(*array)[*length] = NULL;
-#line 5275 "FacebookPublishing.c"
+#line 5573 "FacebookPublishing.c"
}
-static void _vala_array_add9 (PublishingFacebookPublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingFacebookPublishingOptionsPanePrivacyDescription* value) {
+static void
+_vala_array_add9 (PublishingFacebookPublishingOptionsPanePrivacyDescription** * array,
+ int* length,
+ int* size,
+ PublishingFacebookPublishingOptionsPanePrivacyDescription* value)
+{
#line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
if ((*length) == (*size)) {
#line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
*array = g_renew (PublishingFacebookPublishingOptionsPanePrivacyDescription*, *array, (*size) + 1);
-#line 5286 "FacebookPublishing.c"
+#line 5589 "FacebookPublishing.c"
}
#line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
(*array)[(*length)++] = value;
#line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
(*array)[*length] = NULL;
-#line 5292 "FacebookPublishing.c"
+#line 5595 "FacebookPublishing.c"
}
-static void _vala_array_add10 (PublishingFacebookPublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingFacebookPublishingOptionsPanePrivacyDescription* value) {
+static void
+_vala_array_add10 (PublishingFacebookPublishingOptionsPanePrivacyDescription** * array,
+ int* length,
+ int* size,
+ PublishingFacebookPublishingOptionsPanePrivacyDescription* value)
+{
#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
if ((*length) == (*size)) {
#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
*array = g_renew (PublishingFacebookPublishingOptionsPanePrivacyDescription*, *array, (*size) + 1);
-#line 5303 "FacebookPublishing.c"
+#line 5611 "FacebookPublishing.c"
}
#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
(*array)[(*length)++] = value;
#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
(*array)[*length] = NULL;
-#line 5309 "FacebookPublishing.c"
+#line 5617 "FacebookPublishing.c"
}
-static PublishingFacebookPublishingOptionsPanePrivacyDescription** publishing_facebook_publishing_options_pane_create_privacy_descriptions (PublishingFacebookPublishingOptionsPane* self, int* result_length1) {
+static PublishingFacebookPublishingOptionsPanePrivacyDescription**
+publishing_facebook_publishing_options_pane_create_privacy_descriptions (PublishingFacebookPublishingOptionsPane* self,
+ int* result_length1)
+{
PublishingFacebookPublishingOptionsPanePrivacyDescription** result = NULL;
PublishingFacebookPublishingOptionsPanePrivacyDescription** _result_ = NULL;
PublishingFacebookPublishingOptionsPanePrivacyDescription** _tmp0_;
@@ -5388,47 +5699,60 @@ static PublishingFacebookPublishingOptionsPanePrivacyDescription** publishing_fa
if (result_length1) {
#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
*result_length1 = _tmp7__length1;
-#line 5372 "FacebookPublishing.c"
+#line 5683 "FacebookPublishing.c"
}
#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
result = _tmp7_;
#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return result;
-#line 5378 "FacebookPublishing.c"
+#line 5689 "FacebookPublishing.c"
}
-static void _vala_array_add11 (PublishingFacebookResolution* * array, int* length, int* size, PublishingFacebookResolution value) {
+static void
+_vala_array_add11 (PublishingFacebookResolution* * array,
+ int* length,
+ int* size,
+ PublishingFacebookResolution value)
+{
#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
if ((*length) == (*size)) {
#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
*array = g_renew (PublishingFacebookResolution, *array, *size);
-#line 5389 "FacebookPublishing.c"
+#line 5705 "FacebookPublishing.c"
}
#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
(*array)[(*length)++] = value;
-#line 5393 "FacebookPublishing.c"
+#line 5709 "FacebookPublishing.c"
}
-static void _vala_array_add12 (PublishingFacebookResolution* * array, int* length, int* size, PublishingFacebookResolution value) {
+static void
+_vala_array_add12 (PublishingFacebookResolution* * array,
+ int* length,
+ int* size,
+ PublishingFacebookResolution value)
+{
#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
if ((*length) == (*size)) {
#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
*array = g_renew (PublishingFacebookResolution, *array, *size);
-#line 5404 "FacebookPublishing.c"
+#line 5725 "FacebookPublishing.c"
}
#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
(*array)[(*length)++] = value;
-#line 5408 "FacebookPublishing.c"
+#line 5729 "FacebookPublishing.c"
}
-static PublishingFacebookResolution* publishing_facebook_publishing_options_pane_create_resolution_list (PublishingFacebookPublishingOptionsPane* self, int* result_length1) {
+static PublishingFacebookResolution*
+publishing_facebook_publishing_options_pane_create_resolution_list (PublishingFacebookPublishingOptionsPane* self,
+ int* result_length1)
+{
PublishingFacebookResolution* result = NULL;
PublishingFacebookResolution* _result_ = NULL;
PublishingFacebookResolution* _tmp0_;
@@ -5470,222 +5794,218 @@ static PublishingFacebookResolution* publishing_facebook_publishing_options_pane
if (result_length1) {
#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
*result_length1 = _tmp3__length1;
-#line 5454 "FacebookPublishing.c"
+#line 5778 "FacebookPublishing.c"
}
#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
result = _tmp3_;
#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return result;
-#line 5460 "FacebookPublishing.c"
+#line 5784 "FacebookPublishing.c"
}
-void publishing_facebook_publishing_options_pane_installed (PublishingFacebookPublishingOptionsPane* self) {
- gboolean _tmp0_;
- GtkButton* _tmp24_;
+void
+publishing_facebook_publishing_options_pane_installed (PublishingFacebookPublishingOptionsPane* self)
+{
+ GtkButton* _tmp23_;
#line 903 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self));
#line 904 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp0_ = publishing_facebook_publishing_options_pane_publishing_photos (self);
-#line 904 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- if (_tmp0_) {
-#line 5473 "FacebookPublishing.c"
- PublishingFacebookAlbum** _tmp1_;
- gint _tmp1__length1;
+ if (publishing_facebook_publishing_options_pane_publishing_photos (self)) {
+#line 5796 "FacebookPublishing.c"
+ PublishingFacebookAlbum** _tmp0_;
+ gint _tmp0__length1;
#line 905 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp1_ = self->priv->albums;
+ _tmp0_ = self->priv->albums;
#line 905 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp1__length1 = self->priv->albums_length1;
+ _tmp0__length1 = self->priv->albums_length1;
#line 905 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- if (_tmp1__length1 == 0) {
-#line 5482 "FacebookPublishing.c"
- GtkRadioButton* _tmp2_;
- GtkEntry* _tmp3_;
- GtkComboBoxText* _tmp4_;
- GtkRadioButton* _tmp5_;
+ if (_tmp0__length1 == 0) {
+#line 5805 "FacebookPublishing.c"
+ GtkRadioButton* _tmp1_;
+ GtkEntry* _tmp2_;
+ GtkComboBoxText* _tmp3_;
+ GtkRadioButton* _tmp4_;
#line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp2_ = self->priv->create_new_radio;
+ _tmp1_ = self->priv->create_new_radio;
#line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
+ gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
#line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp3_ = self->priv->new_album_entry;
+ _tmp2_ = self->priv->new_album_entry;
#line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- gtk_entry_set_text (_tmp3_, PUBLISHING_FACEBOOK_DEFAULT_ALBUM_NAME);
+ gtk_entry_set_text (_tmp2_, PUBLISHING_FACEBOOK_DEFAULT_ALBUM_NAME);
#line 908 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp4_ = self->priv->existing_albums_combo;
+ _tmp3_ = self->priv->existing_albums_combo;
#line 908 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), FALSE);
+ gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), FALSE);
#line 909 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp5_ = self->priv->use_existing_radio;
+ _tmp4_ = self->priv->use_existing_radio;
#line 909 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 5503 "FacebookPublishing.c"
+ gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 5826 "FacebookPublishing.c"
} else {
gint default_album_seq_num = 0;
gint ticker = 0;
- PublishingFacebookAlbum** _tmp6_;
- gint _tmp6__length1;
- gint _tmp15_;
+ PublishingFacebookAlbum** _tmp5_;
+ gint _tmp5__length1;
+ gint _tmp14_;
#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
default_album_seq_num = -1;
#line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
ticker = 0;
#line 913 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp6_ = self->priv->albums;
+ _tmp5_ = self->priv->albums;
#line 913 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp6__length1 = self->priv->albums_length1;
-#line 5518 "FacebookPublishing.c"
+ _tmp5__length1 = self->priv->albums_length1;
+#line 5841 "FacebookPublishing.c"
{
PublishingFacebookAlbum** album_collection = NULL;
gint album_collection_length1 = 0;
gint _album_collection_size_ = 0;
gint album_it = 0;
#line 913 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- album_collection = _tmp6_;
+ album_collection = _tmp5_;
#line 913 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- album_collection_length1 = _tmp6__length1;
+ album_collection_length1 = _tmp5__length1;
#line 913 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- for (album_it = 0; album_it < _tmp6__length1; album_it = album_it + 1) {
-#line 5530 "FacebookPublishing.c"
- PublishingFacebookAlbum* _tmp7_;
+ for (album_it = 0; album_it < _tmp5__length1; album_it = album_it + 1) {
+#line 5853 "FacebookPublishing.c"
+ PublishingFacebookAlbum* _tmp6_;
PublishingFacebookAlbum* album = NULL;
#line 913 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp7_ = _publishing_facebook_album_ref0 (album_collection[album_it]);
+ _tmp6_ = _publishing_facebook_album_ref0 (album_collection[album_it]);
#line 913 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- album = _tmp7_;
-#line 5537 "FacebookPublishing.c"
+ album = _tmp6_;
+#line 5860 "FacebookPublishing.c"
{
- GtkComboBoxText* _tmp8_;
- PublishingFacebookAlbum* _tmp9_;
- const gchar* _tmp10_;
- PublishingFacebookAlbum* _tmp11_;
- const gchar* _tmp12_;
- gint _tmp14_;
+ GtkComboBoxText* _tmp7_;
+ PublishingFacebookAlbum* _tmp8_;
+ const gchar* _tmp9_;
+ PublishingFacebookAlbum* _tmp10_;
+ const gchar* _tmp11_;
+ gint _tmp13_;
#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp8_ = self->priv->existing_albums_combo;
+ _tmp7_ = self->priv->existing_albums_combo;
#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp9_ = album;
+ _tmp8_ = album;
#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp10_ = _tmp9_->name;
+ _tmp9_ = _tmp8_->name;
#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- gtk_combo_box_text_append_text (_tmp8_, _tmp10_);
+ gtk_combo_box_text_append_text (_tmp7_, _tmp9_);
#line 915 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp11_ = album;
+ _tmp10_ = album;
#line 915 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp12_ = _tmp11_->name;
+ _tmp11_ = _tmp10_->name;
#line 915 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- if (g_strcmp0 (_tmp12_, PUBLISHING_FACEBOOK_DEFAULT_ALBUM_NAME) == 0) {
-#line 5559 "FacebookPublishing.c"
- gint _tmp13_;
+ if (g_strcmp0 (_tmp11_, PUBLISHING_FACEBOOK_DEFAULT_ALBUM_NAME) == 0) {
+#line 5882 "FacebookPublishing.c"
+ gint _tmp12_;
#line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp13_ = ticker;
+ _tmp12_ = ticker;
#line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- default_album_seq_num = _tmp13_;
-#line 5565 "FacebookPublishing.c"
+ default_album_seq_num = _tmp12_;
+#line 5888 "FacebookPublishing.c"
}
#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp14_ = ticker;
+ _tmp13_ = ticker;
#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- ticker = _tmp14_ + 1;
+ ticker = _tmp13_ + 1;
#line 913 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_publishing_facebook_album_unref0 (album);
-#line 5573 "FacebookPublishing.c"
+#line 5896 "FacebookPublishing.c"
}
}
}
#line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp15_ = default_album_seq_num;
+ _tmp14_ = default_album_seq_num;
#line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- if (_tmp15_ != -1) {
-#line 5581 "FacebookPublishing.c"
- GtkComboBoxText* _tmp16_;
- gint _tmp17_;
- GtkRadioButton* _tmp18_;
- GtkEntry* _tmp19_;
+ if (_tmp14_ != -1) {
+#line 5904 "FacebookPublishing.c"
+ GtkComboBoxText* _tmp15_;
+ gint _tmp16_;
+ GtkRadioButton* _tmp17_;
+ GtkEntry* _tmp18_;
#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp16_ = self->priv->existing_albums_combo;
+ _tmp15_ = self->priv->existing_albums_combo;
#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp17_ = default_album_seq_num;
+ _tmp16_ = default_album_seq_num;
#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_combo_box_get_type (), GtkComboBox), _tmp17_);
+ gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_combo_box_get_type (), GtkComboBox), _tmp16_);
#line 921 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp18_ = self->priv->use_existing_radio;
+ _tmp17_ = self->priv->use_existing_radio;
#line 921 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
+ gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp19_ = self->priv->new_album_entry;
+ _tmp18_ = self->priv->new_album_entry;
#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 5600 "FacebookPublishing.c"
+ gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 5923 "FacebookPublishing.c"
} else {
- GtkRadioButton* _tmp20_;
+ GtkRadioButton* _tmp19_;
+ GtkComboBoxText* _tmp20_;
GtkComboBoxText* _tmp21_;
- GtkComboBoxText* _tmp22_;
- GtkEntry* _tmp23_;
+ GtkEntry* _tmp22_;
#line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp20_ = self->priv->create_new_radio;
+ _tmp19_ = self->priv->create_new_radio;
#line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
+ gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
#line 926 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp21_ = self->priv->existing_albums_combo;
+ _tmp20_ = self->priv->existing_albums_combo;
#line 926 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_combo_box_get_type (), GtkComboBox), 0);
+ gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_combo_box_get_type (), GtkComboBox), 0);
#line 927 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp22_ = self->priv->existing_albums_combo;
+ _tmp21_ = self->priv->existing_albums_combo;
#line 927 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_widget_get_type (), GtkWidget), FALSE);
+ gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget), FALSE);
#line 928 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp23_ = self->priv->new_album_entry;
+ _tmp22_ = self->priv->new_album_entry;
#line 928 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- gtk_entry_set_text (_tmp23_, PUBLISHING_FACEBOOK_DEFAULT_ALBUM_NAME);
-#line 5622 "FacebookPublishing.c"
+ gtk_entry_set_text (_tmp22_, PUBLISHING_FACEBOOK_DEFAULT_ALBUM_NAME);
+#line 5945 "FacebookPublishing.c"
}
}
}
#line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp24_ = self->priv->publish_button;
+ _tmp23_ = self->priv->publish_button;
#line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_widget_get_type (), GtkWidget));
-#line 5630 "FacebookPublishing.c"
+ gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget));
+#line 5953 "FacebookPublishing.c"
}
-static void publishing_facebook_publishing_options_pane_notify_logout (PublishingFacebookPublishingOptionsPane* self) {
+static void
+publishing_facebook_publishing_options_pane_notify_logout (PublishingFacebookPublishingOptionsPane* self)
+{
#line 936 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self));
#line 937 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_signal_emit (self, publishing_facebook_publishing_options_pane_signals[PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL], 0);
-#line 5639 "FacebookPublishing.c"
+#line 5964 "FacebookPublishing.c"
}
-static void publishing_facebook_publishing_options_pane_notify_publish (PublishingFacebookPublishingOptionsPane* self, const gchar* target_album, const gchar* privacy_setting, PublishingFacebookResolution target_resolution) {
- const gchar* _tmp0_;
- const gchar* _tmp1_;
- PublishingFacebookResolution _tmp2_;
- GtkCheckButton* _tmp3_;
- gboolean _tmp4_;
+static void
+publishing_facebook_publishing_options_pane_notify_publish (PublishingFacebookPublishingOptionsPane* self,
+ const gchar* target_album,
+ const gchar* privacy_setting,
+ PublishingFacebookResolution target_resolution)
+{
+ GtkCheckButton* _tmp0_;
#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self));
#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_if_fail (privacy_setting != NULL);
#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp0_ = target_album;
+ _tmp0_ = self->priv->strip_metadata_check;
#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp1_ = privacy_setting;
-#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp2_ = target_resolution;
-#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp3_ = self->priv->strip_metadata_check;
-#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp4_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_signal_emit (self, publishing_facebook_publishing_options_pane_signals[PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0, _tmp0_, _tmp1_, _tmp2_, _tmp4_);
-#line 5665 "FacebookPublishing.c"
+ g_signal_emit (self, publishing_facebook_publishing_options_pane_signals[PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0, target_album, privacy_setting, target_resolution, gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_button_get_type (), GtkToggleButton)));
+#line 5983 "FacebookPublishing.c"
}
-static GtkWidget* publishing_facebook_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base) {
+static GtkWidget*
+publishing_facebook_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base)
+{
PublishingFacebookPublishingOptionsPane * self;
GtkWidget* result = NULL;
GtkBox* _tmp0_;
@@ -5700,11 +6020,13 @@ static GtkWidget* publishing_facebook_publishing_options_pane_real_get_widget (S
result = _tmp1_;
#line 945 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return result;
-#line 5684 "FacebookPublishing.c"
+#line 6004 "FacebookPublishing.c"
}
-static SpitPublishingDialogPaneGeometryOptions publishing_facebook_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) {
+static SpitPublishingDialogPaneGeometryOptions
+publishing_facebook_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base)
+{
PublishingFacebookPublishingOptionsPane * self;
SpitPublishingDialogPaneGeometryOptions result = 0;
#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -5713,25 +6035,37 @@ static SpitPublishingDialogPaneGeometryOptions publishing_facebook_publishing_op
result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
#line 949 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return result;
-#line 5697 "FacebookPublishing.c"
+#line 6019 "FacebookPublishing.c"
}
-static void _publishing_facebook_publishing_options_pane_notify_logout_publishing_facebook_publishing_options_pane_logout (PublishingFacebookPublishingOptionsPane* _sender, gpointer self) {
+static void
+_publishing_facebook_publishing_options_pane_notify_logout_publishing_facebook_publishing_options_pane_logout (PublishingFacebookPublishingOptionsPane* _sender,
+ gpointer self)
+{
#line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_publishing_options_pane_notify_logout ((PublishingFacebookPublishingOptionsPane*) self);
-#line 5704 "FacebookPublishing.c"
+#line 6029 "FacebookPublishing.c"
}
-static void _publishing_facebook_publishing_options_pane_notify_publish_publishing_facebook_publishing_options_pane_publish (PublishingFacebookPublishingOptionsPane* _sender, const gchar* target_album, const gchar* privacy_setting, PublishingFacebookResolution target_resolution, gboolean strip_metadata, gpointer self) {
+static void
+_publishing_facebook_publishing_options_pane_notify_publish_publishing_facebook_publishing_options_pane_publish (PublishingFacebookPublishingOptionsPane* _sender,
+ const gchar* target_album,
+ const gchar* privacy_setting,
+ PublishingFacebookResolution target_resolution,
+ gboolean strip_metadata,
+ gpointer self)
+{
#line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_publishing_options_pane_notify_publish ((PublishingFacebookPublishingOptionsPane*) self, target_album, privacy_setting, target_resolution);
-#line 5711 "FacebookPublishing.c"
+#line 6043 "FacebookPublishing.c"
}
-static void publishing_facebook_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base) {
+static void
+publishing_facebook_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base)
+{
PublishingFacebookPublishingOptionsPane * self;
#line 952 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FACEBOOK_TYPE_PUBLISHING_OPTIONS_PANE, PublishingFacebookPublishingOptionsPane);
@@ -5741,11 +6075,13 @@ static void publishing_facebook_publishing_options_pane_real_on_pane_installed (
g_signal_connect_object (self, "publish", (GCallback) _publishing_facebook_publishing_options_pane_notify_publish_publishing_facebook_publishing_options_pane_publish, self, 0);
#line 956 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_publishing_options_pane_installed (self);
-#line 5725 "FacebookPublishing.c"
+#line 6059 "FacebookPublishing.c"
}
-static void publishing_facebook_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) {
+static void
+publishing_facebook_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base)
+{
PublishingFacebookPublishingOptionsPane * self;
guint _tmp0_;
guint _tmp1_;
@@ -5759,11 +6095,18 @@ static void publishing_facebook_publishing_options_pane_real_on_pane_uninstalled
g_signal_parse_name ("publish", PUBLISHING_FACEBOOK_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp1_, NULL, FALSE);
#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_signal_handlers_disconnect_matched (self, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_facebook_publishing_options_pane_notify_publish_publishing_facebook_publishing_options_pane_publish, self);
-#line 5743 "FacebookPublishing.c"
+#line 6079 "FacebookPublishing.c"
}
-static void g_cclosure_user_marshal_VOID__STRING_STRING_ENUM_BOOLEAN (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) {
+static void
+g_cclosure_user_marshal_VOID__STRING_STRING_ENUM_BOOLEAN (GClosure * closure,
+ GValue * return_value,
+ guint n_param_values,
+ const GValue * param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data)
+{
typedef void (*GMarshalFunc_VOID__STRING_STRING_ENUM_BOOLEAN) (gpointer data1, const char* arg_1, const char* arg_2, gint arg_3, gboolean arg_4, gpointer data2);
register GMarshalFunc_VOID__STRING_STRING_ENUM_BOOLEAN callback;
register GCClosure * cc;
@@ -5778,28 +6121,30 @@ static void g_cclosure_user_marshal_VOID__STRING_STRING_ENUM_BOOLEAN (GClosure *
data1 = closure->data;
#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
data2 = param_values->data[0].v_pointer;
-#line 5762 "FacebookPublishing.c"
+#line 6105 "FacebookPublishing.c"
} else {
#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
data1 = param_values->data[0].v_pointer;
#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
data2 = closure->data;
-#line 5768 "FacebookPublishing.c"
+#line 6111 "FacebookPublishing.c"
}
#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
callback = (GMarshalFunc_VOID__STRING_STRING_ENUM_BOOLEAN) (marshal_data ? marshal_data : cc->callback);
#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
callback (data1, g_value_get_string (param_values + 1), g_value_get_string (param_values + 2), g_value_get_enum (param_values + 3), g_value_get_boolean (param_values + 4), data2);
-#line 5774 "FacebookPublishing.c"
+#line 6117 "FacebookPublishing.c"
}
-static PublishingFacebookPublishingOptionsPanePrivacyDescription* publishing_facebook_publishing_options_pane_privacy_description_construct (GType object_type, const gchar* description, const gchar* privacy_setting) {
+static PublishingFacebookPublishingOptionsPanePrivacyDescription*
+publishing_facebook_publishing_options_pane_privacy_description_construct (GType object_type,
+ const gchar* description,
+ const gchar* privacy_setting)
+{
PublishingFacebookPublishingOptionsPanePrivacyDescription* self = NULL;
- const gchar* _tmp0_;
+ gchar* _tmp0_;
gchar* _tmp1_;
- const gchar* _tmp2_;
- gchar* _tmp3_;
#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_val_if_fail (description != NULL, NULL);
#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -5807,132 +6152,156 @@ static PublishingFacebookPublishingOptionsPanePrivacyDescription* publishing_fac
#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
self = (PublishingFacebookPublishingOptionsPanePrivacyDescription*) g_type_create_instance (object_type);
#line 738 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp0_ = description;
-#line 738 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp1_ = g_strdup (_tmp0_);
+ _tmp0_ = g_strdup (description);
#line 738 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_g_free0 (self->description);
#line 738 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- self->description = _tmp1_;
-#line 739 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp2_ = privacy_setting;
+ self->description = _tmp0_;
#line 739 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp3_ = g_strdup (_tmp2_);
+ _tmp1_ = g_strdup (privacy_setting);
#line 739 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_g_free0 (self->privacy_setting);
#line 739 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- self->privacy_setting = _tmp3_;
+ self->privacy_setting = _tmp1_;
#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return self;
-#line 5808 "FacebookPublishing.c"
+#line 6149 "FacebookPublishing.c"
}
-static PublishingFacebookPublishingOptionsPanePrivacyDescription* publishing_facebook_publishing_options_pane_privacy_description_new (const gchar* description, const gchar* privacy_setting) {
+static PublishingFacebookPublishingOptionsPanePrivacyDescription*
+publishing_facebook_publishing_options_pane_privacy_description_new (const gchar* description,
+ const gchar* privacy_setting)
+{
#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return publishing_facebook_publishing_options_pane_privacy_description_construct (PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_TYPE_PRIVACY_DESCRIPTION, description, privacy_setting);
-#line 5815 "FacebookPublishing.c"
+#line 6159 "FacebookPublishing.c"
}
-static void publishing_facebook_publishing_options_pane_value_privacy_description_init (GValue* value) {
+static void
+publishing_facebook_publishing_options_pane_value_privacy_description_init (GValue* value)
+{
#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 5822 "FacebookPublishing.c"
+#line 6168 "FacebookPublishing.c"
}
-static void publishing_facebook_publishing_options_pane_value_privacy_description_free_value (GValue* value) {
+static void
+publishing_facebook_publishing_options_pane_value_privacy_description_free_value (GValue* value)
+{
#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
if (value->data[0].v_pointer) {
#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_publishing_options_pane_privacy_description_unref (value->data[0].v_pointer);
-#line 5831 "FacebookPublishing.c"
+#line 6179 "FacebookPublishing.c"
}
}
-static void publishing_facebook_publishing_options_pane_value_privacy_description_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+publishing_facebook_publishing_options_pane_value_privacy_description_copy_value (const GValue* src_value,
+ GValue* dest_value)
+{
#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
if (src_value->data[0].v_pointer) {
#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
dest_value->data[0].v_pointer = publishing_facebook_publishing_options_pane_privacy_description_ref (src_value->data[0].v_pointer);
-#line 5841 "FacebookPublishing.c"
+#line 6192 "FacebookPublishing.c"
} else {
#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
dest_value->data[0].v_pointer = NULL;
-#line 5845 "FacebookPublishing.c"
+#line 6196 "FacebookPublishing.c"
}
}
-static gpointer publishing_facebook_publishing_options_pane_value_privacy_description_peek_pointer (const GValue* value) {
+static gpointer
+publishing_facebook_publishing_options_pane_value_privacy_description_peek_pointer (const GValue* value)
+{
#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return value->data[0].v_pointer;
-#line 5853 "FacebookPublishing.c"
+#line 6206 "FacebookPublishing.c"
}
-static gchar* publishing_facebook_publishing_options_pane_value_privacy_description_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_facebook_publishing_options_pane_value_privacy_description_collect_value (GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
if (collect_values[0].v_pointer) {
-#line 5860 "FacebookPublishing.c"
+#line 6218 "FacebookPublishing.c"
PublishingFacebookPublishingOptionsPanePrivacyDescription * object;
object = collect_values[0].v_pointer;
#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
if (object->parent_instance.g_class == NULL) {
#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 5867 "FacebookPublishing.c"
+#line 6225 "FacebookPublishing.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 5871 "FacebookPublishing.c"
+#line 6229 "FacebookPublishing.c"
}
#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
value->data[0].v_pointer = publishing_facebook_publishing_options_pane_privacy_description_ref (object);
-#line 5875 "FacebookPublishing.c"
+#line 6233 "FacebookPublishing.c"
} else {
#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 5879 "FacebookPublishing.c"
+#line 6237 "FacebookPublishing.c"
}
#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return NULL;
-#line 5883 "FacebookPublishing.c"
+#line 6241 "FacebookPublishing.c"
}
-static gchar* publishing_facebook_publishing_options_pane_value_privacy_description_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_facebook_publishing_options_pane_value_privacy_description_lcopy_value (const GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
PublishingFacebookPublishingOptionsPanePrivacyDescription ** object_p;
object_p = collect_values[0].v_pointer;
#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
if (!object_p) {
#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 5894 "FacebookPublishing.c"
+#line 6257 "FacebookPublishing.c"
}
#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
if (!value->data[0].v_pointer) {
#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
*object_p = NULL;
-#line 5900 "FacebookPublishing.c"
+#line 6263 "FacebookPublishing.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
*object_p = value->data[0].v_pointer;
-#line 5904 "FacebookPublishing.c"
+#line 6267 "FacebookPublishing.c"
} else {
#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
*object_p = publishing_facebook_publishing_options_pane_privacy_description_ref (value->data[0].v_pointer);
-#line 5908 "FacebookPublishing.c"
+#line 6271 "FacebookPublishing.c"
}
#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return NULL;
-#line 5912 "FacebookPublishing.c"
+#line 6275 "FacebookPublishing.c"
}
-static GParamSpec* publishing_facebook_publishing_options_pane_param_spec_privacy_description (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+static GParamSpec*
+publishing_facebook_publishing_options_pane_param_spec_privacy_description (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags)
+{
PublishingFacebookPublishingOptionsPaneParamSpecPrivacyDescription* spec;
#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_TYPE_PRIVACY_DESCRIPTION), NULL);
@@ -5942,20 +6311,25 @@ static GParamSpec* publishing_facebook_publishing_options_pane_param_spec_privac
G_PARAM_SPEC (spec)->value_type = object_type;
#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return G_PARAM_SPEC (spec);
-#line 5926 "FacebookPublishing.c"
+#line 6295 "FacebookPublishing.c"
}
-static gpointer publishing_facebook_publishing_options_pane_value_get_privacy_description (const GValue* value) {
+static gpointer
+publishing_facebook_publishing_options_pane_value_get_privacy_description (const GValue* value)
+{
#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_TYPE_PRIVACY_DESCRIPTION), NULL);
#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return value->data[0].v_pointer;
-#line 5935 "FacebookPublishing.c"
+#line 6306 "FacebookPublishing.c"
}
-static void publishing_facebook_publishing_options_pane_value_set_privacy_description (GValue* value, gpointer v_object) {
+static void
+publishing_facebook_publishing_options_pane_value_set_privacy_description (GValue* value,
+ gpointer v_object)
+{
PublishingFacebookPublishingOptionsPanePrivacyDescription * old;
#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_TYPE_PRIVACY_DESCRIPTION));
@@ -5971,22 +6345,25 @@ static void publishing_facebook_publishing_options_pane_value_set_privacy_descri
value->data[0].v_pointer = v_object;
#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_publishing_options_pane_privacy_description_ref (value->data[0].v_pointer);
-#line 5955 "FacebookPublishing.c"
+#line 6329 "FacebookPublishing.c"
} else {
#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 5959 "FacebookPublishing.c"
+#line 6333 "FacebookPublishing.c"
}
#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
if (old) {
#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_publishing_options_pane_privacy_description_unref (old);
-#line 5965 "FacebookPublishing.c"
+#line 6339 "FacebookPublishing.c"
}
}
-static void publishing_facebook_publishing_options_pane_value_take_privacy_description (GValue* value, gpointer v_object) {
+static void
+publishing_facebook_publishing_options_pane_value_take_privacy_description (GValue* value,
+ gpointer v_object)
+{
PublishingFacebookPublishingOptionsPanePrivacyDescription * old;
#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_TYPE_PRIVACY_DESCRIPTION));
@@ -6000,38 +6377,44 @@ static void publishing_facebook_publishing_options_pane_value_take_privacy_descr
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
value->data[0].v_pointer = v_object;
-#line 5984 "FacebookPublishing.c"
+#line 6361 "FacebookPublishing.c"
} else {
#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 5988 "FacebookPublishing.c"
+#line 6365 "FacebookPublishing.c"
}
#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
if (old) {
#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_publishing_options_pane_privacy_description_unref (old);
-#line 5994 "FacebookPublishing.c"
+#line 6371 "FacebookPublishing.c"
}
}
-static void publishing_facebook_publishing_options_pane_privacy_description_class_init (PublishingFacebookPublishingOptionsPanePrivacyDescriptionClass * klass) {
+static void
+publishing_facebook_publishing_options_pane_privacy_description_class_init (PublishingFacebookPublishingOptionsPanePrivacyDescriptionClass * klass)
+{
#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_publishing_options_pane_privacy_description_parent_class = g_type_class_peek_parent (klass);
#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
((PublishingFacebookPublishingOptionsPanePrivacyDescriptionClass *) klass)->finalize = publishing_facebook_publishing_options_pane_privacy_description_finalize;
-#line 6004 "FacebookPublishing.c"
+#line 6383 "FacebookPublishing.c"
}
-static void publishing_facebook_publishing_options_pane_privacy_description_instance_init (PublishingFacebookPublishingOptionsPanePrivacyDescription * self) {
+static void
+publishing_facebook_publishing_options_pane_privacy_description_instance_init (PublishingFacebookPublishingOptionsPanePrivacyDescription * self)
+{
#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
self->ref_count = 1;
-#line 6011 "FacebookPublishing.c"
+#line 6392 "FacebookPublishing.c"
}
-static void publishing_facebook_publishing_options_pane_privacy_description_finalize (PublishingFacebookPublishingOptionsPanePrivacyDescription * obj) {
+static void
+publishing_facebook_publishing_options_pane_privacy_description_finalize (PublishingFacebookPublishingOptionsPanePrivacyDescription * obj)
+{
PublishingFacebookPublishingOptionsPanePrivacyDescription * self;
#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_TYPE_PRIVACY_DESCRIPTION, PublishingFacebookPublishingOptionsPanePrivacyDescription);
@@ -6041,11 +6424,13 @@ static void publishing_facebook_publishing_options_pane_privacy_description_fina
_g_free0 (self->description);
#line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_g_free0 (self->privacy_setting);
-#line 6025 "FacebookPublishing.c"
+#line 6408 "FacebookPublishing.c"
}
-static GType publishing_facebook_publishing_options_pane_privacy_description_get_type (void) {
+static GType
+publishing_facebook_publishing_options_pane_privacy_description_get_type (void)
+{
static volatile gsize publishing_facebook_publishing_options_pane_privacy_description_type_id__volatile = 0;
if (g_once_init_enter (&publishing_facebook_publishing_options_pane_privacy_description_type_id__volatile)) {
static const GTypeValueTable g_define_type_value_table = { publishing_facebook_publishing_options_pane_value_privacy_description_init, publishing_facebook_publishing_options_pane_value_privacy_description_free_value, publishing_facebook_publishing_options_pane_value_privacy_description_copy_value, publishing_facebook_publishing_options_pane_value_privacy_description_peek_pointer, "p", publishing_facebook_publishing_options_pane_value_privacy_description_collect_value, "p", publishing_facebook_publishing_options_pane_value_privacy_description_lcopy_value };
@@ -6059,18 +6444,22 @@ static GType publishing_facebook_publishing_options_pane_privacy_description_get
}
-static gpointer publishing_facebook_publishing_options_pane_privacy_description_ref (gpointer instance) {
+static gpointer
+publishing_facebook_publishing_options_pane_privacy_description_ref (gpointer instance)
+{
PublishingFacebookPublishingOptionsPanePrivacyDescription * self;
self = instance;
#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_atomic_int_inc (&self->ref_count);
#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return instance;
-#line 6050 "FacebookPublishing.c"
+#line 6437 "FacebookPublishing.c"
}
-static void publishing_facebook_publishing_options_pane_privacy_description_unref (gpointer instance) {
+static void
+publishing_facebook_publishing_options_pane_privacy_description_unref (gpointer instance)
+{
PublishingFacebookPublishingOptionsPanePrivacyDescription * self;
self = instance;
#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -6079,12 +6468,14 @@ static void publishing_facebook_publishing_options_pane_privacy_description_unre
PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_PRIVACY_DESCRIPTION_GET_CLASS (self)->finalize (self);
#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 6063 "FacebookPublishing.c"
+#line 6452 "FacebookPublishing.c"
}
}
-static void publishing_facebook_publishing_options_pane_class_init (PublishingFacebookPublishingOptionsPaneClass * klass) {
+static void
+publishing_facebook_publishing_options_pane_class_init (PublishingFacebookPublishingOptionsPaneClass * klass)
+{
#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_publishing_options_pane_parent_class = g_type_class_peek_parent (klass);
#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -6095,11 +6486,13 @@ static void publishing_facebook_publishing_options_pane_class_init (PublishingFa
publishing_facebook_publishing_options_pane_signals[PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL] = g_signal_new ("logout", PUBLISHING_FACEBOOK_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_publishing_options_pane_signals[PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL] = g_signal_new ("publish", PUBLISHING_FACEBOOK_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__STRING_STRING_ENUM_BOOLEAN, G_TYPE_NONE, 4, G_TYPE_STRING, G_TYPE_STRING, PUBLISHING_FACEBOOK_TYPE_RESOLUTION, G_TYPE_BOOLEAN);
-#line 6079 "FacebookPublishing.c"
+#line 6470 "FacebookPublishing.c"
}
-static void publishing_facebook_publishing_options_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) {
+static void
+publishing_facebook_publishing_options_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface)
+{
#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -6110,11 +6503,13 @@ static void publishing_facebook_publishing_options_pane_spit_publishing_dialog_p
iface->on_pane_installed = (void (*) (SpitPublishingDialogPane *)) publishing_facebook_publishing_options_pane_real_on_pane_installed;
#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
iface->on_pane_uninstalled = (void (*) (SpitPublishingDialogPane *)) publishing_facebook_publishing_options_pane_real_on_pane_uninstalled;
-#line 6094 "FacebookPublishing.c"
+#line 6487 "FacebookPublishing.c"
}
-static void publishing_facebook_publishing_options_pane_instance_init (PublishingFacebookPublishingOptionsPane * self) {
+static void
+publishing_facebook_publishing_options_pane_instance_init (PublishingFacebookPublishingOptionsPane * self)
+{
#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
self->priv = PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_GET_PRIVATE (self);
#line 704 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -6147,11 +6542,13 @@ static void publishing_facebook_publishing_options_pane_instance_init (Publishin
self->priv->publisher = NULL;
#line 719 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
self->priv->resolution_combo = NULL;
-#line 6131 "FacebookPublishing.c"
+#line 6526 "FacebookPublishing.c"
}
-static void publishing_facebook_publishing_options_pane_finalize (GObject * obj) {
+static void
+publishing_facebook_publishing_options_pane_finalize (GObject * obj)
+{
PublishingFacebookPublishingOptionsPane * self;
#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FACEBOOK_TYPE_PUBLISHING_OPTIONS_PANE, PublishingFacebookPublishingOptionsPane);
@@ -6189,11 +6586,13 @@ static void publishing_facebook_publishing_options_pane_finalize (GObject * obj)
_g_object_unref0 (self->priv->resolution_combo);
#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
G_OBJECT_CLASS (publishing_facebook_publishing_options_pane_parent_class)->finalize (obj);
-#line 6173 "FacebookPublishing.c"
+#line 6570 "FacebookPublishing.c"
}
-GType publishing_facebook_publishing_options_pane_get_type (void) {
+GType
+publishing_facebook_publishing_options_pane_get_type (void)
+{
static volatile gsize publishing_facebook_publishing_options_pane_type_id__volatile = 0;
if (g_once_init_enter (&publishing_facebook_publishing_options_pane_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingFacebookPublishingOptionsPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_facebook_publishing_options_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingFacebookPublishingOptionsPane), 0, (GInstanceInitFunc) publishing_facebook_publishing_options_pane_instance_init, NULL };
@@ -6207,13 +6606,15 @@ GType publishing_facebook_publishing_options_pane_get_type (void) {
}
-gchar* publishing_facebook_endpoint_to_uri (PublishingFacebookEndpoint self) {
+gchar*
+publishing_facebook_endpoint_to_uri (PublishingFacebookEndpoint self)
+{
gchar* result = NULL;
#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
switch (self) {
#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
case PUBLISHING_FACEBOOK_ENDPOINT_DEFAULT:
-#line 6197 "FacebookPublishing.c"
+#line 6598 "FacebookPublishing.c"
{
gchar* _tmp0_;
#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -6222,11 +6623,11 @@ gchar* publishing_facebook_endpoint_to_uri (PublishingFacebookEndpoint self) {
result = _tmp0_;
#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return result;
-#line 6206 "FacebookPublishing.c"
+#line 6607 "FacebookPublishing.c"
}
#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
case PUBLISHING_FACEBOOK_ENDPOINT_VIDEO:
-#line 6210 "FacebookPublishing.c"
+#line 6611 "FacebookPublishing.c"
{
gchar* _tmp1_;
#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -6235,11 +6636,11 @@ gchar* publishing_facebook_endpoint_to_uri (PublishingFacebookEndpoint self) {
result = _tmp1_;
#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return result;
-#line 6219 "FacebookPublishing.c"
+#line 6620 "FacebookPublishing.c"
}
#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
case PUBLISHING_FACEBOOK_ENDPOINT_TEST_CONNECTION:
-#line 6223 "FacebookPublishing.c"
+#line 6624 "FacebookPublishing.c"
{
gchar* _tmp2_;
#line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -6248,19 +6649,21 @@ gchar* publishing_facebook_endpoint_to_uri (PublishingFacebookEndpoint self) {
result = _tmp2_;
#line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return result;
-#line 6232 "FacebookPublishing.c"
+#line 6633 "FacebookPublishing.c"
}
default:
{
#line 982 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_assert_not_reached ();
-#line 6238 "FacebookPublishing.c"
+#line 6639 "FacebookPublishing.c"
}
}
}
-GType publishing_facebook_endpoint_get_type (void) {
+GType
+publishing_facebook_endpoint_get_type (void)
+{
static volatile gsize publishing_facebook_endpoint_type_id__volatile = 0;
if (g_once_init_enter (&publishing_facebook_endpoint_type_id__volatile)) {
static const GEnumValue values[] = {{PUBLISHING_FACEBOOK_ENDPOINT_DEFAULT, "PUBLISHING_FACEBOOK_ENDPOINT_DEFAULT", "default"}, {PUBLISHING_FACEBOOK_ENDPOINT_VIDEO, "PUBLISHING_FACEBOOK_ENDPOINT_VIDEO", "video"}, {PUBLISHING_FACEBOOK_ENDPOINT_TEST_CONNECTION, "PUBLISHING_FACEBOOK_ENDPOINT_TEST_CONNECTION", "test-connection"}, {0, NULL, NULL}};
@@ -6272,53 +6675,70 @@ GType publishing_facebook_endpoint_get_type (void) {
}
-static gchar* publishing_facebook_graph_message_real_get_uri (PublishingFacebookGraphMessage* self) {
+static gchar*
+publishing_facebook_graph_message_real_get_uri (PublishingFacebookGraphMessage* self)
+{
#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_critical ("Type `%s' does not implement abstract method `publishing_facebook_graph_message_get_uri'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return NULL;
-#line 6261 "FacebookPublishing.c"
+#line 6666 "FacebookPublishing.c"
}
-gchar* publishing_facebook_graph_message_get_uri (PublishingFacebookGraphMessage* self) {
+gchar*
+publishing_facebook_graph_message_get_uri (PublishingFacebookGraphMessage* self)
+{
#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_MESSAGE (self), NULL);
#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return PUBLISHING_FACEBOOK_GRAPH_MESSAGE_GET_CLASS (self)->get_uri (self);
-#line 6270 "FacebookPublishing.c"
+#line 6677 "FacebookPublishing.c"
}
-static gchar* publishing_facebook_graph_message_real_get_response_body (PublishingFacebookGraphMessage* self) {
+static gchar*
+publishing_facebook_graph_message_real_get_response_body (PublishingFacebookGraphMessage* self)
+{
#line 993 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_critical ("Type `%s' does not implement abstract method `publishing_facebook_graph_message_get_response_body'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 993 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return NULL;
-#line 6279 "FacebookPublishing.c"
+#line 6688 "FacebookPublishing.c"
}
-gchar* publishing_facebook_graph_message_get_response_body (PublishingFacebookGraphMessage* self) {
+gchar*
+publishing_facebook_graph_message_get_response_body (PublishingFacebookGraphMessage* self)
+{
#line 993 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_MESSAGE (self), NULL);
#line 993 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return PUBLISHING_FACEBOOK_GRAPH_MESSAGE_GET_CLASS (self)->get_response_body (self);
-#line 6288 "FacebookPublishing.c"
+#line 6699 "FacebookPublishing.c"
}
-PublishingFacebookGraphMessage* publishing_facebook_graph_message_construct (GType object_type) {
+PublishingFacebookGraphMessage*
+publishing_facebook_graph_message_construct (GType object_type)
+{
PublishingFacebookGraphMessage* self = NULL;
#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
self = (PublishingFacebookGraphMessage*) g_type_create_instance (object_type);
#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return self;
-#line 6298 "FacebookPublishing.c"
+#line 6711 "FacebookPublishing.c"
}
-static void g_cclosure_user_marshal_VOID__INT_INT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) {
+static void
+g_cclosure_user_marshal_VOID__INT_INT (GClosure * closure,
+ GValue * return_value,
+ guint n_param_values,
+ const GValue * param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data)
+{
typedef void (*GMarshalFunc_VOID__INT_INT) (gpointer data1, gint arg_1, gint arg_2, gpointer data2);
register GMarshalFunc_VOID__INT_INT callback;
register GCClosure * cc;
@@ -6333,120 +6753,145 @@ static void g_cclosure_user_marshal_VOID__INT_INT (GClosure * closure, GValue *
data1 = closure->data;
#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
data2 = param_values->data[0].v_pointer;
-#line 6317 "FacebookPublishing.c"
+#line 6737 "FacebookPublishing.c"
} else {
#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
data1 = param_values->data[0].v_pointer;
#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
data2 = closure->data;
-#line 6323 "FacebookPublishing.c"
+#line 6743 "FacebookPublishing.c"
}
#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
callback = (GMarshalFunc_VOID__INT_INT) (marshal_data ? marshal_data : cc->callback);
#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
callback (data1, g_value_get_int (param_values + 1), g_value_get_int (param_values + 2), data2);
-#line 6329 "FacebookPublishing.c"
+#line 6749 "FacebookPublishing.c"
}
-static void publishing_facebook_value_graph_message_init (GValue* value) {
+static void
+publishing_facebook_value_graph_message_init (GValue* value)
+{
#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 6336 "FacebookPublishing.c"
+#line 6758 "FacebookPublishing.c"
}
-static void publishing_facebook_value_graph_message_free_value (GValue* value) {
+static void
+publishing_facebook_value_graph_message_free_value (GValue* value)
+{
#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
if (value->data[0].v_pointer) {
#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_graph_message_unref (value->data[0].v_pointer);
-#line 6345 "FacebookPublishing.c"
+#line 6769 "FacebookPublishing.c"
}
}
-static void publishing_facebook_value_graph_message_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+publishing_facebook_value_graph_message_copy_value (const GValue* src_value,
+ GValue* dest_value)
+{
#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
if (src_value->data[0].v_pointer) {
#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
dest_value->data[0].v_pointer = publishing_facebook_graph_message_ref (src_value->data[0].v_pointer);
-#line 6355 "FacebookPublishing.c"
+#line 6782 "FacebookPublishing.c"
} else {
#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
dest_value->data[0].v_pointer = NULL;
-#line 6359 "FacebookPublishing.c"
+#line 6786 "FacebookPublishing.c"
}
}
-static gpointer publishing_facebook_value_graph_message_peek_pointer (const GValue* value) {
+static gpointer
+publishing_facebook_value_graph_message_peek_pointer (const GValue* value)
+{
#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return value->data[0].v_pointer;
-#line 6367 "FacebookPublishing.c"
+#line 6796 "FacebookPublishing.c"
}
-static gchar* publishing_facebook_value_graph_message_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_facebook_value_graph_message_collect_value (GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
if (collect_values[0].v_pointer) {
-#line 6374 "FacebookPublishing.c"
+#line 6808 "FacebookPublishing.c"
PublishingFacebookGraphMessage * object;
object = collect_values[0].v_pointer;
#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
if (object->parent_instance.g_class == NULL) {
#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 6381 "FacebookPublishing.c"
+#line 6815 "FacebookPublishing.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 6385 "FacebookPublishing.c"
+#line 6819 "FacebookPublishing.c"
}
#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
value->data[0].v_pointer = publishing_facebook_graph_message_ref (object);
-#line 6389 "FacebookPublishing.c"
+#line 6823 "FacebookPublishing.c"
} else {
#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 6393 "FacebookPublishing.c"
+#line 6827 "FacebookPublishing.c"
}
#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return NULL;
-#line 6397 "FacebookPublishing.c"
+#line 6831 "FacebookPublishing.c"
}
-static gchar* publishing_facebook_value_graph_message_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_facebook_value_graph_message_lcopy_value (const GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
PublishingFacebookGraphMessage ** object_p;
object_p = collect_values[0].v_pointer;
#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
if (!object_p) {
#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 6408 "FacebookPublishing.c"
+#line 6847 "FacebookPublishing.c"
}
#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
if (!value->data[0].v_pointer) {
#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
*object_p = NULL;
-#line 6414 "FacebookPublishing.c"
+#line 6853 "FacebookPublishing.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
*object_p = value->data[0].v_pointer;
-#line 6418 "FacebookPublishing.c"
+#line 6857 "FacebookPublishing.c"
} else {
#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
*object_p = publishing_facebook_graph_message_ref (value->data[0].v_pointer);
-#line 6422 "FacebookPublishing.c"
+#line 6861 "FacebookPublishing.c"
}
#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return NULL;
-#line 6426 "FacebookPublishing.c"
+#line 6865 "FacebookPublishing.c"
}
-GParamSpec* publishing_facebook_param_spec_graph_message (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+publishing_facebook_param_spec_graph_message (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags)
+{
PublishingFacebookParamSpecGraphMessage* spec;
#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE), NULL);
@@ -6456,20 +6901,25 @@ GParamSpec* publishing_facebook_param_spec_graph_message (const gchar* name, con
G_PARAM_SPEC (spec)->value_type = object_type;
#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return G_PARAM_SPEC (spec);
-#line 6440 "FacebookPublishing.c"
+#line 6885 "FacebookPublishing.c"
}
-gpointer publishing_facebook_value_get_graph_message (const GValue* value) {
+gpointer
+publishing_facebook_value_get_graph_message (const GValue* value)
+{
#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE), NULL);
#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return value->data[0].v_pointer;
-#line 6449 "FacebookPublishing.c"
+#line 6896 "FacebookPublishing.c"
}
-void publishing_facebook_value_set_graph_message (GValue* value, gpointer v_object) {
+void
+publishing_facebook_value_set_graph_message (GValue* value,
+ gpointer v_object)
+{
PublishingFacebookGraphMessage * old;
#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE));
@@ -6485,22 +6935,25 @@ void publishing_facebook_value_set_graph_message (GValue* value, gpointer v_obje
value->data[0].v_pointer = v_object;
#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_graph_message_ref (value->data[0].v_pointer);
-#line 6469 "FacebookPublishing.c"
+#line 6919 "FacebookPublishing.c"
} else {
#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 6473 "FacebookPublishing.c"
+#line 6923 "FacebookPublishing.c"
}
#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
if (old) {
#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_graph_message_unref (old);
-#line 6479 "FacebookPublishing.c"
+#line 6929 "FacebookPublishing.c"
}
}
-void publishing_facebook_value_take_graph_message (GValue* value, gpointer v_object) {
+void
+publishing_facebook_value_take_graph_message (GValue* value,
+ gpointer v_object)
+{
PublishingFacebookGraphMessage * old;
#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE));
@@ -6514,22 +6967,24 @@ void publishing_facebook_value_take_graph_message (GValue* value, gpointer v_obj
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
value->data[0].v_pointer = v_object;
-#line 6498 "FacebookPublishing.c"
+#line 6951 "FacebookPublishing.c"
} else {
#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 6502 "FacebookPublishing.c"
+#line 6955 "FacebookPublishing.c"
}
#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
if (old) {
#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_graph_message_unref (old);
-#line 6508 "FacebookPublishing.c"
+#line 6961 "FacebookPublishing.c"
}
}
-static void publishing_facebook_graph_message_class_init (PublishingFacebookGraphMessageClass * klass) {
+static void
+publishing_facebook_graph_message_class_init (PublishingFacebookGraphMessageClass * klass)
+{
#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_graph_message_parent_class = g_type_class_peek_parent (klass);
#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -6544,28 +6999,34 @@ static void publishing_facebook_graph_message_class_init (PublishingFacebookGrap
publishing_facebook_graph_message_signals[PUBLISHING_FACEBOOK_GRAPH_MESSAGE_FAILED_SIGNAL] = g_signal_new ("failed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER);
#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_graph_message_signals[PUBLISHING_FACEBOOK_GRAPH_MESSAGE_DATA_TRANSMITTED_SIGNAL] = g_signal_new ("data-transmitted", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__INT_INT, G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT);
-#line 6528 "FacebookPublishing.c"
+#line 6983 "FacebookPublishing.c"
}
-static void publishing_facebook_graph_message_instance_init (PublishingFacebookGraphMessage * self) {
+static void
+publishing_facebook_graph_message_instance_init (PublishingFacebookGraphMessage * self)
+{
#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
self->ref_count = 1;
-#line 6535 "FacebookPublishing.c"
+#line 6992 "FacebookPublishing.c"
}
-static void publishing_facebook_graph_message_finalize (PublishingFacebookGraphMessage * obj) {
+static void
+publishing_facebook_graph_message_finalize (PublishingFacebookGraphMessage * obj)
+{
PublishingFacebookGraphMessage * self;
#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage);
#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_signal_handlers_destroy (self);
-#line 6545 "FacebookPublishing.c"
+#line 7004 "FacebookPublishing.c"
}
-GType publishing_facebook_graph_message_get_type (void) {
+GType
+publishing_facebook_graph_message_get_type (void)
+{
static volatile gsize publishing_facebook_graph_message_type_id__volatile = 0;
if (g_once_init_enter (&publishing_facebook_graph_message_type_id__volatile)) {
static const GTypeValueTable g_define_type_value_table = { publishing_facebook_value_graph_message_init, publishing_facebook_value_graph_message_free_value, publishing_facebook_value_graph_message_copy_value, publishing_facebook_value_graph_message_peek_pointer, "p", publishing_facebook_value_graph_message_collect_value, "p", publishing_facebook_value_graph_message_lcopy_value };
@@ -6579,18 +7040,22 @@ GType publishing_facebook_graph_message_get_type (void) {
}
-gpointer publishing_facebook_graph_message_ref (gpointer instance) {
+gpointer
+publishing_facebook_graph_message_ref (gpointer instance)
+{
PublishingFacebookGraphMessage * self;
self = instance;
#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_atomic_int_inc (&self->ref_count);
#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return instance;
-#line 6570 "FacebookPublishing.c"
+#line 7033 "FacebookPublishing.c"
}
-void publishing_facebook_graph_message_unref (gpointer instance) {
+void
+publishing_facebook_graph_message_unref (gpointer instance)
+{
PublishingFacebookGraphMessage * self;
self = instance;
#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -6599,19 +7064,25 @@ void publishing_facebook_graph_message_unref (gpointer instance) {
PUBLISHING_FACEBOOK_GRAPH_MESSAGE_GET_CLASS (self)->finalize (self);
#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 6583 "FacebookPublishing.c"
+#line 7048 "FacebookPublishing.c"
}
}
-static void _publishing_facebook_graph_session_on_request_unqueued_soup_session_request_unqueued (SoupSession* _sender, SoupMessage* msg, gpointer self) {
+static void
+_publishing_facebook_graph_session_on_request_unqueued_soup_session_request_unqueued (SoupSession* _sender,
+ SoupMessage* msg,
+ gpointer self)
+{
#line 1172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_graph_session_on_request_unqueued ((PublishingFacebookGraphSession*) self, msg);
-#line 6591 "FacebookPublishing.c"
+#line 7060 "FacebookPublishing.c"
}
-PublishingFacebookGraphSession* publishing_facebook_graph_session_construct (GType object_type) {
+PublishingFacebookGraphSession*
+publishing_facebook_graph_session_construct (GType object_type)
+{
PublishingFacebookGraphSession* self = NULL;
SoupSession* _tmp0_;
SoupSession* _tmp1_;
@@ -6647,28 +7118,34 @@ PublishingFacebookGraphSession* publishing_facebook_graph_session_construct (GTy
g_object_set (_tmp3_, "ssl-use-system-ca-file", TRUE, NULL);
#line 1162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return self;
-#line 6631 "FacebookPublishing.c"
+#line 7102 "FacebookPublishing.c"
}
-PublishingFacebookGraphSession* publishing_facebook_graph_session_new (void) {
+PublishingFacebookGraphSession*
+publishing_facebook_graph_session_new (void)
+{
#line 1162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return publishing_facebook_graph_session_construct (PUBLISHING_FACEBOOK_TYPE_GRAPH_SESSION);
-#line 6638 "FacebookPublishing.c"
+#line 7111 "FacebookPublishing.c"
}
-static gpointer _publishing_facebook_graph_message_ref0 (gpointer self) {
+static gpointer
+_publishing_facebook_graph_message_ref0 (gpointer self)
+{
#line 1178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return self ? publishing_facebook_graph_message_ref (self) : NULL;
-#line 6645 "FacebookPublishing.c"
+#line 7120 "FacebookPublishing.c"
}
-static void publishing_facebook_graph_session_manage_message (PublishingFacebookGraphSession* self, PublishingFacebookGraphMessage* msg) {
+static void
+publishing_facebook_graph_session_manage_message (PublishingFacebookGraphSession* self,
+ PublishingFacebookGraphMessage* msg)
+{
PublishingFacebookGraphMessage* _tmp0_;
PublishingFacebookGraphMessage* _tmp1_;
- PublishingFacebookGraphMessage* _tmp2_;
#line 1175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (self));
#line 1175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -6678,18 +7155,19 @@ static void publishing_facebook_graph_session_manage_message (PublishingFacebook
#line 1176 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_vala_assert (_tmp0_ == NULL, "current_message == null");
#line 1178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp1_ = msg;
-#line 1178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp2_ = _publishing_facebook_graph_message_ref0 (_tmp1_);
+ _tmp1_ = _publishing_facebook_graph_message_ref0 (msg);
#line 1178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_publishing_facebook_graph_message_unref0 (self->priv->current_message);
#line 1178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- self->priv->current_message = _tmp2_;
-#line 6669 "FacebookPublishing.c"
+ self->priv->current_message = _tmp1_;
+#line 7144 "FacebookPublishing.c"
}
-static void publishing_facebook_graph_session_unmanage_message (PublishingFacebookGraphSession* self, PublishingFacebookGraphMessage* msg) {
+static void
+publishing_facebook_graph_session_unmanage_message (PublishingFacebookGraphSession* self,
+ PublishingFacebookGraphMessage* msg)
+{
PublishingFacebookGraphMessage* _tmp0_;
#line 1181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (self));
@@ -6703,40 +7181,43 @@ static void publishing_facebook_graph_session_unmanage_message (PublishingFacebo
_publishing_facebook_graph_message_unref0 (self->priv->current_message);
#line 1184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
self->priv->current_message = NULL;
-#line 6687 "FacebookPublishing.c"
+#line 7165 "FacebookPublishing.c"
}
-static void _publishing_facebook_graph_session_graph_message_impl_on_wrote_body_data_soup_message_wrote_body_data (SoupMessage* _sender, SoupBuffer* chunk, gpointer self) {
+static void
+_publishing_facebook_graph_session_graph_message_impl_on_wrote_body_data_soup_message_wrote_body_data (SoupMessage* _sender,
+ SoupBuffer* chunk,
+ gpointer self)
+{
#line 1203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_graph_session_graph_message_impl_on_wrote_body_data ((PublishingFacebookGraphSessionGraphMessageImpl*) self, chunk);
-#line 6694 "FacebookPublishing.c"
+#line 7176 "FacebookPublishing.c"
}
-static void publishing_facebook_graph_session_on_request_unqueued (PublishingFacebookGraphSession* self, SoupMessage* msg) {
+static void
+publishing_facebook_graph_session_on_request_unqueued (PublishingFacebookGraphSession* self,
+ SoupMessage* msg)
+{
PublishingFacebookGraphMessage* _tmp0_;
PublishingFacebookGraphSessionGraphMessageImpl* real_message = NULL;
PublishingFacebookGraphMessage* _tmp1_;
PublishingFacebookGraphSessionGraphMessageImpl* _tmp2_;
PublishingFacebookGraphSessionGraphMessageImpl* _tmp3_;
SoupMessage* _tmp4_;
- SoupMessage* _tmp5_;
+ gboolean _tmp5_ = FALSE;
gboolean _tmp6_ = FALSE;
- gboolean _tmp7_ = FALSE;
- SoupMessage* _tmp8_;
- guint _tmp9_;
- guint _tmp10_;
- PublishingFacebookGraphSessionGraphMessageImpl* _tmp21_;
- SoupMessage* _tmp22_;
- PublishingFacebookGraphSessionGraphMessageImpl* _tmp23_;
- guint _tmp24_;
+ guint _tmp7_;
+ guint _tmp8_;
+ PublishingFacebookGraphSessionGraphMessageImpl* _tmp16_;
+ PublishingFacebookGraphSessionGraphMessageImpl* _tmp17_;
+ guint _tmp18_;
GError* _error_ = NULL;
- SoupMessage* _tmp25_;
- guint _tmp26_;
- guint _tmp27_;
- GError* _tmp68_;
- GError* _tmp80_;
+ guint _tmp19_;
+ guint _tmp20_;
+ GError* _tmp54_;
+ GError* _tmp64_;
#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (self));
#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -6756,422 +7237,380 @@ static void publishing_facebook_graph_session_on_request_unqueued (PublishingFac
#line 1190 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_tmp4_ = _tmp3_->soup_message;
#line 1190 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp5_ = msg;
-#line 1190 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _vala_assert (_tmp4_ == _tmp5_, "real_message.soup_message == msg");
-#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp8_ = msg;
+ _vala_assert (_tmp4_ == msg, "real_message.soup_message == msg");
#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_object_get (_tmp8_, "status-code", &_tmp9_, NULL);
+ g_object_get (msg, "status-code", &_tmp7_, NULL);
#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp10_ = _tmp9_;
+ _tmp8_ = _tmp7_;
#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- if (_tmp10_ == ((guint) SOUP_STATUS_IO_ERROR)) {
+ if (_tmp8_ == ((guint) SOUP_STATUS_IO_ERROR)) {
#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp7_ = TRUE;
-#line 6753 "FacebookPublishing.c"
+ _tmp6_ = TRUE;
+#line 7230 "FacebookPublishing.c"
} else {
- SoupMessage* _tmp11_;
- guint _tmp12_;
- guint _tmp13_;
+ guint _tmp9_;
+ guint _tmp10_;
#line 1195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp11_ = msg;
+ g_object_get (msg, "status-code", &_tmp9_, NULL);
#line 1195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_object_get (_tmp11_, "status-code", &_tmp12_, NULL);
+ _tmp10_ = _tmp9_;
#line 1195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp13_ = _tmp12_;
-#line 1195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp7_ = _tmp13_ == ((guint) SOUP_STATUS_MALFORMED);
-#line 6766 "FacebookPublishing.c"
+ _tmp6_ = _tmp10_ == ((guint) SOUP_STATUS_MALFORMED);
+#line 7240 "FacebookPublishing.c"
}
#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- if (_tmp7_) {
+ if (_tmp6_) {
#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp6_ = TRUE;
-#line 6772 "FacebookPublishing.c"
+ _tmp5_ = TRUE;
+#line 7246 "FacebookPublishing.c"
} else {
- SoupMessage* _tmp14_;
- guint _tmp15_;
- guint _tmp16_;
-#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp14_ = msg;
+ guint _tmp11_;
+ guint _tmp12_;
#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_object_get (_tmp14_, "status-code", &_tmp15_, NULL);
+ g_object_get (msg, "status-code", &_tmp11_, NULL);
#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp16_ = _tmp15_;
+ _tmp12_ = _tmp11_;
#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp6_ = _tmp16_ == ((guint) SOUP_STATUS_TRY_AGAIN);
-#line 6785 "FacebookPublishing.c"
+ _tmp5_ = _tmp12_ == ((guint) SOUP_STATUS_TRY_AGAIN);
+#line 7256 "FacebookPublishing.c"
}
#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- if (_tmp6_) {
-#line 6789 "FacebookPublishing.c"
- PublishingFacebookGraphSessionGraphMessageImpl* _tmp17_;
- SoupSession* _tmp18_;
- SoupMessage* _tmp19_;
- SoupMessage* _tmp20_;
+ if (_tmp5_) {
+#line 7260 "FacebookPublishing.c"
+ PublishingFacebookGraphSessionGraphMessageImpl* _tmp13_;
+ SoupSession* _tmp14_;
+ SoupMessage* _tmp15_;
#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp17_ = real_message;
+ _tmp13_ = real_message;
#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp17_->bytes_so_far = 0;
-#line 1198 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp18_ = self->priv->soup_session;
+ _tmp13_->bytes_so_far = 0;
#line 1198 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp19_ = msg;
+ _tmp14_ = self->priv->soup_session;
#line 1198 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp20_ = _g_object_ref0 (_tmp19_);
+ _tmp15_ = _g_object_ref0 (msg);
#line 1198 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- soup_session_queue_message (_tmp18_, _tmp20_, NULL, NULL);
+ soup_session_queue_message (_tmp14_, _tmp15_, NULL, NULL);
#line 1199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_publishing_facebook_graph_message_unref0 (real_message);
#line 1199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return;
-#line 6810 "FacebookPublishing.c"
+#line 7278 "FacebookPublishing.c"
}
#line 1202 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp21_ = real_message;
+ _tmp16_ = real_message;
#line 1202 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- publishing_facebook_graph_session_unmanage_message (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage));
-#line 1203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp22_ = msg;
+ publishing_facebook_graph_session_unmanage_message (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage));
#line 1203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp23_ = real_message;
+ _tmp17_ = real_message;
#line 1203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_signal_parse_name ("wrote-body-data", soup_message_get_type (), &_tmp24_, NULL, FALSE);
+ g_signal_parse_name ("wrote-body-data", soup_message_get_type (), &_tmp18_, NULL, FALSE);
#line 1203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp22_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp24_, 0, NULL, (GCallback) _publishing_facebook_graph_session_graph_message_impl_on_wrote_body_data_soup_message_wrote_body_data, _tmp23_);
+ g_signal_handlers_disconnect_matched (msg, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp18_, 0, NULL, (GCallback) _publishing_facebook_graph_session_graph_message_impl_on_wrote_body_data_soup_message_wrote_body_data, _tmp17_);
#line 1205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_error_ = NULL;
#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp25_ = msg;
+ g_object_get (msg, "status-code", &_tmp19_, NULL);
#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_object_get (_tmp25_, "status-code", &_tmp26_, NULL);
+ _tmp20_ = _tmp19_;
#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp27_ = _tmp26_;
-#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- switch (_tmp27_) {
+ switch (_tmp20_) {
#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
case SOUP_STATUS_OK:
#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
case SOUP_STATUS_CREATED:
-#line 6838 "FacebookPublishing.c"
+#line 7302 "FacebookPublishing.c"
{
#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
break;
-#line 6842 "FacebookPublishing.c"
+#line 7306 "FacebookPublishing.c"
}
#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
case PUBLISHING_FACEBOOK_EXPIRED_SESSION_STATUS_CODE:
-#line 6846 "FacebookPublishing.c"
+#line 7310 "FacebookPublishing.c"
{
- GError* _tmp28_;
+ GError* _tmp21_;
#line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp28_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_EXPIRED_SESSION, "OAuth Access Token has Expired. Logout user.");
+ _tmp21_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_EXPIRED_SESSION, "OAuth Access Token has Expired. Logout user.");
#line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_g_error_free0 (_error_);
#line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _error_ = _tmp28_;
+ _error_ = _tmp21_;
#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
break;
-#line 6857 "FacebookPublishing.c"
+#line 7321 "FacebookPublishing.c"
}
#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
case SOUP_STATUS_CANT_RESOLVE:
#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
case SOUP_STATUS_CANT_RESOLVE_PROXY:
-#line 6863 "FacebookPublishing.c"
+#line 7327 "FacebookPublishing.c"
{
- PublishingFacebookGraphSessionGraphMessageImpl* _tmp29_;
- gchar* _tmp30_;
- gchar* _tmp31_;
- SoupMessage* _tmp32_;
- guint _tmp33_;
- guint _tmp34_;
- GError* _tmp35_;
-#line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp29_ = real_message;
+ PublishingFacebookGraphSessionGraphMessageImpl* _tmp22_;
+ gchar* _tmp23_;
+ gchar* _tmp24_;
+ guint _tmp25_;
+ guint _tmp26_;
+ GError* _tmp27_;
#line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp30_ = publishing_facebook_graph_message_get_uri (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage));
+ _tmp22_ = real_message;
#line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp31_ = _tmp30_;
+ _tmp23_ = publishing_facebook_graph_message_get_uri (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage));
#line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp32_ = msg;
+ _tmp24_ = _tmp23_;
#line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_object_get (_tmp32_, "status-code", &_tmp33_, NULL);
+ g_object_get (msg, "status-code", &_tmp25_, NULL);
#line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp34_ = _tmp33_;
+ _tmp26_ = _tmp25_;
#line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp35_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_NO_ANSWER, "Unable to resolve %s (error code %u)", _tmp31_, _tmp34_);
+ _tmp27_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_NO_ANSWER, "Unable to resolve %s (error code %u)", _tmp24_, _tmp26_);
#line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_g_error_free0 (_error_);
#line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _error_ = _tmp35_;
+ _error_ = _tmp27_;
#line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _g_free0 (_tmp31_);
+ _g_free0 (_tmp24_);
#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
break;
-#line 6894 "FacebookPublishing.c"
+#line 7355 "FacebookPublishing.c"
}
#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
case SOUP_STATUS_CANT_CONNECT:
#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
case SOUP_STATUS_CANT_CONNECT_PROXY:
-#line 6900 "FacebookPublishing.c"
+#line 7361 "FacebookPublishing.c"
{
- PublishingFacebookGraphSessionGraphMessageImpl* _tmp36_;
- gchar* _tmp37_;
- gchar* _tmp38_;
- SoupMessage* _tmp39_;
- guint _tmp40_;
- guint _tmp41_;
- GError* _tmp42_;
-#line 1226 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp36_ = real_message;
+ PublishingFacebookGraphSessionGraphMessageImpl* _tmp28_;
+ gchar* _tmp29_;
+ gchar* _tmp30_;
+ guint _tmp31_;
+ guint _tmp32_;
+ GError* _tmp33_;
#line 1226 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp37_ = publishing_facebook_graph_message_get_uri (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage));
+ _tmp28_ = real_message;
#line 1226 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp38_ = _tmp37_;
+ _tmp29_ = publishing_facebook_graph_message_get_uri (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage));
#line 1226 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp39_ = msg;
+ _tmp30_ = _tmp29_;
#line 1226 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_object_get (_tmp39_, "status-code", &_tmp40_, NULL);
+ g_object_get (msg, "status-code", &_tmp31_, NULL);
#line 1226 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp41_ = _tmp40_;
+ _tmp32_ = _tmp31_;
#line 1226 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp42_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_NO_ANSWER, "Unable to connect to %s (error code %u)", _tmp38_, _tmp41_);
+ _tmp33_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_NO_ANSWER, "Unable to connect to %s (error code %u)", _tmp30_, _tmp32_);
#line 1226 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_g_error_free0 (_error_);
#line 1226 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _error_ = _tmp42_;
+ _error_ = _tmp33_;
#line 1226 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _g_free0 (_tmp38_);
+ _g_free0 (_tmp30_);
#line 1228 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
break;
-#line 6931 "FacebookPublishing.c"
+#line 7389 "FacebookPublishing.c"
}
default:
{
- SoupMessage* _tmp43_;
- guint _tmp44_;
- guint _tmp45_;
-#line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp43_ = msg;
+ guint _tmp34_;
+ guint _tmp35_;
#line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_object_get (_tmp43_, "status-code", &_tmp44_, NULL);
+ g_object_get (msg, "status-code", &_tmp34_, NULL);
#line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp45_ = _tmp44_;
+ _tmp35_ = _tmp34_;
#line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- if (_tmp45_ >= ((guint) 100)) {
-#line 6946 "FacebookPublishing.c"
- PublishingFacebookGraphSessionGraphMessageImpl* _tmp46_;
- gchar* _tmp47_;
- gchar* _tmp48_;
- SoupMessage* _tmp49_;
- guint _tmp50_;
- guint _tmp51_;
- SoupMessage* _tmp52_;
- gchar* _tmp53_;
- gchar* _tmp54_;
- gchar* _tmp55_;
- GError* _tmp56_;
-#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp46_ = real_message;
-#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp47_ = publishing_facebook_graph_message_get_uri (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage));
+ if (_tmp35_ >= ((guint) 100)) {
+#line 7401 "FacebookPublishing.c"
+ PublishingFacebookGraphSessionGraphMessageImpl* _tmp36_;
+ gchar* _tmp37_;
+ gchar* _tmp38_;
+ guint _tmp39_;
+ guint _tmp40_;
+ gchar* _tmp41_;
+ gchar* _tmp42_;
+ gchar* _tmp43_;
+ GError* _tmp44_;
#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp48_ = _tmp47_;
+ _tmp36_ = real_message;
#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp49_ = msg;
+ _tmp37_ = publishing_facebook_graph_message_get_uri (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage));
#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_object_get (_tmp49_, "status-code", &_tmp50_, NULL);
+ _tmp38_ = _tmp37_;
#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp51_ = _tmp50_;
+ g_object_get (msg, "status-code", &_tmp39_, NULL);
#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp52_ = msg;
+ _tmp40_ = _tmp39_;
#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_object_get (_tmp52_, "reason-phrase", &_tmp53_, NULL);
+ g_object_get (msg, "reason-phrase", &_tmp41_, NULL);
#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp54_ = _tmp53_;
+ _tmp42_ = _tmp41_;
#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp55_ = _tmp54_;
+ _tmp43_ = _tmp42_;
#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp56_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_NO_ANSWER, "Service %s returned HTTP status code %u %s", _tmp48_, _tmp51_, _tmp55_);
+ _tmp44_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_NO_ANSWER, "Service %s returned HTTP status code %u %s", _tmp38_, _tmp40_, _tmp43_);
#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_g_error_free0 (_error_);
#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _error_ = _tmp56_;
+ _error_ = _tmp44_;
#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _g_free0 (_tmp55_);
+ _g_free0 (_tmp43_);
#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _g_free0 (_tmp48_);
-#line 6988 "FacebookPublishing.c"
+ _g_free0 (_tmp38_);
+#line 7437 "FacebookPublishing.c"
} else {
- SoupMessage* _tmp57_;
- gchar* _tmp58_;
- gchar* _tmp59_;
- gchar* _tmp60_;
- PublishingFacebookGraphSessionGraphMessageImpl* _tmp61_;
- gchar* _tmp62_;
- gchar* _tmp63_;
- SoupMessage* _tmp64_;
- guint _tmp65_;
- guint _tmp66_;
- GError* _tmp67_;
-#line 1238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp57_ = msg;
+ gchar* _tmp45_;
+ gchar* _tmp46_;
+ gchar* _tmp47_;
+ PublishingFacebookGraphSessionGraphMessageImpl* _tmp48_;
+ gchar* _tmp49_;
+ gchar* _tmp50_;
+ guint _tmp51_;
+ guint _tmp52_;
+ GError* _tmp53_;
#line 1238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_object_get (_tmp57_, "reason-phrase", &_tmp58_, NULL);
+ g_object_get (msg, "reason-phrase", &_tmp45_, NULL);
#line 1238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp59_ = _tmp58_;
+ _tmp46_ = _tmp45_;
#line 1238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp60_ = _tmp59_;
+ _tmp47_ = _tmp46_;
#line 1238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_debug ("FacebookPublishing.vala:1238: %s", _tmp60_);
+ g_debug ("FacebookPublishing.vala:1238: %s", _tmp47_);
#line 1238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _g_free0 (_tmp60_);
+ _g_free0 (_tmp47_);
#line 1239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp61_ = real_message;
+ _tmp48_ = real_message;
#line 1239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp62_ = publishing_facebook_graph_message_get_uri (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage));
+ _tmp49_ = publishing_facebook_graph_message_get_uri (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage));
#line 1239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp63_ = _tmp62_;
+ _tmp50_ = _tmp49_;
#line 1239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp64_ = msg;
+ g_object_get (msg, "status-code", &_tmp51_, NULL);
#line 1239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_object_get (_tmp64_, "status-code", &_tmp65_, NULL);
+ _tmp52_ = _tmp51_;
#line 1239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp66_ = _tmp65_;
-#line 1239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp67_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_NO_ANSWER, "Failure communicating with %s (error code %u)", _tmp63_, _tmp66_);
+ _tmp53_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_NO_ANSWER, "Failure communicating with %s (error code %u)", _tmp50_, _tmp52_);
#line 1239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_g_error_free0 (_error_);
#line 1239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _error_ = _tmp67_;
+ _error_ = _tmp53_;
#line 1239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _g_free0 (_tmp63_);
-#line 7033 "FacebookPublishing.c"
+ _g_free0 (_tmp50_);
+#line 7476 "FacebookPublishing.c"
}
#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
break;
-#line 7037 "FacebookPublishing.c"
+#line 7480 "FacebookPublishing.c"
}
}
#line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp68_ = _error_;
+ _tmp54_ = _error_;
#line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- if (_tmp68_ == NULL) {
-#line 7044 "FacebookPublishing.c"
- gboolean _tmp69_ = FALSE;
- SoupMessage* _tmp70_;
- SoupMessageBody* _tmp71_;
- guint8* _tmp72_;
- gint _tmp72__length1;
-#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp70_ = msg;
+ if (_tmp54_ == NULL) {
+#line 7487 "FacebookPublishing.c"
+ gboolean _tmp55_ = FALSE;
+ SoupMessageBody* _tmp56_;
+ guint8* _tmp57_;
+ gint _tmp57__length1;
#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp71_ = _tmp70_->response_body;
+ _tmp56_ = msg->response_body;
#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp72_ = _tmp71_->data;
+ _tmp57_ = _tmp56_->data;
#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp72__length1 = (gint) _tmp71_->length;
+ _tmp57__length1 = (gint) _tmp56_->length;
#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- if (_tmp72_ == NULL) {
+ if (_tmp57_ == NULL) {
#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp69_ = TRUE;
-#line 7062 "FacebookPublishing.c"
+ _tmp55_ = TRUE;
+#line 7502 "FacebookPublishing.c"
} else {
- SoupMessage* _tmp73_;
- SoupMessageBody* _tmp74_;
- guint8* _tmp75_;
- gint _tmp75__length1;
+ SoupMessageBody* _tmp58_;
+ guint8* _tmp59_;
+ gint _tmp59__length1;
#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp73_ = msg;
+ _tmp58_ = msg->response_body;
#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp74_ = _tmp73_->response_body;
+ _tmp59_ = _tmp58_->data;
#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp75_ = _tmp74_->data;
+ _tmp59__length1 = (gint) _tmp58_->length;
#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp75__length1 = (gint) _tmp74_->length;
-#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp69_ = _tmp75__length1 == 0;
-#line 7078 "FacebookPublishing.c"
+ _tmp55_ = _tmp59__length1 == 0;
+#line 7515 "FacebookPublishing.c"
}
#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- if (_tmp69_) {
-#line 7082 "FacebookPublishing.c"
- PublishingFacebookGraphSessionGraphMessageImpl* _tmp76_;
- gchar* _tmp77_;
- gchar* _tmp78_;
- GError* _tmp79_;
+ if (_tmp55_) {
+#line 7519 "FacebookPublishing.c"
+ PublishingFacebookGraphSessionGraphMessageImpl* _tmp60_;
+ gchar* _tmp61_;
+ gchar* _tmp62_;
+ GError* _tmp63_;
#line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp76_ = real_message;
+ _tmp60_ = real_message;
#line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp77_ = publishing_facebook_graph_message_get_uri (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage));
+ _tmp61_ = publishing_facebook_graph_message_get_uri (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage));
#line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp78_ = _tmp77_;
+ _tmp62_ = _tmp61_;
#line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp79_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "No response data from %s", _tmp78_);
+ _tmp63_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "No response data from %s", _tmp62_);
#line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_g_error_free0 (_error_);
#line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _error_ = _tmp79_;
+ _error_ = _tmp63_;
#line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _g_free0 (_tmp78_);
-#line 7101 "FacebookPublishing.c"
+ _g_free0 (_tmp62_);
+#line 7538 "FacebookPublishing.c"
}
}
#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp80_ = _error_;
+ _tmp64_ = _error_;
#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- if (_tmp80_ == NULL) {
-#line 7108 "FacebookPublishing.c"
- PublishingFacebookGraphSessionGraphMessageImpl* _tmp81_;
+ if (_tmp64_ == NULL) {
+#line 7545 "FacebookPublishing.c"
+ PublishingFacebookGraphSessionGraphMessageImpl* _tmp65_;
#line 1253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp81_ = real_message;
+ _tmp65_ = real_message;
#line 1253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_signal_emit (G_TYPE_CHECK_INSTANCE_CAST (_tmp81_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage), publishing_facebook_graph_message_signals[PUBLISHING_FACEBOOK_GRAPH_MESSAGE_COMPLETED_SIGNAL], 0);
-#line 7114 "FacebookPublishing.c"
+ g_signal_emit (G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage), publishing_facebook_graph_message_signals[PUBLISHING_FACEBOOK_GRAPH_MESSAGE_COMPLETED_SIGNAL], 0);
+#line 7551 "FacebookPublishing.c"
} else {
- PublishingFacebookGraphSessionGraphMessageImpl* _tmp82_;
- GError* _tmp83_;
+ PublishingFacebookGraphSessionGraphMessageImpl* _tmp66_;
+ GError* _tmp67_;
#line 1255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp82_ = real_message;
+ _tmp66_ = real_message;
#line 1255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp83_ = _error_;
+ _tmp67_ = _error_;
#line 1255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_signal_emit (G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage), publishing_facebook_graph_message_signals[PUBLISHING_FACEBOOK_GRAPH_MESSAGE_FAILED_SIGNAL], 0, _tmp83_);
-#line 7124 "FacebookPublishing.c"
+ g_signal_emit (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage), publishing_facebook_graph_message_signals[PUBLISHING_FACEBOOK_GRAPH_MESSAGE_FAILED_SIGNAL], 0, _tmp67_);
+#line 7561 "FacebookPublishing.c"
}
#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_g_error_free0 (_error_);
#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_publishing_facebook_graph_message_unref0 (real_message);
-#line 7130 "FacebookPublishing.c"
+#line 7567 "FacebookPublishing.c"
}
-void publishing_facebook_graph_session_authenticate (PublishingFacebookGraphSession* self, const gchar* access_token) {
- const gchar* _tmp0_;
- gchar* _tmp1_;
+void
+publishing_facebook_graph_session_authenticate (PublishingFacebookGraphSession* self,
+ const gchar* access_token)
+{
+ gchar* _tmp0_;
#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (self));
#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_if_fail (access_token != NULL);
#line 1259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp0_ = access_token;
-#line 1259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp1_ = g_strdup (_tmp0_);
+ _tmp0_ = g_strdup (access_token);
#line 1259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_g_free0 (self->priv->access_token);
#line 1259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- self->priv->access_token = _tmp1_;
+ self->priv->access_token = _tmp0_;
#line 1260 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_signal_emit (self, publishing_facebook_graph_session_signals[PUBLISHING_FACEBOOK_GRAPH_SESSION_AUTHENTICATED_SIGNAL], 0);
-#line 7151 "FacebookPublishing.c"
+#line 7588 "FacebookPublishing.c"
}
-gboolean publishing_facebook_graph_session_is_authenticated (PublishingFacebookGraphSession* self) {
+gboolean
+publishing_facebook_graph_session_is_authenticated (PublishingFacebookGraphSession* self)
+{
gboolean result = FALSE;
const gchar* _tmp0_;
#line 1263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -7182,41 +7621,43 @@ gboolean publishing_facebook_graph_session_is_authenticated (PublishingFacebookG
result = _tmp0_ != NULL;
#line 1264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return result;
-#line 7166 "FacebookPublishing.c"
+#line 7605 "FacebookPublishing.c"
}
-PublishingFacebookGraphMessage* publishing_facebook_graph_session_new_query (PublishingFacebookGraphSession* self, const gchar* resource_path) {
+PublishingFacebookGraphMessage*
+publishing_facebook_graph_session_new_query (PublishingFacebookGraphSession* self,
+ const gchar* resource_path)
+{
PublishingFacebookGraphMessage* result = NULL;
const gchar* _tmp0_;
- const gchar* _tmp1_;
- PublishingFacebookGraphSessionGraphQueryMessage* _tmp2_;
+ PublishingFacebookGraphSessionGraphQueryMessage* _tmp1_;
#line 1273 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (self), NULL);
#line 1273 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_val_if_fail (resource_path != NULL, NULL);
#line 1274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp0_ = resource_path;
-#line 1274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp1_ = self->priv->access_token;
+ _tmp0_ = self->priv->access_token;
#line 1274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp2_ = publishing_facebook_graph_session_graph_query_message_new (self, _tmp0_, _tmp1_);
+ _tmp1_ = publishing_facebook_graph_session_graph_query_message_new (self, resource_path, _tmp0_);
#line 1274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage);
+ result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage);
#line 1274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return result;
-#line 7189 "FacebookPublishing.c"
+#line 7628 "FacebookPublishing.c"
}
-PublishingFacebookGraphMessage* publishing_facebook_graph_session_new_upload (PublishingFacebookGraphSession* self, const gchar* resource_path, SpitPublishingPublishable* publishable, gboolean suppress_titling, const gchar* resource_privacy) {
+PublishingFacebookGraphMessage*
+publishing_facebook_graph_session_new_upload (PublishingFacebookGraphSession* self,
+ const gchar* resource_path,
+ SpitPublishingPublishable* publishable,
+ gboolean suppress_titling,
+ const gchar* resource_privacy)
+{
PublishingFacebookGraphMessage* result = NULL;
const gchar* _tmp0_;
- const gchar* _tmp1_;
- SpitPublishingPublishable* _tmp2_;
- gboolean _tmp3_;
- const gchar* _tmp4_;
- PublishingFacebookGraphSessionGraphUploadMessage* _tmp5_;
+ PublishingFacebookGraphSessionGraphUploadMessage* _tmp1_;
#line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (self), NULL);
#line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -7226,29 +7667,23 @@ PublishingFacebookGraphMessage* publishing_facebook_graph_session_new_upload (Pu
#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_tmp0_ = self->priv->access_token;
#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp1_ = resource_path;
-#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp2_ = publishable;
-#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp3_ = suppress_titling;
+ _tmp1_ = publishing_facebook_graph_session_graph_upload_message_new (self, _tmp0_, resource_path, publishable, suppress_titling, resource_privacy);
#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp4_ = resource_privacy;
-#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp5_ = publishing_facebook_graph_session_graph_upload_message_new (self, _tmp0_, _tmp1_, _tmp2_, _tmp3_, _tmp4_);
-#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- result = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage);
+ result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage);
#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return result;
-#line 7223 "FacebookPublishing.c"
+#line 7656 "FacebookPublishing.c"
}
-PublishingFacebookGraphMessage* publishing_facebook_graph_session_new_create_album (PublishingFacebookGraphSession* self, const gchar* album_name, const gchar* privacy) {
+PublishingFacebookGraphMessage*
+publishing_facebook_graph_session_new_create_album (PublishingFacebookGraphSession* self,
+ const gchar* album_name,
+ const gchar* privacy)
+{
PublishingFacebookGraphMessage* result = NULL;
const gchar* _tmp0_;
- const gchar* _tmp1_;
- const gchar* _tmp2_;
- PublishingFacebookGraphSessionGraphCreateAlbumMessage* _tmp3_;
+ PublishingFacebookGraphSessionGraphCreateAlbumMessage* _tmp1_;
#line 1283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (self), NULL);
#line 1283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -7258,100 +7693,92 @@ PublishingFacebookGraphMessage* publishing_facebook_graph_session_new_create_alb
#line 1284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_tmp0_ = self->priv->access_token;
#line 1284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp1_ = album_name;
-#line 1284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp2_ = privacy;
-#line 1284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp3_ = publishing_facebook_graph_session_graph_create_album_message_new (self, _tmp0_, _tmp1_, _tmp2_);
+ _tmp1_ = publishing_facebook_graph_session_graph_create_album_message_new (self, _tmp0_, album_name, privacy);
#line 1284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- result = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage);
+ result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage);
#line 1284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return result;
-#line 7251 "FacebookPublishing.c"
+#line 7682 "FacebookPublishing.c"
}
-void publishing_facebook_graph_session_send_message (PublishingFacebookGraphSession* self, PublishingFacebookGraphMessage* message) {
+void
+publishing_facebook_graph_session_send_message (PublishingFacebookGraphSession* self,
+ PublishingFacebookGraphMessage* message)
+{
PublishingFacebookGraphSessionGraphMessageImpl* real_message = NULL;
- PublishingFacebookGraphMessage* _tmp0_;
+ PublishingFacebookGraphSessionGraphMessageImpl* _tmp0_;
PublishingFacebookGraphSessionGraphMessageImpl* _tmp1_;
- PublishingFacebookGraphSessionGraphMessageImpl* _tmp2_;
- SoupMessage* _tmp3_;
+ SoupMessage* _tmp2_;
+ SoupURI* _tmp3_;
SoupURI* _tmp4_;
- SoupURI* _tmp5_;
+ gchar* _tmp5_;
gchar* _tmp6_;
gchar* _tmp7_;
gchar* _tmp8_;
- gchar* _tmp9_;
- PublishingFacebookGraphSessionGraphMessageImpl* _tmp10_;
- gboolean _tmp11_;
+ PublishingFacebookGraphSessionGraphMessageImpl* _tmp9_;
#line 1287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (self));
#line 1287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_MESSAGE (message));
#line 1288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp0_ = message;
-#line 1288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp1_ = _publishing_facebook_graph_message_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl));
+ _tmp0_ = _publishing_facebook_graph_message_ref0 (G_TYPE_CHECK_INSTANCE_CAST (message, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl));
#line 1288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- real_message = _tmp1_;
+ real_message = _tmp0_;
#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp2_ = real_message;
+ _tmp1_ = real_message;
#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp3_ = _tmp2_->soup_message;
+ _tmp2_ = _tmp1_->soup_message;
#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp4_ = soup_message_get_uri (_tmp3_);
+ _tmp3_ = soup_message_get_uri (_tmp2_);
#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp5_ = _tmp4_;
+ _tmp4_ = _tmp3_;
#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp6_ = soup_uri_to_string (_tmp5_, FALSE);
+ _tmp5_ = soup_uri_to_string (_tmp4_, FALSE);
#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp7_ = _tmp6_;
+ _tmp6_ = _tmp5_;
#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp8_ = g_strconcat ("making HTTP request to URI: ", _tmp7_, NULL);
+ _tmp7_ = g_strconcat ("making HTTP request to URI: ", _tmp6_, NULL);
#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp9_ = _tmp8_;
+ _tmp8_ = _tmp7_;
#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_debug ("FacebookPublishing.vala:1290: %s", _tmp9_);
+ g_debug ("FacebookPublishing.vala:1290: %s", _tmp8_);
#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _g_free0 (_tmp9_);
+ _g_free0 (_tmp8_);
#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _g_free0 (_tmp7_);
-#line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp10_ = real_message;
+ _g_free0 (_tmp6_);
#line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp11_ = publishing_facebook_graph_session_graph_message_impl_prepare_for_transmission (_tmp10_);
+ _tmp9_ = real_message;
#line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- if (_tmp11_) {
-#line 7307 "FacebookPublishing.c"
- PublishingFacebookGraphMessage* _tmp12_;
- SoupSession* _tmp13_;
- PublishingFacebookGraphSessionGraphMessageImpl* _tmp14_;
- SoupMessage* _tmp15_;
- SoupMessage* _tmp16_;
+ if (publishing_facebook_graph_session_graph_message_impl_prepare_for_transmission (_tmp9_)) {
+#line 7735 "FacebookPublishing.c"
+ SoupSession* _tmp10_;
+ PublishingFacebookGraphSessionGraphMessageImpl* _tmp11_;
+ SoupMessage* _tmp12_;
+ SoupMessage* _tmp13_;
#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp12_ = message;
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- publishing_facebook_graph_session_manage_message (self, _tmp12_);
+ publishing_facebook_graph_session_manage_message (self, message);
#line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp13_ = self->priv->soup_session;
+ _tmp10_ = self->priv->soup_session;
#line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp14_ = real_message;
+ _tmp11_ = real_message;
#line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp15_ = _tmp14_->soup_message;
+ _tmp12_ = _tmp11_->soup_message;
#line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp16_ = _g_object_ref0 (_tmp15_);
+ _tmp13_ = _g_object_ref0 (_tmp12_);
#line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- soup_session_queue_message (_tmp13_, _tmp16_, NULL, NULL);
-#line 7327 "FacebookPublishing.c"
+ soup_session_queue_message (_tmp10_, _tmp13_, NULL, NULL);
+#line 7752 "FacebookPublishing.c"
}
#line 1287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_publishing_facebook_graph_message_unref0 (real_message);
-#line 7331 "FacebookPublishing.c"
+#line 7756 "FacebookPublishing.c"
}
-void publishing_facebook_graph_session_stop_transactions (PublishingFacebookGraphSession* self) {
+void
+publishing_facebook_graph_session_stop_transactions (PublishingFacebookGraphSession* self)
+{
SoupSession* _tmp0_;
#line 1298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (self));
@@ -7359,19 +7786,22 @@ void publishing_facebook_graph_session_stop_transactions (PublishingFacebookGrap
_tmp0_ = self->priv->soup_session;
#line 1299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
soup_session_abort (_tmp0_);
-#line 7343 "FacebookPublishing.c"
+#line 7770 "FacebookPublishing.c"
}
-static PublishingFacebookGraphSessionGraphMessageImpl* publishing_facebook_graph_session_graph_message_impl_construct (GType object_type, PublishingFacebookGraphSession* host_session, PublishingRESTSupportHttpMethod method, const gchar* relative_uri, const gchar* access_token, PublishingFacebookEndpoint endpoint) {
+static PublishingFacebookGraphSessionGraphMessageImpl*
+publishing_facebook_graph_session_graph_message_impl_construct (GType object_type,
+ PublishingFacebookGraphSession* host_session,
+ PublishingRESTSupportHttpMethod method,
+ const gchar* relative_uri,
+ const gchar* access_token,
+ PublishingFacebookEndpoint endpoint)
+{
PublishingFacebookGraphSessionGraphMessageImpl* self = NULL;
- PublishingRESTSupportHttpMethod _tmp0_;
- const gchar* _tmp1_;
- gchar* _tmp2_;
- PublishingFacebookGraphSession* _tmp3_;
+ gchar* _tmp0_;
gchar* endpoint_uri = NULL;
- PublishingFacebookEndpoint _tmp4_;
- gchar* _tmp5_;
+ gchar* _tmp1_;
GError * _inner_error_ = NULL;
#line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (host_session), NULL);
@@ -7382,48 +7812,39 @@ static PublishingFacebookGraphSessionGraphMessageImpl* publishing_facebook_graph
#line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
self = (PublishingFacebookGraphSessionGraphMessageImpl*) publishing_facebook_graph_message_construct (object_type);
#line 1007 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp0_ = method;
-#line 1007 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- self->method = _tmp0_;
+ self->method = method;
#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp1_ = access_token;
-#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp2_ = g_strdup (_tmp1_);
+ _tmp0_ = g_strdup (access_token);
#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_g_free0 (self->access_token);
#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- self->access_token = _tmp2_;
-#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp3_ = host_session;
+ self->access_token = _tmp0_;
#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- self->host_session = _tmp3_;
+ self->host_session = host_session;
#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
self->bytes_so_far = 0;
#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp4_ = endpoint;
-#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp5_ = publishing_facebook_endpoint_to_uri (_tmp4_);
+ _tmp1_ = publishing_facebook_endpoint_to_uri (endpoint);
#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- endpoint_uri = _tmp5_;
-#line 7389 "FacebookPublishing.c"
+ endpoint_uri = _tmp1_;
+#line 7811 "FacebookPublishing.c"
{
GRegex* starting_slashes = NULL;
- GRegex* _tmp6_;
- gchar* _tmp7_ = NULL;
- GRegex* _tmp8_;
- const gchar* _tmp9_;
- gchar* _tmp10_;
- const gchar* _tmp11_;
- gchar* _tmp12_;
+ GRegex* _tmp2_;
+ gchar* _tmp3_ = NULL;
+ GRegex* _tmp4_;
+ gchar* _tmp5_;
+ const gchar* _tmp6_;
+ gchar* _tmp7_;
#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp6_ = g_regex_new ("^/+", 0, 0, &_inner_error_);
+ _tmp2_ = g_regex_new ("^/+", 0, 0, &_inner_error_);
#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- starting_slashes = _tmp6_;
+ starting_slashes = _tmp2_;
#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 7407 "FacebookPublishing.c"
+#line 7828 "FacebookPublishing.c"
goto __catch4_g_regex_error;
}
#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -7434,23 +7855,21 @@ static PublishingFacebookGraphSessionGraphMessageImpl* publishing_facebook_graph
g_clear_error (&_inner_error_);
#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return NULL;
-#line 7418 "FacebookPublishing.c"
+#line 7839 "FacebookPublishing.c"
}
#line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp8_ = starting_slashes;
+ _tmp4_ = starting_slashes;
#line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp9_ = relative_uri;
+ _tmp5_ = g_regex_replace (_tmp4_, relative_uri, (gssize) -1, 0, "", 0, &_inner_error_);
#line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp10_ = g_regex_replace (_tmp8_, _tmp9_, (gssize) -1, 0, "", 0, &_inner_error_);
-#line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp7_ = _tmp10_;
+ _tmp3_ = _tmp5_;
#line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_g_regex_unref0 (starting_slashes);
#line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 7434 "FacebookPublishing.c"
+#line 7853 "FacebookPublishing.c"
goto __catch4_g_regex_error;
}
#line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -7463,21 +7882,21 @@ static PublishingFacebookGraphSessionGraphMessageImpl* publishing_facebook_graph
g_clear_error (&_inner_error_);
#line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return NULL;
-#line 7447 "FacebookPublishing.c"
+#line 7866 "FacebookPublishing.c"
}
#line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp11_ = endpoint_uri;
+ _tmp6_ = endpoint_uri;
#line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp12_ = g_strconcat (_tmp11_, _tmp7_, NULL);
+ _tmp7_ = g_strconcat (_tmp6_, _tmp3_, NULL);
#line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_g_free0 (self->uri);
#line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- self->uri = _tmp12_;
+ self->uri = _tmp7_;
#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _g_free0 (_tmp7_);
+ _g_free0 (_tmp3_);
#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_g_regex_unref0 (starting_slashes);
-#line 7461 "FacebookPublishing.c"
+#line 7880 "FacebookPublishing.c"
}
goto __finally4;
__catch4_g_regex_error:
@@ -7491,7 +7910,7 @@ static PublishingFacebookGraphSessionGraphMessageImpl* publishing_facebook_graph
g_assert_not_reached ();
#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_g_error_free0 (err);
-#line 7475 "FacebookPublishing.c"
+#line 7894 "FacebookPublishing.c"
}
__finally4:
#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -7504,36 +7923,42 @@ static PublishingFacebookGraphSessionGraphMessageImpl* publishing_facebook_graph
g_clear_error (&_inner_error_);
#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return NULL;
-#line 7488 "FacebookPublishing.c"
+#line 7907 "FacebookPublishing.c"
}
#line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_g_free0 (endpoint_uri);
#line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return self;
-#line 7494 "FacebookPublishing.c"
+#line 7913 "FacebookPublishing.c"
}
-static gboolean publishing_facebook_graph_session_graph_message_impl_real_prepare_for_transmission (PublishingFacebookGraphSessionGraphMessageImpl* self) {
+static gboolean
+publishing_facebook_graph_session_graph_message_impl_real_prepare_for_transmission (PublishingFacebookGraphSessionGraphMessageImpl* self)
+{
gboolean result = FALSE;
#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
result = TRUE;
#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return result;
-#line 7504 "FacebookPublishing.c"
+#line 7925 "FacebookPublishing.c"
}
-gboolean publishing_facebook_graph_session_graph_message_impl_prepare_for_transmission (PublishingFacebookGraphSessionGraphMessageImpl* self) {
+gboolean
+publishing_facebook_graph_session_graph_message_impl_prepare_for_transmission (PublishingFacebookGraphSessionGraphMessageImpl* self)
+{
#line 1021 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_val_if_fail (PUBLISHING_FACEBOOK_GRAPH_SESSION_IS_GRAPH_MESSAGE_IMPL (self), FALSE);
#line 1021 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return PUBLISHING_FACEBOOK_GRAPH_SESSION_GRAPH_MESSAGE_IMPL_GET_CLASS (self)->prepare_for_transmission (self);
-#line 7513 "FacebookPublishing.c"
+#line 7936 "FacebookPublishing.c"
}
-static gchar* publishing_facebook_graph_session_graph_message_impl_real_get_uri (PublishingFacebookGraphMessage* base) {
+static gchar*
+publishing_facebook_graph_session_graph_message_impl_real_get_uri (PublishingFacebookGraphMessage* base)
+{
PublishingFacebookGraphSessionGraphMessageImpl * self;
gchar* result = NULL;
const gchar* _tmp0_;
@@ -7548,11 +7973,13 @@ static gchar* publishing_facebook_graph_session_graph_message_impl_real_get_uri
result = _tmp1_;
#line 1026 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return result;
-#line 7532 "FacebookPublishing.c"
+#line 7957 "FacebookPublishing.c"
}
-static gchar* publishing_facebook_graph_session_graph_message_impl_real_get_response_body (PublishingFacebookGraphMessage* base) {
+static gchar*
+publishing_facebook_graph_session_graph_message_impl_real_get_response_body (PublishingFacebookGraphMessage* base)
+{
PublishingFacebookGraphSessionGraphMessageImpl * self;
gchar* result = NULL;
SoupMessage* _tmp0_;
@@ -7576,18 +8003,20 @@ static gchar* publishing_facebook_graph_session_graph_message_impl_real_get_resp
result = _tmp3_;
#line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return result;
-#line 7560 "FacebookPublishing.c"
+#line 7987 "FacebookPublishing.c"
}
-static void publishing_facebook_graph_session_graph_message_impl_on_wrote_body_data (PublishingFacebookGraphSessionGraphMessageImpl* self, SoupBuffer* chunk) {
+static void
+publishing_facebook_graph_session_graph_message_impl_on_wrote_body_data (PublishingFacebookGraphSessionGraphMessageImpl* self,
+ SoupBuffer* chunk)
+{
gint _tmp0_;
- SoupBuffer* _tmp1_;
- gsize _tmp2_;
- gint _tmp3_;
- SoupMessage* _tmp4_;
- SoupMessageBody* _tmp5_;
- gint64 _tmp6_;
+ gsize _tmp1_;
+ gint _tmp2_;
+ SoupMessage* _tmp3_;
+ SoupMessageBody* _tmp4_;
+ gint64 _tmp5_;
#line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_if_fail (PUBLISHING_FACEBOOK_GRAPH_SESSION_IS_GRAPH_MESSAGE_IMPL (self));
#line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -7595,26 +8024,26 @@ static void publishing_facebook_graph_session_graph_message_impl_on_wrote_body_d
#line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_tmp0_ = self->bytes_so_far;
#line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp1_ = chunk;
-#line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp2_ = _tmp1_->length;
+ _tmp1_ = chunk->length;
#line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- self->bytes_so_far = _tmp0_ + ((gint) _tmp2_);
+ self->bytes_so_far = _tmp0_ + ((gint) _tmp1_);
#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp3_ = self->bytes_so_far;
+ _tmp2_ = self->bytes_so_far;
#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp4_ = self->soup_message;
+ _tmp3_ = self->soup_message;
#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp5_ = _tmp4_->request_body;
+ _tmp4_ = _tmp3_->request_body;
#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp6_ = _tmp5_->length;
+ _tmp5_ = _tmp4_->length;
#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_signal_emit (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage), publishing_facebook_graph_message_signals[PUBLISHING_FACEBOOK_GRAPH_MESSAGE_DATA_TRANSMITTED_SIGNAL], 0, _tmp3_, (gint) _tmp6_);
-#line 7594 "FacebookPublishing.c"
+ g_signal_emit (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage), publishing_facebook_graph_message_signals[PUBLISHING_FACEBOOK_GRAPH_MESSAGE_DATA_TRANSMITTED_SIGNAL], 0, _tmp2_, (gint) _tmp5_);
+#line 8021 "FacebookPublishing.c"
}
-static void publishing_facebook_graph_session_graph_message_impl_class_init (PublishingFacebookGraphSessionGraphMessageImplClass * klass) {
+static void
+publishing_facebook_graph_session_graph_message_impl_class_init (PublishingFacebookGraphSessionGraphMessageImplClass * klass)
+{
#line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_graph_session_graph_message_impl_parent_class = g_type_class_peek_parent (klass);
#line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -7625,15 +8054,19 @@ static void publishing_facebook_graph_session_graph_message_impl_class_init (Pub
((PublishingFacebookGraphMessageClass *) klass)->get_uri = (gchar* (*) (PublishingFacebookGraphMessage *)) publishing_facebook_graph_session_graph_message_impl_real_get_uri;
#line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
((PublishingFacebookGraphMessageClass *) klass)->get_response_body = (gchar* (*) (PublishingFacebookGraphMessage *)) publishing_facebook_graph_session_graph_message_impl_real_get_response_body;
-#line 7609 "FacebookPublishing.c"
+#line 8038 "FacebookPublishing.c"
}
-static void publishing_facebook_graph_session_graph_message_impl_instance_init (PublishingFacebookGraphSessionGraphMessageImpl * self) {
+static void
+publishing_facebook_graph_session_graph_message_impl_instance_init (PublishingFacebookGraphSessionGraphMessageImpl * self)
+{
}
-static void publishing_facebook_graph_session_graph_message_impl_finalize (PublishingFacebookGraphMessage * obj) {
+static void
+publishing_facebook_graph_session_graph_message_impl_finalize (PublishingFacebookGraphMessage * obj)
+{
PublishingFacebookGraphSessionGraphMessageImpl * self;
#line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl);
@@ -7645,11 +8078,13 @@ static void publishing_facebook_graph_session_graph_message_impl_finalize (Publi
_g_object_unref0 (self->soup_message);
#line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
PUBLISHING_FACEBOOK_GRAPH_MESSAGE_CLASS (publishing_facebook_graph_session_graph_message_impl_parent_class)->finalize (obj);
-#line 7629 "FacebookPublishing.c"
+#line 8062 "FacebookPublishing.c"
}
-static GType publishing_facebook_graph_session_graph_message_impl_get_type (void) {
+static GType
+publishing_facebook_graph_session_graph_message_impl_get_type (void)
+{
static volatile gsize publishing_facebook_graph_session_graph_message_impl_type_id__volatile = 0;
if (g_once_init_enter (&publishing_facebook_graph_session_graph_message_impl_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingFacebookGraphSessionGraphMessageImplClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_facebook_graph_session_graph_message_impl_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingFacebookGraphSessionGraphMessageImpl), 0, (GInstanceInitFunc) publishing_facebook_graph_session_graph_message_impl_instance_init, NULL };
@@ -7661,32 +8096,35 @@ static GType publishing_facebook_graph_session_graph_message_impl_get_type (void
}
-static void _vala_SoupURI_free (SoupURI* self) {
+static void
+_vala_SoupURI_free (SoupURI* self)
+{
#line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_boxed_free (soup_uri_get_type (), self);
-#line 7648 "FacebookPublishing.c"
+#line 8085 "FacebookPublishing.c"
}
-static PublishingFacebookGraphSessionGraphQueryMessage* publishing_facebook_graph_session_graph_query_message_construct (GType object_type, PublishingFacebookGraphSession* host_session, const gchar* relative_uri, const gchar* access_token) {
+static PublishingFacebookGraphSessionGraphQueryMessage*
+publishing_facebook_graph_session_graph_query_message_construct (GType object_type,
+ PublishingFacebookGraphSession* host_session,
+ const gchar* relative_uri,
+ const gchar* access_token)
+{
PublishingFacebookGraphSessionGraphQueryMessage* self = NULL;
- PublishingFacebookGraphSession* _tmp0_;
- const gchar* _tmp1_;
- const gchar* _tmp2_;
SoupURI* destination_uri = NULL;
- const gchar* _tmp3_;
+ const gchar* _tmp0_;
+ gchar* _tmp1_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
gchar* _tmp4_;
- gchar* _tmp5_;
- const gchar* _tmp6_;
- gchar* _tmp7_;
+ SoupURI* _tmp5_;
+ SoupURI* _tmp6_;
+ PublishingRESTSupportHttpMethod _tmp7_;
gchar* _tmp8_;
- SoupURI* _tmp9_;
- SoupURI* _tmp10_;
- PublishingRESTSupportHttpMethod _tmp11_;
- gchar* _tmp12_;
- gchar* _tmp13_;
- SoupMessage* _tmp14_;
- SoupMessage* _tmp15_;
+ gchar* _tmp9_;
+ SoupMessage* _tmp10_;
+ SoupMessage* _tmp11_;
#line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (host_session), NULL);
#line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -7694,80 +8132,82 @@ static PublishingFacebookGraphSessionGraphQueryMessage* publishing_facebook_grap
#line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_val_if_fail (access_token != NULL, NULL);
#line 1043 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp0_ = host_session;
-#line 1043 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp1_ = relative_uri;
-#line 1043 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp2_ = access_token;
-#line 1043 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- self = (PublishingFacebookGraphSessionGraphQueryMessage*) publishing_facebook_graph_session_graph_message_impl_construct (object_type, _tmp0_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET, _tmp1_, _tmp2_, PUBLISHING_FACEBOOK_ENDPOINT_DEFAULT);
-#line 1045 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->uri;
+ self = (PublishingFacebookGraphSessionGraphQueryMessage*) publishing_facebook_graph_session_graph_message_impl_construct (object_type, host_session, PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET, relative_uri, access_token, PUBLISHING_FACEBOOK_ENDPOINT_DEFAULT);
#line 1045 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp4_ = g_strconcat (_tmp3_, "?access_token=", NULL);
+ _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->uri;
#line 1045 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp5_ = _tmp4_;
+ _tmp1_ = g_strconcat (_tmp0_, "?access_token=", NULL);
#line 1045 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp6_ = access_token;
+ _tmp2_ = _tmp1_;
#line 1045 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp7_ = g_strconcat (_tmp5_, _tmp6_, NULL);
+ _tmp3_ = g_strconcat (_tmp2_, access_token, NULL);
#line 1045 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp8_ = _tmp7_;
+ _tmp4_ = _tmp3_;
#line 1045 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp9_ = soup_uri_new (_tmp8_);
+ _tmp5_ = soup_uri_new (_tmp4_);
#line 1045 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp10_ = _tmp9_;
+ _tmp6_ = _tmp5_;
#line 1045 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _g_free0 (_tmp8_);
+ _g_free0 (_tmp4_);
#line 1045 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _g_free0 (_tmp5_);
+ _g_free0 (_tmp2_);
#line 1045 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- destination_uri = _tmp10_;
+ destination_uri = _tmp6_;
#line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp11_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->method;
+ _tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->method;
#line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp12_ = publishing_rest_support_http_method_to_string (_tmp11_);
+ _tmp8_ = publishing_rest_support_http_method_to_string (_tmp7_);
#line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp13_ = _tmp12_;
+ _tmp9_ = _tmp8_;
#line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp14_ = soup_message_new_from_uri (_tmp13_, destination_uri);
+ _tmp10_ = soup_message_new_from_uri (_tmp9_, destination_uri);
#line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_g_object_unref0 (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->soup_message);
#line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->soup_message = _tmp14_;
+ G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->soup_message = _tmp10_;
#line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _g_free0 (_tmp13_);
+ _g_free0 (_tmp9_);
#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp15_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->soup_message;
+ _tmp11_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->soup_message;
#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_signal_connect (_tmp15_, "wrote-body-data", (GCallback) _publishing_facebook_graph_session_graph_message_impl_on_wrote_body_data_soup_message_wrote_body_data, G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl));
+ g_signal_connect (_tmp11_, "wrote-body-data", (GCallback) _publishing_facebook_graph_session_graph_message_impl_on_wrote_body_data_soup_message_wrote_body_data, G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl));
#line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
__vala_SoupURI_free0 (destination_uri);
#line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return self;
-#line 7729 "FacebookPublishing.c"
+#line 8159 "FacebookPublishing.c"
}
-static PublishingFacebookGraphSessionGraphQueryMessage* publishing_facebook_graph_session_graph_query_message_new (PublishingFacebookGraphSession* host_session, const gchar* relative_uri, const gchar* access_token) {
+static PublishingFacebookGraphSessionGraphQueryMessage*
+publishing_facebook_graph_session_graph_query_message_new (PublishingFacebookGraphSession* host_session,
+ const gchar* relative_uri,
+ const gchar* access_token)
+{
#line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return publishing_facebook_graph_session_graph_query_message_construct (PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_QUERY_MESSAGE, host_session, relative_uri, access_token);
-#line 7736 "FacebookPublishing.c"
+#line 8170 "FacebookPublishing.c"
}
-static void publishing_facebook_graph_session_graph_query_message_class_init (PublishingFacebookGraphSessionGraphQueryMessageClass * klass) {
+static void
+publishing_facebook_graph_session_graph_query_message_class_init (PublishingFacebookGraphSessionGraphQueryMessageClass * klass)
+{
#line 1040 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_graph_session_graph_query_message_parent_class = g_type_class_peek_parent (klass);
-#line 7743 "FacebookPublishing.c"
+#line 8179 "FacebookPublishing.c"
}
-static void publishing_facebook_graph_session_graph_query_message_instance_init (PublishingFacebookGraphSessionGraphQueryMessage * self) {
+static void
+publishing_facebook_graph_session_graph_query_message_instance_init (PublishingFacebookGraphSessionGraphQueryMessage * self)
+{
}
-static GType publishing_facebook_graph_session_graph_query_message_get_type (void) {
+static GType
+publishing_facebook_graph_session_graph_query_message_get_type (void)
+{
static volatile gsize publishing_facebook_graph_session_graph_query_message_type_id__volatile = 0;
if (g_once_init_enter (&publishing_facebook_graph_session_graph_query_message_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingFacebookGraphSessionGraphQueryMessageClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_facebook_graph_session_graph_query_message_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingFacebookGraphSessionGraphQueryMessage), 0, (GInstanceInitFunc) publishing_facebook_graph_session_graph_query_message_instance_init, NULL };
@@ -7779,74 +8219,82 @@ static GType publishing_facebook_graph_session_graph_query_message_get_type (voi
}
-static PublishingFacebookGraphSessionGraphEndpointProbeMessage* publishing_facebook_graph_session_graph_endpoint_probe_message_construct (GType object_type, PublishingFacebookGraphSession* host_session) {
+static PublishingFacebookGraphSessionGraphEndpointProbeMessage*
+publishing_facebook_graph_session_graph_endpoint_probe_message_construct (GType object_type,
+ PublishingFacebookGraphSession* host_session)
+{
PublishingFacebookGraphSessionGraphEndpointProbeMessage* self = NULL;
- PublishingFacebookGraphSession* _tmp0_;
- PublishingRESTSupportHttpMethod _tmp1_;
+ PublishingRESTSupportHttpMethod _tmp0_;
+ gchar* _tmp1_;
gchar* _tmp2_;
- gchar* _tmp3_;
- const gchar* _tmp4_;
+ const gchar* _tmp3_;
+ SoupURI* _tmp4_;
SoupURI* _tmp5_;
- SoupURI* _tmp6_;
+ SoupMessage* _tmp6_;
SoupMessage* _tmp7_;
- SoupMessage* _tmp8_;
#line 1052 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (host_session), NULL);
#line 1053 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp0_ = host_session;
-#line 1053 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- self = (PublishingFacebookGraphSessionGraphEndpointProbeMessage*) publishing_facebook_graph_session_graph_message_impl_construct (object_type, _tmp0_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET, "/", "", PUBLISHING_FACEBOOK_ENDPOINT_TEST_CONNECTION);
+ self = (PublishingFacebookGraphSessionGraphEndpointProbeMessage*) publishing_facebook_graph_session_graph_message_impl_construct (object_type, host_session, PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET, "/", "", PUBLISHING_FACEBOOK_ENDPOINT_TEST_CONNECTION);
#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->method;
+ _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->method;
#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp2_ = publishing_rest_support_http_method_to_string (_tmp1_);
+ _tmp1_ = publishing_rest_support_http_method_to_string (_tmp0_);
#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp3_ = _tmp2_;
+ _tmp2_ = _tmp1_;
#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->uri;
+ _tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->uri;
#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp5_ = soup_uri_new (_tmp4_);
+ _tmp4_ = soup_uri_new (_tmp3_);
#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp6_ = _tmp5_;
+ _tmp5_ = _tmp4_;
#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp7_ = soup_message_new_from_uri (_tmp3_, _tmp6_);
+ _tmp6_ = soup_message_new_from_uri (_tmp2_, _tmp5_);
#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_g_object_unref0 (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->soup_message);
#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->soup_message = _tmp7_;
+ G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->soup_message = _tmp6_;
#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- __vala_SoupURI_free0 (_tmp6_);
+ __vala_SoupURI_free0 (_tmp5_);
#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _g_free0 (_tmp3_);
+ _g_free0 (_tmp2_);
#line 1057 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->soup_message;
+ _tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->soup_message;
#line 1057 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_signal_connect (_tmp8_, "wrote-body-data", (GCallback) _publishing_facebook_graph_session_graph_message_impl_on_wrote_body_data_soup_message_wrote_body_data, G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl));
+ g_signal_connect (_tmp7_, "wrote-body-data", (GCallback) _publishing_facebook_graph_session_graph_message_impl_on_wrote_body_data_soup_message_wrote_body_data, G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl));
#line 1052 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return self;
-#line 7808 "FacebookPublishing.c"
+#line 8248 "FacebookPublishing.c"
}
-static PublishingFacebookGraphSessionGraphEndpointProbeMessage* publishing_facebook_graph_session_graph_endpoint_probe_message_new (PublishingFacebookGraphSession* host_session) {
+static PublishingFacebookGraphSessionGraphEndpointProbeMessage*
+publishing_facebook_graph_session_graph_endpoint_probe_message_new (PublishingFacebookGraphSession* host_session)
+{
#line 1052 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return publishing_facebook_graph_session_graph_endpoint_probe_message_construct (PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_ENDPOINT_PROBE_MESSAGE, host_session);
-#line 7815 "FacebookPublishing.c"
+#line 8257 "FacebookPublishing.c"
}
-static void publishing_facebook_graph_session_graph_endpoint_probe_message_class_init (PublishingFacebookGraphSessionGraphEndpointProbeMessageClass * klass) {
+static void
+publishing_facebook_graph_session_graph_endpoint_probe_message_class_init (PublishingFacebookGraphSessionGraphEndpointProbeMessageClass * klass)
+{
#line 1051 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_graph_session_graph_endpoint_probe_message_parent_class = g_type_class_peek_parent (klass);
-#line 7822 "FacebookPublishing.c"
+#line 8266 "FacebookPublishing.c"
}
-static void publishing_facebook_graph_session_graph_endpoint_probe_message_instance_init (PublishingFacebookGraphSessionGraphEndpointProbeMessage * self) {
+static void
+publishing_facebook_graph_session_graph_endpoint_probe_message_instance_init (PublishingFacebookGraphSessionGraphEndpointProbeMessage * self)
+{
}
-static GType publishing_facebook_graph_session_graph_endpoint_probe_message_get_type (void) {
+static GType
+publishing_facebook_graph_session_graph_endpoint_probe_message_get_type (void)
+{
static volatile gsize publishing_facebook_graph_session_graph_endpoint_probe_message_type_id__volatile = 0;
if (g_once_init_enter (&publishing_facebook_graph_session_graph_endpoint_probe_message_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingFacebookGraphSessionGraphEndpointProbeMessageClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_facebook_graph_session_graph_endpoint_probe_message_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingFacebookGraphSessionGraphEndpointProbeMessage), 0, (GInstanceInitFunc) publishing_facebook_graph_session_graph_endpoint_probe_message_instance_init, NULL };
@@ -7858,103 +8306,97 @@ static GType publishing_facebook_graph_session_graph_endpoint_probe_message_get_
}
-static gchar* g_date_time_to_string (GDateTime* self) {
+static gchar*
+g_date_time_to_string (GDateTime* self)
+{
gchar* result = NULL;
gchar* _tmp0_;
-#line 2930 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 2952 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 2931 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 2953 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp0_ = g_date_time_format (self, "%FT%H:%M:%S%z");
-#line 2931 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 2953 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
result = _tmp0_;
-#line 2931 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 2953 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 7853 "FacebookPublishing.c"
+#line 8303 "FacebookPublishing.c"
}
-static void _vala_SoupMultipart_free (SoupMultipart* self) {
+static void
+_vala_SoupMultipart_free (SoupMultipart* self)
+{
#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_boxed_free (soup_multipart_get_type (), self);
-#line 7860 "FacebookPublishing.c"
+#line 8312 "FacebookPublishing.c"
}
-static void _vala_SoupBuffer_free (SoupBuffer* self) {
+static void
+_vala_SoupBuffer_free (SoupBuffer* self)
+{
#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_boxed_free (soup_buffer_get_type (), self);
-#line 7867 "FacebookPublishing.c"
+#line 8321 "FacebookPublishing.c"
}
-static PublishingFacebookGraphSessionGraphUploadMessage* publishing_facebook_graph_session_graph_upload_message_construct (GType object_type, PublishingFacebookGraphSession* host_session, const gchar* access_token, const gchar* relative_uri, SpitPublishingPublishable* publishable, gboolean suppress_titling, const gchar* resource_privacy) {
+static PublishingFacebookGraphSessionGraphUploadMessage*
+publishing_facebook_graph_session_graph_upload_message_construct (GType object_type,
+ PublishingFacebookGraphSession* host_session,
+ const gchar* access_token,
+ const gchar* relative_uri,
+ SpitPublishingPublishable* publishable,
+ gboolean suppress_titling,
+ const gchar* resource_privacy)
+{
PublishingFacebookGraphSessionGraphUploadMessage* self = NULL;
PublishingFacebookEndpoint _tmp0_ = 0;
- SpitPublishingPublishable* _tmp1_;
- SpitPublishingPublisherMediaType _tmp2_;
- PublishingFacebookGraphSession* _tmp3_;
- const gchar* _tmp4_;
- const gchar* _tmp5_;
- gboolean _tmp6_ = FALSE;
- SpitPublishingPublishable* _tmp7_;
- SpitPublishingPublisherMediaType _tmp8_;
- SpitPublishingPublishable* _tmp10_;
- SpitPublishingPublishable* _tmp11_;
- PublishingRESTSupportHttpMethod _tmp21_;
- gchar* _tmp22_;
- gchar* _tmp23_;
- const gchar* _tmp24_;
- SoupURI* _tmp25_;
- SoupURI* _tmp26_;
- SoupMessage* _tmp27_;
- SoupMessage* _tmp28_;
+ gboolean _tmp1_ = FALSE;
+ SpitPublishingPublishable* _tmp2_;
+ PublishingRESTSupportHttpMethod _tmp11_;
+ gchar* _tmp12_;
+ gchar* _tmp13_;
+ const gchar* _tmp14_;
+ SoupURI* _tmp15_;
+ SoupURI* _tmp16_;
+ SoupMessage* _tmp17_;
+ SoupMessage* _tmp18_;
guint8* payload = NULL;
- GMappedFile* _tmp29_;
- gchar* _tmp30_;
+ GMappedFile* _tmp19_;
+ gchar* _tmp20_;
gint payload_length1;
gint _payload_size_;
- GMappedFile* _tmp31_;
- gsize _tmp32_;
- gint _tmp33_;
+ GMappedFile* _tmp21_;
+ gint _tmp22_;
SoupBuffer* image_data = NULL;
- guint8* _tmp34_;
- gint _tmp34__length1;
- SoupBuffer* _tmp35_;
+ guint8* _tmp23_;
+ gint _tmp23__length1;
+ SoupBuffer* _tmp24_;
SoupMultipart* mp_envelope = NULL;
- SoupMultipart* _tmp36_;
- SoupMultipart* _tmp37_;
- const gchar* _tmp38_;
- SpitPublishingPublishable* _tmp39_;
- SpitPublishingPublisherMediaType _tmp40_;
+ SoupMultipart* _tmp25_;
+ SoupMultipart* _tmp26_;
gchar* publishable_title = NULL;
- SpitPublishingPublishable* _tmp43_;
- gchar* _tmp44_;
- gboolean _tmp45_ = FALSE;
- gboolean _tmp46_;
+ gchar* _tmp28_;
+ gboolean _tmp29_ = FALSE;
gchar* publishable_comment = NULL;
- SpitPublishingPublishable* _tmp50_;
- gchar* _tmp51_;
- gboolean _tmp52_ = FALSE;
- gboolean _tmp53_;
- gboolean _tmp57_;
- const gchar* _tmp64_ = NULL;
- SpitPublishingPublishable* _tmp65_;
- SpitPublishingPublisherMediaType _tmp66_;
+ gchar* _tmp33_;
+ gboolean _tmp34_ = FALSE;
+ const gchar* _tmp43_ = NULL;
gchar* source_file_mime_type = NULL;
- gchar* _tmp67_;
- SoupMultipart* _tmp68_;
- SpitPublishingPublishable* _tmp69_;
- GFile* _tmp70_;
- GFile* _tmp71_;
- gchar* _tmp72_;
- gchar* _tmp73_;
- const gchar* _tmp74_;
- SoupBuffer* _tmp75_;
- SoupMultipart* _tmp76_;
- SoupMessage* _tmp77_;
- SoupMessageHeaders* _tmp78_;
- SoupMessage* _tmp79_;
- SoupMessageBody* _tmp80_;
+ gchar* _tmp44_;
+ SoupMultipart* _tmp45_;
+ GFile* _tmp46_;
+ GFile* _tmp47_;
+ gchar* _tmp48_;
+ gchar* _tmp49_;
+ const gchar* _tmp50_;
+ SoupBuffer* _tmp51_;
+ SoupMultipart* _tmp52_;
+ SoupMessage* _tmp53_;
+ SoupMessageHeaders* _tmp54_;
+ SoupMessage* _tmp55_;
+ SoupMessageBody* _tmp56_;
GError * _inner_error_ = NULL;
#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (host_session), NULL);
@@ -7965,90 +8407,68 @@ static PublishingFacebookGraphSessionGraphUploadMessage* publishing_facebook_gra
#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL);
#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp1_ = publishable;
-#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp2_ = spit_publishing_publishable_get_media_type (_tmp1_);
-#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- if (_tmp2_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
+ if (spit_publishing_publishable_get_media_type (publishable) == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
#line 1070 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_tmp0_ = PUBLISHING_FACEBOOK_ENDPOINT_VIDEO;
-#line 7956 "FacebookPublishing.c"
+#line 8394 "FacebookPublishing.c"
} else {
#line 1070 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_tmp0_ = PUBLISHING_FACEBOOK_ENDPOINT_DEFAULT;
-#line 7960 "FacebookPublishing.c"
+#line 8398 "FacebookPublishing.c"
}
#line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp3_ = host_session;
-#line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp4_ = relative_uri;
-#line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp5_ = access_token;
-#line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- self = (PublishingFacebookGraphSessionGraphUploadMessage*) publishing_facebook_graph_session_graph_message_impl_construct (object_type, _tmp3_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST, _tmp4_, _tmp5_, _tmp0_);
-#line 1075 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp7_ = publishable;
-#line 1075 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp8_ = spit_publishing_publishable_get_media_type (_tmp7_);
+ self = (PublishingFacebookGraphSessionGraphUploadMessage*) publishing_facebook_graph_session_graph_message_impl_construct (object_type, host_session, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST, relative_uri, access_token, _tmp0_);
#line 1075 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- if (_tmp8_ != SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
+ if (spit_publishing_publishable_get_media_type (publishable) != SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
#line 1075 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp6_ = TRUE;
-#line 7978 "FacebookPublishing.c"
+ _tmp1_ = TRUE;
+#line 8406 "FacebookPublishing.c"
} else {
- const gchar* _tmp9_;
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp9_ = resource_privacy;
#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp6_ = _tmp9_ != NULL;
-#line 7985 "FacebookPublishing.c"
+ _tmp1_ = resource_privacy != NULL;
+#line 8410 "FacebookPublishing.c"
}
#line 1075 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _vala_assert (_tmp6_, "publishable.get_media_type() != Spit.Publishing.Publisher.MediaType.VIDEO || resource_privacy != null");
+ _vala_assert (_tmp1_, "publishable.get_media_type() != Spit.Publishing.Publisher.MediaType.VIDEO || resource_privacy != null");
#line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp10_ = publishable;
-#line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp11_ = _g_object_ref0 (_tmp10_);
+ _tmp2_ = _g_object_ref0 (publishable);
#line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_g_object_unref0 (self->priv->publishable);
#line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- self->priv->publishable = _tmp11_;
-#line 7997 "FacebookPublishing.c"
+ self->priv->publishable = _tmp2_;
+#line 8420 "FacebookPublishing.c"
{
- GMappedFile* _tmp12_ = NULL;
- SpitPublishingPublishable* _tmp13_;
- GFile* _tmp14_;
- GFile* _tmp15_;
- gchar* _tmp16_;
- gchar* _tmp17_;
- GMappedFile* _tmp18_;
- GMappedFile* _tmp19_;
- GMappedFile* _tmp20_;
-#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp13_ = publishable;
+ GMappedFile* _tmp3_ = NULL;
+ GFile* _tmp4_;
+ GFile* _tmp5_;
+ gchar* _tmp6_;
+ gchar* _tmp7_;
+ GMappedFile* _tmp8_;
+ GMappedFile* _tmp9_;
+ GMappedFile* _tmp10_;
#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp14_ = spit_publishing_publishable_get_serialized_file (_tmp13_);
+ _tmp4_ = spit_publishing_publishable_get_serialized_file (publishable);
#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp15_ = _tmp14_;
+ _tmp5_ = _tmp4_;
#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp16_ = g_file_get_path (_tmp15_);
+ _tmp6_ = g_file_get_path (_tmp5_);
#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp17_ = _tmp16_;
+ _tmp7_ = _tmp6_;
#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp18_ = g_mapped_file_new (_tmp17_, FALSE, &_inner_error_);
+ _tmp8_ = g_mapped_file_new (_tmp7_, FALSE, &_inner_error_);
#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp19_ = _tmp18_;
+ _tmp9_ = _tmp8_;
#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _g_free0 (_tmp17_);
+ _g_free0 (_tmp7_);
#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _g_object_unref0 (_tmp15_);
+ _g_object_unref0 (_tmp5_);
#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp12_ = _tmp19_;
+ _tmp3_ = _tmp9_;
#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
if (_inner_error_->domain == G_FILE_ERROR) {
-#line 8032 "FacebookPublishing.c"
+#line 8452 "FacebookPublishing.c"
goto __catch5_g_file_error;
}
#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -8057,19 +8477,19 @@ static PublishingFacebookGraphSessionGraphUploadMessage* publishing_facebook_gra
g_clear_error (&_inner_error_);
#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return NULL;
-#line 8041 "FacebookPublishing.c"
+#line 8461 "FacebookPublishing.c"
}
#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp20_ = _tmp12_;
+ _tmp10_ = _tmp3_;
#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp12_ = NULL;
+ _tmp3_ = NULL;
#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_g_mapped_file_unref0 (self->priv->mapped_file);
#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- self->priv->mapped_file = _tmp20_;
+ self->priv->mapped_file = _tmp10_;
#line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _g_mapped_file_unref0 (_tmp12_);
-#line 8053 "FacebookPublishing.c"
+ _g_mapped_file_unref0 (_tmp3_);
+#line 8473 "FacebookPublishing.c"
}
goto __finally5;
__catch5_g_file_error:
@@ -8083,7 +8503,7 @@ static PublishingFacebookGraphSessionGraphUploadMessage* publishing_facebook_gra
_g_error_free0 (e);
#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return self;
-#line 8067 "FacebookPublishing.c"
+#line 8487 "FacebookPublishing.c"
}
__finally5:
#line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -8094,240 +8514,210 @@ static PublishingFacebookGraphSessionGraphUploadMessage* publishing_facebook_gra
g_clear_error (&_inner_error_);
#line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return NULL;
-#line 8078 "FacebookPublishing.c"
+#line 8498 "FacebookPublishing.c"
}
#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp21_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->method;
+ _tmp11_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->method;
#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp22_ = publishing_rest_support_http_method_to_string (_tmp21_);
+ _tmp12_ = publishing_rest_support_http_method_to_string (_tmp11_);
#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp23_ = _tmp22_;
+ _tmp13_ = _tmp12_;
#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp24_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->uri;
+ _tmp14_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->uri;
#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp25_ = soup_uri_new (_tmp24_);
+ _tmp15_ = soup_uri_new (_tmp14_);
#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp26_ = _tmp25_;
+ _tmp16_ = _tmp15_;
#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp27_ = soup_message_new_from_uri (_tmp23_, _tmp26_);
+ _tmp17_ = soup_message_new_from_uri (_tmp13_, _tmp16_);
#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_g_object_unref0 (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->soup_message);
#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->soup_message = _tmp27_;
+ G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->soup_message = _tmp17_;
#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- __vala_SoupURI_free0 (_tmp26_);
+ __vala_SoupURI_free0 (_tmp16_);
#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _g_free0 (_tmp23_);
+ _g_free0 (_tmp13_);
#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp28_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->soup_message;
+ _tmp18_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->soup_message;
#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_signal_connect (_tmp28_, "wrote-body-data", (GCallback) _publishing_facebook_graph_session_graph_message_impl_on_wrote_body_data_soup_message_wrote_body_data, G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl));
+ g_signal_connect (_tmp18_, "wrote-body-data", (GCallback) _publishing_facebook_graph_session_graph_message_impl_on_wrote_body_data_soup_message_wrote_body_data, G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl));
#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp29_ = self->priv->mapped_file;
+ _tmp19_ = self->priv->mapped_file;
#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp30_ = g_mapped_file_get_contents (_tmp29_);
+ _tmp20_ = g_mapped_file_get_contents (_tmp19_);
#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- payload = (guint8*) _tmp30_;
+ payload = (guint8*) _tmp20_;
#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
payload_length1 = sizeof (gchar) / sizeof (guint8);
#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_payload_size_ = payload_length1;
#line 1092 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp31_ = self->priv->mapped_file;
-#line 1092 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp32_ = g_mapped_file_get_length (_tmp31_);
+ _tmp21_ = self->priv->mapped_file;
#line 1092 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- payload_length1 = (gint) _tmp32_;
+ payload_length1 = (gint) g_mapped_file_get_length (_tmp21_);
#line 1092 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp33_ = payload_length1;
+ _tmp22_ = payload_length1;
#line 1094 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp34_ = payload;
+ _tmp23_ = payload;
#line 1094 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp34__length1 = payload_length1;
+ _tmp23__length1 = payload_length1;
#line 1094 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp35_ = soup_buffer_new (SOUP_MEMORY_TEMPORARY, _tmp34_, _tmp34__length1);
+ _tmp24_ = soup_buffer_new (SOUP_MEMORY_TEMPORARY, _tmp23_, _tmp23__length1);
#line 1094 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- image_data = _tmp35_;
+ image_data = _tmp24_;
#line 1096 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp36_ = soup_multipart_new ("multipart/form-data");
+ _tmp25_ = soup_multipart_new ("multipart/form-data");
#line 1096 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- mp_envelope = _tmp36_;
+ mp_envelope = _tmp25_;
#line 1098 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp37_ = mp_envelope;
+ _tmp26_ = mp_envelope;
#line 1098 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp38_ = access_token;
-#line 1098 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- soup_multipart_append_form_string (_tmp37_, "access_token", _tmp38_);
-#line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp39_ = publishable;
-#line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp40_ = spit_publishing_publishable_get_media_type (_tmp39_);
+ soup_multipart_append_form_string (_tmp26_, "access_token", access_token);
#line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- if (_tmp40_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 8148 "FacebookPublishing.c"
- SoupMultipart* _tmp41_;
- const gchar* _tmp42_;
+ if (spit_publishing_publishable_get_media_type (publishable) == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
+#line 8560 "FacebookPublishing.c"
+ SoupMultipart* _tmp27_;
#line 1101 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp41_ = mp_envelope;
+ _tmp27_ = mp_envelope;
#line 1101 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp42_ = resource_privacy;
-#line 1101 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- soup_multipart_append_form_string (_tmp41_, "privacy", _tmp42_);
-#line 8157 "FacebookPublishing.c"
+ soup_multipart_append_form_string (_tmp27_, "privacy", resource_privacy);
+#line 8566 "FacebookPublishing.c"
}
#line 1104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp43_ = publishable;
-#line 1104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp44_ = spit_publishing_publishable_get_param_string (_tmp43_, "title");
+ _tmp28_ = spit_publishing_publishable_get_param_string (publishable, "title");
#line 1104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- publishable_title = _tmp44_;
+ publishable_title = _tmp28_;
#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp46_ = suppress_titling;
+ if (!suppress_titling) {
+#line 8574 "FacebookPublishing.c"
+ const gchar* _tmp30_;
#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- if (!_tmp46_) {
-#line 8169 "FacebookPublishing.c"
- const gchar* _tmp47_;
+ _tmp30_ = publishable_title;
#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp47_ = publishable_title;
-#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp45_ = _tmp47_ != NULL;
-#line 8175 "FacebookPublishing.c"
+ _tmp29_ = _tmp30_ != NULL;
+#line 8580 "FacebookPublishing.c"
} else {
#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp45_ = FALSE;
-#line 8179 "FacebookPublishing.c"
+ _tmp29_ = FALSE;
+#line 8584 "FacebookPublishing.c"
}
#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- if (_tmp45_) {
-#line 8183 "FacebookPublishing.c"
- SoupMultipart* _tmp48_;
- const gchar* _tmp49_;
+ if (_tmp29_) {
+#line 8588 "FacebookPublishing.c"
+ SoupMultipart* _tmp31_;
+ const gchar* _tmp32_;
#line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp48_ = mp_envelope;
+ _tmp31_ = mp_envelope;
#line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp49_ = publishable_title;
+ _tmp32_ = publishable_title;
#line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- soup_multipart_append_form_string (_tmp48_, "name", _tmp49_);
-#line 8192 "FacebookPublishing.c"
+ soup_multipart_append_form_string (_tmp31_, "name", _tmp32_);
+#line 8597 "FacebookPublishing.c"
}
#line 1109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp50_ = publishable;
+ _tmp33_ = spit_publishing_publishable_get_param_string (publishable, "comment");
#line 1109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp51_ = spit_publishing_publishable_get_param_string (_tmp50_, "comment");
-#line 1109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- publishable_comment = _tmp51_;
-#line 1110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp53_ = suppress_titling;
+ publishable_comment = _tmp33_;
#line 1110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- if (!_tmp53_) {
-#line 8204 "FacebookPublishing.c"
- const gchar* _tmp54_;
+ if (!suppress_titling) {
+#line 8605 "FacebookPublishing.c"
+ const gchar* _tmp35_;
#line 1110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp54_ = publishable_comment;
+ _tmp35_ = publishable_comment;
#line 1110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp52_ = _tmp54_ != NULL;
-#line 8210 "FacebookPublishing.c"
+ _tmp34_ = _tmp35_ != NULL;
+#line 8611 "FacebookPublishing.c"
} else {
#line 1110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp52_ = FALSE;
-#line 8214 "FacebookPublishing.c"
+ _tmp34_ = FALSE;
+#line 8615 "FacebookPublishing.c"
}
#line 1110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- if (_tmp52_) {
-#line 8218 "FacebookPublishing.c"
- SoupMultipart* _tmp55_;
- const gchar* _tmp56_;
+ if (_tmp34_) {
+#line 8619 "FacebookPublishing.c"
+ SoupMultipart* _tmp36_;
+ const gchar* _tmp37_;
#line 1111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp55_ = mp_envelope;
+ _tmp36_ = mp_envelope;
#line 1111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp56_ = publishable_comment;
+ _tmp37_ = publishable_comment;
#line 1111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- soup_multipart_append_form_string (_tmp55_, "message", _tmp56_);
-#line 8227 "FacebookPublishing.c"
+ soup_multipart_append_form_string (_tmp36_, "message", _tmp37_);
+#line 8628 "FacebookPublishing.c"
}
#line 1114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp57_ = suppress_titling;
-#line 1114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- if (!_tmp57_) {
-#line 8233 "FacebookPublishing.c"
- SoupMultipart* _tmp58_;
- SpitPublishingPublishable* _tmp59_;
- GDateTime* _tmp60_;
- GDateTime* _tmp61_;
- gchar* _tmp62_;
- gchar* _tmp63_;
+ if (!suppress_titling) {
+#line 8632 "FacebookPublishing.c"
+ SoupMultipart* _tmp38_;
+ GDateTime* _tmp39_;
+ GDateTime* _tmp40_;
+ gchar* _tmp41_;
+ gchar* _tmp42_;
#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp58_ = mp_envelope;
+ _tmp38_ = mp_envelope;
#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp59_ = publishable;
+ _tmp39_ = spit_publishing_publishable_get_exposure_date_time (publishable);
#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp60_ = spit_publishing_publishable_get_exposure_date_time (_tmp59_);
+ _tmp40_ = _tmp39_;
#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp61_ = _tmp60_;
+ _tmp41_ = g_date_time_to_string (_tmp40_);
#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp62_ = g_date_time_to_string (_tmp61_);
+ _tmp42_ = _tmp41_;
#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp63_ = _tmp62_;
+ soup_multipart_append_form_string (_tmp38_, "backdated_time", _tmp42_);
#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- soup_multipart_append_form_string (_tmp58_, "backdated_time", _tmp63_);
+ _g_free0 (_tmp42_);
#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _g_free0 (_tmp63_);
-#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _g_date_time_unref0 (_tmp61_);
-#line 8258 "FacebookPublishing.c"
+ _g_date_time_unref0 (_tmp40_);
+#line 8654 "FacebookPublishing.c"
}
#line 1118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp65_ = publishable;
-#line 1118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp66_ = spit_publishing_publishable_get_media_type (_tmp65_);
-#line 1118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- if (_tmp66_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
+ if (spit_publishing_publishable_get_media_type (publishable) == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
#line 1119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp64_ = "video";
-#line 8268 "FacebookPublishing.c"
+ _tmp43_ = "video";
+#line 8660 "FacebookPublishing.c"
} else {
#line 1119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp64_ = "image/jpeg";
-#line 8272 "FacebookPublishing.c"
+ _tmp43_ = "image/jpeg";
+#line 8664 "FacebookPublishing.c"
}
#line 1117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp67_ = g_strdup (_tmp64_);
+ _tmp44_ = g_strdup (_tmp43_);
#line 1117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- source_file_mime_type = _tmp67_;
+ source_file_mime_type = _tmp44_;
#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp68_ = mp_envelope;
+ _tmp45_ = mp_envelope;
#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp69_ = publishable;
+ _tmp46_ = spit_publishing_publishable_get_serialized_file (publishable);
#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp70_ = spit_publishing_publishable_get_serialized_file (_tmp69_);
+ _tmp47_ = _tmp46_;
#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp71_ = _tmp70_;
+ _tmp48_ = g_file_get_basename (_tmp47_);
#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp72_ = g_file_get_basename (_tmp71_);
+ _tmp49_ = _tmp48_;
#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp73_ = _tmp72_;
+ _tmp50_ = source_file_mime_type;
#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp74_ = source_file_mime_type;
+ _tmp51_ = image_data;
#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp75_ = image_data;
+ soup_multipart_append_form_file (_tmp45_, "source", _tmp49_, _tmp50_, _tmp51_);
#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- soup_multipart_append_form_file (_tmp68_, "source", _tmp73_, _tmp74_, _tmp75_);
+ _g_free0 (_tmp49_);
#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _g_free0 (_tmp73_);
-#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _g_object_unref0 (_tmp71_);
+ _g_object_unref0 (_tmp47_);
#line 1123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp76_ = mp_envelope;
+ _tmp52_ = mp_envelope;
#line 1123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp77_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->soup_message;
+ _tmp53_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->soup_message;
#line 1123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp78_ = _tmp77_->request_headers;
+ _tmp54_ = _tmp53_->request_headers;
#line 1123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp79_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->soup_message;
+ _tmp55_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->soup_message;
#line 1123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp80_ = _tmp79_->request_body;
+ _tmp56_ = _tmp55_->request_body;
#line 1123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- soup_multipart_to_message (_tmp76_, _tmp78_, _tmp80_);
+ soup_multipart_to_message (_tmp52_, _tmp54_, _tmp56_);
#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_g_free0 (source_file_mime_type);
#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -8340,18 +8730,27 @@ static PublishingFacebookGraphSessionGraphUploadMessage* publishing_facebook_gra
__vala_SoupBuffer_free0 (image_data);
#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return self;
-#line 8324 "FacebookPublishing.c"
+#line 8714 "FacebookPublishing.c"
}
-static PublishingFacebookGraphSessionGraphUploadMessage* publishing_facebook_graph_session_graph_upload_message_new (PublishingFacebookGraphSession* host_session, const gchar* access_token, const gchar* relative_uri, SpitPublishingPublishable* publishable, gboolean suppress_titling, const gchar* resource_privacy) {
+static PublishingFacebookGraphSessionGraphUploadMessage*
+publishing_facebook_graph_session_graph_upload_message_new (PublishingFacebookGraphSession* host_session,
+ const gchar* access_token,
+ const gchar* relative_uri,
+ SpitPublishingPublishable* publishable,
+ gboolean suppress_titling,
+ const gchar* resource_privacy)
+{
#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return publishing_facebook_graph_session_graph_upload_message_construct (PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_UPLOAD_MESSAGE, host_session, access_token, relative_uri, publishable, suppress_titling, resource_privacy);
-#line 8331 "FacebookPublishing.c"
+#line 8728 "FacebookPublishing.c"
}
-static gboolean publishing_facebook_graph_session_graph_upload_message_real_prepare_for_transmission (PublishingFacebookGraphSessionGraphMessageImpl* base) {
+static gboolean
+publishing_facebook_graph_session_graph_upload_message_real_prepare_for_transmission (PublishingFacebookGraphSessionGraphMessageImpl* base)
+{
PublishingFacebookGraphSessionGraphUploadMessage * self;
gboolean result = FALSE;
GMappedFile* _tmp0_;
@@ -8361,7 +8760,7 @@ static gboolean publishing_facebook_graph_session_graph_upload_message_real_prep
_tmp0_ = self->priv->mapped_file;
#line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
if (_tmp0_ == NULL) {
-#line 8345 "FacebookPublishing.c"
+#line 8744 "FacebookPublishing.c"
SpitPublishingPublishable* _tmp1_;
GFile* _tmp2_;
GFile* _tmp3_;
@@ -8403,18 +8802,20 @@ static gboolean publishing_facebook_graph_session_graph_upload_message_real_prep
result = FALSE;
#line 1130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return result;
-#line 8387 "FacebookPublishing.c"
+#line 8786 "FacebookPublishing.c"
} else {
#line 1132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
result = TRUE;
#line 1132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return result;
-#line 8393 "FacebookPublishing.c"
+#line 8792 "FacebookPublishing.c"
}
}
-static void publishing_facebook_graph_session_graph_upload_message_class_init (PublishingFacebookGraphSessionGraphUploadMessageClass * klass) {
+static void
+publishing_facebook_graph_session_graph_upload_message_class_init (PublishingFacebookGraphSessionGraphUploadMessageClass * klass)
+{
#line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_graph_session_graph_upload_message_parent_class = g_type_class_peek_parent (klass);
#line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -8423,20 +8824,24 @@ static void publishing_facebook_graph_session_graph_upload_message_class_init (P
g_type_class_add_private (klass, sizeof (PublishingFacebookGraphSessionGraphUploadMessagePrivate));
#line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
((PublishingFacebookGraphSessionGraphMessageImplClass *) klass)->prepare_for_transmission = (gboolean (*) (PublishingFacebookGraphSessionGraphMessageImpl *)) publishing_facebook_graph_session_graph_upload_message_real_prepare_for_transmission;
-#line 8407 "FacebookPublishing.c"
+#line 8808 "FacebookPublishing.c"
}
-static void publishing_facebook_graph_session_graph_upload_message_instance_init (PublishingFacebookGraphSessionGraphUploadMessage * self) {
+static void
+publishing_facebook_graph_session_graph_upload_message_instance_init (PublishingFacebookGraphSessionGraphUploadMessage * self)
+{
#line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
self->priv = PUBLISHING_FACEBOOK_GRAPH_SESSION_GRAPH_UPLOAD_MESSAGE_GET_PRIVATE (self);
#line 1062 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
self->priv->mapped_file = NULL;
-#line 8416 "FacebookPublishing.c"
+#line 8819 "FacebookPublishing.c"
}
-static void publishing_facebook_graph_session_graph_upload_message_finalize (PublishingFacebookGraphMessage * obj) {
+static void
+publishing_facebook_graph_session_graph_upload_message_finalize (PublishingFacebookGraphMessage * obj)
+{
PublishingFacebookGraphSessionGraphUploadMessage * self;
#line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_UPLOAD_MESSAGE, PublishingFacebookGraphSessionGraphUploadMessage);
@@ -8446,11 +8851,13 @@ static void publishing_facebook_graph_session_graph_upload_message_finalize (Pub
_g_object_unref0 (self->priv->publishable);
#line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
PUBLISHING_FACEBOOK_GRAPH_MESSAGE_CLASS (publishing_facebook_graph_session_graph_upload_message_parent_class)->finalize (obj);
-#line 8430 "FacebookPublishing.c"
+#line 8835 "FacebookPublishing.c"
}
-static GType publishing_facebook_graph_session_graph_upload_message_get_type (void) {
+static GType
+publishing_facebook_graph_session_graph_upload_message_get_type (void)
+{
static volatile gsize publishing_facebook_graph_session_graph_upload_message_type_id__volatile = 0;
if (g_once_init_enter (&publishing_facebook_graph_session_graph_upload_message_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingFacebookGraphSessionGraphUploadMessageClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_facebook_graph_session_graph_upload_message_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingFacebookGraphSessionGraphUploadMessage), 0, (GInstanceInitFunc) publishing_facebook_graph_session_graph_upload_message_instance_init, NULL };
@@ -8462,28 +8869,28 @@ static GType publishing_facebook_graph_session_graph_upload_message_get_type (vo
}
-static PublishingFacebookGraphSessionGraphCreateAlbumMessage* publishing_facebook_graph_session_graph_create_album_message_construct (GType object_type, PublishingFacebookGraphSession* host_session, const gchar* access_token, const gchar* album_name, const gchar* album_privacy) {
+static PublishingFacebookGraphSessionGraphCreateAlbumMessage*
+publishing_facebook_graph_session_graph_create_album_message_construct (GType object_type,
+ PublishingFacebookGraphSession* host_session,
+ const gchar* access_token,
+ const gchar* album_name,
+ const gchar* album_privacy)
+{
PublishingFacebookGraphSessionGraphCreateAlbumMessage* self = NULL;
- PublishingFacebookGraphSession* _tmp0_;
- const gchar* _tmp1_;
- gboolean _tmp2_ = FALSE;
- const gchar* _tmp3_;
- PublishingRESTSupportHttpMethod _tmp5_;
- gchar* _tmp6_;
- gchar* _tmp7_;
- const gchar* _tmp8_;
- SoupURI* _tmp9_;
- SoupURI* _tmp10_;
- SoupMessage* _tmp11_;
+ gboolean _tmp0_ = FALSE;
+ PublishingRESTSupportHttpMethod _tmp1_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
+ const gchar* _tmp4_;
+ SoupURI* _tmp5_;
+ SoupURI* _tmp6_;
+ SoupMessage* _tmp7_;
SoupMultipart* mp_envelope = NULL;
- SoupMultipart* _tmp12_;
- const gchar* _tmp13_;
- const gchar* _tmp14_;
- const gchar* _tmp15_;
- SoupMessage* _tmp16_;
- SoupMessageHeaders* _tmp17_;
- SoupMessage* _tmp18_;
- SoupMessageBody* _tmp19_;
+ SoupMultipart* _tmp8_;
+ SoupMessage* _tmp9_;
+ SoupMessageHeaders* _tmp10_;
+ SoupMessage* _tmp11_;
+ SoupMessageBody* _tmp12_;
#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (host_session), NULL);
#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -8493,104 +8900,99 @@ static PublishingFacebookGraphSessionGraphCreateAlbumMessage* publishing_faceboo
#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_val_if_fail (album_privacy != NULL, NULL);
#line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp0_ = host_session;
-#line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp1_ = access_token;
-#line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- self = (PublishingFacebookGraphSessionGraphCreateAlbumMessage*) publishing_facebook_graph_session_graph_message_impl_construct (object_type, _tmp0_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST, "/me/albums", _tmp1_, PUBLISHING_FACEBOOK_ENDPOINT_DEFAULT);
-#line 1142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp3_ = album_privacy;
-#line 1142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- if (_tmp3_ != NULL) {
-#line 8486 "FacebookPublishing.c"
- const gchar* _tmp4_;
+ self = (PublishingFacebookGraphSessionGraphCreateAlbumMessage*) publishing_facebook_graph_session_graph_message_impl_construct (object_type, host_session, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST, "/me/albums", access_token, PUBLISHING_FACEBOOK_ENDPOINT_DEFAULT);
#line 1142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp4_ = album_privacy;
+ if (album_privacy != NULL) {
#line 1142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp2_ = g_strcmp0 (_tmp4_, "") != 0;
-#line 8492 "FacebookPublishing.c"
+ _tmp0_ = g_strcmp0 (album_privacy, "") != 0;
+#line 8889 "FacebookPublishing.c"
} else {
#line 1142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp2_ = FALSE;
-#line 8496 "FacebookPublishing.c"
+ _tmp0_ = FALSE;
+#line 8893 "FacebookPublishing.c"
}
#line 1142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _vala_assert (_tmp2_, "album_privacy != null && album_privacy != \"\"");
+ _vala_assert (_tmp0_, "album_privacy != null && album_privacy != \"\"");
#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->method;
+ _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->method;
#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp6_ = publishing_rest_support_http_method_to_string (_tmp5_);
+ _tmp2_ = publishing_rest_support_http_method_to_string (_tmp1_);
#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp7_ = _tmp6_;
+ _tmp3_ = _tmp2_;
#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->uri;
+ _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->uri;
#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp9_ = soup_uri_new (_tmp8_);
+ _tmp5_ = soup_uri_new (_tmp4_);
#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp10_ = _tmp9_;
+ _tmp6_ = _tmp5_;
#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp11_ = soup_message_new_from_uri (_tmp7_, _tmp10_);
+ _tmp7_ = soup_message_new_from_uri (_tmp3_, _tmp6_);
#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_g_object_unref0 (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->soup_message);
#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->soup_message = _tmp11_;
+ G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->soup_message = _tmp7_;
#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- __vala_SoupURI_free0 (_tmp10_);
+ __vala_SoupURI_free0 (_tmp6_);
#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _g_free0 (_tmp7_);
+ _g_free0 (_tmp3_);
#line 1146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp12_ = soup_multipart_new ("multipart/form-data");
+ _tmp8_ = soup_multipart_new ("multipart/form-data");
#line 1146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- mp_envelope = _tmp12_;
+ mp_envelope = _tmp8_;
#line 1148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp13_ = access_token;
-#line 1148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- soup_multipart_append_form_string (mp_envelope, "access_token", _tmp13_);
-#line 1149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp14_ = album_name;
+ soup_multipart_append_form_string (mp_envelope, "access_token", access_token);
#line 1149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- soup_multipart_append_form_string (mp_envelope, "name", _tmp14_);
-#line 1150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp15_ = album_privacy;
+ soup_multipart_append_form_string (mp_envelope, "name", album_name);
#line 1150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- soup_multipart_append_form_string (mp_envelope, "privacy", _tmp15_);
+ soup_multipart_append_form_string (mp_envelope, "privacy", album_privacy);
#line 1152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp16_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->soup_message;
+ _tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->soup_message;
#line 1152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp17_ = _tmp16_->request_headers;
+ _tmp10_ = _tmp9_->request_headers;
#line 1152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp18_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->soup_message;
+ _tmp11_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->soup_message;
#line 1152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp19_ = _tmp18_->request_body;
+ _tmp12_ = _tmp11_->request_body;
#line 1152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- soup_multipart_to_message (mp_envelope, _tmp17_, _tmp19_);
+ soup_multipart_to_message (mp_envelope, _tmp10_, _tmp12_);
#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
__vala_SoupMultipart_free0 (mp_envelope);
#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return self;
-#line 8552 "FacebookPublishing.c"
+#line 8943 "FacebookPublishing.c"
}
-static PublishingFacebookGraphSessionGraphCreateAlbumMessage* publishing_facebook_graph_session_graph_create_album_message_new (PublishingFacebookGraphSession* host_session, const gchar* access_token, const gchar* album_name, const gchar* album_privacy) {
+static PublishingFacebookGraphSessionGraphCreateAlbumMessage*
+publishing_facebook_graph_session_graph_create_album_message_new (PublishingFacebookGraphSession* host_session,
+ const gchar* access_token,
+ const gchar* album_name,
+ const gchar* album_privacy)
+{
#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return publishing_facebook_graph_session_graph_create_album_message_construct (PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_CREATE_ALBUM_MESSAGE, host_session, access_token, album_name, album_privacy);
-#line 8559 "FacebookPublishing.c"
+#line 8955 "FacebookPublishing.c"
}
-static void publishing_facebook_graph_session_graph_create_album_message_class_init (PublishingFacebookGraphSessionGraphCreateAlbumMessageClass * klass) {
+static void
+publishing_facebook_graph_session_graph_create_album_message_class_init (PublishingFacebookGraphSessionGraphCreateAlbumMessageClass * klass)
+{
#line 1137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_graph_session_graph_create_album_message_parent_class = g_type_class_peek_parent (klass);
-#line 8566 "FacebookPublishing.c"
+#line 8964 "FacebookPublishing.c"
}
-static void publishing_facebook_graph_session_graph_create_album_message_instance_init (PublishingFacebookGraphSessionGraphCreateAlbumMessage * self) {
+static void
+publishing_facebook_graph_session_graph_create_album_message_instance_init (PublishingFacebookGraphSessionGraphCreateAlbumMessage * self)
+{
}
-static GType publishing_facebook_graph_session_graph_create_album_message_get_type (void) {
+static GType
+publishing_facebook_graph_session_graph_create_album_message_get_type (void)
+{
static volatile gsize publishing_facebook_graph_session_graph_create_album_message_type_id__volatile = 0;
if (g_once_init_enter (&publishing_facebook_graph_session_graph_create_album_message_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingFacebookGraphSessionGraphCreateAlbumMessageClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_facebook_graph_session_graph_create_album_message_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingFacebookGraphSessionGraphCreateAlbumMessage), 0, (GInstanceInitFunc) publishing_facebook_graph_session_graph_create_album_message_instance_init, NULL };
@@ -8602,104 +9004,129 @@ static GType publishing_facebook_graph_session_graph_create_album_message_get_ty
}
-static void publishing_facebook_value_graph_session_init (GValue* value) {
+static void
+publishing_facebook_value_graph_session_init (GValue* value)
+{
#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 8589 "FacebookPublishing.c"
+#line 8993 "FacebookPublishing.c"
}
-static void publishing_facebook_value_graph_session_free_value (GValue* value) {
+static void
+publishing_facebook_value_graph_session_free_value (GValue* value)
+{
#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
if (value->data[0].v_pointer) {
#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_graph_session_unref (value->data[0].v_pointer);
-#line 8598 "FacebookPublishing.c"
+#line 9004 "FacebookPublishing.c"
}
}
-static void publishing_facebook_value_graph_session_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+publishing_facebook_value_graph_session_copy_value (const GValue* src_value,
+ GValue* dest_value)
+{
#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
if (src_value->data[0].v_pointer) {
#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
dest_value->data[0].v_pointer = publishing_facebook_graph_session_ref (src_value->data[0].v_pointer);
-#line 8608 "FacebookPublishing.c"
+#line 9017 "FacebookPublishing.c"
} else {
#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
dest_value->data[0].v_pointer = NULL;
-#line 8612 "FacebookPublishing.c"
+#line 9021 "FacebookPublishing.c"
}
}
-static gpointer publishing_facebook_value_graph_session_peek_pointer (const GValue* value) {
+static gpointer
+publishing_facebook_value_graph_session_peek_pointer (const GValue* value)
+{
#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return value->data[0].v_pointer;
-#line 8620 "FacebookPublishing.c"
+#line 9031 "FacebookPublishing.c"
}
-static gchar* publishing_facebook_value_graph_session_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_facebook_value_graph_session_collect_value (GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
if (collect_values[0].v_pointer) {
-#line 8627 "FacebookPublishing.c"
+#line 9043 "FacebookPublishing.c"
PublishingFacebookGraphSession * object;
object = collect_values[0].v_pointer;
#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
if (object->parent_instance.g_class == NULL) {
#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 8634 "FacebookPublishing.c"
+#line 9050 "FacebookPublishing.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 8638 "FacebookPublishing.c"
+#line 9054 "FacebookPublishing.c"
}
#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
value->data[0].v_pointer = publishing_facebook_graph_session_ref (object);
-#line 8642 "FacebookPublishing.c"
+#line 9058 "FacebookPublishing.c"
} else {
#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 8646 "FacebookPublishing.c"
+#line 9062 "FacebookPublishing.c"
}
#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return NULL;
-#line 8650 "FacebookPublishing.c"
+#line 9066 "FacebookPublishing.c"
}
-static gchar* publishing_facebook_value_graph_session_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_facebook_value_graph_session_lcopy_value (const GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
PublishingFacebookGraphSession ** object_p;
object_p = collect_values[0].v_pointer;
#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
if (!object_p) {
#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 8661 "FacebookPublishing.c"
+#line 9082 "FacebookPublishing.c"
}
#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
if (!value->data[0].v_pointer) {
#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
*object_p = NULL;
-#line 8667 "FacebookPublishing.c"
+#line 9088 "FacebookPublishing.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
*object_p = value->data[0].v_pointer;
-#line 8671 "FacebookPublishing.c"
+#line 9092 "FacebookPublishing.c"
} else {
#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
*object_p = publishing_facebook_graph_session_ref (value->data[0].v_pointer);
-#line 8675 "FacebookPublishing.c"
+#line 9096 "FacebookPublishing.c"
}
#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return NULL;
-#line 8679 "FacebookPublishing.c"
+#line 9100 "FacebookPublishing.c"
}
-GParamSpec* publishing_facebook_param_spec_graph_session (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+publishing_facebook_param_spec_graph_session (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags)
+{
PublishingFacebookParamSpecGraphSession* spec;
#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_FACEBOOK_TYPE_GRAPH_SESSION), NULL);
@@ -8709,20 +9136,25 @@ GParamSpec* publishing_facebook_param_spec_graph_session (const gchar* name, con
G_PARAM_SPEC (spec)->value_type = object_type;
#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return G_PARAM_SPEC (spec);
-#line 8693 "FacebookPublishing.c"
+#line 9120 "FacebookPublishing.c"
}
-gpointer publishing_facebook_value_get_graph_session (const GValue* value) {
+gpointer
+publishing_facebook_value_get_graph_session (const GValue* value)
+{
#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_GRAPH_SESSION), NULL);
#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return value->data[0].v_pointer;
-#line 8702 "FacebookPublishing.c"
+#line 9131 "FacebookPublishing.c"
}
-void publishing_facebook_value_set_graph_session (GValue* value, gpointer v_object) {
+void
+publishing_facebook_value_set_graph_session (GValue* value,
+ gpointer v_object)
+{
PublishingFacebookGraphSession * old;
#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_GRAPH_SESSION));
@@ -8738,22 +9170,25 @@ void publishing_facebook_value_set_graph_session (GValue* value, gpointer v_obje
value->data[0].v_pointer = v_object;
#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_graph_session_ref (value->data[0].v_pointer);
-#line 8722 "FacebookPublishing.c"
+#line 9154 "FacebookPublishing.c"
} else {
#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 8726 "FacebookPublishing.c"
+#line 9158 "FacebookPublishing.c"
}
#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
if (old) {
#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_graph_session_unref (old);
-#line 8732 "FacebookPublishing.c"
+#line 9164 "FacebookPublishing.c"
}
}
-void publishing_facebook_value_take_graph_session (GValue* value, gpointer v_object) {
+void
+publishing_facebook_value_take_graph_session (GValue* value,
+ gpointer v_object)
+{
PublishingFacebookGraphSession * old;
#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_GRAPH_SESSION));
@@ -8767,22 +9202,24 @@ void publishing_facebook_value_take_graph_session (GValue* value, gpointer v_obj
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
value->data[0].v_pointer = v_object;
-#line 8751 "FacebookPublishing.c"
+#line 9186 "FacebookPublishing.c"
} else {
#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 8755 "FacebookPublishing.c"
+#line 9190 "FacebookPublishing.c"
}
#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
if (old) {
#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_graph_session_unref (old);
-#line 8761 "FacebookPublishing.c"
+#line 9196 "FacebookPublishing.c"
}
}
-static void publishing_facebook_graph_session_class_init (PublishingFacebookGraphSessionClass * klass) {
+static void
+publishing_facebook_graph_session_class_init (PublishingFacebookGraphSessionClass * klass)
+{
#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_graph_session_parent_class = g_type_class_peek_parent (klass);
#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -8791,20 +9228,24 @@ static void publishing_facebook_graph_session_class_init (PublishingFacebookGrap
g_type_class_add_private (klass, sizeof (PublishingFacebookGraphSessionPrivate));
#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_graph_session_signals[PUBLISHING_FACEBOOK_GRAPH_SESSION_AUTHENTICATED_SIGNAL] = g_signal_new ("authenticated", PUBLISHING_FACEBOOK_TYPE_GRAPH_SESSION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 8775 "FacebookPublishing.c"
+#line 9212 "FacebookPublishing.c"
}
-static void publishing_facebook_graph_session_instance_init (PublishingFacebookGraphSession * self) {
+static void
+publishing_facebook_graph_session_instance_init (PublishingFacebookGraphSession * self)
+{
#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
self->priv = PUBLISHING_FACEBOOK_GRAPH_SESSION_GET_PRIVATE (self);
#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
self->ref_count = 1;
-#line 8784 "FacebookPublishing.c"
+#line 9223 "FacebookPublishing.c"
}
-static void publishing_facebook_graph_session_finalize (PublishingFacebookGraphSession * obj) {
+static void
+publishing_facebook_graph_session_finalize (PublishingFacebookGraphSession * obj)
+{
PublishingFacebookGraphSession * self;
SoupSession* _tmp0_;
guint _tmp1_;
@@ -8824,11 +9265,13 @@ static void publishing_facebook_graph_session_finalize (PublishingFacebookGraphS
_g_free0 (self->priv->access_token);
#line 1160 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_publishing_facebook_graph_message_unref0 (self->priv->current_message);
-#line 8808 "FacebookPublishing.c"
+#line 9249 "FacebookPublishing.c"
}
-GType publishing_facebook_graph_session_get_type (void) {
+GType
+publishing_facebook_graph_session_get_type (void)
+{
static volatile gsize publishing_facebook_graph_session_type_id__volatile = 0;
if (g_once_init_enter (&publishing_facebook_graph_session_type_id__volatile)) {
static const GTypeValueTable g_define_type_value_table = { publishing_facebook_value_graph_session_init, publishing_facebook_value_graph_session_free_value, publishing_facebook_value_graph_session_copy_value, publishing_facebook_value_graph_session_peek_pointer, "p", publishing_facebook_value_graph_session_collect_value, "p", publishing_facebook_value_graph_session_lcopy_value };
@@ -8842,18 +9285,22 @@ GType publishing_facebook_graph_session_get_type (void) {
}
-gpointer publishing_facebook_graph_session_ref (gpointer instance) {
+gpointer
+publishing_facebook_graph_session_ref (gpointer instance)
+{
PublishingFacebookGraphSession * self;
self = instance;
#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_atomic_int_inc (&self->ref_count);
#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return instance;
-#line 8833 "FacebookPublishing.c"
+#line 9278 "FacebookPublishing.c"
}
-void publishing_facebook_graph_session_unref (gpointer instance) {
+void
+publishing_facebook_graph_session_unref (gpointer instance)
+{
PublishingFacebookGraphSession * self;
self = instance;
#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -8862,56 +9309,65 @@ void publishing_facebook_graph_session_unref (gpointer instance) {
PUBLISHING_FACEBOOK_GRAPH_SESSION_GET_CLASS (self)->finalize (self);
#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 8846 "FacebookPublishing.c"
+#line 9293 "FacebookPublishing.c"
}
}
-static SpitPublishingPublishable** _vala_array_dup3 (SpitPublishingPublishable** self, int length) {
+static SpitPublishingPublishable**
+_vala_array_dup3 (SpitPublishingPublishable** self,
+ int length)
+{
SpitPublishingPublishable** result;
int i;
#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
result = g_new0 (SpitPublishingPublishable*, length + 1);
#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
for (i = 0; i < length; i++) {
-#line 8858 "FacebookPublishing.c"
+#line 9308 "FacebookPublishing.c"
SpitPublishingPublishable* _tmp0_;
#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_tmp0_ = _g_object_ref0 (self[i]);
#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
result[i] = _tmp0_;
-#line 8864 "FacebookPublishing.c"
+#line 9314 "FacebookPublishing.c"
}
#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return result;
-#line 8868 "FacebookPublishing.c"
+#line 9318 "FacebookPublishing.c"
}
-static gpointer _publishing_facebook_graph_session_ref0 (gpointer self) {
+static gpointer
+_publishing_facebook_graph_session_ref0 (gpointer self)
+{
#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return self ? publishing_facebook_graph_session_ref (self) : NULL;
-#line 8875 "FacebookPublishing.c"
+#line 9327 "FacebookPublishing.c"
}
-static gpointer _publishing_facebook_publishing_parameters_ref0 (gpointer self) {
+static gpointer
+_publishing_facebook_publishing_parameters_ref0 (gpointer self)
+{
#line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return self ? publishing_facebook_publishing_parameters_ref (self) : NULL;
-#line 8882 "FacebookPublishing.c"
+#line 9336 "FacebookPublishing.c"
}
-PublishingFacebookUploader* publishing_facebook_uploader_construct (GType object_type, PublishingFacebookGraphSession* session, PublishingFacebookPublishingParameters* publishing_params, SpitPublishingPublishable** publishables, int publishables_length1) {
+PublishingFacebookUploader*
+publishing_facebook_uploader_construct (GType object_type,
+ PublishingFacebookGraphSession* session,
+ PublishingFacebookPublishingParameters* publishing_params,
+ SpitPublishingPublishable** publishables,
+ int publishables_length1)
+{
PublishingFacebookUploader* self = NULL;
SpitPublishingPublishable** _tmp0_;
gint _tmp0__length1;
- SpitPublishingPublishable** _tmp1_;
- gint _tmp1__length1;
- PublishingFacebookGraphSession* _tmp2_;
- PublishingFacebookGraphSession* _tmp3_;
- PublishingFacebookPublishingParameters* _tmp4_;
- PublishingFacebookPublishingParameters* _tmp5_;
+ PublishingFacebookGraphSession* _tmp1_;
+ PublishingFacebookPublishingParameters* _tmp2_;
#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (session), NULL);
#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -8921,72 +9377,83 @@ PublishingFacebookUploader* publishing_facebook_uploader_construct (GType object
#line 1315 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
self->priv->current_file = 0;
#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp0_ = publishables;
+ _tmp0_ = (publishables != NULL) ? _vala_array_dup3 (publishables, publishables_length1) : ((gpointer) publishables);
#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_tmp0__length1 = publishables_length1;
#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup3 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
-#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp1__length1 = _tmp0__length1;
-#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
self->priv->publishables = (_vala_array_free (self->priv->publishables, self->priv->publishables_length1, (GDestroyNotify) g_object_unref), NULL);
#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- self->priv->publishables = _tmp1_;
+ self->priv->publishables = _tmp0_;
#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- self->priv->publishables_length1 = _tmp1__length1;
+ self->priv->publishables_length1 = _tmp0__length1;
#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
self->priv->_publishables_size_ = self->priv->publishables_length1;
#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp2_ = session;
-#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp3_ = _publishing_facebook_graph_session_ref0 (_tmp2_);
+ _tmp1_ = _publishing_facebook_graph_session_ref0 (session);
#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_publishing_facebook_graph_session_unref0 (self->priv->session);
#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- self->priv->session = _tmp3_;
-#line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp4_ = publishing_params;
+ self->priv->session = _tmp1_;
#line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp5_ = _publishing_facebook_publishing_parameters_ref0 (_tmp4_);
+ _tmp2_ = _publishing_facebook_publishing_parameters_ref0 (publishing_params);
#line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_publishing_facebook_publishing_parameters_unref0 (self->priv->publishing_params);
#line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- self->priv->publishing_params = _tmp5_;
+ self->priv->publishing_params = _tmp2_;
#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return self;
-#line 8938 "FacebookPublishing.c"
+#line 9386 "FacebookPublishing.c"
}
-PublishingFacebookUploader* publishing_facebook_uploader_new (PublishingFacebookGraphSession* session, PublishingFacebookPublishingParameters* publishing_params, SpitPublishingPublishable** publishables, int publishables_length1) {
+PublishingFacebookUploader*
+publishing_facebook_uploader_new (PublishingFacebookGraphSession* session,
+ PublishingFacebookPublishingParameters* publishing_params,
+ SpitPublishingPublishable** publishables,
+ int publishables_length1)
+{
#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return publishing_facebook_uploader_construct (PUBLISHING_FACEBOOK_TYPE_UPLOADER, session, publishing_params, publishables, publishables_length1);
-#line 8945 "FacebookPublishing.c"
+#line 9398 "FacebookPublishing.c"
}
-static void _publishing_facebook_uploader_on_chunk_transmitted_publishing_facebook_graph_message_data_transmitted (PublishingFacebookGraphMessage* _sender, gint bytes_sent_so_far, gint total_bytes, gpointer self) {
+static void
+_publishing_facebook_uploader_on_chunk_transmitted_publishing_facebook_graph_message_data_transmitted (PublishingFacebookGraphMessage* _sender,
+ gint bytes_sent_so_far,
+ gint total_bytes,
+ gpointer self)
+{
#line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_uploader_on_chunk_transmitted ((PublishingFacebookUploader*) self, bytes_sent_so_far, total_bytes);
-#line 8952 "FacebookPublishing.c"
+#line 9410 "FacebookPublishing.c"
}
-static void _publishing_facebook_uploader_on_message_completed_publishing_facebook_graph_message_completed (PublishingFacebookGraphMessage* _sender, gpointer self) {
+static void
+_publishing_facebook_uploader_on_message_completed_publishing_facebook_graph_message_completed (PublishingFacebookGraphMessage* _sender,
+ gpointer self)
+{
#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_uploader_on_message_completed ((PublishingFacebookUploader*) self, _sender);
-#line 8959 "FacebookPublishing.c"
+#line 9420 "FacebookPublishing.c"
}
-static void _publishing_facebook_uploader_on_message_failed_publishing_facebook_graph_message_failed (PublishingFacebookGraphMessage* _sender, GError* err, gpointer self) {
+static void
+_publishing_facebook_uploader_on_message_failed_publishing_facebook_graph_message_failed (PublishingFacebookGraphMessage* _sender,
+ GError* err,
+ gpointer self)
+{
#line 1342 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_uploader_on_message_failed ((PublishingFacebookUploader*) self, _sender, err);
-#line 8966 "FacebookPublishing.c"
+#line 9431 "FacebookPublishing.c"
}
-static void publishing_facebook_uploader_send_current_file (PublishingFacebookUploader* self) {
+static void
+publishing_facebook_uploader_send_current_file (PublishingFacebookUploader* self)
+{
SpitPublishingPublishable* publishable = NULL;
SpitPublishingPublishable** _tmp0_;
gint _tmp0__length1;
@@ -8999,27 +9466,25 @@ static void publishing_facebook_uploader_send_current_file (PublishingFacebookUp
GFile* _tmp6_;
gchar* _tmp8_ = NULL;
SpitPublishingPublishable* _tmp9_;
- SpitPublishingPublisherMediaType _tmp10_;
gchar* resource_uri = NULL;
- gchar* _tmp16_;
- const gchar* _tmp17_ = NULL;
- SpitPublishingPublishable* _tmp18_;
- SpitPublishingPublisherMediaType _tmp19_;
+ gchar* _tmp15_;
+ const gchar* _tmp16_ = NULL;
+ SpitPublishingPublishable* _tmp17_;
gchar* resource_privacy = NULL;
- gchar* _tmp22_;
+ gchar* _tmp20_;
PublishingFacebookGraphMessage* upload_message = NULL;
- PublishingFacebookGraphSession* _tmp23_;
- const gchar* _tmp24_;
- SpitPublishingPublishable* _tmp25_;
- PublishingFacebookPublishingParameters* _tmp26_;
- gboolean _tmp27_;
- const gchar* _tmp28_;
+ PublishingFacebookGraphSession* _tmp21_;
+ const gchar* _tmp22_;
+ SpitPublishingPublishable* _tmp23_;
+ PublishingFacebookPublishingParameters* _tmp24_;
+ gboolean _tmp25_;
+ const gchar* _tmp26_;
+ PublishingFacebookGraphMessage* _tmp27_;
+ PublishingFacebookGraphMessage* _tmp28_;
PublishingFacebookGraphMessage* _tmp29_;
PublishingFacebookGraphMessage* _tmp30_;
- PublishingFacebookGraphMessage* _tmp31_;
+ PublishingFacebookGraphSession* _tmp31_;
PublishingFacebookGraphMessage* _tmp32_;
- PublishingFacebookGraphSession* _tmp33_;
- PublishingFacebookGraphMessage* _tmp34_;
#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_if_fail (PUBLISHING_FACEBOOK_IS_UPLOADER (self));
#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -9044,7 +9509,7 @@ static void publishing_facebook_uploader_send_current_file (PublishingFacebookUp
_tmp6_ = file;
#line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
if (_tmp6_ == NULL) {
-#line 9028 "FacebookPublishing.c"
+#line 9493 "FacebookPublishing.c"
gint _tmp7_;
#line 1327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_tmp7_ = self->priv->current_file;
@@ -9056,107 +9521,103 @@ static void publishing_facebook_uploader_send_current_file (PublishingFacebookUp
_g_object_unref0 (publishable);
#line 1328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return;
-#line 9040 "FacebookPublishing.c"
+#line 9505 "FacebookPublishing.c"
}
#line 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_tmp9_ = publishable;
#line 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp10_ = spit_publishing_publishable_get_media_type (_tmp9_);
-#line 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- if (_tmp10_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) {
-#line 9048 "FacebookPublishing.c"
- PublishingFacebookPublishingParameters* _tmp11_;
+ if (spit_publishing_publishable_get_media_type (_tmp9_) == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) {
+#line 9511 "FacebookPublishing.c"
+ PublishingFacebookPublishingParameters* _tmp10_;
+ gchar* _tmp11_;
gchar* _tmp12_;
gchar* _tmp13_;
- gchar* _tmp14_;
#line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp11_ = self->priv->publishing_params;
+ _tmp10_ = self->priv->publishing_params;
#line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp12_ = publishing_facebook_publishing_parameters_get_target_album_id (_tmp11_);
+ _tmp11_ = publishing_facebook_publishing_parameters_get_target_album_id (_tmp10_);
#line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp13_ = _tmp12_;
+ _tmp12_ = _tmp11_;
#line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp14_ = g_strdup_printf ("/%s/photos", _tmp13_);
+ _tmp13_ = g_strdup_printf ("/%s/photos", _tmp12_);
#line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_g_free0 (_tmp8_);
#line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp8_ = _tmp14_;
+ _tmp8_ = _tmp13_;
#line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _g_free0 (_tmp13_);
-#line 9067 "FacebookPublishing.c"
+ _g_free0 (_tmp12_);
+#line 9530 "FacebookPublishing.c"
} else {
- gchar* _tmp15_;
+ gchar* _tmp14_;
#line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp15_ = g_strdup ("/me/videos");
+ _tmp14_ = g_strdup ("/me/videos");
#line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_g_free0 (_tmp8_);
#line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp8_ = _tmp15_;
-#line 9076 "FacebookPublishing.c"
+ _tmp8_ = _tmp14_;
+#line 9539 "FacebookPublishing.c"
}
#line 1331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp16_ = g_strdup (_tmp8_);
+ _tmp15_ = g_strdup (_tmp8_);
#line 1331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- resource_uri = _tmp16_;
-#line 1335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp18_ = publishable;
+ resource_uri = _tmp15_;
#line 1335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp19_ = spit_publishing_publishable_get_media_type (_tmp18_);
+ _tmp17_ = publishable;
#line 1335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- if (_tmp19_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 9088 "FacebookPublishing.c"
- PublishingFacebookPublishingParameters* _tmp20_;
- const gchar* _tmp21_;
+ if (spit_publishing_publishable_get_media_type (_tmp17_) == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
+#line 9549 "FacebookPublishing.c"
+ PublishingFacebookPublishingParameters* _tmp18_;
+ const gchar* _tmp19_;
#line 1336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp20_ = self->priv->publishing_params;
+ _tmp18_ = self->priv->publishing_params;
#line 1336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp21_ = _tmp20_->privacy_object;
+ _tmp19_ = _tmp18_->privacy_object;
#line 1336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp17_ = _tmp21_;
-#line 9097 "FacebookPublishing.c"
+ _tmp16_ = _tmp19_;
+#line 9558 "FacebookPublishing.c"
} else {
#line 1336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp17_ = NULL;
-#line 9101 "FacebookPublishing.c"
+ _tmp16_ = NULL;
+#line 9562 "FacebookPublishing.c"
}
#line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp22_ = g_strdup (_tmp17_);
+ _tmp20_ = g_strdup (_tmp16_);
#line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- resource_privacy = _tmp22_;
+ resource_privacy = _tmp20_;
#line 1337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp23_ = self->priv->session;
+ _tmp21_ = self->priv->session;
#line 1337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp24_ = resource_uri;
+ _tmp22_ = resource_uri;
#line 1337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp25_ = publishable;
+ _tmp23_ = publishable;
#line 1337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp26_ = self->priv->publishing_params;
+ _tmp24_ = self->priv->publishing_params;
#line 1337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp27_ = _tmp26_->strip_metadata;
+ _tmp25_ = _tmp24_->strip_metadata;
#line 1337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp28_ = resource_privacy;
+ _tmp26_ = resource_privacy;
#line 1337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp29_ = publishing_facebook_graph_session_new_upload (_tmp23_, _tmp24_, _tmp25_, _tmp27_, _tmp28_);
+ _tmp27_ = publishing_facebook_graph_session_new_upload (_tmp21_, _tmp22_, _tmp23_, _tmp25_, _tmp26_);
#line 1337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- upload_message = _tmp29_;
+ upload_message = _tmp27_;
#line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp30_ = upload_message;
+ _tmp28_ = upload_message;
#line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_signal_connect (_tmp30_, "data-transmitted", (GCallback) _publishing_facebook_uploader_on_chunk_transmitted_publishing_facebook_graph_message_data_transmitted, self);
+ g_signal_connect (_tmp28_, "data-transmitted", (GCallback) _publishing_facebook_uploader_on_chunk_transmitted_publishing_facebook_graph_message_data_transmitted, self);
#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp31_ = upload_message;
+ _tmp29_ = upload_message;
#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_signal_connect (_tmp31_, "completed", (GCallback) _publishing_facebook_uploader_on_message_completed_publishing_facebook_graph_message_completed, self);
+ g_signal_connect (_tmp29_, "completed", (GCallback) _publishing_facebook_uploader_on_message_completed_publishing_facebook_graph_message_completed, self);
#line 1342 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp32_ = upload_message;
+ _tmp30_ = upload_message;
#line 1342 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_signal_connect (_tmp32_, "failed", (GCallback) _publishing_facebook_uploader_on_message_failed_publishing_facebook_graph_message_failed, self);
+ g_signal_connect (_tmp30_, "failed", (GCallback) _publishing_facebook_uploader_on_message_failed_publishing_facebook_graph_message_failed, self);
#line 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp33_ = self->priv->session;
+ _tmp31_ = self->priv->session;
#line 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp34_ = upload_message;
+ _tmp32_ = upload_message;
#line 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- publishing_facebook_graph_session_send_message (_tmp33_, _tmp34_);
+ publishing_facebook_graph_session_send_message (_tmp31_, _tmp32_);
#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_publishing_facebook_graph_message_unref0 (upload_message);
#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -9169,35 +9630,39 @@ static void publishing_facebook_uploader_send_current_file (PublishingFacebookUp
_g_object_unref0 (file);
#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_g_object_unref0 (publishable);
-#line 9153 "FacebookPublishing.c"
+#line 9614 "FacebookPublishing.c"
}
-static void publishing_facebook_uploader_send_files (PublishingFacebookUploader* self) {
+static void
+publishing_facebook_uploader_send_files (PublishingFacebookUploader* self)
+{
#line 1347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_if_fail (PUBLISHING_FACEBOOK_IS_UPLOADER (self));
#line 1348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
self->priv->current_file = 0;
#line 1349 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_uploader_send_current_file (self);
-#line 9164 "FacebookPublishing.c"
+#line 9627 "FacebookPublishing.c"
}
-static void publishing_facebook_uploader_on_chunk_transmitted (PublishingFacebookUploader* self, gint bytes_written_so_far, gint total_bytes) {
+static void
+publishing_facebook_uploader_on_chunk_transmitted (PublishingFacebookUploader* self,
+ gint bytes_written_so_far,
+ gint total_bytes)
+{
gdouble file_span = 0.0;
SpitPublishingPublishable** _tmp0_;
gint _tmp0__length1;
gdouble this_file_fraction_complete = 0.0;
- gint _tmp1_;
- gint _tmp2_;
gdouble fraction_complete = 0.0;
- gint _tmp3_;
+ gint _tmp1_;
+ gdouble _tmp2_;
+ gdouble _tmp3_;
gdouble _tmp4_;
- gdouble _tmp5_;
- gdouble _tmp6_;
- SpitPublishingProgressCallback _tmp7_;
- void* _tmp7__target;
+ SpitPublishingProgressCallback _tmp5_;
+ void* _tmp5__target;
#line 1352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_if_fail (PUBLISHING_FACEBOOK_IS_UPLOADER (self));
#line 1353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -9207,270 +9672,275 @@ static void publishing_facebook_uploader_on_chunk_transmitted (PublishingFaceboo
#line 1353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
file_span = 1.0 / _tmp0__length1;
#line 1354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp1_ = bytes_written_so_far;
-#line 1354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp2_ = total_bytes;
-#line 1354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- this_file_fraction_complete = ((gdouble) _tmp1_) / _tmp2_;
+ this_file_fraction_complete = ((gdouble) bytes_written_so_far) / total_bytes;
#line 1355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp3_ = self->priv->current_file;
+ _tmp1_ = self->priv->current_file;
#line 1355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp4_ = file_span;
+ _tmp2_ = file_span;
#line 1355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp5_ = this_file_fraction_complete;
+ _tmp3_ = this_file_fraction_complete;
#line 1355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp6_ = file_span;
+ _tmp4_ = file_span;
#line 1355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- fraction_complete = (_tmp3_ * _tmp4_) + (_tmp5_ * _tmp6_);
+ fraction_complete = (_tmp1_ * _tmp2_) + (_tmp3_ * _tmp4_);
#line 1358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp7_ = self->priv->status_updated;
+ _tmp5_ = self->priv->status_updated;
#line 1358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp7__target = self->priv->status_updated_target;
+ _tmp5__target = self->priv->status_updated_target;
#line 1358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- if (_tmp7_ != NULL) {
-#line 9212 "FacebookPublishing.c"
- SpitPublishingProgressCallback _tmp8_;
- void* _tmp8__target;
- gint _tmp9_;
- gdouble _tmp10_;
+ if (_tmp5_ != NULL) {
+#line 9673 "FacebookPublishing.c"
+ SpitPublishingProgressCallback _tmp6_;
+ void* _tmp6__target;
+ gint _tmp7_;
+ gdouble _tmp8_;
#line 1359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp8_ = self->priv->status_updated;
+ _tmp6_ = self->priv->status_updated;
#line 1359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp8__target = self->priv->status_updated_target;
+ _tmp6__target = self->priv->status_updated_target;
#line 1359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp9_ = self->priv->current_file;
+ _tmp7_ = self->priv->current_file;
#line 1359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp10_ = fraction_complete;
+ _tmp8_ = fraction_complete;
#line 1359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp8_ (_tmp9_ + 1, _tmp10_, _tmp8__target);
-#line 9227 "FacebookPublishing.c"
+ _tmp6_ (_tmp7_ + 1, _tmp8_, _tmp6__target);
+#line 9688 "FacebookPublishing.c"
}
}
-static void publishing_facebook_uploader_on_message_completed (PublishingFacebookUploader* self, PublishingFacebookGraphMessage* message) {
- PublishingFacebookGraphMessage* _tmp0_;
+static void
+publishing_facebook_uploader_on_message_completed (PublishingFacebookUploader* self,
+ PublishingFacebookGraphMessage* message)
+{
+ guint _tmp0_;
guint _tmp1_;
- PublishingFacebookGraphMessage* _tmp2_;
- guint _tmp3_;
- PublishingFacebookGraphMessage* _tmp4_;
- guint _tmp5_;
- gint _tmp6_;
- gint _tmp7_;
- SpitPublishingPublishable** _tmp8_;
- gint _tmp8__length1;
+ guint _tmp2_;
+ gint _tmp3_;
+ gint _tmp4_;
+ SpitPublishingPublishable** _tmp5_;
+ gint _tmp5__length1;
#line 1362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_if_fail (PUBLISHING_FACEBOOK_IS_UPLOADER (self));
#line 1362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_MESSAGE (message));
#line 1363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp0_ = message;
+ g_signal_parse_name ("data-transmitted", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp0_, NULL, FALSE);
#line 1363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_signal_parse_name ("data-transmitted", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp1_, NULL, FALSE);
-#line 1363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_facebook_uploader_on_chunk_transmitted_publishing_facebook_graph_message_data_transmitted, self);
-#line 1364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp2_ = message;
+ g_signal_handlers_disconnect_matched (message, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_facebook_uploader_on_chunk_transmitted_publishing_facebook_graph_message_data_transmitted, self);
#line 1364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_signal_parse_name ("completed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp3_, NULL, FALSE);
+ g_signal_parse_name ("completed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp1_, NULL, FALSE);
#line 1364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_facebook_uploader_on_message_completed_publishing_facebook_graph_message_completed, self);
+ g_signal_handlers_disconnect_matched (message, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_facebook_uploader_on_message_completed_publishing_facebook_graph_message_completed, self);
#line 1365 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp4_ = message;
+ g_signal_parse_name ("failed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp2_, NULL, FALSE);
#line 1365 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_signal_parse_name ("failed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp5_, NULL, FALSE);
-#line 1365 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _publishing_facebook_uploader_on_message_failed_publishing_facebook_graph_message_failed, self);
+ g_signal_handlers_disconnect_matched (message, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _publishing_facebook_uploader_on_message_failed_publishing_facebook_graph_message_failed, self);
#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp6_ = self->priv->current_file;
+ _tmp3_ = self->priv->current_file;
#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- self->priv->current_file = _tmp6_ + 1;
+ self->priv->current_file = _tmp3_ + 1;
#line 1368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp7_ = self->priv->current_file;
+ _tmp4_ = self->priv->current_file;
#line 1368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp8_ = self->priv->publishables;
+ _tmp5_ = self->priv->publishables;
#line 1368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp8__length1 = self->priv->publishables_length1;
+ _tmp5__length1 = self->priv->publishables_length1;
#line 1368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- if (_tmp7_ < _tmp8__length1) {
+ if (_tmp4_ < _tmp5__length1) {
#line 1369 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_uploader_send_current_file (self);
-#line 9279 "FacebookPublishing.c"
+#line 9734 "FacebookPublishing.c"
} else {
- gint _tmp9_;
+ gint _tmp6_;
#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp9_ = self->priv->current_file;
+ _tmp6_ = self->priv->current_file;
#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_signal_emit (self, publishing_facebook_uploader_signals[PUBLISHING_FACEBOOK_UPLOADER_UPLOAD_COMPLETE_SIGNAL], 0, _tmp9_);
-#line 9286 "FacebookPublishing.c"
+ g_signal_emit (self, publishing_facebook_uploader_signals[PUBLISHING_FACEBOOK_UPLOADER_UPLOAD_COMPLETE_SIGNAL], 0, _tmp6_);
+#line 9741 "FacebookPublishing.c"
}
}
-static void publishing_facebook_uploader_on_message_failed (PublishingFacebookUploader* self, PublishingFacebookGraphMessage* message, GError* _error_) {
- PublishingFacebookGraphMessage* _tmp0_;
+static void
+publishing_facebook_uploader_on_message_failed (PublishingFacebookUploader* self,
+ PublishingFacebookGraphMessage* message,
+ GError* _error_)
+{
+ guint _tmp0_;
guint _tmp1_;
- PublishingFacebookGraphMessage* _tmp2_;
- guint _tmp3_;
- PublishingFacebookGraphMessage* _tmp4_;
- guint _tmp5_;
- GError* _tmp6_;
+ guint _tmp2_;
#line 1375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_if_fail (PUBLISHING_FACEBOOK_IS_UPLOADER (self));
#line 1375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_MESSAGE (message));
#line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp0_ = message;
-#line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_signal_parse_name ("data-transmitted", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp1_, NULL, FALSE);
+ g_signal_parse_name ("data-transmitted", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp0_, NULL, FALSE);
#line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_facebook_uploader_on_chunk_transmitted_publishing_facebook_graph_message_data_transmitted, self);
+ g_signal_handlers_disconnect_matched (message, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_facebook_uploader_on_chunk_transmitted_publishing_facebook_graph_message_data_transmitted, self);
#line 1377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp2_ = message;
-#line 1377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_signal_parse_name ("completed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp3_, NULL, FALSE);
+ g_signal_parse_name ("completed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp1_, NULL, FALSE);
#line 1377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_facebook_uploader_on_message_completed_publishing_facebook_graph_message_completed, self);
-#line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp4_ = message;
+ g_signal_handlers_disconnect_matched (message, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_facebook_uploader_on_message_completed_publishing_facebook_graph_message_completed, self);
#line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_signal_parse_name ("failed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp5_, NULL, FALSE);
+ g_signal_parse_name ("failed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp2_, NULL, FALSE);
#line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _publishing_facebook_uploader_on_message_failed_publishing_facebook_graph_message_failed, self);
+ g_signal_handlers_disconnect_matched (message, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _publishing_facebook_uploader_on_message_failed_publishing_facebook_graph_message_failed, self);
#line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp6_ = _error_;
-#line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- g_signal_emit (self, publishing_facebook_uploader_signals[PUBLISHING_FACEBOOK_UPLOADER_UPLOAD_ERROR_SIGNAL], 0, _tmp6_);
-#line 9325 "FacebookPublishing.c"
+ g_signal_emit (self, publishing_facebook_uploader_signals[PUBLISHING_FACEBOOK_UPLOADER_UPLOAD_ERROR_SIGNAL], 0, _error_);
+#line 9772 "FacebookPublishing.c"
}
-void publishing_facebook_uploader_upload (PublishingFacebookUploader* self, SpitPublishingProgressCallback status_updated, void* status_updated_target) {
- SpitPublishingProgressCallback _tmp0_;
- void* _tmp0__target;
- SpitPublishingPublishable** _tmp1_;
- gint _tmp1__length1;
+void
+publishing_facebook_uploader_upload (PublishingFacebookUploader* self,
+ SpitPublishingProgressCallback status_updated,
+ void* status_updated_target)
+{
+ SpitPublishingPublishable** _tmp0_;
+ gint _tmp0__length1;
#line 1383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_if_fail (PUBLISHING_FACEBOOK_IS_UPLOADER (self));
#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp0_ = status_updated;
+ self->priv->status_updated = status_updated;
#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp0__target = status_updated_target;
-#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- self->priv->status_updated = _tmp0_;
-#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- self->priv->status_updated_target = _tmp0__target;
+ self->priv->status_updated_target = status_updated_target;
#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp1_ = self->priv->publishables;
+ _tmp0_ = self->priv->publishables;
#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp1__length1 = self->priv->publishables_length1;
+ _tmp0__length1 = self->priv->publishables_length1;
#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- if (_tmp1__length1 > 0) {
+ if (_tmp0__length1 > 0) {
#line 1387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_uploader_send_files (self);
-#line 9352 "FacebookPublishing.c"
+#line 9797 "FacebookPublishing.c"
}
}
-static void publishing_facebook_value_uploader_init (GValue* value) {
+static void
+publishing_facebook_value_uploader_init (GValue* value)
+{
#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 9360 "FacebookPublishing.c"
+#line 9807 "FacebookPublishing.c"
}
-static void publishing_facebook_value_uploader_free_value (GValue* value) {
+static void
+publishing_facebook_value_uploader_free_value (GValue* value)
+{
#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
if (value->data[0].v_pointer) {
#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_uploader_unref (value->data[0].v_pointer);
-#line 9369 "FacebookPublishing.c"
+#line 9818 "FacebookPublishing.c"
}
}
-static void publishing_facebook_value_uploader_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+publishing_facebook_value_uploader_copy_value (const GValue* src_value,
+ GValue* dest_value)
+{
#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
if (src_value->data[0].v_pointer) {
#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
dest_value->data[0].v_pointer = publishing_facebook_uploader_ref (src_value->data[0].v_pointer);
-#line 9379 "FacebookPublishing.c"
+#line 9831 "FacebookPublishing.c"
} else {
#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
dest_value->data[0].v_pointer = NULL;
-#line 9383 "FacebookPublishing.c"
+#line 9835 "FacebookPublishing.c"
}
}
-static gpointer publishing_facebook_value_uploader_peek_pointer (const GValue* value) {
+static gpointer
+publishing_facebook_value_uploader_peek_pointer (const GValue* value)
+{
#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return value->data[0].v_pointer;
-#line 9391 "FacebookPublishing.c"
+#line 9845 "FacebookPublishing.c"
}
-static gchar* publishing_facebook_value_uploader_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_facebook_value_uploader_collect_value (GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
if (collect_values[0].v_pointer) {
-#line 9398 "FacebookPublishing.c"
+#line 9857 "FacebookPublishing.c"
PublishingFacebookUploader * object;
object = collect_values[0].v_pointer;
#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
if (object->parent_instance.g_class == NULL) {
#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 9405 "FacebookPublishing.c"
+#line 9864 "FacebookPublishing.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 9409 "FacebookPublishing.c"
+#line 9868 "FacebookPublishing.c"
}
#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
value->data[0].v_pointer = publishing_facebook_uploader_ref (object);
-#line 9413 "FacebookPublishing.c"
+#line 9872 "FacebookPublishing.c"
} else {
#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 9417 "FacebookPublishing.c"
+#line 9876 "FacebookPublishing.c"
}
#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return NULL;
-#line 9421 "FacebookPublishing.c"
+#line 9880 "FacebookPublishing.c"
}
-static gchar* publishing_facebook_value_uploader_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_facebook_value_uploader_lcopy_value (const GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
PublishingFacebookUploader ** object_p;
object_p = collect_values[0].v_pointer;
#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
if (!object_p) {
#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 9432 "FacebookPublishing.c"
+#line 9896 "FacebookPublishing.c"
}
#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
if (!value->data[0].v_pointer) {
#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
*object_p = NULL;
-#line 9438 "FacebookPublishing.c"
+#line 9902 "FacebookPublishing.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
*object_p = value->data[0].v_pointer;
-#line 9442 "FacebookPublishing.c"
+#line 9906 "FacebookPublishing.c"
} else {
#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
*object_p = publishing_facebook_uploader_ref (value->data[0].v_pointer);
-#line 9446 "FacebookPublishing.c"
+#line 9910 "FacebookPublishing.c"
}
#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return NULL;
-#line 9450 "FacebookPublishing.c"
+#line 9914 "FacebookPublishing.c"
}
-GParamSpec* publishing_facebook_param_spec_uploader (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+publishing_facebook_param_spec_uploader (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags)
+{
PublishingFacebookParamSpecUploader* spec;
#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_FACEBOOK_TYPE_UPLOADER), NULL);
@@ -9480,20 +9950,25 @@ GParamSpec* publishing_facebook_param_spec_uploader (const gchar* name, const gc
G_PARAM_SPEC (spec)->value_type = object_type;
#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return G_PARAM_SPEC (spec);
-#line 9464 "FacebookPublishing.c"
+#line 9934 "FacebookPublishing.c"
}
-gpointer publishing_facebook_value_get_uploader (const GValue* value) {
+gpointer
+publishing_facebook_value_get_uploader (const GValue* value)
+{
#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_UPLOADER), NULL);
#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return value->data[0].v_pointer;
-#line 9473 "FacebookPublishing.c"
+#line 9945 "FacebookPublishing.c"
}
-void publishing_facebook_value_set_uploader (GValue* value, gpointer v_object) {
+void
+publishing_facebook_value_set_uploader (GValue* value,
+ gpointer v_object)
+{
PublishingFacebookUploader * old;
#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_UPLOADER));
@@ -9509,22 +9984,25 @@ void publishing_facebook_value_set_uploader (GValue* value, gpointer v_object) {
value->data[0].v_pointer = v_object;
#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_uploader_ref (value->data[0].v_pointer);
-#line 9493 "FacebookPublishing.c"
+#line 9968 "FacebookPublishing.c"
} else {
#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 9497 "FacebookPublishing.c"
+#line 9972 "FacebookPublishing.c"
}
#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
if (old) {
#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_uploader_unref (old);
-#line 9503 "FacebookPublishing.c"
+#line 9978 "FacebookPublishing.c"
}
}
-void publishing_facebook_value_take_uploader (GValue* value, gpointer v_object) {
+void
+publishing_facebook_value_take_uploader (GValue* value,
+ gpointer v_object)
+{
PublishingFacebookUploader * old;
#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_UPLOADER));
@@ -9538,22 +10016,24 @@ void publishing_facebook_value_take_uploader (GValue* value, gpointer v_object)
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
value->data[0].v_pointer = v_object;
-#line 9522 "FacebookPublishing.c"
+#line 10000 "FacebookPublishing.c"
} else {
#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 9526 "FacebookPublishing.c"
+#line 10004 "FacebookPublishing.c"
}
#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
if (old) {
#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_uploader_unref (old);
-#line 9532 "FacebookPublishing.c"
+#line 10010 "FacebookPublishing.c"
}
}
-static void publishing_facebook_uploader_class_init (PublishingFacebookUploaderClass * klass) {
+static void
+publishing_facebook_uploader_class_init (PublishingFacebookUploaderClass * klass)
+{
#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_uploader_parent_class = g_type_class_peek_parent (klass);
#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -9564,11 +10044,13 @@ static void publishing_facebook_uploader_class_init (PublishingFacebookUploaderC
publishing_facebook_uploader_signals[PUBLISHING_FACEBOOK_UPLOADER_UPLOAD_COMPLETE_SIGNAL] = g_signal_new ("upload-complete", PUBLISHING_FACEBOOK_TYPE_UPLOADER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT);
#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
publishing_facebook_uploader_signals[PUBLISHING_FACEBOOK_UPLOADER_UPLOAD_ERROR_SIGNAL] = g_signal_new ("upload-error", PUBLISHING_FACEBOOK_TYPE_UPLOADER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER);
-#line 9548 "FacebookPublishing.c"
+#line 10028 "FacebookPublishing.c"
}
-static void publishing_facebook_uploader_instance_init (PublishingFacebookUploader * self) {
+static void
+publishing_facebook_uploader_instance_init (PublishingFacebookUploader * self)
+{
#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
self->priv = PUBLISHING_FACEBOOK_UPLOADER_GET_PRIVATE (self);
#line 1308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -9577,11 +10059,13 @@ static void publishing_facebook_uploader_instance_init (PublishingFacebookUpload
self->priv->status_updated_target = self;
#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
self->ref_count = 1;
-#line 9561 "FacebookPublishing.c"
+#line 10043 "FacebookPublishing.c"
}
-static void publishing_facebook_uploader_finalize (PublishingFacebookUploader * obj) {
+static void
+publishing_facebook_uploader_finalize (PublishingFacebookUploader * obj)
+{
PublishingFacebookUploader * self;
#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FACEBOOK_TYPE_UPLOADER, PublishingFacebookUploader);
@@ -9593,11 +10077,13 @@ static void publishing_facebook_uploader_finalize (PublishingFacebookUploader *
_publishing_facebook_graph_session_unref0 (self->priv->session);
#line 1307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_publishing_facebook_publishing_parameters_unref0 (self->priv->publishing_params);
-#line 9577 "FacebookPublishing.c"
+#line 10061 "FacebookPublishing.c"
}
-GType publishing_facebook_uploader_get_type (void) {
+GType
+publishing_facebook_uploader_get_type (void)
+{
static volatile gsize publishing_facebook_uploader_type_id__volatile = 0;
if (g_once_init_enter (&publishing_facebook_uploader_type_id__volatile)) {
static const GTypeValueTable g_define_type_value_table = { publishing_facebook_value_uploader_init, publishing_facebook_value_uploader_free_value, publishing_facebook_value_uploader_copy_value, publishing_facebook_value_uploader_peek_pointer, "p", publishing_facebook_value_uploader_collect_value, "p", publishing_facebook_value_uploader_lcopy_value };
@@ -9611,18 +10097,22 @@ GType publishing_facebook_uploader_get_type (void) {
}
-gpointer publishing_facebook_uploader_ref (gpointer instance) {
+gpointer
+publishing_facebook_uploader_ref (gpointer instance)
+{
PublishingFacebookUploader * self;
self = instance;
#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_atomic_int_inc (&self->ref_count);
#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
return instance;
-#line 9602 "FacebookPublishing.c"
+#line 10090 "FacebookPublishing.c"
}
-void publishing_facebook_uploader_unref (gpointer instance) {
+void
+publishing_facebook_uploader_unref (gpointer instance)
+{
PublishingFacebookUploader * self;
self = instance;
#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -9631,12 +10121,16 @@ void publishing_facebook_uploader_unref (gpointer instance) {
PUBLISHING_FACEBOOK_UPLOADER_GET_CLASS (self)->finalize (self);
#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 9615 "FacebookPublishing.c"
+#line 10105 "FacebookPublishing.c"
}
}
-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) {
@@ -9648,7 +10142,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/plugins/shotwell-publishing/FlickrPublishing.c b/plugins/shotwell-publishing/FlickrPublishing.c
index fb7e9a3..1601192 100644
--- a/plugins/shotwell-publishing/FlickrPublishing.c
+++ b/plugins/shotwell-publishing/FlickrPublishing.c
@@ -1,4 +1,4 @@
-/* FlickrPublishing.c generated by valac 0.36.6, the Vala compiler
+/* FlickrPublishing.c generated by valac 0.40.4, the Vala compiler
* generated from FlickrPublishing.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>
@@ -37,6 +38,11 @@
typedef struct _FlickrService FlickrService;
typedef struct _FlickrServiceClass FlickrServiceClass;
typedef struct _FlickrServicePrivate FlickrServicePrivate;
+enum {
+ FLICKR_SERVICE_0_PROPERTY,
+ FLICKR_SERVICE_NUM_PROPERTIES
+};
+static GParamSpec* flickr_service_properties[FLICKR_SERVICE_NUM_PROPERTIES];
#define _g_free0(var) (var = (g_free (var), NULL))
#define PUBLISHING_FLICKR_TYPE_FLICKR_PUBLISHER (publishing_flickr_flickr_publisher_get_type ())
@@ -86,6 +92,11 @@ typedef struct _PublishingFlickrFlickrPublisherPrivate PublishingFlickrFlickrPub
typedef struct _PublishingFlickrPublishingOptionsPane PublishingFlickrPublishingOptionsPane;
typedef struct _PublishingFlickrPublishingOptionsPaneClass PublishingFlickrPublishingOptionsPaneClass;
+enum {
+ PUBLISHING_FLICKR_FLICKR_PUBLISHER_0_PROPERTY,
+ PUBLISHING_FLICKR_FLICKR_PUBLISHER_NUM_PROPERTIES
+};
+static GParamSpec* publishing_flickr_flickr_publisher_properties[PUBLISHING_FLICKR_FLICKR_PUBLISHER_NUM_PROPERTIES];
#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
#define _publishing_rest_support_session_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rest_support_session_unref (var), NULL)))
#define _publishing_flickr_publishing_parameters_unref0(var) ((var == NULL) ? NULL : (var = (publishing_flickr_publishing_parameters_unref (var), NULL)))
@@ -149,6 +160,11 @@ typedef struct _PublishingFlickrPublishingOptionsPaneVisibilityEntryClass Publis
typedef struct _PublishingFlickrPublishingOptionsPaneSizeEntry PublishingFlickrPublishingOptionsPaneSizeEntry;
typedef struct _PublishingFlickrPublishingOptionsPaneSizeEntryClass PublishingFlickrPublishingOptionsPaneSizeEntryClass;
+enum {
+ PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_0_PROPERTY,
+ PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_NUM_PROPERTIES
+};
+static GParamSpec* publishing_flickr_publishing_options_pane_properties[PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_NUM_PROPERTIES];
#define _g_slist_free0(var) ((var == NULL) ? NULL : (var = (g_slist_free (var), NULL)))
typedef struct _PublishingFlickrPublishingOptionsPaneVisibilityEntryPrivate PublishingFlickrPublishingOptionsPaneVisibilityEntryPrivate;
typedef struct _PublishingFlickrPublishingOptionsPaneSizeEntryPrivate PublishingFlickrPublishingOptionsPaneSizeEntryPrivate;
@@ -159,9 +175,9 @@ typedef struct _PublishingFlickrPublishingOptionsPaneParamSpecVisibilityEntry Pu
enum {
PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL,
PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL,
- PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL
+ PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_NUM_SIGNALS
};
-static guint publishing_flickr_publishing_options_pane_signals[PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL] = {0};
+static guint publishing_flickr_publishing_options_pane_signals[PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_NUM_SIGNALS] = {0};
typedef struct _PublishingFlickrUploaderPrivate PublishingFlickrUploaderPrivate;
#define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
#define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; }
@@ -366,21 +382,28 @@ static SpitPublishingDialogPaneIface * publishing_flickr_publishing_options_pane
static gpointer publishing_flickr_uploader_parent_class = NULL;
GType flickr_service_get_type (void) G_GNUC_CONST;
-enum {
- FLICKR_SERVICE_DUMMY_PROPERTY
-};
#define FLICKR_SERVICE_ICON_FILENAME "flickr.png"
FlickrService* flickr_service_new (GFile* resource_directory);
-FlickrService* flickr_service_construct (GType object_type, GFile* resource_directory);
-static gint flickr_service_real_get_pluggable_interface (SpitPluggable* base, gint min_host_interface, gint max_host_interface);
+FlickrService* flickr_service_construct (GType object_type,
+ GFile* resource_directory);
+static gint flickr_service_real_get_pluggable_interface (SpitPluggable* base,
+ gint min_host_interface,
+ gint max_host_interface);
static const gchar* flickr_service_real_get_id (SpitPluggable* base);
static const gchar* flickr_service_real_get_pluggable_name (SpitPluggable* base);
-static void flickr_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info);
-static GdkPixbuf** _vala_array_dup7 (GdkPixbuf** self, int length);
-static void flickr_service_real_activation (SpitPluggable* base, gboolean enabled);
-static SpitPublishingPublisher* flickr_service_real_create_publisher (SpitPublishingService* base, SpitPublishingPluginHost* host);
-PublishingFlickrFlickrPublisher* publishing_flickr_flickr_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host);
-PublishingFlickrFlickrPublisher* publishing_flickr_flickr_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host);
+static void flickr_service_real_get_info (SpitPluggable* base,
+ SpitPluggableInfo* info);
+static GdkPixbuf** _vala_array_dup7 (GdkPixbuf** self,
+ int length);
+static void flickr_service_real_activation (SpitPluggable* base,
+ gboolean enabled);
+static SpitPublishingPublisher* flickr_service_real_create_publisher (SpitPublishingService* base,
+ SpitPublishingPluginHost* host);
+PublishingFlickrFlickrPublisher* publishing_flickr_flickr_publisher_new (SpitPublishingService* service,
+ SpitPublishingPluginHost* host);
+PublishingFlickrFlickrPublisher* publishing_flickr_flickr_publisher_construct (GType object_type,
+ SpitPublishingService* service,
+ SpitPublishingPluginHost* host);
GType publishing_flickr_flickr_publisher_get_type (void) G_GNUC_CONST;
static SpitPublishingPublisherMediaType flickr_service_real_get_supported_media (SpitPublishingService* base);
static void flickr_service_finalize (GObject * obj);
@@ -391,172 +414,289 @@ static void flickr_service_finalize (GObject * obj);
GType publishing_flickr_user_kind_get_type (void) G_GNUC_CONST;
gpointer publishing_flickr_visibility_specification_ref (gpointer instance);
void publishing_flickr_visibility_specification_unref (gpointer instance);
-GParamSpec* publishing_flickr_param_spec_visibility_specification (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void publishing_flickr_value_set_visibility_specification (GValue* value, gpointer v_object);
-void publishing_flickr_value_take_visibility_specification (GValue* value, gpointer v_object);
+GParamSpec* publishing_flickr_param_spec_visibility_specification (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void publishing_flickr_value_set_visibility_specification (GValue* value,
+ gpointer v_object);
+void publishing_flickr_value_take_visibility_specification (GValue* value,
+ gpointer v_object);
gpointer publishing_flickr_value_get_visibility_specification (const GValue* value);
GType publishing_flickr_visibility_specification_get_type (void) G_GNUC_CONST;
-enum {
- PUBLISHING_FLICKR_VISIBILITY_SPECIFICATION_DUMMY_PROPERTY
-};
-PublishingFlickrVisibilitySpecification* publishing_flickr_visibility_specification_new (gint friends_level, gint family_level, gint everyone_level);
-PublishingFlickrVisibilitySpecification* publishing_flickr_visibility_specification_construct (GType object_type, gint friends_level, gint family_level, gint everyone_level);
+PublishingFlickrVisibilitySpecification* publishing_flickr_visibility_specification_new (gint friends_level,
+ gint family_level,
+ gint everyone_level);
+PublishingFlickrVisibilitySpecification* publishing_flickr_visibility_specification_construct (GType object_type,
+ gint friends_level,
+ gint family_level,
+ gint everyone_level);
static void publishing_flickr_visibility_specification_finalize (PublishingFlickrVisibilitySpecification * obj);
gpointer publishing_flickr_publishing_parameters_ref (gpointer instance);
void publishing_flickr_publishing_parameters_unref (gpointer instance);
-GParamSpec* publishing_flickr_param_spec_publishing_parameters (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void publishing_flickr_value_set_publishing_parameters (GValue* value, gpointer v_object);
-void publishing_flickr_value_take_publishing_parameters (GValue* value, gpointer v_object);
+GParamSpec* publishing_flickr_param_spec_publishing_parameters (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void publishing_flickr_value_set_publishing_parameters (GValue* value,
+ gpointer v_object);
+void publishing_flickr_value_take_publishing_parameters (GValue* value,
+ gpointer v_object);
gpointer publishing_flickr_value_get_publishing_parameters (const GValue* value);
GType publishing_flickr_publishing_parameters_get_type (void) G_GNUC_CONST;
-enum {
- PUBLISHING_FLICKR_PUBLISHING_PARAMETERS_DUMMY_PROPERTY
-};
PublishingFlickrPublishingParameters* publishing_flickr_publishing_parameters_new (void);
PublishingFlickrPublishingParameters* publishing_flickr_publishing_parameters_construct (GType object_type);
static void publishing_flickr_publishing_parameters_finalize (PublishingFlickrPublishingParameters * obj);
GType publishing_flickr_publishing_options_pane_get_type (void) G_GNUC_CONST;
#define PUBLISHING_FLICKR_FLICKR_PUBLISHER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_FLICKR_TYPE_FLICKR_PUBLISHER, PublishingFlickrFlickrPublisherPrivate))
-enum {
- PUBLISHING_FLICKR_FLICKR_PUBLISHER_DUMMY_PROPERTY
-};
static void publishing_flickr_flickr_publisher_on_session_authenticated (PublishingFlickrFlickrPublisher* self);
-static void _publishing_flickr_flickr_publisher_on_session_authenticated_spit_publishing_authenticator_authenticated (SpitPublishingAuthenticator* _sender, gpointer self);
+static void _publishing_flickr_flickr_publisher_on_session_authenticated_spit_publishing_authenticator_authenticated (SpitPublishingAuthenticator* _sender,
+ gpointer self);
SpitPublishingAuthenticator* publishing_flickr_flickr_publisher_get_authenticator (PublishingFlickrFlickrPublisher* self);
static gboolean publishing_flickr_flickr_publisher_get_persistent_strip_metadata (PublishingFlickrFlickrPublisher* self);
-static void publishing_flickr_flickr_publisher_set_persistent_strip_metadata (PublishingFlickrFlickrPublisher* self, gboolean strip_metadata);
+static void publishing_flickr_flickr_publisher_set_persistent_strip_metadata (PublishingFlickrFlickrPublisher* self,
+ gboolean strip_metadata);
static void publishing_flickr_flickr_publisher_do_fetch_account_info (PublishingFlickrFlickrPublisher* self);
-static void publishing_flickr_flickr_publisher_on_account_fetch_txn_completed (PublishingFlickrFlickrPublisher* self, PublishingRESTSupportTransaction* txn);
-static void _publishing_flickr_flickr_publisher_on_account_fetch_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
-static void publishing_flickr_flickr_publisher_on_account_fetch_txn_error (PublishingFlickrFlickrPublisher* self, PublishingRESTSupportTransaction* txn, GError* err);
-static void _publishing_flickr_flickr_publisher_on_account_fetch_txn_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self);
-static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (PublishingFlickrFlickrPublisher* self, const gchar* xml);
+static void publishing_flickr_flickr_publisher_on_account_fetch_txn_completed (PublishingFlickrFlickrPublisher* self,
+ PublishingRESTSupportTransaction* txn);
+static void _publishing_flickr_flickr_publisher_on_account_fetch_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+ gpointer self);
+static void publishing_flickr_flickr_publisher_on_account_fetch_txn_error (PublishingFlickrFlickrPublisher* self,
+ PublishingRESTSupportTransaction* txn,
+ GError* err);
+static void _publishing_flickr_flickr_publisher_on_account_fetch_txn_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+ GError* err,
+ gpointer self);
+static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (PublishingFlickrFlickrPublisher* self,
+ const gchar* xml);
static void publishing_flickr_flickr_publisher_on_account_info_available (PublishingFlickrFlickrPublisher* self);
static void publishing_flickr_flickr_publisher_do_show_publishing_options_pane (PublishingFlickrFlickrPublisher* self);
-static void publishing_flickr_flickr_publisher_on_publishing_options_pane_publish (PublishingFlickrFlickrPublisher* self, gboolean strip_metadata);
-static void _publishing_flickr_flickr_publisher_on_publishing_options_pane_publish_publishing_flickr_publishing_options_pane_publish (PublishingFlickrPublishingOptionsPane* _sender, gboolean strip_metadata, gpointer self);
+static void publishing_flickr_flickr_publisher_on_publishing_options_pane_publish (PublishingFlickrFlickrPublisher* self,
+ gboolean strip_metadata);
+static void _publishing_flickr_flickr_publisher_on_publishing_options_pane_publish_publishing_flickr_publishing_options_pane_publish (PublishingFlickrPublishingOptionsPane* _sender,
+ gboolean strip_metadata,
+ gpointer self);
static void publishing_flickr_flickr_publisher_on_publishing_options_pane_logout (PublishingFlickrFlickrPublisher* self);
-static void _publishing_flickr_flickr_publisher_on_publishing_options_pane_logout_publishing_flickr_publishing_options_pane_logout (PublishingFlickrPublishingOptionsPane* _sender, gpointer self);
-static void publishing_flickr_flickr_publisher_do_publish (PublishingFlickrFlickrPublisher* self, gboolean strip_metadata);
+static void _publishing_flickr_flickr_publisher_on_publishing_options_pane_logout_publishing_flickr_publishing_options_pane_logout (PublishingFlickrPublishingOptionsPane* _sender,
+ gpointer self);
+static void publishing_flickr_flickr_publisher_do_publish (PublishingFlickrFlickrPublisher* self,
+ gboolean strip_metadata);
static void publishing_flickr_flickr_publisher_do_logout (PublishingFlickrFlickrPublisher* self);
-static void publishing_flickr_flickr_publisher_on_upload_status_updated (PublishingFlickrFlickrPublisher* self, gint file_number, gdouble completed_fraction);
-static void publishing_flickr_flickr_publisher_on_upload_complete (PublishingFlickrFlickrPublisher* self, PublishingRESTSupportBatchUploader* uploader, gint num_published);
-static void _publishing_flickr_flickr_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender, gint num_photos_published, gpointer self);
-static void publishing_flickr_flickr_publisher_on_upload_error (PublishingFlickrFlickrPublisher* self, PublishingRESTSupportBatchUploader* uploader, GError* err);
-static void _publishing_flickr_flickr_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender, GError* err, gpointer self);
+static void publishing_flickr_flickr_publisher_on_upload_status_updated (PublishingFlickrFlickrPublisher* self,
+ gint file_number,
+ gdouble completed_fraction);
+static void publishing_flickr_flickr_publisher_on_upload_complete (PublishingFlickrFlickrPublisher* self,
+ PublishingRESTSupportBatchUploader* uploader,
+ gint num_published);
+static void _publishing_flickr_flickr_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender,
+ gint num_photos_published,
+ gpointer self);
+static void publishing_flickr_flickr_publisher_on_upload_error (PublishingFlickrFlickrPublisher* self,
+ PublishingRESTSupportBatchUploader* uploader,
+ GError* err);
+static void _publishing_flickr_flickr_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender,
+ GError* err,
+ gpointer self);
static void publishing_flickr_flickr_publisher_do_show_success_pane (PublishingFlickrFlickrPublisher* self);
GType publishing_flickr_account_info_fetch_transaction_get_type (void) G_GNUC_CONST;
PublishingFlickrAccountInfoFetchTransaction* publishing_flickr_account_info_fetch_transaction_new (PublishingRESTSupportOAuth1Session* session);
-PublishingFlickrAccountInfoFetchTransaction* publishing_flickr_account_info_fetch_transaction_construct (GType object_type, PublishingRESTSupportOAuth1Session* session);
-PublishingRESTSupportXmlDocument* publishing_flickr_transaction_parse_flickr_response (const gchar* xml, GError** error);
+PublishingFlickrAccountInfoFetchTransaction* publishing_flickr_account_info_fetch_transaction_construct (GType object_type,
+ PublishingRESTSupportOAuth1Session* session);
+PublishingRESTSupportXmlDocument* publishing_flickr_transaction_parse_flickr_response (const gchar* xml,
+ GError** error);
static void publishing_flickr_flickr_publisher_attempt_start (PublishingFlickrFlickrPublisher* self);
-PublishingFlickrPublishingOptionsPane* publishing_flickr_publishing_options_pane_new (PublishingFlickrFlickrPublisher* publisher, PublishingFlickrPublishingParameters* parameters, SpitPublishingPublisherMediaType media_type, GtkBuilder* builder, gboolean strip_metadata);
-PublishingFlickrPublishingOptionsPane* publishing_flickr_publishing_options_pane_construct (GType object_type, PublishingFlickrFlickrPublisher* publisher, PublishingFlickrPublishingParameters* parameters, SpitPublishingPublisherMediaType media_type, GtkBuilder* builder, gboolean strip_metadata);
-gint publishing_flickr_flickr_publisher_flickr_date_time_compare_func (SpitPublishingPublishable* a, SpitPublishingPublishable* b);
-static gint _publishing_flickr_flickr_publisher_flickr_date_time_compare_func_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self);
+PublishingFlickrPublishingOptionsPane* publishing_flickr_publishing_options_pane_new (PublishingFlickrFlickrPublisher* publisher,
+ PublishingFlickrPublishingParameters* parameters,
+ SpitPublishingPublisherMediaType media_type,
+ GtkBuilder* builder,
+ gboolean strip_metadata);
+PublishingFlickrPublishingOptionsPane* publishing_flickr_publishing_options_pane_construct (GType object_type,
+ PublishingFlickrFlickrPublisher* publisher,
+ PublishingFlickrPublishingParameters* parameters,
+ SpitPublishingPublisherMediaType media_type,
+ GtkBuilder* builder,
+ gboolean strip_metadata);
+gint publishing_flickr_flickr_publisher_flickr_date_time_compare_func (SpitPublishingPublishable* a,
+ SpitPublishingPublishable* b);
+static gint _publishing_flickr_flickr_publisher_flickr_date_time_compare_func_gcompare_data_func (gconstpointer a,
+ gconstpointer b,
+ gpointer self);
GType publishing_flickr_uploader_get_type (void) G_GNUC_CONST;
-PublishingFlickrUploader* publishing_flickr_uploader_new (PublishingRESTSupportOAuth1Session* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingFlickrPublishingParameters* parameters, gboolean strip_metadata);
-PublishingFlickrUploader* publishing_flickr_uploader_construct (GType object_type, PublishingRESTSupportOAuth1Session* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingFlickrPublishingParameters* parameters, gboolean strip_metadata);
-static void _publishing_flickr_flickr_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self);
+PublishingFlickrUploader* publishing_flickr_uploader_new (PublishingRESTSupportOAuth1Session* session,
+ SpitPublishingPublishable** publishables,
+ int publishables_length1,
+ PublishingFlickrPublishingParameters* parameters,
+ gboolean strip_metadata);
+PublishingFlickrUploader* publishing_flickr_uploader_construct (GType object_type,
+ PublishingRESTSupportOAuth1Session* session,
+ SpitPublishingPublishable** publishables,
+ int publishables_length1,
+ PublishingFlickrPublishingParameters* parameters,
+ gboolean strip_metadata);
+static void _publishing_flickr_flickr_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number,
+ gdouble fraction_complete,
+ gpointer self);
gint publishing_flickr_flickr_publisher_get_persistent_visibility (PublishingFlickrFlickrPublisher* self);
-void publishing_flickr_flickr_publisher_set_persistent_visibility (PublishingFlickrFlickrPublisher* self, gint vis);
+void publishing_flickr_flickr_publisher_set_persistent_visibility (PublishingFlickrFlickrPublisher* self,
+ gint vis);
gint publishing_flickr_flickr_publisher_get_persistent_default_size (PublishingFlickrFlickrPublisher* self);
-void publishing_flickr_flickr_publisher_set_persistent_default_size (PublishingFlickrFlickrPublisher* self, gint size);
+void publishing_flickr_flickr_publisher_set_persistent_default_size (PublishingFlickrFlickrPublisher* self,
+ gint size);
static SpitPublishingService* publishing_flickr_flickr_publisher_real_get_service (SpitPublishingPublisher* base);
static gboolean publishing_flickr_flickr_publisher_real_is_running (SpitPublishingPublisher* base);
static void publishing_flickr_flickr_publisher_real_start (SpitPublishingPublisher* base);
static void publishing_flickr_flickr_publisher_real_stop (SpitPublishingPublisher* base);
static void publishing_flickr_flickr_publisher_finalize (GObject * obj);
gchar* publishing_flickr_transaction_validate_xml (PublishingRESTSupportXmlDocument* doc);
-static gchar* _publishing_flickr_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response (PublishingRESTSupportXmlDocument* doc, gpointer self);
-enum {
- PUBLISHING_FLICKR_ACCOUNT_INFO_FETCH_TRANSACTION_DUMMY_PROPERTY
-};
+static gchar* _publishing_flickr_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response (PublishingRESTSupportXmlDocument* doc,
+ gpointer self);
GType publishing_flickr_upload_transaction_get_type (void) G_GNUC_CONST;
#define PUBLISHING_FLICKR_UPLOAD_TRANSACTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_FLICKR_TYPE_UPLOAD_TRANSACTION, PublishingFlickrUploadTransactionPrivate))
-enum {
- PUBLISHING_FLICKR_UPLOAD_TRANSACTION_DUMMY_PROPERTY
-};
-PublishingFlickrUploadTransaction* publishing_flickr_upload_transaction_new (PublishingRESTSupportOAuth1Session* session, PublishingFlickrPublishingParameters* parameters, SpitPublishingPublishable* publishable);
-PublishingFlickrUploadTransaction* publishing_flickr_upload_transaction_construct (GType object_type, PublishingRESTSupportOAuth1Session* session, PublishingFlickrPublishingParameters* parameters, SpitPublishingPublishable* publishable);
+PublishingFlickrUploadTransaction* publishing_flickr_upload_transaction_new (PublishingRESTSupportOAuth1Session* session,
+ PublishingFlickrPublishingParameters* parameters,
+ SpitPublishingPublishable* publishable);
+PublishingFlickrUploadTransaction* publishing_flickr_upload_transaction_construct (GType object_type,
+ PublishingRESTSupportOAuth1Session* session,
+ PublishingFlickrPublishingParameters* parameters,
+ SpitPublishingPublishable* publishable);
static void _g_free0_ (gpointer var);
-static void publishing_flickr_upload_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error);
+static void publishing_flickr_upload_transaction_real_execute (PublishingRESTSupportTransaction* base,
+ GError** error);
static void publishing_flickr_upload_transaction_finalize (PublishingRESTSupportTransaction * obj);
static gpointer publishing_flickr_publishing_options_pane_visibility_entry_ref (gpointer instance);
static void publishing_flickr_publishing_options_pane_visibility_entry_unref (gpointer instance);
-static GParamSpec* publishing_flickr_publishing_options_pane_param_spec_visibility_entry (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) G_GNUC_UNUSED;
-static void publishing_flickr_publishing_options_pane_value_set_visibility_entry (GValue* value, gpointer v_object) G_GNUC_UNUSED;
-static void publishing_flickr_publishing_options_pane_value_take_visibility_entry (GValue* value, gpointer v_object) G_GNUC_UNUSED;
+static GParamSpec* publishing_flickr_publishing_options_pane_param_spec_visibility_entry (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags) G_GNUC_UNUSED;
+static void publishing_flickr_publishing_options_pane_value_set_visibility_entry (GValue* value,
+ gpointer v_object) G_GNUC_UNUSED;
+static void publishing_flickr_publishing_options_pane_value_take_visibility_entry (GValue* value,
+ gpointer v_object) G_GNUC_UNUSED;
static gpointer publishing_flickr_publishing_options_pane_value_get_visibility_entry (const GValue* value) G_GNUC_UNUSED;
static GType publishing_flickr_publishing_options_pane_visibility_entry_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
static gpointer publishing_flickr_publishing_options_pane_size_entry_ref (gpointer instance);
static void publishing_flickr_publishing_options_pane_size_entry_unref (gpointer instance);
-static GParamSpec* publishing_flickr_publishing_options_pane_param_spec_size_entry (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) G_GNUC_UNUSED;
-static void publishing_flickr_publishing_options_pane_value_set_size_entry (GValue* value, gpointer v_object) G_GNUC_UNUSED;
-static void publishing_flickr_publishing_options_pane_value_take_size_entry (GValue* value, gpointer v_object) G_GNUC_UNUSED;
+static GParamSpec* publishing_flickr_publishing_options_pane_param_spec_size_entry (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags) G_GNUC_UNUSED;
+static void publishing_flickr_publishing_options_pane_value_set_size_entry (GValue* value,
+ gpointer v_object) G_GNUC_UNUSED;
+static void publishing_flickr_publishing_options_pane_value_take_size_entry (GValue* value,
+ gpointer v_object) G_GNUC_UNUSED;
static gpointer publishing_flickr_publishing_options_pane_value_get_size_entry (const GValue* value) G_GNUC_UNUSED;
static GType publishing_flickr_publishing_options_pane_size_entry_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
#define PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, PublishingFlickrPublishingOptionsPanePrivate))
-enum {
- PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_DUMMY_PROPERTY
-};
-static PublishingFlickrPublishingOptionsPaneVisibilityEntry** publishing_flickr_publishing_options_pane_create_visibilities (PublishingFlickrPublishingOptionsPane* self, int* result_length1);
-static PublishingFlickrPublishingOptionsPaneSizeEntry** publishing_flickr_publishing_options_pane_create_sizes (PublishingFlickrPublishingOptionsPane* self, int* result_length1);
+static PublishingFlickrPublishingOptionsPaneVisibilityEntry** publishing_flickr_publishing_options_pane_create_visibilities (PublishingFlickrPublishingOptionsPane* self,
+ int* result_length1);
+static PublishingFlickrPublishingOptionsPaneSizeEntry** publishing_flickr_publishing_options_pane_create_sizes (PublishingFlickrPublishingOptionsPane* self,
+ int* result_length1);
static void publishing_flickr_publishing_options_pane_populate_visibility_combo (PublishingFlickrPublishingOptionsPane* self);
static void publishing_flickr_publishing_options_pane_on_visibility_changed (PublishingFlickrPublishingOptionsPane* self);
-static void _publishing_flickr_publishing_options_pane_on_visibility_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
+static void _publishing_flickr_publishing_options_pane_on_visibility_changed_gtk_combo_box_changed (GtkComboBox* _sender,
+ gpointer self);
static void publishing_flickr_publishing_options_pane_populate_size_combo (PublishingFlickrPublishingOptionsPane* self);
static void publishing_flickr_publishing_options_pane_on_size_changed (PublishingFlickrPublishingOptionsPane* self);
-static void _publishing_flickr_publishing_options_pane_on_size_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
+static void _publishing_flickr_publishing_options_pane_on_size_changed_gtk_combo_box_changed (GtkComboBox* _sender,
+ gpointer self);
static void publishing_flickr_publishing_options_pane_on_logout_clicked (PublishingFlickrPublishingOptionsPane* self);
-static void _publishing_flickr_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void _publishing_flickr_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender,
+ gpointer self);
static void publishing_flickr_publishing_options_pane_on_publish_clicked (PublishingFlickrPublishingOptionsPane* self);
-static void _publishing_flickr_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
-static PublishingFlickrPublishingOptionsPaneVisibilityEntry* publishing_flickr_publishing_options_pane_visibility_entry_new (const gchar* creator_title, PublishingFlickrVisibilitySpecification* creator_specification);
-static PublishingFlickrPublishingOptionsPaneVisibilityEntry* publishing_flickr_publishing_options_pane_visibility_entry_construct (GType object_type, const gchar* creator_title, PublishingFlickrVisibilitySpecification* creator_specification);
-static void _vala_array_add20 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value);
-static void _vala_array_add21 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value);
-static void _vala_array_add22 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value);
-static void _vala_array_add23 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value);
-static void _vala_array_add24 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value);
-static PublishingFlickrPublishingOptionsPaneSizeEntry* publishing_flickr_publishing_options_pane_size_entry_new (const gchar* creator_title, gint creator_size);
-static PublishingFlickrPublishingOptionsPaneSizeEntry* publishing_flickr_publishing_options_pane_size_entry_construct (GType object_type, const gchar* creator_title, gint creator_size);
-static void _vala_array_add25 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value);
-static void _vala_array_add26 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value);
-static void _vala_array_add27 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value);
-static void _vala_array_add28 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value);
-static void _vala_array_add29 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value);
+static void _publishing_flickr_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender,
+ gpointer self);
+static PublishingFlickrPublishingOptionsPaneVisibilityEntry* publishing_flickr_publishing_options_pane_visibility_entry_new (const gchar* creator_title,
+ PublishingFlickrVisibilitySpecification* creator_specification);
+static PublishingFlickrPublishingOptionsPaneVisibilityEntry* publishing_flickr_publishing_options_pane_visibility_entry_construct (GType object_type,
+ const gchar* creator_title,
+ PublishingFlickrVisibilitySpecification* creator_specification);
+static void _vala_array_add20 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array,
+ int* length,
+ int* size,
+ PublishingFlickrPublishingOptionsPaneVisibilityEntry* value);
+static void _vala_array_add21 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array,
+ int* length,
+ int* size,
+ PublishingFlickrPublishingOptionsPaneVisibilityEntry* value);
+static void _vala_array_add22 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array,
+ int* length,
+ int* size,
+ PublishingFlickrPublishingOptionsPaneVisibilityEntry* value);
+static void _vala_array_add23 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array,
+ int* length,
+ int* size,
+ PublishingFlickrPublishingOptionsPaneVisibilityEntry* value);
+static void _vala_array_add24 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array,
+ int* length,
+ int* size,
+ PublishingFlickrPublishingOptionsPaneVisibilityEntry* value);
+static PublishingFlickrPublishingOptionsPaneSizeEntry* publishing_flickr_publishing_options_pane_size_entry_new (const gchar* creator_title,
+ gint creator_size);
+static PublishingFlickrPublishingOptionsPaneSizeEntry* publishing_flickr_publishing_options_pane_size_entry_construct (GType object_type,
+ const gchar* creator_title,
+ gint creator_size);
+static void _vala_array_add25 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array,
+ int* length,
+ int* size,
+ PublishingFlickrPublishingOptionsPaneSizeEntry* value);
+static void _vala_array_add26 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array,
+ int* length,
+ int* size,
+ PublishingFlickrPublishingOptionsPaneSizeEntry* value);
+static void _vala_array_add27 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array,
+ int* length,
+ int* size,
+ PublishingFlickrPublishingOptionsPaneSizeEntry* value);
+static void _vala_array_add28 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array,
+ int* length,
+ int* size,
+ PublishingFlickrPublishingOptionsPaneSizeEntry* value);
+static void _vala_array_add29 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array,
+ int* length,
+ int* size,
+ PublishingFlickrPublishingOptionsPaneSizeEntry* value);
void publishing_flickr_publishing_options_pane_notify_publish (PublishingFlickrPublishingOptionsPane* self);
void publishing_flickr_publishing_options_pane_notify_logout (PublishingFlickrPublishingOptionsPane* self);
static GtkWidget* publishing_flickr_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base);
static SpitPublishingDialogPaneGeometryOptions publishing_flickr_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base);
static void publishing_flickr_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base);
-static void _publishing_flickr_publishing_options_pane_notify_publish_publishing_flickr_publishing_options_pane_publish (PublishingFlickrPublishingOptionsPane* _sender, gboolean strip_metadata, gpointer self);
-static void _publishing_flickr_publishing_options_pane_notify_logout_publishing_flickr_publishing_options_pane_logout (PublishingFlickrPublishingOptionsPane* _sender, gpointer self);
+static void _publishing_flickr_publishing_options_pane_notify_publish_publishing_flickr_publishing_options_pane_publish (PublishingFlickrPublishingOptionsPane* _sender,
+ gboolean strip_metadata,
+ gpointer self);
+static void _publishing_flickr_publishing_options_pane_notify_logout_publishing_flickr_publishing_options_pane_logout (PublishingFlickrPublishingOptionsPane* _sender,
+ gpointer self);
static void publishing_flickr_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base);
-enum {
- PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_SIZE_ENTRY_DUMMY_PROPERTY
-};
static void publishing_flickr_publishing_options_pane_size_entry_finalize (PublishingFlickrPublishingOptionsPaneSizeEntry * obj);
-enum {
- PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_VISIBILITY_ENTRY_DUMMY_PROPERTY
-};
static void publishing_flickr_publishing_options_pane_visibility_entry_finalize (PublishingFlickrPublishingOptionsPaneVisibilityEntry * obj);
static void publishing_flickr_publishing_options_pane_finalize (GObject * obj);
#define PUBLISHING_FLICKR_UPLOADER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_FLICKR_TYPE_UPLOADER, PublishingFlickrUploaderPrivate))
-enum {
- PUBLISHING_FLICKR_UPLOADER_DUMMY_PROPERTY
-};
-static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrUploader* self, SpitPublishingPublishable* publishable);
-static void _vala_array_add30 (gchar** * array, int* length, int* size, gchar* value);
-static PublishingRESTSupportTransaction* publishing_flickr_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base, SpitPublishingPublishable* publishable);
+static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrUploader* self,
+ SpitPublishingPublishable* publishable);
+static void _vala_array_add30 (gchar** * array,
+ int* length,
+ int* size,
+ gchar* value);
+static PublishingRESTSupportTransaction* publishing_flickr_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base,
+ SpitPublishingPublishable* publishable);
static void publishing_flickr_uploader_finalize (PublishingRESTSupportBatchUploader * 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 gint _vala_array_length (gpointer array);
-FlickrService* flickr_service_construct (GType object_type, GFile* resource_directory) {
+FlickrService*
+flickr_service_construct (GType object_type,
+ GFile* resource_directory)
+{
FlickrService * self = NULL;
GdkPixbuf** _tmp0_;
gint _tmp0__length1;
@@ -570,7 +710,7 @@ FlickrService* flickr_service_construct (GType object_type, GFile* resource_dire
_tmp0__length1 = flickr_service_icon_pixbuf_set_length1;
#line 13 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
if (_tmp0_ == NULL) {
-#line 574 "FlickrPublishing.c"
+#line 714 "FlickrPublishing.c"
gint _tmp1_;
GdkPixbuf** _tmp2_;
#line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -583,44 +723,43 @@ FlickrService* flickr_service_construct (GType object_type, GFile* resource_dire
flickr_service_icon_pixbuf_set_length1 = _tmp1_;
#line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_flickr_service_icon_pixbuf_set_size_ = flickr_service_icon_pixbuf_set_length1;
-#line 587 "FlickrPublishing.c"
+#line 727 "FlickrPublishing.c"
}
#line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return self;
-#line 591 "FlickrPublishing.c"
+#line 731 "FlickrPublishing.c"
}
-FlickrService* flickr_service_new (GFile* resource_directory) {
+FlickrService*
+flickr_service_new (GFile* resource_directory)
+{
#line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return flickr_service_construct (TYPE_FLICKR_SERVICE, resource_directory);
-#line 598 "FlickrPublishing.c"
+#line 740 "FlickrPublishing.c"
}
-static gint flickr_service_real_get_pluggable_interface (SpitPluggable* base, gint min_host_interface, gint max_host_interface) {
+static gint
+flickr_service_real_get_pluggable_interface (SpitPluggable* base,
+ gint min_host_interface,
+ gint max_host_interface)
+{
FlickrService * self;
gint result = 0;
- gint _tmp0_;
- gint _tmp1_;
- gint _tmp2_;
#line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FLICKR_SERVICE, FlickrService);
#line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp0_ = min_host_interface;
-#line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp1_ = max_host_interface;
-#line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp2_ = spit_negotiate_interfaces (_tmp0_, _tmp1_, SPIT_PUBLISHING_CURRENT_INTERFACE);
-#line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- result = _tmp2_;
+ result = spit_negotiate_interfaces (min_host_interface, max_host_interface, SPIT_PUBLISHING_CURRENT_INTERFACE);
#line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return result;
-#line 620 "FlickrPublishing.c"
+#line 757 "FlickrPublishing.c"
}
-static const gchar* flickr_service_real_get_id (SpitPluggable* base) {
+static const gchar*
+flickr_service_real_get_id (SpitPluggable* base)
+{
FlickrService * self;
const gchar* result = NULL;
#line 23 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -629,11 +768,13 @@ static const gchar* flickr_service_real_get_id (SpitPluggable* base) {
result = "org.yorba.shotwell.publishing.flickr";
#line 24 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return result;
-#line 633 "FlickrPublishing.c"
+#line 772 "FlickrPublishing.c"
}
-static const gchar* flickr_service_real_get_pluggable_name (SpitPluggable* base) {
+static const gchar*
+flickr_service_real_get_pluggable_name (SpitPluggable* base)
+{
FlickrService * self;
const gchar* result = NULL;
#line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -642,39 +783,47 @@ static const gchar* flickr_service_real_get_pluggable_name (SpitPluggable* base)
result = "Flickr";
#line 28 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return result;
-#line 646 "FlickrPublishing.c"
+#line 787 "FlickrPublishing.c"
}
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return self ? g_object_ref (self) : NULL;
-#line 653 "FlickrPublishing.c"
+#line 796 "FlickrPublishing.c"
}
-static GdkPixbuf** _vala_array_dup7 (GdkPixbuf** self, int length) {
+static GdkPixbuf**
+_vala_array_dup7 (GdkPixbuf** self,
+ int length)
+{
GdkPixbuf** result;
int i;
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
result = g_new0 (GdkPixbuf*, length + 1);
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
for (i = 0; i < length; i++) {
-#line 664 "FlickrPublishing.c"
+#line 810 "FlickrPublishing.c"
GdkPixbuf* _tmp0_;
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_tmp0_ = _g_object_ref0 (self[i]);
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
result[i] = _tmp0_;
-#line 670 "FlickrPublishing.c"
+#line 816 "FlickrPublishing.c"
}
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return result;
-#line 674 "FlickrPublishing.c"
+#line 820 "FlickrPublishing.c"
}
-static void flickr_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info) {
+static void
+flickr_service_real_get_info (SpitPluggable* base,
+ SpitPluggableInfo* info)
+{
FlickrService * self;
gchar* _tmp0_;
gchar* _tmp1_;
@@ -749,40 +898,45 @@ static void flickr_service_real_get_info (SpitPluggable* base, SpitPluggableInfo
(*info).icons = _tmp8_;
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
(*info).icons_length1 = _tmp8__length1;
-#line 753 "FlickrPublishing.c"
+#line 902 "FlickrPublishing.c"
}
-static void flickr_service_real_activation (SpitPluggable* base, gboolean enabled) {
+static void
+flickr_service_real_activation (SpitPluggable* base,
+ gboolean enabled)
+{
FlickrService * self;
#line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FLICKR_SERVICE, FlickrService);
-#line 761 "FlickrPublishing.c"
+#line 913 "FlickrPublishing.c"
}
-static SpitPublishingPublisher* flickr_service_real_create_publisher (SpitPublishingService* base, SpitPublishingPluginHost* host) {
+static SpitPublishingPublisher*
+flickr_service_real_create_publisher (SpitPublishingService* base,
+ SpitPublishingPluginHost* host)
+{
FlickrService * self;
SpitPublishingPublisher* result = NULL;
- SpitPublishingPluginHost* _tmp0_;
- PublishingFlickrFlickrPublisher* _tmp1_;
+ PublishingFlickrFlickrPublisher* _tmp0_;
#line 46 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FLICKR_SERVICE, FlickrService);
#line 46 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL);
#line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp0_ = host;
+ _tmp0_ = publishing_flickr_flickr_publisher_new (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_SERVICE, SpitPublishingService), host);
#line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp1_ = publishing_flickr_flickr_publisher_new (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_SERVICE, SpitPublishingService), _tmp0_);
-#line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher);
+ result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher);
#line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return result;
-#line 782 "FlickrPublishing.c"
+#line 934 "FlickrPublishing.c"
}
-static SpitPublishingPublisherMediaType flickr_service_real_get_supported_media (SpitPublishingService* base) {
+static SpitPublishingPublisherMediaType
+flickr_service_real_get_supported_media (SpitPublishingService* base)
+{
FlickrService * self;
SpitPublishingPublisherMediaType result = 0;
#line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -791,20 +945,24 @@ static SpitPublishingPublisherMediaType flickr_service_real_get_supported_media
result = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO | SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO;
#line 51 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return result;
-#line 795 "FlickrPublishing.c"
+#line 949 "FlickrPublishing.c"
}
-static void flickr_service_class_init (FlickrServiceClass * klass) {
+static void
+flickr_service_class_init (FlickrServiceClass * klass)
+{
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
flickr_service_parent_class = g_type_class_peek_parent (klass);
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
G_OBJECT_CLASS (klass)->finalize = flickr_service_finalize;
-#line 804 "FlickrPublishing.c"
+#line 960 "FlickrPublishing.c"
}
-static void flickr_service_spit_pluggable_interface_init (SpitPluggableIface * iface) {
+static void
+flickr_service_spit_pluggable_interface_init (SpitPluggableIface * iface)
+{
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
flickr_service_spit_pluggable_parent_iface = g_type_interface_peek_parent (iface);
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -817,36 +975,44 @@ static void flickr_service_spit_pluggable_interface_init (SpitPluggableIface * i
iface->get_info = (void (*) (SpitPluggable *, SpitPluggableInfo*)) flickr_service_real_get_info;
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
iface->activation = (void (*) (SpitPluggable *, gboolean)) flickr_service_real_activation;
-#line 821 "FlickrPublishing.c"
+#line 979 "FlickrPublishing.c"
}
-static void flickr_service_spit_publishing_service_interface_init (SpitPublishingServiceIface * iface) {
+static void
+flickr_service_spit_publishing_service_interface_init (SpitPublishingServiceIface * iface)
+{
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
flickr_service_spit_publishing_service_parent_iface = g_type_interface_peek_parent (iface);
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
iface->create_publisher = (SpitPublishingPublisher* (*) (SpitPublishingService *, SpitPublishingPluginHost*)) flickr_service_real_create_publisher;
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
iface->get_supported_media = (SpitPublishingPublisherMediaType (*) (SpitPublishingService *)) flickr_service_real_get_supported_media;
-#line 832 "FlickrPublishing.c"
+#line 992 "FlickrPublishing.c"
}
-static void flickr_service_instance_init (FlickrService * self) {
+static void
+flickr_service_instance_init (FlickrService * self)
+{
}
-static void flickr_service_finalize (GObject * obj) {
+static void
+flickr_service_finalize (GObject * obj)
+{
FlickrService * self;
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_FLICKR_SERVICE, FlickrService);
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
G_OBJECT_CLASS (flickr_service_parent_class)->finalize (obj);
-#line 846 "FlickrPublishing.c"
+#line 1010 "FlickrPublishing.c"
}
-GType flickr_service_get_type (void) {
+GType
+flickr_service_get_type (void)
+{
static volatile gsize flickr_service_type_id__volatile = 0;
if (g_once_init_enter (&flickr_service_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (FlickrServiceClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) flickr_service_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (FlickrService), 0, (GInstanceInitFunc) flickr_service_instance_init, NULL };
@@ -862,7 +1028,9 @@ GType flickr_service_get_type (void) {
}
-GType publishing_flickr_user_kind_get_type (void) {
+GType
+publishing_flickr_user_kind_get_type (void)
+{
static volatile gsize publishing_flickr_user_kind_type_id__volatile = 0;
if (g_once_init_enter (&publishing_flickr_user_kind_type_id__volatile)) {
static const GEnumValue values[] = {{PUBLISHING_FLICKR_USER_KIND_PRO, "PUBLISHING_FLICKR_USER_KIND_PRO", "pro"}, {PUBLISHING_FLICKR_USER_KIND_FREE, "PUBLISHING_FLICKR_USER_KIND_FREE", "free"}, {0, NULL, NULL}};
@@ -874,136 +1042,161 @@ GType publishing_flickr_user_kind_get_type (void) {
}
-PublishingFlickrVisibilitySpecification* publishing_flickr_visibility_specification_construct (GType object_type, gint friends_level, gint family_level, gint everyone_level) {
+PublishingFlickrVisibilitySpecification*
+publishing_flickr_visibility_specification_construct (GType object_type,
+ gint friends_level,
+ gint family_level,
+ gint everyone_level)
+{
PublishingFlickrVisibilitySpecification* self = NULL;
- gint _tmp0_;
- gint _tmp1_;
- gint _tmp2_;
#line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
self = (PublishingFlickrVisibilitySpecification*) g_type_create_instance (object_type);
#line 74 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp0_ = friends_level;
-#line 74 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- self->friends_level = _tmp0_;
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp1_ = family_level;
+ self->friends_level = friends_level;
#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- self->family_level = _tmp1_;
+ self->family_level = family_level;
#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp2_ = everyone_level;
-#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- self->everyone_level = _tmp2_;
+ self->everyone_level = everyone_level;
#line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return self;
-#line 899 "FlickrPublishing.c"
+#line 1063 "FlickrPublishing.c"
}
-PublishingFlickrVisibilitySpecification* publishing_flickr_visibility_specification_new (gint friends_level, gint family_level, gint everyone_level) {
+PublishingFlickrVisibilitySpecification*
+publishing_flickr_visibility_specification_new (gint friends_level,
+ gint family_level,
+ gint everyone_level)
+{
#line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return publishing_flickr_visibility_specification_construct (PUBLISHING_FLICKR_TYPE_VISIBILITY_SPECIFICATION, friends_level, family_level, everyone_level);
-#line 906 "FlickrPublishing.c"
+#line 1074 "FlickrPublishing.c"
}
-static void publishing_flickr_value_visibility_specification_init (GValue* value) {
+static void
+publishing_flickr_value_visibility_specification_init (GValue* value)
+{
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 913 "FlickrPublishing.c"
+#line 1083 "FlickrPublishing.c"
}
-static void publishing_flickr_value_visibility_specification_free_value (GValue* value) {
+static void
+publishing_flickr_value_visibility_specification_free_value (GValue* value)
+{
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
if (value->data[0].v_pointer) {
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
publishing_flickr_visibility_specification_unref (value->data[0].v_pointer);
-#line 922 "FlickrPublishing.c"
+#line 1094 "FlickrPublishing.c"
}
}
-static void publishing_flickr_value_visibility_specification_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+publishing_flickr_value_visibility_specification_copy_value (const GValue* src_value,
+ GValue* dest_value)
+{
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
if (src_value->data[0].v_pointer) {
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
dest_value->data[0].v_pointer = publishing_flickr_visibility_specification_ref (src_value->data[0].v_pointer);
-#line 932 "FlickrPublishing.c"
+#line 1107 "FlickrPublishing.c"
} else {
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
dest_value->data[0].v_pointer = NULL;
-#line 936 "FlickrPublishing.c"
+#line 1111 "FlickrPublishing.c"
}
}
-static gpointer publishing_flickr_value_visibility_specification_peek_pointer (const GValue* value) {
+static gpointer
+publishing_flickr_value_visibility_specification_peek_pointer (const GValue* value)
+{
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return value->data[0].v_pointer;
-#line 944 "FlickrPublishing.c"
+#line 1121 "FlickrPublishing.c"
}
-static gchar* publishing_flickr_value_visibility_specification_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_flickr_value_visibility_specification_collect_value (GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
if (collect_values[0].v_pointer) {
-#line 951 "FlickrPublishing.c"
+#line 1133 "FlickrPublishing.c"
PublishingFlickrVisibilitySpecification * object;
object = collect_values[0].v_pointer;
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
if (object->parent_instance.g_class == NULL) {
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 958 "FlickrPublishing.c"
+#line 1140 "FlickrPublishing.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 962 "FlickrPublishing.c"
+#line 1144 "FlickrPublishing.c"
}
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
value->data[0].v_pointer = publishing_flickr_visibility_specification_ref (object);
-#line 966 "FlickrPublishing.c"
+#line 1148 "FlickrPublishing.c"
} else {
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 970 "FlickrPublishing.c"
+#line 1152 "FlickrPublishing.c"
}
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return NULL;
-#line 974 "FlickrPublishing.c"
+#line 1156 "FlickrPublishing.c"
}
-static gchar* publishing_flickr_value_visibility_specification_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_flickr_value_visibility_specification_lcopy_value (const GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
PublishingFlickrVisibilitySpecification ** object_p;
object_p = collect_values[0].v_pointer;
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
if (!object_p) {
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 985 "FlickrPublishing.c"
+#line 1172 "FlickrPublishing.c"
}
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
if (!value->data[0].v_pointer) {
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
*object_p = NULL;
-#line 991 "FlickrPublishing.c"
+#line 1178 "FlickrPublishing.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
*object_p = value->data[0].v_pointer;
-#line 995 "FlickrPublishing.c"
+#line 1182 "FlickrPublishing.c"
} else {
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
*object_p = publishing_flickr_visibility_specification_ref (value->data[0].v_pointer);
-#line 999 "FlickrPublishing.c"
+#line 1186 "FlickrPublishing.c"
}
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return NULL;
-#line 1003 "FlickrPublishing.c"
+#line 1190 "FlickrPublishing.c"
}
-GParamSpec* publishing_flickr_param_spec_visibility_specification (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+publishing_flickr_param_spec_visibility_specification (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags)
+{
PublishingFlickrParamSpecVisibilitySpecification* spec;
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_FLICKR_TYPE_VISIBILITY_SPECIFICATION), NULL);
@@ -1013,20 +1206,25 @@ GParamSpec* publishing_flickr_param_spec_visibility_specification (const gchar*
G_PARAM_SPEC (spec)->value_type = object_type;
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return G_PARAM_SPEC (spec);
-#line 1017 "FlickrPublishing.c"
+#line 1210 "FlickrPublishing.c"
}
-gpointer publishing_flickr_value_get_visibility_specification (const GValue* value) {
+gpointer
+publishing_flickr_value_get_visibility_specification (const GValue* value)
+{
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FLICKR_TYPE_VISIBILITY_SPECIFICATION), NULL);
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return value->data[0].v_pointer;
-#line 1026 "FlickrPublishing.c"
+#line 1221 "FlickrPublishing.c"
}
-void publishing_flickr_value_set_visibility_specification (GValue* value, gpointer v_object) {
+void
+publishing_flickr_value_set_visibility_specification (GValue* value,
+ gpointer v_object)
+{
PublishingFlickrVisibilitySpecification * old;
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FLICKR_TYPE_VISIBILITY_SPECIFICATION));
@@ -1042,22 +1240,25 @@ void publishing_flickr_value_set_visibility_specification (GValue* value, gpoint
value->data[0].v_pointer = v_object;
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
publishing_flickr_visibility_specification_ref (value->data[0].v_pointer);
-#line 1046 "FlickrPublishing.c"
+#line 1244 "FlickrPublishing.c"
} else {
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 1050 "FlickrPublishing.c"
+#line 1248 "FlickrPublishing.c"
}
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
if (old) {
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
publishing_flickr_visibility_specification_unref (old);
-#line 1056 "FlickrPublishing.c"
+#line 1254 "FlickrPublishing.c"
}
}
-void publishing_flickr_value_take_visibility_specification (GValue* value, gpointer v_object) {
+void
+publishing_flickr_value_take_visibility_specification (GValue* value,
+ gpointer v_object)
+{
PublishingFlickrVisibilitySpecification * old;
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FLICKR_TYPE_VISIBILITY_SPECIFICATION));
@@ -1071,48 +1272,56 @@ void publishing_flickr_value_take_visibility_specification (GValue* value, gpoin
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
value->data[0].v_pointer = v_object;
-#line 1075 "FlickrPublishing.c"
+#line 1276 "FlickrPublishing.c"
} else {
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 1079 "FlickrPublishing.c"
+#line 1280 "FlickrPublishing.c"
}
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
if (old) {
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
publishing_flickr_visibility_specification_unref (old);
-#line 1085 "FlickrPublishing.c"
+#line 1286 "FlickrPublishing.c"
}
}
-static void publishing_flickr_visibility_specification_class_init (PublishingFlickrVisibilitySpecificationClass * klass) {
+static void
+publishing_flickr_visibility_specification_class_init (PublishingFlickrVisibilitySpecificationClass * klass)
+{
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
publishing_flickr_visibility_specification_parent_class = g_type_class_peek_parent (klass);
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
((PublishingFlickrVisibilitySpecificationClass *) klass)->finalize = publishing_flickr_visibility_specification_finalize;
-#line 1095 "FlickrPublishing.c"
+#line 1298 "FlickrPublishing.c"
}
-static void publishing_flickr_visibility_specification_instance_init (PublishingFlickrVisibilitySpecification * self) {
+static void
+publishing_flickr_visibility_specification_instance_init (PublishingFlickrVisibilitySpecification * self)
+{
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
self->ref_count = 1;
-#line 1102 "FlickrPublishing.c"
+#line 1307 "FlickrPublishing.c"
}
-static void publishing_flickr_visibility_specification_finalize (PublishingFlickrVisibilitySpecification * obj) {
+static void
+publishing_flickr_visibility_specification_finalize (PublishingFlickrVisibilitySpecification * obj)
+{
PublishingFlickrVisibilitySpecification * self;
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_TYPE_VISIBILITY_SPECIFICATION, PublishingFlickrVisibilitySpecification);
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_signal_handlers_destroy (self);
-#line 1112 "FlickrPublishing.c"
+#line 1319 "FlickrPublishing.c"
}
-GType publishing_flickr_visibility_specification_get_type (void) {
+GType
+publishing_flickr_visibility_specification_get_type (void)
+{
static volatile gsize publishing_flickr_visibility_specification_type_id__volatile = 0;
if (g_once_init_enter (&publishing_flickr_visibility_specification_type_id__volatile)) {
static const GTypeValueTable g_define_type_value_table = { publishing_flickr_value_visibility_specification_init, publishing_flickr_value_visibility_specification_free_value, publishing_flickr_value_visibility_specification_copy_value, publishing_flickr_value_visibility_specification_peek_pointer, "p", publishing_flickr_value_visibility_specification_collect_value, "p", publishing_flickr_value_visibility_specification_lcopy_value };
@@ -1126,18 +1335,22 @@ GType publishing_flickr_visibility_specification_get_type (void) {
}
-gpointer publishing_flickr_visibility_specification_ref (gpointer instance) {
+gpointer
+publishing_flickr_visibility_specification_ref (gpointer instance)
+{
PublishingFlickrVisibilitySpecification * self;
self = instance;
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_atomic_int_inc (&self->ref_count);
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return instance;
-#line 1137 "FlickrPublishing.c"
+#line 1348 "FlickrPublishing.c"
}
-void publishing_flickr_visibility_specification_unref (gpointer instance) {
+void
+publishing_flickr_visibility_specification_unref (gpointer instance)
+{
PublishingFlickrVisibilitySpecification * self;
self = instance;
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -1146,126 +1359,155 @@ void publishing_flickr_visibility_specification_unref (gpointer instance) {
PUBLISHING_FLICKR_VISIBILITY_SPECIFICATION_GET_CLASS (self)->finalize (self);
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 1150 "FlickrPublishing.c"
+#line 1363 "FlickrPublishing.c"
}
}
-PublishingFlickrPublishingParameters* publishing_flickr_publishing_parameters_construct (GType object_type) {
+PublishingFlickrPublishingParameters*
+publishing_flickr_publishing_parameters_construct (GType object_type)
+{
PublishingFlickrPublishingParameters* self = NULL;
#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
self = (PublishingFlickrPublishingParameters*) g_type_create_instance (object_type);
#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return self;
-#line 1161 "FlickrPublishing.c"
+#line 1376 "FlickrPublishing.c"
}
-PublishingFlickrPublishingParameters* publishing_flickr_publishing_parameters_new (void) {
+PublishingFlickrPublishingParameters*
+publishing_flickr_publishing_parameters_new (void)
+{
#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return publishing_flickr_publishing_parameters_construct (PUBLISHING_FLICKR_TYPE_PUBLISHING_PARAMETERS);
-#line 1168 "FlickrPublishing.c"
+#line 1385 "FlickrPublishing.c"
}
-static void publishing_flickr_value_publishing_parameters_init (GValue* value) {
+static void
+publishing_flickr_value_publishing_parameters_init (GValue* value)
+{
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 1175 "FlickrPublishing.c"
+#line 1394 "FlickrPublishing.c"
}
-static void publishing_flickr_value_publishing_parameters_free_value (GValue* value) {
+static void
+publishing_flickr_value_publishing_parameters_free_value (GValue* value)
+{
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
if (value->data[0].v_pointer) {
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
publishing_flickr_publishing_parameters_unref (value->data[0].v_pointer);
-#line 1184 "FlickrPublishing.c"
+#line 1405 "FlickrPublishing.c"
}
}
-static void publishing_flickr_value_publishing_parameters_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+publishing_flickr_value_publishing_parameters_copy_value (const GValue* src_value,
+ GValue* dest_value)
+{
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
if (src_value->data[0].v_pointer) {
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
dest_value->data[0].v_pointer = publishing_flickr_publishing_parameters_ref (src_value->data[0].v_pointer);
-#line 1194 "FlickrPublishing.c"
+#line 1418 "FlickrPublishing.c"
} else {
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
dest_value->data[0].v_pointer = NULL;
-#line 1198 "FlickrPublishing.c"
+#line 1422 "FlickrPublishing.c"
}
}
-static gpointer publishing_flickr_value_publishing_parameters_peek_pointer (const GValue* value) {
+static gpointer
+publishing_flickr_value_publishing_parameters_peek_pointer (const GValue* value)
+{
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return value->data[0].v_pointer;
-#line 1206 "FlickrPublishing.c"
+#line 1432 "FlickrPublishing.c"
}
-static gchar* publishing_flickr_value_publishing_parameters_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_flickr_value_publishing_parameters_collect_value (GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
if (collect_values[0].v_pointer) {
-#line 1213 "FlickrPublishing.c"
+#line 1444 "FlickrPublishing.c"
PublishingFlickrPublishingParameters * object;
object = collect_values[0].v_pointer;
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
if (object->parent_instance.g_class == NULL) {
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1220 "FlickrPublishing.c"
+#line 1451 "FlickrPublishing.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1224 "FlickrPublishing.c"
+#line 1455 "FlickrPublishing.c"
}
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
value->data[0].v_pointer = publishing_flickr_publishing_parameters_ref (object);
-#line 1228 "FlickrPublishing.c"
+#line 1459 "FlickrPublishing.c"
} else {
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 1232 "FlickrPublishing.c"
+#line 1463 "FlickrPublishing.c"
}
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return NULL;
-#line 1236 "FlickrPublishing.c"
+#line 1467 "FlickrPublishing.c"
}
-static gchar* publishing_flickr_value_publishing_parameters_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_flickr_value_publishing_parameters_lcopy_value (const GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
PublishingFlickrPublishingParameters ** object_p;
object_p = collect_values[0].v_pointer;
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
if (!object_p) {
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1247 "FlickrPublishing.c"
+#line 1483 "FlickrPublishing.c"
}
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
if (!value->data[0].v_pointer) {
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
*object_p = NULL;
-#line 1253 "FlickrPublishing.c"
+#line 1489 "FlickrPublishing.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
*object_p = value->data[0].v_pointer;
-#line 1257 "FlickrPublishing.c"
+#line 1493 "FlickrPublishing.c"
} else {
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
*object_p = publishing_flickr_publishing_parameters_ref (value->data[0].v_pointer);
-#line 1261 "FlickrPublishing.c"
+#line 1497 "FlickrPublishing.c"
}
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return NULL;
-#line 1265 "FlickrPublishing.c"
+#line 1501 "FlickrPublishing.c"
}
-GParamSpec* publishing_flickr_param_spec_publishing_parameters (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+publishing_flickr_param_spec_publishing_parameters (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags)
+{
PublishingFlickrParamSpecPublishingParameters* spec;
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_FLICKR_TYPE_PUBLISHING_PARAMETERS), NULL);
@@ -1275,20 +1517,25 @@ GParamSpec* publishing_flickr_param_spec_publishing_parameters (const gchar* nam
G_PARAM_SPEC (spec)->value_type = object_type;
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return G_PARAM_SPEC (spec);
-#line 1279 "FlickrPublishing.c"
+#line 1521 "FlickrPublishing.c"
}
-gpointer publishing_flickr_value_get_publishing_parameters (const GValue* value) {
+gpointer
+publishing_flickr_value_get_publishing_parameters (const GValue* value)
+{
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FLICKR_TYPE_PUBLISHING_PARAMETERS), NULL);
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return value->data[0].v_pointer;
-#line 1288 "FlickrPublishing.c"
+#line 1532 "FlickrPublishing.c"
}
-void publishing_flickr_value_set_publishing_parameters (GValue* value, gpointer v_object) {
+void
+publishing_flickr_value_set_publishing_parameters (GValue* value,
+ gpointer v_object)
+{
PublishingFlickrPublishingParameters * old;
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FLICKR_TYPE_PUBLISHING_PARAMETERS));
@@ -1304,22 +1551,25 @@ void publishing_flickr_value_set_publishing_parameters (GValue* value, gpointer
value->data[0].v_pointer = v_object;
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
publishing_flickr_publishing_parameters_ref (value->data[0].v_pointer);
-#line 1308 "FlickrPublishing.c"
+#line 1555 "FlickrPublishing.c"
} else {
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 1312 "FlickrPublishing.c"
+#line 1559 "FlickrPublishing.c"
}
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
if (old) {
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
publishing_flickr_publishing_parameters_unref (old);
-#line 1318 "FlickrPublishing.c"
+#line 1565 "FlickrPublishing.c"
}
}
-void publishing_flickr_value_take_publishing_parameters (GValue* value, gpointer v_object) {
+void
+publishing_flickr_value_take_publishing_parameters (GValue* value,
+ gpointer v_object)
+{
PublishingFlickrPublishingParameters * old;
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FLICKR_TYPE_PUBLISHING_PARAMETERS));
@@ -1333,38 +1583,44 @@ void publishing_flickr_value_take_publishing_parameters (GValue* value, gpointer
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
value->data[0].v_pointer = v_object;
-#line 1337 "FlickrPublishing.c"
+#line 1587 "FlickrPublishing.c"
} else {
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 1341 "FlickrPublishing.c"
+#line 1591 "FlickrPublishing.c"
}
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
if (old) {
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
publishing_flickr_publishing_parameters_unref (old);
-#line 1347 "FlickrPublishing.c"
+#line 1597 "FlickrPublishing.c"
}
}
-static void publishing_flickr_publishing_parameters_class_init (PublishingFlickrPublishingParametersClass * klass) {
+static void
+publishing_flickr_publishing_parameters_class_init (PublishingFlickrPublishingParametersClass * klass)
+{
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
publishing_flickr_publishing_parameters_parent_class = g_type_class_peek_parent (klass);
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
((PublishingFlickrPublishingParametersClass *) klass)->finalize = publishing_flickr_publishing_parameters_finalize;
-#line 1357 "FlickrPublishing.c"
+#line 1609 "FlickrPublishing.c"
}
-static void publishing_flickr_publishing_parameters_instance_init (PublishingFlickrPublishingParameters * self) {
+static void
+publishing_flickr_publishing_parameters_instance_init (PublishingFlickrPublishingParameters * self)
+{
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
self->ref_count = 1;
-#line 1364 "FlickrPublishing.c"
+#line 1618 "FlickrPublishing.c"
}
-static void publishing_flickr_publishing_parameters_finalize (PublishingFlickrPublishingParameters * obj) {
+static void
+publishing_flickr_publishing_parameters_finalize (PublishingFlickrPublishingParameters * obj)
+{
PublishingFlickrPublishingParameters * self;
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_TYPE_PUBLISHING_PARAMETERS, PublishingFlickrPublishingParameters);
@@ -1374,11 +1630,13 @@ static void publishing_flickr_publishing_parameters_finalize (PublishingFlickrPu
_g_free0 (self->username);
#line 86 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_publishing_flickr_visibility_specification_unref0 (self->visibility_specification);
-#line 1378 "FlickrPublishing.c"
+#line 1634 "FlickrPublishing.c"
}
-GType publishing_flickr_publishing_parameters_get_type (void) {
+GType
+publishing_flickr_publishing_parameters_get_type (void)
+{
static volatile gsize publishing_flickr_publishing_parameters_type_id__volatile = 0;
if (g_once_init_enter (&publishing_flickr_publishing_parameters_type_id__volatile)) {
static const GTypeValueTable g_define_type_value_table = { publishing_flickr_value_publishing_parameters_init, publishing_flickr_value_publishing_parameters_free_value, publishing_flickr_value_publishing_parameters_copy_value, publishing_flickr_value_publishing_parameters_peek_pointer, "p", publishing_flickr_value_publishing_parameters_collect_value, "p", publishing_flickr_value_publishing_parameters_lcopy_value };
@@ -1392,18 +1650,22 @@ GType publishing_flickr_publishing_parameters_get_type (void) {
}
-gpointer publishing_flickr_publishing_parameters_ref (gpointer instance) {
+gpointer
+publishing_flickr_publishing_parameters_ref (gpointer instance)
+{
PublishingFlickrPublishingParameters * self;
self = instance;
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_atomic_int_inc (&self->ref_count);
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return instance;
-#line 1403 "FlickrPublishing.c"
+#line 1663 "FlickrPublishing.c"
}
-void publishing_flickr_publishing_parameters_unref (gpointer instance) {
+void
+publishing_flickr_publishing_parameters_unref (gpointer instance)
+{
PublishingFlickrPublishingParameters * self;
self = instance;
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -1412,31 +1674,35 @@ void publishing_flickr_publishing_parameters_unref (gpointer instance) {
PUBLISHING_FLICKR_PUBLISHING_PARAMETERS_GET_CLASS (self)->finalize (self);
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 1416 "FlickrPublishing.c"
+#line 1678 "FlickrPublishing.c"
}
}
-static void _publishing_flickr_flickr_publisher_on_session_authenticated_spit_publishing_authenticator_authenticated (SpitPublishingAuthenticator* _sender, gpointer self) {
+static void
+_publishing_flickr_flickr_publisher_on_session_authenticated_spit_publishing_authenticator_authenticated (SpitPublishingAuthenticator* _sender,
+ gpointer self)
+{
#line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
publishing_flickr_flickr_publisher_on_session_authenticated ((PublishingFlickrFlickrPublisher*) self);
-#line 1424 "FlickrPublishing.c"
+#line 1689 "FlickrPublishing.c"
}
-PublishingFlickrFlickrPublisher* publishing_flickr_flickr_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host) {
+PublishingFlickrFlickrPublisher*
+publishing_flickr_flickr_publisher_construct (GType object_type,
+ SpitPublishingService* service,
+ SpitPublishingPluginHost* host)
+{
PublishingFlickrFlickrPublisher * self = NULL;
SpitPublishingService* _tmp0_;
- SpitPublishingService* _tmp1_;
- SpitPublishingPluginHost* _tmp2_;
- SpitPublishingPluginHost* _tmp3_;
- PublishingRESTSupportOAuth1Session* _tmp4_;
- PublishingFlickrPublishingParameters* _tmp5_;
- PublishingAuthenticatorFactory* _tmp6_;
- PublishingAuthenticatorFactory* _tmp7_;
- SpitPublishingPluginHost* _tmp8_;
- SpitPublishingAuthenticator* _tmp9_;
- SpitPublishingAuthenticator* _tmp10_;
+ SpitPublishingPluginHost* _tmp1_;
+ PublishingRESTSupportOAuth1Session* _tmp2_;
+ PublishingFlickrPublishingParameters* _tmp3_;
+ PublishingAuthenticatorFactory* _tmp4_;
+ PublishingAuthenticatorFactory* _tmp5_;
+ SpitPublishingAuthenticator* _tmp6_;
+ SpitPublishingAuthenticator* _tmp7_;
#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_return_val_if_fail (SPIT_PUBLISHING_IS_SERVICE (service), NULL);
#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -1446,65 +1712,64 @@ PublishingFlickrFlickrPublisher* publishing_flickr_flickr_publisher_construct (G
#line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_debug ("FlickrPublishing.vala:106: FlickrPublisher instantiated.");
#line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp0_ = service;
-#line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp1_ = _g_object_ref0 (_tmp0_);
+ _tmp0_ = _g_object_ref0 (service);
#line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_g_object_unref0 (self->priv->service);
#line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- self->priv->service = _tmp1_;
-#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp2_ = host;
+ self->priv->service = _tmp0_;
#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp3_ = _g_object_ref0 (_tmp2_);
+ _tmp1_ = _g_object_ref0 (host);
#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_g_object_unref0 (self->priv->host);
#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- self->priv->host = _tmp3_;
+ self->priv->host = _tmp1_;
#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp4_ = publishing_rest_support_oauth1_session_new (PUBLISHING_FLICKR_ENDPOINT_URL);
+ _tmp2_ = publishing_rest_support_oauth1_session_new (PUBLISHING_FLICKR_ENDPOINT_URL);
#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_publishing_rest_support_session_unref0 (self->priv->session);
#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- self->priv->session = _tmp4_;
+ self->priv->session = _tmp2_;
#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp5_ = publishing_flickr_publishing_parameters_new ();
+ _tmp3_ = publishing_flickr_publishing_parameters_new ();
#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_publishing_flickr_publishing_parameters_unref0 (self->priv->parameters);
#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- self->priv->parameters = _tmp5_;
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp6_ = publishing_authenticator_factory_get_instance ();
+ self->priv->parameters = _tmp3_;
#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp7_ = _tmp6_;
+ _tmp4_ = publishing_authenticator_factory_get_instance ();
#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp8_ = host;
+ _tmp5_ = _tmp4_;
#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp9_ = spit_publishing_authenticator_factory_create (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, SPIT_PUBLISHING_TYPE_AUTHENTICATOR_FACTORY, SpitPublishingAuthenticatorFactory), "flickr", _tmp8_);
+ _tmp6_ = spit_publishing_authenticator_factory_create (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SPIT_PUBLISHING_TYPE_AUTHENTICATOR_FACTORY, SpitPublishingAuthenticatorFactory), "flickr", host);
#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_g_object_unref0 (self->priv->authenticator);
#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- self->priv->authenticator = _tmp9_;
+ self->priv->authenticator = _tmp6_;
#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _g_object_unref0 (_tmp7_);
+ _g_object_unref0 (_tmp5_);
#line 113 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp10_ = self->priv->authenticator;
+ _tmp7_ = self->priv->authenticator;
#line 113 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- g_signal_connect_object (_tmp10_, "authenticated", (GCallback) _publishing_flickr_flickr_publisher_on_session_authenticated_spit_publishing_authenticator_authenticated, self, 0);
+ g_signal_connect_object (_tmp7_, "authenticated", (GCallback) _publishing_flickr_flickr_publisher_on_session_authenticated_spit_publishing_authenticator_authenticated, self, 0);
#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return self;
-#line 1497 "FlickrPublishing.c"
+#line 1757 "FlickrPublishing.c"
}
-PublishingFlickrFlickrPublisher* publishing_flickr_flickr_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host) {
+PublishingFlickrFlickrPublisher*
+publishing_flickr_flickr_publisher_new (SpitPublishingService* service,
+ SpitPublishingPluginHost* host)
+{
#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return publishing_flickr_flickr_publisher_construct (PUBLISHING_FLICKR_TYPE_FLICKR_PUBLISHER, service, host);
-#line 1504 "FlickrPublishing.c"
+#line 1767 "FlickrPublishing.c"
}
-SpitPublishingAuthenticator* publishing_flickr_flickr_publisher_get_authenticator (PublishingFlickrFlickrPublisher* self) {
+SpitPublishingAuthenticator*
+publishing_flickr_flickr_publisher_get_authenticator (PublishingFlickrFlickrPublisher* self)
+{
SpitPublishingAuthenticator* result = NULL;
SpitPublishingAuthenticator* _tmp0_;
SpitPublishingAuthenticator* _tmp1_;
@@ -1518,109 +1783,109 @@ SpitPublishingAuthenticator* publishing_flickr_flickr_publisher_get_authenticato
result = _tmp1_;
#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return result;
-#line 1522 "FlickrPublishing.c"
+#line 1787 "FlickrPublishing.c"
}
-static gboolean publishing_flickr_flickr_publisher_get_persistent_strip_metadata (PublishingFlickrFlickrPublisher* self) {
+static gboolean
+publishing_flickr_flickr_publisher_get_persistent_strip_metadata (PublishingFlickrFlickrPublisher* self)
+{
gboolean result = FALSE;
SpitPublishingPluginHost* _tmp0_;
- gboolean _tmp1_;
#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_return_val_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self), FALSE);
#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_tmp0_ = self->priv->host;
#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp1_ = spit_host_interface_get_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "strip_metadata", FALSE);
-#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- result = _tmp1_;
+ result = spit_host_interface_get_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "strip_metadata", FALSE);
#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return result;
-#line 1540 "FlickrPublishing.c"
+#line 1804 "FlickrPublishing.c"
}
-static void publishing_flickr_flickr_publisher_set_persistent_strip_metadata (PublishingFlickrFlickrPublisher* self, gboolean strip_metadata) {
+static void
+publishing_flickr_flickr_publisher_set_persistent_strip_metadata (PublishingFlickrFlickrPublisher* self,
+ gboolean strip_metadata)
+{
SpitPublishingPluginHost* _tmp0_;
- gboolean _tmp1_;
#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_tmp0_ = self->priv->host;
#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp1_ = strip_metadata;
-#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "strip_metadata", _tmp1_);
-#line 1555 "FlickrPublishing.c"
+ spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "strip_metadata", strip_metadata);
+#line 1819 "FlickrPublishing.c"
}
-static gpointer _g_variant_ref0 (gpointer self) {
+static gpointer
+_g_variant_ref0 (gpointer self)
+{
#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return self ? g_variant_ref (self) : NULL;
-#line 1562 "FlickrPublishing.c"
+#line 1828 "FlickrPublishing.c"
}
-static void publishing_flickr_flickr_publisher_on_session_authenticated (PublishingFlickrFlickrPublisher* self) {
- gboolean _tmp0_;
+static void
+publishing_flickr_flickr_publisher_on_session_authenticated (PublishingFlickrFlickrPublisher* self)
+{
GHashTable* params = NULL;
- SpitPublishingAuthenticator* _tmp1_;
- GHashTable* _tmp2_;
+ SpitPublishingAuthenticator* _tmp0_;
+ GHashTable* _tmp1_;
GVariant* consumer_key = NULL;
GVariant* consumer_secret = NULL;
GVariant* auth_token = NULL;
GVariant* auth_token_secret = NULL;
GVariant* username = NULL;
- GHashTable* _tmp3_;
- gconstpointer _tmp4_ = NULL;
- GVariant* _tmp5_;
- GHashTable* _tmp6_;
- gconstpointer _tmp7_ = NULL;
- GVariant* _tmp8_;
- PublishingRESTSupportOAuth1Session* _tmp9_;
- GVariant* _tmp10_;
- const gchar* _tmp11_;
- GVariant* _tmp12_;
- const gchar* _tmp13_;
- GHashTable* _tmp14_;
- gconstpointer _tmp15_ = NULL;
- GVariant* _tmp16_;
- GHashTable* _tmp17_;
- gconstpointer _tmp18_ = NULL;
- GVariant* _tmp19_;
- GHashTable* _tmp20_;
- gconstpointer _tmp21_ = NULL;
- GVariant* _tmp22_;
- PublishingRESTSupportOAuth1Session* _tmp23_;
- GVariant* _tmp24_;
- const gchar* _tmp25_;
- GVariant* _tmp26_;
- const gchar* _tmp27_;
- GVariant* _tmp28_;
- const gchar* _tmp29_;
- PublishingFlickrPublishingParameters* _tmp30_;
- PublishingRESTSupportOAuth1Session* _tmp31_;
- gchar* _tmp32_;
+ GHashTable* _tmp2_;
+ gconstpointer _tmp3_ = NULL;
+ GVariant* _tmp4_;
+ GHashTable* _tmp5_;
+ gconstpointer _tmp6_ = NULL;
+ GVariant* _tmp7_;
+ PublishingRESTSupportOAuth1Session* _tmp8_;
+ GVariant* _tmp9_;
+ const gchar* _tmp10_;
+ GVariant* _tmp11_;
+ const gchar* _tmp12_;
+ GHashTable* _tmp13_;
+ gconstpointer _tmp14_ = NULL;
+ GVariant* _tmp15_;
+ GHashTable* _tmp16_;
+ gconstpointer _tmp17_ = NULL;
+ GVariant* _tmp18_;
+ GHashTable* _tmp19_;
+ gconstpointer _tmp20_ = NULL;
+ GVariant* _tmp21_;
+ PublishingRESTSupportOAuth1Session* _tmp22_;
+ GVariant* _tmp23_;
+ const gchar* _tmp24_;
+ GVariant* _tmp25_;
+ const gchar* _tmp26_;
+ GVariant* _tmp27_;
+ const gchar* _tmp28_;
+ PublishingFlickrPublishingParameters* _tmp29_;
+ PublishingRESTSupportOAuth1Session* _tmp30_;
+ gchar* _tmp31_;
#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- if (!_tmp0_) {
+ if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
#line 134 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return;
-#line 1614 "FlickrPublishing.c"
+#line 1879 "FlickrPublishing.c"
}
#line 136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_debug ("FlickrPublishing.vala:136: EVENT: a fully authenticated session has be" \
"come available");
#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp1_ = self->priv->authenticator;
+ _tmp0_ = self->priv->authenticator;
#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp2_ = spit_publishing_authenticator_get_authentication_parameter (_tmp1_);
+ _tmp1_ = spit_publishing_authenticator_get_authentication_parameter (_tmp0_);
#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- params = _tmp2_;
+ params = _tmp1_;
#line 139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
consumer_key = NULL;
#line 140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -1632,93 +1897,93 @@ static void publishing_flickr_flickr_publisher_on_session_authenticated (Publish
#line 143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
username = NULL;
#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp3_ = params;
+ _tmp2_ = params;
#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- g_hash_table_lookup_extended (_tmp3_, "ConsumerKey", NULL, &_tmp4_);
+ g_hash_table_lookup_extended (_tmp2_, "ConsumerKey", NULL, &_tmp3_);
#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_g_variant_unref0 (consumer_key);
#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp5_ = _g_variant_ref0 (_tmp4_);
+ _tmp4_ = _g_variant_ref0 (_tmp3_);
#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- consumer_key = _tmp5_;
+ consumer_key = _tmp4_;
#line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp6_ = params;
+ _tmp5_ = params;
#line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- g_hash_table_lookup_extended (_tmp6_, "ConsumerSecret", NULL, &_tmp7_);
+ g_hash_table_lookup_extended (_tmp5_, "ConsumerSecret", NULL, &_tmp6_);
#line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_g_variant_unref0 (consumer_secret);
#line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp8_ = _g_variant_ref0 (_tmp7_);
+ _tmp7_ = _g_variant_ref0 (_tmp6_);
#line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- consumer_secret = _tmp8_;
+ consumer_secret = _tmp7_;
#line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp9_ = self->priv->session;
+ _tmp8_ = self->priv->session;
#line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp10_ = consumer_key;
+ _tmp9_ = consumer_key;
#line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp11_ = g_variant_get_string (_tmp10_, NULL);
+ _tmp10_ = g_variant_get_string (_tmp9_, NULL);
#line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp12_ = consumer_secret;
+ _tmp11_ = consumer_secret;
#line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp13_ = g_variant_get_string (_tmp12_, NULL);
+ _tmp12_ = g_variant_get_string (_tmp11_, NULL);
#line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- publishing_rest_support_oauth1_session_set_api_credentials (_tmp9_, _tmp11_, _tmp13_);
+ publishing_rest_support_oauth1_session_set_api_credentials (_tmp8_, _tmp10_, _tmp12_);
#line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp14_ = params;
+ _tmp13_ = params;
#line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- g_hash_table_lookup_extended (_tmp14_, "AuthToken", NULL, &_tmp15_);
+ g_hash_table_lookup_extended (_tmp13_, "AuthToken", NULL, &_tmp14_);
#line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_g_variant_unref0 (auth_token);
#line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp16_ = _g_variant_ref0 (_tmp15_);
+ _tmp15_ = _g_variant_ref0 (_tmp14_);
#line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- auth_token = _tmp16_;
+ auth_token = _tmp15_;
#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp17_ = params;
+ _tmp16_ = params;
#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- g_hash_table_lookup_extended (_tmp17_, "AuthTokenSecret", NULL, &_tmp18_);
+ g_hash_table_lookup_extended (_tmp16_, "AuthTokenSecret", NULL, &_tmp17_);
#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_g_variant_unref0 (auth_token_secret);
#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp19_ = _g_variant_ref0 (_tmp18_);
+ _tmp18_ = _g_variant_ref0 (_tmp17_);
#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- auth_token_secret = _tmp19_;
+ auth_token_secret = _tmp18_;
#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp20_ = params;
+ _tmp19_ = params;
#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- g_hash_table_lookup_extended (_tmp20_, "Username", NULL, &_tmp21_);
+ g_hash_table_lookup_extended (_tmp19_, "Username", NULL, &_tmp20_);
#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_g_variant_unref0 (username);
#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp22_ = _g_variant_ref0 (_tmp21_);
+ _tmp21_ = _g_variant_ref0 (_tmp20_);
#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- username = _tmp22_;
+ username = _tmp21_;
#line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp23_ = self->priv->session;
+ _tmp22_ = self->priv->session;
#line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp24_ = auth_token;
+ _tmp23_ = auth_token;
#line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp25_ = g_variant_get_string (_tmp24_, NULL);
+ _tmp24_ = g_variant_get_string (_tmp23_, NULL);
#line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp26_ = auth_token_secret;
+ _tmp25_ = auth_token_secret;
#line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp27_ = g_variant_get_string (_tmp26_, NULL);
+ _tmp26_ = g_variant_get_string (_tmp25_, NULL);
#line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp28_ = username;
+ _tmp27_ = username;
#line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp29_ = g_variant_get_string (_tmp28_, NULL);
+ _tmp28_ = g_variant_get_string (_tmp27_, NULL);
#line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- publishing_rest_support_oauth1_session_set_access_phase_credentials (_tmp23_, _tmp25_, _tmp27_, _tmp29_);
+ publishing_rest_support_oauth1_session_set_access_phase_credentials (_tmp22_, _tmp24_, _tmp26_, _tmp28_);
#line 155 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp30_ = self->priv->parameters;
+ _tmp29_ = self->priv->parameters;
#line 155 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp31_ = self->priv->session;
+ _tmp30_ = self->priv->session;
#line 155 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp32_ = publishing_rest_support_oauth1_session_get_username (_tmp31_);
+ _tmp31_ = publishing_rest_support_oauth1_session_get_username (_tmp30_);
#line 155 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _g_free0 (_tmp30_->username);
+ _g_free0 (_tmp29_->username);
#line 155 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp30_->username = _tmp32_;
+ _tmp29_->username = _tmp31_;
#line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
publishing_flickr_flickr_publisher_do_fetch_account_info (self);
#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -1733,161 +1998,158 @@ static void publishing_flickr_flickr_publisher_on_session_authenticated (Publish
_g_variant_unref0 (consumer_key);
#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_g_hash_table_unref0 (params);
-#line 1736 "FlickrPublishing.c"
+#line 2001 "FlickrPublishing.c"
}
-static void _publishing_flickr_flickr_publisher_on_account_fetch_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
+static void
+_publishing_flickr_flickr_publisher_on_account_fetch_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+ gpointer self)
+{
#line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
publishing_flickr_flickr_publisher_on_account_fetch_txn_completed ((PublishingFlickrFlickrPublisher*) self, _sender);
-#line 1743 "FlickrPublishing.c"
+#line 2011 "FlickrPublishing.c"
}
-static void _publishing_flickr_flickr_publisher_on_account_fetch_txn_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
+static void
+_publishing_flickr_flickr_publisher_on_account_fetch_txn_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+ GError* err,
+ gpointer self)
+{
#line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
publishing_flickr_flickr_publisher_on_account_fetch_txn_error ((PublishingFlickrFlickrPublisher*) self, _sender, err);
-#line 1750 "FlickrPublishing.c"
+#line 2022 "FlickrPublishing.c"
}
-static void publishing_flickr_flickr_publisher_on_account_fetch_txn_completed (PublishingFlickrFlickrPublisher* self, PublishingRESTSupportTransaction* txn) {
- PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_flickr_flickr_publisher_on_account_fetch_txn_completed (PublishingFlickrFlickrPublisher* self,
+ PublishingRESTSupportTransaction* txn)
+{
+ guint _tmp0_;
guint _tmp1_;
- PublishingRESTSupportTransaction* _tmp2_;
- guint _tmp3_;
- gboolean _tmp4_;
- PublishingRESTSupportTransaction* _tmp5_;
- gchar* _tmp6_;
- gchar* _tmp7_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
#line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
#line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
#line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp0_ = txn;
-#line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
+ g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
#line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_flickr_flickr_publisher_on_account_fetch_txn_completed_publishing_rest_support_transaction_completed, self);
-#line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp2_ = txn;
+ g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_flickr_flickr_publisher_on_account_fetch_txn_completed_publishing_rest_support_transaction_completed, self);
#line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
+ g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
#line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_flickr_flickr_publisher_on_account_fetch_txn_error_publishing_rest_support_transaction_network_error, self);
+ g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_flickr_flickr_publisher_on_account_fetch_txn_error_publishing_rest_support_transaction_network_error, self);
#line 164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- if (!_tmp4_) {
+ if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
#line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return;
-#line 1785 "FlickrPublishing.c"
+#line 2050 "FlickrPublishing.c"
}
#line 167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_debug ("FlickrPublishing.vala:167: EVENT: account fetch transaction response r" \
"eceived over the network");
#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp5_ = txn;
-#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp6_ = publishing_rest_support_transaction_get_response (_tmp5_);
+ _tmp2_ = publishing_rest_support_transaction_get_response (txn);
#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp7_ = _tmp6_;
+ _tmp3_ = _tmp2_;
#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (self, _tmp7_);
+ publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (self, _tmp3_);
#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _g_free0 (_tmp7_);
-#line 1799 "FlickrPublishing.c"
+ _g_free0 (_tmp3_);
+#line 2062 "FlickrPublishing.c"
}
-static void publishing_flickr_flickr_publisher_on_account_fetch_txn_error (PublishingFlickrFlickrPublisher* self, PublishingRESTSupportTransaction* txn, GError* err) {
- PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_flickr_flickr_publisher_on_account_fetch_txn_error (PublishingFlickrFlickrPublisher* self,
+ PublishingRESTSupportTransaction* txn,
+ GError* err)
+{
+ guint _tmp0_;
guint _tmp1_;
- PublishingRESTSupportTransaction* _tmp2_;
- guint _tmp3_;
- gboolean _tmp4_;
- SpitPublishingPluginHost* _tmp5_;
- GError* _tmp6_;
+ SpitPublishingPluginHost* _tmp2_;
#line 171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
#line 171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp0_ = txn;
+ g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_flickr_flickr_publisher_on_account_fetch_txn_completed_publishing_rest_support_transaction_completed, self);
-#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp2_ = txn;
+ g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_flickr_flickr_publisher_on_account_fetch_txn_completed_publishing_rest_support_transaction_completed, self);
#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
+ g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_flickr_flickr_publisher_on_account_fetch_txn_error_publishing_rest_support_transaction_network_error, self);
+ g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_flickr_flickr_publisher_on_account_fetch_txn_error_publishing_rest_support_transaction_network_error, self);
#line 176 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 176 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- if (!_tmp4_) {
+ if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
#line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return;
-#line 1833 "FlickrPublishing.c"
+#line 2090 "FlickrPublishing.c"
}
#line 179 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_debug ("FlickrPublishing.vala:179: EVENT: account fetch transaction caused a n" \
"etwork error");
#line 180 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp5_ = self->priv->host;
-#line 180 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp6_ = err;
+ _tmp2_ = self->priv->host;
#line 180 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- spit_publishing_plugin_host_post_error (_tmp5_, _tmp6_);
-#line 1843 "FlickrPublishing.c"
+ spit_publishing_plugin_host_post_error (_tmp2_, err);
+#line 2098 "FlickrPublishing.c"
}
-static void publishing_flickr_flickr_publisher_on_account_info_available (PublishingFlickrFlickrPublisher* self) {
- gboolean _tmp0_;
+static void
+publishing_flickr_flickr_publisher_on_account_info_available (PublishingFlickrFlickrPublisher* self)
+{
#line 183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
#line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- if (!_tmp0_) {
+ if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
#line 185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return;
-#line 1857 "FlickrPublishing.c"
+#line 2111 "FlickrPublishing.c"
}
#line 187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_debug ("FlickrPublishing.vala:187: EVENT: account information has become avail" \
"able");
#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
publishing_flickr_flickr_publisher_do_show_publishing_options_pane (self);
-#line 1863 "FlickrPublishing.c"
+#line 2117 "FlickrPublishing.c"
}
-static void _publishing_flickr_flickr_publisher_on_publishing_options_pane_publish_publishing_flickr_publishing_options_pane_publish (PublishingFlickrPublishingOptionsPane* _sender, gboolean strip_metadata, gpointer self) {
+static void
+_publishing_flickr_flickr_publisher_on_publishing_options_pane_publish_publishing_flickr_publishing_options_pane_publish (PublishingFlickrPublishingOptionsPane* _sender,
+ gboolean strip_metadata,
+ gpointer self)
+{
#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
publishing_flickr_flickr_publisher_on_publishing_options_pane_publish ((PublishingFlickrFlickrPublisher*) self, strip_metadata);
-#line 1870 "FlickrPublishing.c"
+#line 2128 "FlickrPublishing.c"
}
-static void _publishing_flickr_flickr_publisher_on_publishing_options_pane_logout_publishing_flickr_publishing_options_pane_logout (PublishingFlickrPublishingOptionsPane* _sender, gpointer self) {
+static void
+_publishing_flickr_flickr_publisher_on_publishing_options_pane_logout_publishing_flickr_publishing_options_pane_logout (PublishingFlickrPublishingOptionsPane* _sender,
+ gpointer self)
+{
#line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
publishing_flickr_flickr_publisher_on_publishing_options_pane_logout ((PublishingFlickrFlickrPublisher*) self);
-#line 1877 "FlickrPublishing.c"
+#line 2138 "FlickrPublishing.c"
}
-static void publishing_flickr_flickr_publisher_on_publishing_options_pane_publish (PublishingFlickrFlickrPublisher* self, gboolean strip_metadata) {
+static void
+publishing_flickr_flickr_publisher_on_publishing_options_pane_publish (PublishingFlickrFlickrPublisher* self,
+ gboolean strip_metadata)
+{
PublishingFlickrPublishingOptionsPane* _tmp0_;
guint _tmp1_;
PublishingFlickrPublishingOptionsPane* _tmp2_;
guint _tmp3_;
- gboolean _tmp4_;
- gboolean _tmp5_;
#line 191 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -1903,30 +2165,27 @@ static void publishing_flickr_flickr_publisher_on_publishing_options_pane_publis
#line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_flickr_flickr_publisher_on_publishing_options_pane_logout_publishing_flickr_publishing_options_pane_logout, self);
#line 195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- if (!_tmp4_) {
+ if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
#line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return;
-#line 1908 "FlickrPublishing.c"
+#line 2168 "FlickrPublishing.c"
}
#line 198 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_debug ("FlickrPublishing.vala:198: EVENT: user clicked the 'Publish' button in" \
" the publishing options pane");
#line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp5_ = strip_metadata;
-#line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- publishing_flickr_flickr_publisher_do_publish (self, _tmp5_);
-#line 1916 "FlickrPublishing.c"
+ publishing_flickr_flickr_publisher_do_publish (self, strip_metadata);
+#line 2174 "FlickrPublishing.c"
}
-static void publishing_flickr_flickr_publisher_on_publishing_options_pane_logout (PublishingFlickrFlickrPublisher* self) {
+static void
+publishing_flickr_flickr_publisher_on_publishing_options_pane_logout (PublishingFlickrFlickrPublisher* self)
+{
PublishingFlickrPublishingOptionsPane* _tmp0_;
guint _tmp1_;
PublishingFlickrPublishingOptionsPane* _tmp2_;
guint _tmp3_;
- gboolean _tmp4_;
#line 202 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -1942,174 +2201,155 @@ static void publishing_flickr_flickr_publisher_on_publishing_options_pane_logout
#line 204 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_flickr_flickr_publisher_on_publishing_options_pane_logout_publishing_flickr_publishing_options_pane_logout, self);
#line 206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- if (!_tmp4_) {
+ if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
#line 207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return;
-#line 1946 "FlickrPublishing.c"
+#line 2203 "FlickrPublishing.c"
}
#line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_debug ("FlickrPublishing.vala:209: EVENT: user clicked the 'Logout' button in " \
"the publishing options pane");
#line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
publishing_flickr_flickr_publisher_do_logout (self);
-#line 1952 "FlickrPublishing.c"
+#line 2209 "FlickrPublishing.c"
}
-static void publishing_flickr_flickr_publisher_on_upload_status_updated (PublishingFlickrFlickrPublisher* self, gint file_number, gdouble completed_fraction) {
- gboolean _tmp0_;
- gdouble _tmp1_;
- SpitPublishingProgressCallback _tmp2_;
- void* _tmp2__target;
- SpitPublishingProgressCallback _tmp3_;
- void* _tmp3__target;
- gint _tmp4_;
- gdouble _tmp5_;
+static void
+publishing_flickr_flickr_publisher_on_upload_status_updated (PublishingFlickrFlickrPublisher* self,
+ gint file_number,
+ gdouble completed_fraction)
+{
+ SpitPublishingProgressCallback _tmp0_;
+ void* _tmp0__target;
+ SpitPublishingProgressCallback _tmp1_;
+ void* _tmp1__target;
#line 214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
#line 215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- if (!_tmp0_) {
+ if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
#line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return;
-#line 1973 "FlickrPublishing.c"
+#line 2228 "FlickrPublishing.c"
}
#line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp1_ = completed_fraction;
-#line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_debug ("FlickrPublishing.vala:218: EVENT: uploader reports upload %.2f percent" \
-" complete.", 100.0 * _tmp1_);
+" complete.", 100.0 * completed_fraction);
#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp2_ = self->priv->progress_reporter;
+ _tmp0_ = self->priv->progress_reporter;
#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp2__target = self->priv->progress_reporter_target;
+ _tmp0__target = self->priv->progress_reporter_target;
#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _vala_assert (_tmp2_ != NULL, "progress_reporter != null");
-#line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp3_ = self->priv->progress_reporter;
-#line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp3__target = self->priv->progress_reporter_target;
+ _vala_assert (_tmp0_ != NULL, "progress_reporter != null");
#line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp4_ = file_number;
+ _tmp1_ = self->priv->progress_reporter;
#line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp5_ = completed_fraction;
+ _tmp1__target = self->priv->progress_reporter_target;
#line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp3_ (_tmp4_, _tmp5_, _tmp3__target);
-#line 1995 "FlickrPublishing.c"
+ _tmp1_ (file_number, completed_fraction, _tmp1__target);
+#line 2244 "FlickrPublishing.c"
}
-static void _publishing_flickr_flickr_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender, gint num_photos_published, gpointer self) {
+static void
+_publishing_flickr_flickr_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender,
+ gint num_photos_published,
+ gpointer self)
+{
#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
publishing_flickr_flickr_publisher_on_upload_complete ((PublishingFlickrFlickrPublisher*) self, _sender, num_photos_published);
-#line 2002 "FlickrPublishing.c"
+#line 2255 "FlickrPublishing.c"
}
-static void _publishing_flickr_flickr_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender, GError* err, gpointer self) {
+static void
+_publishing_flickr_flickr_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender,
+ GError* err,
+ gpointer self)
+{
#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
publishing_flickr_flickr_publisher_on_upload_error ((PublishingFlickrFlickrPublisher*) self, _sender, err);
-#line 2009 "FlickrPublishing.c"
+#line 2266 "FlickrPublishing.c"
}
-static void publishing_flickr_flickr_publisher_on_upload_complete (PublishingFlickrFlickrPublisher* self, PublishingRESTSupportBatchUploader* uploader, gint num_published) {
- gboolean _tmp0_;
- gint _tmp1_;
- PublishingRESTSupportBatchUploader* _tmp2_;
- guint _tmp3_;
- PublishingRESTSupportBatchUploader* _tmp4_;
- guint _tmp5_;
+static void
+publishing_flickr_flickr_publisher_on_upload_complete (PublishingFlickrFlickrPublisher* self,
+ PublishingRESTSupportBatchUploader* uploader,
+ gint num_published)
+{
+ guint _tmp0_;
+ guint _tmp1_;
#line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
#line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (uploader));
#line 227 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 227 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- if (!_tmp0_) {
+ if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
#line 228 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return;
-#line 2030 "FlickrPublishing.c"
+#line 2285 "FlickrPublishing.c"
}
#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp1_ = num_published;
-#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_debug ("FlickrPublishing.vala:230: EVENT: uploader reports upload complete; %d" \
-" items published.", _tmp1_);
-#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp2_ = uploader;
+" items published.", num_published);
#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp3_, NULL, FALSE);
+ g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp0_, NULL, FALSE);
#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_flickr_flickr_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self);
-#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp4_ = uploader;
+ g_signal_handlers_disconnect_matched (uploader, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_flickr_flickr_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self);
#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp5_, NULL, FALSE);
+ g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp1_, NULL, FALSE);
#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _publishing_flickr_flickr_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self);
+ g_signal_handlers_disconnect_matched (uploader, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_flickr_flickr_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self);
#line 235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
publishing_flickr_flickr_publisher_do_show_success_pane (self);
-#line 2050 "FlickrPublishing.c"
+#line 2299 "FlickrPublishing.c"
}
-static void publishing_flickr_flickr_publisher_on_upload_error (PublishingFlickrFlickrPublisher* self, PublishingRESTSupportBatchUploader* uploader, GError* err) {
- gboolean _tmp0_;
- GError* _tmp1_;
- const gchar* _tmp2_;
- PublishingRESTSupportBatchUploader* _tmp3_;
- guint _tmp4_;
- PublishingRESTSupportBatchUploader* _tmp5_;
- guint _tmp6_;
- SpitPublishingPluginHost* _tmp7_;
- GError* _tmp8_;
+static void
+publishing_flickr_flickr_publisher_on_upload_error (PublishingFlickrFlickrPublisher* self,
+ PublishingRESTSupportBatchUploader* uploader,
+ GError* err)
+{
+ const gchar* _tmp0_;
+ guint _tmp1_;
+ guint _tmp2_;
+ SpitPublishingPluginHost* _tmp3_;
#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (uploader));
#line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- if (!_tmp0_) {
+ if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return;
-#line 2074 "FlickrPublishing.c"
+#line 2320 "FlickrPublishing.c"
}
#line 243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp1_ = err;
-#line 243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp2_ = _tmp1_->message;
+ _tmp0_ = err->message;
#line 243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_debug ("FlickrPublishing.vala:243: EVENT: uploader reports upload error = '%s'" \
-".", _tmp2_);
-#line 245 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp3_ = uploader;
+".", _tmp0_);
#line 245 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp4_, NULL, FALSE);
+ g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp1_, NULL, FALSE);
#line 245 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp3_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _publishing_flickr_flickr_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self);
+ g_signal_handlers_disconnect_matched (uploader, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_flickr_flickr_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self);
#line 246 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp5_ = uploader;
+ g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp2_, NULL, FALSE);
#line 246 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp6_, NULL, FALSE);
-#line 246 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp5_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp6_, 0, NULL, (GCallback) _publishing_flickr_flickr_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self);
+ g_signal_handlers_disconnect_matched (uploader, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _publishing_flickr_flickr_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self);
#line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp7_ = self->priv->host;
+ _tmp3_ = self->priv->host;
#line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp8_ = err;
-#line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- spit_publishing_plugin_host_post_error (_tmp7_, _tmp8_);
-#line 2100 "FlickrPublishing.c"
+ spit_publishing_plugin_host_post_error (_tmp3_, err);
+#line 2338 "FlickrPublishing.c"
}
-static void publishing_flickr_flickr_publisher_do_fetch_account_info (PublishingFlickrFlickrPublisher* self) {
+static void
+publishing_flickr_flickr_publisher_do_fetch_account_info (PublishingFlickrFlickrPublisher* self)
+{
SpitPublishingPluginHost* _tmp0_;
SpitPublishingPluginHost* _tmp1_;
PublishingFlickrAccountInfoFetchTransaction* txn = NULL;
@@ -2139,7 +2379,7 @@ static void publishing_flickr_flickr_publisher_do_fetch_account_info (Publishing
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_flickr_flickr_publisher_on_account_fetch_txn_completed_publishing_rest_support_transaction_completed, self, 0);
#line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_flickr_flickr_publisher_on_account_fetch_txn_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 2133 "FlickrPublishing.c"
+#line 2373 "FlickrPublishing.c"
{
#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
@@ -2147,7 +2387,7 @@ static void publishing_flickr_flickr_publisher_do_fetch_account_info (Publishing
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2141 "FlickrPublishing.c"
+#line 2381 "FlickrPublishing.c"
goto __catch13_spit_publishing_publishing_error;
}
#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -2158,7 +2398,7 @@ static void publishing_flickr_flickr_publisher_do_fetch_account_info (Publishing
g_clear_error (&_inner_error_);
#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return;
-#line 2152 "FlickrPublishing.c"
+#line 2392 "FlickrPublishing.c"
}
}
goto __finally13;
@@ -2179,7 +2419,7 @@ static void publishing_flickr_flickr_publisher_do_fetch_account_info (Publishing
spit_publishing_plugin_host_post_error (_tmp4_, _tmp5_);
#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_g_error_free0 (err);
-#line 2173 "FlickrPublishing.c"
+#line 2413 "FlickrPublishing.c"
}
__finally13:
#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -2192,88 +2432,83 @@ static void publishing_flickr_flickr_publisher_do_fetch_account_info (Publishing
g_clear_error (&_inner_error_);
#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return;
-#line 2186 "FlickrPublishing.c"
+#line 2426 "FlickrPublishing.c"
}
#line 251 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_publishing_rest_support_transaction_unref0 (txn);
-#line 2190 "FlickrPublishing.c"
+#line 2430 "FlickrPublishing.c"
}
-static gint64 int64_parse (const gchar* str) {
+static gint64
+int64_parse (const gchar* str)
+{
gint64 result = 0LL;
- const gchar* _tmp0_;
- gint64 _tmp1_;
-#line 687 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ gint64 _tmp0_;
+#line 687 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (str != NULL, 0LL);
-#line 688 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp0_ = str;
-#line 688 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp1_ = g_ascii_strtoll (_tmp0_, NULL, (guint) 0);
-#line 688 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- result = _tmp1_;
-#line 688 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 688 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp0_ = g_ascii_strtoll (str, NULL, (guint) 0);
+#line 688 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = _tmp0_;
+#line 688 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 2208 "FlickrPublishing.c"
+#line 2447 "FlickrPublishing.c"
}
-static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (PublishingFlickrFlickrPublisher* self, const gchar* xml) {
- const gchar* _tmp0_;
+static void
+publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (PublishingFlickrFlickrPublisher* self,
+ const gchar* xml)
+{
GError * _inner_error_ = NULL;
#line 268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
#line 268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_return_if_fail (xml != NULL);
#line 269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp0_ = xml;
-#line 269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_debug ("FlickrPublishing.vala:269: ACTION: parsing account information from xm" \
-"l = '%s'", _tmp0_);
-#line 2223 "FlickrPublishing.c"
+"l = '%s'", xml);
+#line 2462 "FlickrPublishing.c"
{
PublishingRESTSupportXmlDocument* response_doc = NULL;
- const gchar* _tmp1_;
- PublishingRESTSupportXmlDocument* _tmp2_;
+ PublishingRESTSupportXmlDocument* _tmp0_;
xmlNode* root_node = NULL;
+ PublishingRESTSupportXmlDocument* _tmp1_;
+ xmlNode* _tmp2_;
+ xmlNode* user_node = NULL;
PublishingRESTSupportXmlDocument* _tmp3_;
xmlNode* _tmp4_;
- xmlNode* user_node = NULL;
- PublishingRESTSupportXmlDocument* _tmp5_;
- xmlNode* _tmp6_;
- xmlNode* _tmp7_;
+ xmlNode* _tmp5_;
gchar* is_pro_str = NULL;
- PublishingRESTSupportXmlDocument* _tmp8_;
- xmlNode* _tmp9_;
- gchar* _tmp10_;
+ PublishingRESTSupportXmlDocument* _tmp6_;
+ xmlNode* _tmp7_;
+ gchar* _tmp8_;
xmlNode* bandwidth_node = NULL;
- PublishingRESTSupportXmlDocument* _tmp11_;
- xmlNode* _tmp12_;
- xmlNode* _tmp13_;
+ PublishingRESTSupportXmlDocument* _tmp9_;
+ xmlNode* _tmp10_;
+ xmlNode* _tmp11_;
gchar* remaining_kb_str = NULL;
- PublishingRESTSupportXmlDocument* _tmp14_;
- xmlNode* _tmp15_;
- gchar* _tmp16_;
+ PublishingRESTSupportXmlDocument* _tmp12_;
+ xmlNode* _tmp13_;
+ gchar* _tmp14_;
PublishingFlickrUserKind user_kind = 0;
- const gchar* _tmp17_;
+ const gchar* _tmp15_;
gint64 quota_bytes_left = 0LL;
- const gchar* _tmp20_;
- gint64 _tmp21_;
- PublishingFlickrPublishingParameters* _tmp22_;
- gint64 _tmp23_;
- PublishingFlickrPublishingParameters* _tmp24_;
- PublishingFlickrUserKind _tmp25_;
+ const gchar* _tmp18_;
+ PublishingFlickrPublishingParameters* _tmp19_;
+ gint64 _tmp20_;
+ PublishingFlickrPublishingParameters* _tmp21_;
+ PublishingFlickrUserKind _tmp22_;
#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp1_ = xml;
+ _tmp0_ = publishing_flickr_transaction_parse_flickr_response (xml, &_inner_error_);
#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp2_ = publishing_flickr_transaction_parse_flickr_response (_tmp1_, &_inner_error_);
-#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- response_doc = _tmp2_;
+ response_doc = _tmp0_;
#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2266 "FlickrPublishing.c"
+#line 2501 "FlickrPublishing.c"
goto __catch14_spit_publishing_publishing_error;
}
#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -2282,29 +2517,29 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P
g_clear_error (&_inner_error_);
#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return;
-#line 2275 "FlickrPublishing.c"
+#line 2510 "FlickrPublishing.c"
}
#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp3_ = response_doc;
+ _tmp1_ = response_doc;
#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp4_ = publishing_rest_support_xml_document_get_root_node (_tmp3_);
+ _tmp2_ = publishing_rest_support_xml_document_get_root_node (_tmp1_);
#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- root_node = _tmp4_;
+ root_node = _tmp2_;
#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp5_ = response_doc;
+ _tmp3_ = response_doc;
#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp6_ = root_node;
+ _tmp4_ = root_node;
#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp7_ = publishing_rest_support_xml_document_get_named_child (_tmp5_, _tmp6_, "user", &_inner_error_);
+ _tmp5_ = publishing_rest_support_xml_document_get_named_child (_tmp3_, _tmp4_, "user", &_inner_error_);
#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- user_node = _tmp7_;
+ user_node = _tmp5_;
#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_publishing_rest_support_xml_document_unref0 (response_doc);
#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2297 "FlickrPublishing.c"
+#line 2532 "FlickrPublishing.c"
goto __catch14_spit_publishing_publishing_error;
}
#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -2315,23 +2550,23 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P
g_clear_error (&_inner_error_);
#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return;
-#line 2308 "FlickrPublishing.c"
+#line 2543 "FlickrPublishing.c"
}
#line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp8_ = response_doc;
+ _tmp6_ = response_doc;
#line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp9_ = user_node;
+ _tmp7_ = user_node;
#line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp10_ = publishing_rest_support_xml_document_get_property_value (_tmp8_, _tmp9_, "ispro", &_inner_error_);
+ _tmp8_ = publishing_rest_support_xml_document_get_property_value (_tmp6_, _tmp7_, "ispro", &_inner_error_);
#line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- is_pro_str = _tmp10_;
+ is_pro_str = _tmp8_;
#line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_publishing_rest_support_xml_document_unref0 (response_doc);
#line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2324 "FlickrPublishing.c"
+#line 2559 "FlickrPublishing.c"
goto __catch14_spit_publishing_publishing_error;
}
#line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -2342,16 +2577,16 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P
g_clear_error (&_inner_error_);
#line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return;
-#line 2335 "FlickrPublishing.c"
+#line 2570 "FlickrPublishing.c"
}
#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp11_ = response_doc;
+ _tmp9_ = response_doc;
#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp12_ = user_node;
+ _tmp10_ = user_node;
#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp13_ = publishing_rest_support_xml_document_get_named_child (_tmp11_, _tmp12_, "bandwidth", &_inner_error_);
+ _tmp11_ = publishing_rest_support_xml_document_get_named_child (_tmp9_, _tmp10_, "bandwidth", &_inner_error_);
#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- bandwidth_node = _tmp13_;
+ bandwidth_node = _tmp11_;
#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -2360,7 +2595,7 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P
_publishing_rest_support_xml_document_unref0 (response_doc);
#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2353 "FlickrPublishing.c"
+#line 2588 "FlickrPublishing.c"
goto __catch14_spit_publishing_publishing_error;
}
#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -2373,16 +2608,16 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P
g_clear_error (&_inner_error_);
#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return;
-#line 2366 "FlickrPublishing.c"
+#line 2601 "FlickrPublishing.c"
}
#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp14_ = response_doc;
+ _tmp12_ = response_doc;
#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp15_ = bandwidth_node;
+ _tmp13_ = bandwidth_node;
#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp16_ = publishing_rest_support_xml_document_get_property_value (_tmp14_, _tmp15_, "remainingkb", &_inner_error_);
+ _tmp14_ = publishing_rest_support_xml_document_get_property_value (_tmp12_, _tmp13_, "remainingkb", &_inner_error_);
#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- remaining_kb_str = _tmp16_;
+ remaining_kb_str = _tmp14_;
#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -2391,7 +2626,7 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P
_publishing_rest_support_xml_document_unref0 (response_doc);
#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2384 "FlickrPublishing.c"
+#line 2619 "FlickrPublishing.c"
goto __catch14_spit_publishing_publishing_error;
}
#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -2404,30 +2639,30 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P
g_clear_error (&_inner_error_);
#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return;
-#line 2397 "FlickrPublishing.c"
+#line 2632 "FlickrPublishing.c"
}
#line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp17_ = is_pro_str;
+ _tmp15_ = is_pro_str;
#line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- if (g_strcmp0 (_tmp17_, "0") == 0) {
+ if (g_strcmp0 (_tmp15_, "0") == 0) {
#line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
user_kind = PUBLISHING_FLICKR_USER_KIND_FREE;
-#line 2405 "FlickrPublishing.c"
+#line 2640 "FlickrPublishing.c"
} else {
- const gchar* _tmp18_;
+ const gchar* _tmp16_;
#line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp18_ = is_pro_str;
+ _tmp16_ = is_pro_str;
#line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- if (g_strcmp0 (_tmp18_, "1") == 0) {
+ if (g_strcmp0 (_tmp16_, "1") == 0) {
#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
user_kind = PUBLISHING_FLICKR_USER_KIND_PRO;
-#line 2414 "FlickrPublishing.c"
+#line 2649 "FlickrPublishing.c"
} else {
- GError* _tmp19_;
+ GError* _tmp17_;
#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp19_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Unable to determine if user has free or pro account");
+ _tmp17_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Unable to determine if user has free or pro account");
#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _inner_error_ = _tmp19_;
+ _inner_error_ = _tmp17_;
#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_g_free0 (remaining_kb_str);
#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -2436,7 +2671,7 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P
_publishing_rest_support_xml_document_unref0 (response_doc);
#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2429 "FlickrPublishing.c"
+#line 2664 "FlickrPublishing.c"
goto __catch14_spit_publishing_publishing_error;
}
#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -2451,69 +2686,67 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P
g_clear_error (&_inner_error_);
#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return;
-#line 2444 "FlickrPublishing.c"
+#line 2679 "FlickrPublishing.c"
}
}
#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp20_ = remaining_kb_str;
+ _tmp18_ = remaining_kb_str;
#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp21_ = int64_parse (_tmp20_);
-#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- quota_bytes_left = _tmp21_ * 1024;
+ quota_bytes_left = int64_parse (_tmp18_) * 1024;
#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp22_ = self->priv->parameters;
+ _tmp19_ = self->priv->parameters;
#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp23_ = quota_bytes_left;
+ _tmp20_ = quota_bytes_left;
#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp22_->quota_free_bytes = _tmp23_;
+ _tmp19_->quota_free_bytes = _tmp20_;
#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp24_ = self->priv->parameters;
+ _tmp21_ = self->priv->parameters;
#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp25_ = user_kind;
+ _tmp22_ = user_kind;
#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp24_->user_kind = _tmp25_;
+ _tmp21_->user_kind = _tmp22_;
#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_g_free0 (remaining_kb_str);
#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_g_free0 (is_pro_str);
#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 2471 "FlickrPublishing.c"
+#line 2704 "FlickrPublishing.c"
}
goto __finally14;
__catch14_spit_publishing_publishing_error:
{
GError* err = NULL;
- GError* _tmp26_;
- SpitPublishingPluginHost* _tmp27_;
- GError* _tmp28_;
+ GError* _tmp23_;
+ SpitPublishingPluginHost* _tmp24_;
+ GError* _tmp25_;
#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
err = _inner_error_;
#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_inner_error_ = NULL;
#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp26_ = err;
+ _tmp23_ = err;
#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- if (g_error_matches (_tmp26_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_EXPIRED_SESSION)) {
+ if (g_error_matches (_tmp23_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_EXPIRED_SESSION)) {
#line 301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
publishing_flickr_flickr_publisher_do_logout (self);
#line 302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_g_error_free0 (err);
#line 302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return;
-#line 2494 "FlickrPublishing.c"
+#line 2727 "FlickrPublishing.c"
}
#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp27_ = self->priv->host;
+ _tmp24_ = self->priv->host;
#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp28_ = err;
+ _tmp25_ = err;
#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- spit_publishing_plugin_host_post_error (_tmp27_, _tmp28_);
+ spit_publishing_plugin_host_post_error (_tmp24_, _tmp25_);
#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_g_error_free0 (err);
#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return;
-#line 2506 "FlickrPublishing.c"
+#line 2739 "FlickrPublishing.c"
}
__finally14:
#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -2524,17 +2757,18 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P
g_clear_error (&_inner_error_);
#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return;
-#line 2517 "FlickrPublishing.c"
+#line 2750 "FlickrPublishing.c"
}
#line 309 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
publishing_flickr_flickr_publisher_on_account_info_available (self);
-#line 2521 "FlickrPublishing.c"
+#line 2754 "FlickrPublishing.c"
}
-static void publishing_flickr_flickr_publisher_do_logout (PublishingFlickrFlickrPublisher* self) {
+static void
+publishing_flickr_flickr_publisher_do_logout (PublishingFlickrFlickrPublisher* self)
+{
SpitPublishingAuthenticator* _tmp0_;
- gboolean _tmp1_;
#line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
#line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -2543,39 +2777,37 @@ static void publishing_flickr_flickr_publisher_do_logout (PublishingFlickrFlickr
#line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_tmp0_ = self->priv->authenticator;
#line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp1_ = spit_publishing_authenticator_can_logout (_tmp0_);
-#line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- if (_tmp1_) {
-#line 2538 "FlickrPublishing.c"
- SpitPublishingAuthenticator* _tmp2_;
+ if (spit_publishing_authenticator_can_logout (_tmp0_)) {
+#line 2770 "FlickrPublishing.c"
+ SpitPublishingAuthenticator* _tmp1_;
#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp2_ = self->priv->authenticator;
+ _tmp1_ = self->priv->authenticator;
#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- spit_publishing_authenticator_logout (_tmp2_);
-#line 2544 "FlickrPublishing.c"
+ spit_publishing_authenticator_logout (_tmp1_);
+#line 2776 "FlickrPublishing.c"
}
#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
self->priv->running = FALSE;
#line 321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
publishing_flickr_flickr_publisher_attempt_start (self);
-#line 2550 "FlickrPublishing.c"
+#line 2782 "FlickrPublishing.c"
}
-static void publishing_flickr_flickr_publisher_do_show_publishing_options_pane (PublishingFlickrFlickrPublisher* self) {
+static void
+publishing_flickr_flickr_publisher_do_show_publishing_options_pane (PublishingFlickrFlickrPublisher* self)
+{
SpitPublishingPluginHost* _tmp0_;
GtkBuilder* builder = NULL;
GtkBuilder* _tmp1_;
PublishingFlickrPublishingParameters* _tmp8_;
SpitPublishingPluginHost* _tmp9_;
- SpitPublishingPublisherMediaType _tmp10_;
- GtkBuilder* _tmp11_;
- gboolean _tmp12_;
+ GtkBuilder* _tmp10_;
+ PublishingFlickrPublishingOptionsPane* _tmp11_;
+ PublishingFlickrPublishingOptionsPane* _tmp12_;
PublishingFlickrPublishingOptionsPane* _tmp13_;
- PublishingFlickrPublishingOptionsPane* _tmp14_;
+ SpitPublishingPluginHost* _tmp14_;
PublishingFlickrPublishingOptionsPane* _tmp15_;
- SpitPublishingPluginHost* _tmp16_;
- PublishingFlickrPublishingOptionsPane* _tmp17_;
GError * _inner_error_ = NULL;
#line 324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
@@ -2589,7 +2821,7 @@ static void publishing_flickr_flickr_publisher_do_show_publishing_options_pane (
_tmp1_ = gtk_builder_new ();
#line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
builder = _tmp1_;
-#line 2581 "FlickrPublishing.c"
+#line 2813 "FlickrPublishing.c"
{
GtkBuilder* _tmp2_;
#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -2598,7 +2830,7 @@ static void publishing_flickr_flickr_publisher_do_show_publishing_options_pane (
gtk_builder_add_from_resource (_tmp2_, PLUGIN_RESOURCE_PATH "/" "flickr_publishing_options_pane.ui", &_inner_error_);
#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2590 "FlickrPublishing.c"
+#line 2822 "FlickrPublishing.c"
goto __catch15_g_error;
}
}
@@ -2638,7 +2870,7 @@ static void publishing_flickr_flickr_publisher_do_show_publishing_options_pane (
_g_object_unref0 (builder);
#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return;
-#line 2629 "FlickrPublishing.c"
+#line 2861 "FlickrPublishing.c"
}
__finally15:
#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -2651,161 +2883,154 @@ static void publishing_flickr_flickr_publisher_do_show_publishing_options_pane (
g_clear_error (&_inner_error_);
#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return;
-#line 2642 "FlickrPublishing.c"
+#line 2874 "FlickrPublishing.c"
}
#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_tmp8_ = self->priv->parameters;
#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_tmp9_ = self->priv->host;
#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp10_ = spit_publishing_plugin_host_get_publishable_media_type (_tmp9_);
-#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp11_ = builder;
+ _tmp10_ = builder;
#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp12_ = publishing_flickr_flickr_publisher_get_persistent_strip_metadata (self);
-#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp13_ = publishing_flickr_publishing_options_pane_new (self, _tmp8_, _tmp10_, _tmp11_, _tmp12_);
+ _tmp11_ = publishing_flickr_publishing_options_pane_new (self, _tmp8_, spit_publishing_plugin_host_get_publishable_media_type (_tmp9_), _tmp10_, publishing_flickr_flickr_publisher_get_persistent_strip_metadata (self));
#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_g_object_unref0 (self->priv->publishing_options_pane);
#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- self->priv->publishing_options_pane = _tmp13_;
+ self->priv->publishing_options_pane = _tmp11_;
#line 346 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp14_ = self->priv->publishing_options_pane;
+ _tmp12_ = self->priv->publishing_options_pane;
#line 346 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- g_signal_connect_object (_tmp14_, "publish", (GCallback) _publishing_flickr_flickr_publisher_on_publishing_options_pane_publish_publishing_flickr_publishing_options_pane_publish, self, 0);
+ g_signal_connect_object (_tmp12_, "publish", (GCallback) _publishing_flickr_flickr_publisher_on_publishing_options_pane_publish_publishing_flickr_publishing_options_pane_publish, self, 0);
#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp15_ = self->priv->publishing_options_pane;
+ _tmp13_ = self->priv->publishing_options_pane;
#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- g_signal_connect_object (_tmp15_, "logout", (GCallback) _publishing_flickr_flickr_publisher_on_publishing_options_pane_logout_publishing_flickr_publishing_options_pane_logout, self, 0);
+ g_signal_connect_object (_tmp13_, "logout", (GCallback) _publishing_flickr_flickr_publisher_on_publishing_options_pane_logout_publishing_flickr_publishing_options_pane_logout, self, 0);
#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp16_ = self->priv->host;
+ _tmp14_ = self->priv->host;
#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp17_ = self->priv->publishing_options_pane;
+ _tmp15_ = self->priv->publishing_options_pane;
#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- spit_publishing_plugin_host_install_dialog_pane (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
+ spit_publishing_plugin_host_install_dialog_pane (_tmp14_, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
#line 324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_g_object_unref0 (builder);
-#line 2676 "FlickrPublishing.c"
+#line 2904 "FlickrPublishing.c"
}
-gint publishing_flickr_flickr_publisher_flickr_date_time_compare_func (SpitPublishingPublishable* a, SpitPublishingPublishable* b) {
+gint
+publishing_flickr_flickr_publisher_flickr_date_time_compare_func (SpitPublishingPublishable* a,
+ SpitPublishingPublishable* b)
+{
gint result = 0;
- SpitPublishingPublishable* _tmp0_;
+ GDateTime* _tmp0_;
GDateTime* _tmp1_;
GDateTime* _tmp2_;
- SpitPublishingPublishable* _tmp3_;
- GDateTime* _tmp4_;
- GDateTime* _tmp5_;
- gint _tmp6_;
- gint _tmp7_;
+ GDateTime* _tmp3_;
+ gint _tmp4_;
#line 351 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (a), 0);
#line 351 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (b), 0);
#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp0_ = a;
-#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp1_ = spit_publishing_publishable_get_exposure_date_time (_tmp0_);
-#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp2_ = _tmp1_;
+ _tmp0_ = spit_publishing_publishable_get_exposure_date_time (a);
#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp3_ = b;
-#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp4_ = spit_publishing_publishable_get_exposure_date_time (_tmp3_);
+ _tmp1_ = _tmp0_;
#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp5_ = _tmp4_;
+ _tmp2_ = spit_publishing_publishable_get_exposure_date_time (b);
#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp6_ = g_date_time_compare (_tmp2_, _tmp5_);
+ _tmp3_ = _tmp2_;
#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp7_ = _tmp6_;
+ _tmp4_ = g_date_time_compare (_tmp1_, _tmp3_);
#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _g_date_time_unref0 (_tmp5_);
+ _g_date_time_unref0 (_tmp3_);
#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _g_date_time_unref0 (_tmp2_);
+ _g_date_time_unref0 (_tmp1_);
#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- result = _tmp7_;
+ result = _tmp4_;
#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return result;
-#line 2718 "FlickrPublishing.c"
+#line 2940 "FlickrPublishing.c"
}
-static gint _publishing_flickr_flickr_publisher_flickr_date_time_compare_func_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self) {
+static gint
+_publishing_flickr_flickr_publisher_flickr_date_time_compare_func_gcompare_data_func (gconstpointer a,
+ gconstpointer b,
+ gpointer self)
+{
gint result;
result = publishing_flickr_flickr_publisher_flickr_date_time_compare_func ((SpitPublishingPublishable*) a, (SpitPublishingPublishable*) b);
#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return result;
-#line 2727 "FlickrPublishing.c"
+#line 2953 "FlickrPublishing.c"
}
-static void _publishing_flickr_flickr_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self) {
+static void
+_publishing_flickr_flickr_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number,
+ gdouble fraction_complete,
+ gpointer self)
+{
#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
publishing_flickr_flickr_publisher_on_upload_status_updated ((PublishingFlickrFlickrPublisher*) self, file_number, fraction_complete);
-#line 2734 "FlickrPublishing.c"
+#line 2964 "FlickrPublishing.c"
}
-static void publishing_flickr_flickr_publisher_do_publish (PublishingFlickrFlickrPublisher* self, gboolean strip_metadata) {
- gboolean _tmp0_;
+static void
+publishing_flickr_flickr_publisher_do_publish (PublishingFlickrFlickrPublisher* self,
+ gboolean strip_metadata)
+{
+ SpitPublishingPluginHost* _tmp0_;
SpitPublishingPluginHost* _tmp1_;
- SpitPublishingPluginHost* _tmp2_;
- PublishingFlickrPublishingParameters* _tmp3_;
- gint _tmp4_;
- gboolean _tmp5_;
- void* _tmp6_;
- GDestroyNotify _tmp7_;
- SpitPublishingProgressCallback _tmp8_;
- gboolean _tmp9_;
+ PublishingFlickrPublishingParameters* _tmp2_;
+ gint _tmp3_;
+ void* _tmp4_;
+ GDestroyNotify _tmp5_;
+ SpitPublishingProgressCallback _tmp6_;
SpitPublishingPublishable** publishables = NULL;
- SpitPublishingPluginHost* _tmp10_;
- gint _tmp11_;
- SpitPublishingPublishable** _tmp12_;
+ SpitPublishingPluginHost* _tmp7_;
+ gint _tmp8_;
+ SpitPublishingPublishable** _tmp9_;
gint publishables_length1;
gint _publishables_size_;
GeeArrayList* sorted_list = NULL;
- GeeArrayList* _tmp13_;
- SpitPublishingPublishable** _tmp14_;
- gint _tmp14__length1;
- GeeArrayList* _tmp18_;
+ GeeArrayList* _tmp10_;
+ SpitPublishingPublishable** _tmp11_;
+ gint _tmp11__length1;
+ GeeArrayList* _tmp15_;
PublishingFlickrUploader* uploader = NULL;
- PublishingRESTSupportOAuth1Session* _tmp19_;
- GeeArrayList* _tmp20_;
- gint _tmp21_;
- gpointer* _tmp22_;
- SpitPublishingPublishable** _tmp23_;
- gint _tmp23__length1;
- PublishingFlickrPublishingParameters* _tmp24_;
- gboolean _tmp25_;
+ PublishingRESTSupportOAuth1Session* _tmp16_;
+ GeeArrayList* _tmp17_;
+ gint _tmp18_;
+ gpointer* _tmp19_;
+ SpitPublishingPublishable** _tmp20_;
+ gint _tmp20__length1;
+ PublishingFlickrPublishingParameters* _tmp21_;
+ PublishingFlickrUploader* _tmp22_;
+ PublishingFlickrUploader* _tmp23_;
+ PublishingFlickrUploader* _tmp24_;
+ PublishingFlickrUploader* _tmp25_;
PublishingFlickrUploader* _tmp26_;
- PublishingFlickrUploader* _tmp27_;
- PublishingFlickrUploader* _tmp28_;
- PublishingFlickrUploader* _tmp29_;
- PublishingFlickrUploader* _tmp30_;
#line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
#line 357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp0_ = strip_metadata;
-#line 357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- publishing_flickr_flickr_publisher_set_persistent_strip_metadata (self, _tmp0_);
+ publishing_flickr_flickr_publisher_set_persistent_strip_metadata (self, strip_metadata);
#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_debug ("FlickrPublishing.vala:358: ACTION: uploading media items to remote ser" \
"ver.");
#line 360 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp1_ = self->priv->host;
+ _tmp0_ = self->priv->host;
#line 360 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- spit_publishing_plugin_host_set_service_locked (_tmp1_, TRUE);
-#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp2_ = self->priv->host;
+ spit_publishing_plugin_host_set_service_locked (_tmp0_, TRUE);
#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp3_ = self->priv->parameters;
+ _tmp1_ = self->priv->host;
#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp4_ = _tmp3_->photo_major_axis_size;
+ _tmp2_ = self->priv->parameters;
#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp5_ = strip_metadata;
+ _tmp3_ = _tmp2_->photo_major_axis_size;
#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp8_ = spit_publishing_plugin_host_serialize_publishables (_tmp2_, _tmp4_, _tmp5_, &_tmp6_, &_tmp7_);
+ _tmp6_ = spit_publishing_plugin_host_serialize_publishables (_tmp1_, _tmp3_, strip_metadata, &_tmp4_, &_tmp5_);
#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
(self->priv->progress_reporter_target_destroy_notify == NULL) ? NULL : (self->priv->progress_reporter_target_destroy_notify (self->priv->progress_reporter_target), NULL);
#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -2815,121 +3040,119 @@ static void publishing_flickr_flickr_publisher_do_publish (PublishingFlickrFlick
#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
self->priv->progress_reporter_target_destroy_notify = NULL;
#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- self->priv->progress_reporter = _tmp8_;
+ self->priv->progress_reporter = _tmp6_;
#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- self->priv->progress_reporter_target = _tmp6_;
+ self->priv->progress_reporter_target = _tmp4_;
#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- self->priv->progress_reporter_target_destroy_notify = _tmp7_;
-#line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp9_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
+ self->priv->progress_reporter_target_destroy_notify = _tmp5_;
#line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- if (!_tmp9_) {
+ if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
#line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return;
-#line 2816 "FlickrPublishing.c"
+#line 3039 "FlickrPublishing.c"
}
#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp10_ = self->priv->host;
+ _tmp7_ = self->priv->host;
#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp12_ = spit_publishing_plugin_host_get_publishables (_tmp10_, &_tmp11_);
+ _tmp9_ = spit_publishing_plugin_host_get_publishables (_tmp7_, &_tmp8_);
#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- publishables = _tmp12_;
+ publishables = _tmp9_;
#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- publishables_length1 = _tmp11_;
+ publishables_length1 = _tmp8_;
#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_publishables_size_ = publishables_length1;
#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp13_ = gee_array_list_new (SPIT_PUBLISHING_TYPE_PUBLISHABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
+ _tmp10_ = gee_array_list_new (SPIT_PUBLISHING_TYPE_PUBLISHABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- sorted_list = _tmp13_;
+ sorted_list = _tmp10_;
#line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp14_ = publishables;
+ _tmp11_ = publishables;
#line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp14__length1 = publishables_length1;
-#line 2836 "FlickrPublishing.c"
+ _tmp11__length1 = publishables_length1;
+#line 3059 "FlickrPublishing.c"
{
SpitPublishingPublishable** p_collection = NULL;
gint p_collection_length1 = 0;
gint _p_collection_size_ = 0;
gint p_it = 0;
#line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- p_collection = _tmp14_;
+ p_collection = _tmp11_;
#line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- p_collection_length1 = _tmp14__length1;
+ p_collection_length1 = _tmp11__length1;
#line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- for (p_it = 0; p_it < _tmp14__length1; p_it = p_it + 1) {
-#line 2848 "FlickrPublishing.c"
- SpitPublishingPublishable* _tmp15_;
+ for (p_it = 0; p_it < _tmp11__length1; p_it = p_it + 1) {
+#line 3071 "FlickrPublishing.c"
+ SpitPublishingPublishable* _tmp12_;
SpitPublishingPublishable* p = NULL;
#line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp15_ = _g_object_ref0 (p_collection[p_it]);
+ _tmp12_ = _g_object_ref0 (p_collection[p_it]);
#line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- p = _tmp15_;
-#line 2855 "FlickrPublishing.c"
+ p = _tmp12_;
+#line 3078 "FlickrPublishing.c"
{
- GeeArrayList* _tmp16_;
- SpitPublishingPublishable* _tmp17_;
+ GeeArrayList* _tmp13_;
+ SpitPublishingPublishable* _tmp14_;
#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp16_ = sorted_list;
+ _tmp13_ = sorted_list;
#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp17_ = p;
+ _tmp14_ = p;
#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp17_);
+ gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp14_);
#line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_g_object_unref0 (p);
-#line 2867 "FlickrPublishing.c"
+#line 3090 "FlickrPublishing.c"
}
}
}
#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp18_ = sorted_list;
+ _tmp15_ = sorted_list;
#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- gee_list_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_LIST, GeeList), _publishing_flickr_flickr_publisher_flickr_date_time_compare_func_gcompare_data_func, NULL, NULL);
-#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp19_ = self->priv->session;
+ gee_list_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_LIST, GeeList), _publishing_flickr_flickr_publisher_flickr_date_time_compare_func_gcompare_data_func, NULL, NULL);
#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp20_ = sorted_list;
+ _tmp16_ = self->priv->session;
#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp22_ = gee_collection_to_array (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_COLLECTION, GeeCollection), &_tmp21_);
+ _tmp17_ = sorted_list;
#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp23_ = _tmp22_;
+ _tmp19_ = gee_collection_to_array (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_COLLECTION, GeeCollection), &_tmp18_);
#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp23__length1 = _tmp21_;
+ _tmp20_ = _tmp19_;
#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp24_ = self->priv->parameters;
+ _tmp20__length1 = _tmp18_;
#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp25_ = strip_metadata;
+ _tmp21_ = self->priv->parameters;
#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp26_ = publishing_flickr_uploader_new (_tmp19_, _tmp23_, _tmp21_, _tmp24_, _tmp25_);
+ _tmp22_ = publishing_flickr_uploader_new (_tmp16_, _tmp20_, _tmp18_, _tmp21_, strip_metadata);
#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp27_ = _tmp26_;
+ _tmp23_ = _tmp22_;
#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp23_ = (_vala_array_free (_tmp23_, _tmp23__length1, (GDestroyNotify) g_object_unref), NULL);
+ _tmp20_ = (_vala_array_free (_tmp20_, _tmp20__length1, (GDestroyNotify) g_object_unref), NULL);
#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- uploader = _tmp27_;
+ uploader = _tmp23_;
#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp28_ = uploader;
+ _tmp24_ = uploader;
#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), "upload-complete", (GCallback) _publishing_flickr_flickr_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self, 0);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), "upload-complete", (GCallback) _publishing_flickr_flickr_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self, 0);
#line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp29_ = uploader;
+ _tmp25_ = uploader;
#line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), "upload-error", (GCallback) _publishing_flickr_flickr_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self, 0);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), "upload-error", (GCallback) _publishing_flickr_flickr_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self, 0);
#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp30_ = uploader;
+ _tmp26_ = uploader;
#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- publishing_rest_support_batch_uploader_upload (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), _publishing_flickr_flickr_publisher_on_upload_status_updated_spit_publishing_progress_callback, self);
+ publishing_rest_support_batch_uploader_upload (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), _publishing_flickr_flickr_publisher_on_upload_status_updated_spit_publishing_progress_callback, self);
#line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_publishing_rest_support_batch_uploader_unref0 (uploader);
#line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_g_object_unref0 (sorted_list);
#line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
publishables = (_vala_array_free (publishables, publishables_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 2915 "FlickrPublishing.c"
+#line 3136 "FlickrPublishing.c"
}
-static void publishing_flickr_flickr_publisher_do_show_success_pane (PublishingFlickrFlickrPublisher* self) {
+static void
+publishing_flickr_flickr_publisher_do_show_success_pane (PublishingFlickrFlickrPublisher* self)
+{
SpitPublishingPluginHost* _tmp0_;
SpitPublishingPluginHost* _tmp1_;
#line 385 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -2944,77 +3167,77 @@ static void publishing_flickr_flickr_publisher_do_show_success_pane (PublishingF
_tmp1_ = self->priv->host;
#line 389 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
spit_publishing_plugin_host_install_success_pane (_tmp1_);
-#line 2934 "FlickrPublishing.c"
+#line 3157 "FlickrPublishing.c"
}
-gint publishing_flickr_flickr_publisher_get_persistent_visibility (PublishingFlickrFlickrPublisher* self) {
+gint
+publishing_flickr_flickr_publisher_get_persistent_visibility (PublishingFlickrFlickrPublisher* self)
+{
gint result = 0;
SpitPublishingPluginHost* _tmp0_;
- gint _tmp1_;
#line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_return_val_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self), 0);
#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_tmp0_ = self->priv->host;
#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp1_ = spit_host_interface_get_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "visibility", 0);
-#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- result = _tmp1_;
+ result = spit_host_interface_get_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "visibility", 0);
#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return result;
-#line 2952 "FlickrPublishing.c"
+#line 3174 "FlickrPublishing.c"
}
-void publishing_flickr_flickr_publisher_set_persistent_visibility (PublishingFlickrFlickrPublisher* self, gint vis) {
+void
+publishing_flickr_flickr_publisher_set_persistent_visibility (PublishingFlickrFlickrPublisher* self,
+ gint vis)
+{
SpitPublishingPluginHost* _tmp0_;
- gint _tmp1_;
#line 396 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
#line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_tmp0_ = self->priv->host;
#line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp1_ = vis;
-#line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "visibility", _tmp1_);
-#line 2967 "FlickrPublishing.c"
+ spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "visibility", vis);
+#line 3189 "FlickrPublishing.c"
}
-gint publishing_flickr_flickr_publisher_get_persistent_default_size (PublishingFlickrFlickrPublisher* self) {
+gint
+publishing_flickr_flickr_publisher_get_persistent_default_size (PublishingFlickrFlickrPublisher* self)
+{
gint result = 0;
SpitPublishingPluginHost* _tmp0_;
- gint _tmp1_;
#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_return_val_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self), 0);
#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_tmp0_ = self->priv->host;
#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp1_ = spit_host_interface_get_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "default_size", 1);
-#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- result = _tmp1_;
+ result = spit_host_interface_get_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "default_size", 1);
#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return result;
-#line 2985 "FlickrPublishing.c"
+#line 3206 "FlickrPublishing.c"
}
-void publishing_flickr_flickr_publisher_set_persistent_default_size (PublishingFlickrFlickrPublisher* self, gint size) {
+void
+publishing_flickr_flickr_publisher_set_persistent_default_size (PublishingFlickrFlickrPublisher* self,
+ gint size)
+{
SpitPublishingPluginHost* _tmp0_;
- gint _tmp1_;
#line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_tmp0_ = self->priv->host;
#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp1_ = size;
-#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "default_size", _tmp1_);
-#line 3000 "FlickrPublishing.c"
+ spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "default_size", size);
+#line 3221 "FlickrPublishing.c"
}
-static SpitPublishingService* publishing_flickr_flickr_publisher_real_get_service (SpitPublishingPublisher* base) {
+static SpitPublishingService*
+publishing_flickr_flickr_publisher_real_get_service (SpitPublishingPublisher* base)
+{
PublishingFlickrFlickrPublisher * self;
SpitPublishingService* result = NULL;
SpitPublishingService* _tmp0_;
@@ -3029,11 +3252,13 @@ static SpitPublishingService* publishing_flickr_flickr_publisher_real_get_servic
result = _tmp1_;
#line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return result;
-#line 3019 "FlickrPublishing.c"
+#line 3242 "FlickrPublishing.c"
}
-static gboolean publishing_flickr_flickr_publisher_real_is_running (SpitPublishingPublisher* base) {
+static gboolean
+publishing_flickr_flickr_publisher_real_is_running (SpitPublishingPublisher* base)
+{
PublishingFlickrFlickrPublisher * self;
gboolean result = FALSE;
gboolean _tmp0_;
@@ -3045,11 +3270,13 @@ static gboolean publishing_flickr_flickr_publisher_real_is_running (SpitPublishi
result = _tmp0_;
#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return result;
-#line 3035 "FlickrPublishing.c"
+#line 3260 "FlickrPublishing.c"
}
-static void publishing_flickr_flickr_publisher_attempt_start (PublishingFlickrFlickrPublisher* self) {
+static void
+publishing_flickr_flickr_publisher_attempt_start (PublishingFlickrFlickrPublisher* self)
+{
SpitPublishingAuthenticator* _tmp0_;
#line 418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
@@ -3061,42 +3288,43 @@ static void publishing_flickr_flickr_publisher_attempt_start (PublishingFlickrFl
_tmp0_ = self->priv->authenticator;
#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
spit_publishing_authenticator_authenticate (_tmp0_);
-#line 3051 "FlickrPublishing.c"
+#line 3278 "FlickrPublishing.c"
}
-static void publishing_flickr_flickr_publisher_real_start (SpitPublishingPublisher* base) {
+static void
+publishing_flickr_flickr_publisher_real_start (SpitPublishingPublisher* base)
+{
PublishingFlickrFlickrPublisher * self;
gboolean _tmp0_;
- gboolean _tmp1_;
#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_FLICKR_PUBLISHER, PublishingFlickrFlickrPublisher);
#line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- if (_tmp0_) {
+ if (spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
#line 427 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return;
-#line 3067 "FlickrPublishing.c"
+#line 3293 "FlickrPublishing.c"
}
#line 429 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp1_ = self->priv->was_started;
+ _tmp0_ = self->priv->was_started;
#line 429 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- if (_tmp1_) {
+ if (_tmp0_) {
#line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_error ("FlickrPublishing.vala:430: FlickrPublisher: start( ): can't start; thi" \
"s publisher is not restartable.");
-#line 3075 "FlickrPublishing.c"
+#line 3301 "FlickrPublishing.c"
}
#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_debug ("FlickrPublishing.vala:432: FlickrPublisher: starting interaction.");
#line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
publishing_flickr_flickr_publisher_attempt_start (self);
-#line 3081 "FlickrPublishing.c"
+#line 3307 "FlickrPublishing.c"
}
-static void publishing_flickr_flickr_publisher_real_stop (SpitPublishingPublisher* base) {
+static void
+publishing_flickr_flickr_publisher_real_stop (SpitPublishingPublisher* base)
+{
PublishingFlickrFlickrPublisher * self;
PublishingRESTSupportOAuth1Session* _tmp0_;
#line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -3107,32 +3335,36 @@ static void publishing_flickr_flickr_publisher_real_stop (SpitPublishingPublishe
_tmp0_ = self->priv->session;
#line 440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
if (_tmp0_ != NULL) {
-#line 3096 "FlickrPublishing.c"
+#line 3324 "FlickrPublishing.c"
PublishingRESTSupportOAuth1Session* _tmp1_;
#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_tmp1_ = self->priv->session;
#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
publishing_rest_support_session_stop_transactions (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 3102 "FlickrPublishing.c"
+#line 3330 "FlickrPublishing.c"
}
#line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
self->priv->running = FALSE;
-#line 3106 "FlickrPublishing.c"
+#line 3334 "FlickrPublishing.c"
}
-static void publishing_flickr_flickr_publisher_class_init (PublishingFlickrFlickrPublisherClass * klass) {
+static void
+publishing_flickr_flickr_publisher_class_init (PublishingFlickrFlickrPublisherClass * klass)
+{
#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
publishing_flickr_flickr_publisher_parent_class = g_type_class_peek_parent (klass);
#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_type_class_add_private (klass, sizeof (PublishingFlickrFlickrPublisherPrivate));
#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
G_OBJECT_CLASS (klass)->finalize = publishing_flickr_flickr_publisher_finalize;
-#line 3117 "FlickrPublishing.c"
+#line 3347 "FlickrPublishing.c"
}
-static void publishing_flickr_flickr_publisher_spit_publishing_publisher_interface_init (SpitPublishingPublisherIface * iface) {
+static void
+publishing_flickr_flickr_publisher_spit_publishing_publisher_interface_init (SpitPublishingPublisherIface * iface)
+{
#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
publishing_flickr_flickr_publisher_spit_publishing_publisher_parent_iface = g_type_interface_peek_parent (iface);
#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -3143,11 +3375,13 @@ static void publishing_flickr_flickr_publisher_spit_publishing_publisher_interfa
iface->start = (void (*) (SpitPublishingPublisher *)) publishing_flickr_flickr_publisher_real_start;
#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
iface->stop = (void (*) (SpitPublishingPublisher *)) publishing_flickr_flickr_publisher_real_stop;
-#line 3132 "FlickrPublishing.c"
+#line 3364 "FlickrPublishing.c"
}
-static void publishing_flickr_flickr_publisher_instance_init (PublishingFlickrFlickrPublisher * self) {
+static void
+publishing_flickr_flickr_publisher_instance_init (PublishingFlickrFlickrPublisher * self)
+{
#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
self->priv = PUBLISHING_FLICKR_FLICKR_PUBLISHER_GET_PRIVATE (self);
#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -3168,11 +3402,13 @@ static void publishing_flickr_flickr_publisher_instance_init (PublishingFlickrFl
self->priv->authenticator = NULL;
#line 102 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
self->priv->parameters = NULL;
-#line 3157 "FlickrPublishing.c"
+#line 3391 "FlickrPublishing.c"
}
-static void publishing_flickr_flickr_publisher_finalize (GObject * obj) {
+static void
+publishing_flickr_flickr_publisher_finalize (GObject * obj)
+{
PublishingFlickrFlickrPublisher * self;
SpitPublishingAuthenticator* _tmp0_;
guint _tmp1_;
@@ -3206,11 +3442,13 @@ static void publishing_flickr_flickr_publisher_finalize (GObject * obj) {
_publishing_flickr_publishing_parameters_unref0 (self->priv->parameters);
#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
G_OBJECT_CLASS (publishing_flickr_flickr_publisher_parent_class)->finalize (obj);
-#line 3195 "FlickrPublishing.c"
+#line 3431 "FlickrPublishing.c"
}
-GType publishing_flickr_flickr_publisher_get_type (void) {
+GType
+publishing_flickr_flickr_publisher_get_type (void)
+{
static volatile gsize publishing_flickr_flickr_publisher_type_id__volatile = 0;
if (g_once_init_enter (&publishing_flickr_flickr_publisher_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingFlickrFlickrPublisherClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_flickr_flickr_publisher_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingFlickrFlickrPublisher), 0, (GInstanceInitFunc) publishing_flickr_flickr_publisher_instance_init, NULL };
@@ -3224,86 +3462,82 @@ GType publishing_flickr_flickr_publisher_get_type (void) {
}
-gchar* publishing_flickr_transaction_validate_xml (PublishingRESTSupportXmlDocument* doc) {
+gchar*
+publishing_flickr_transaction_validate_xml (PublishingRESTSupportXmlDocument* doc)
+{
gchar* result = NULL;
xmlNode* root = NULL;
- PublishingRESTSupportXmlDocument* _tmp0_;
- xmlNode* _tmp1_;
+ xmlNode* _tmp0_;
gchar* status = NULL;
- xmlNode* _tmp2_;
- gchar* _tmp3_;
- const gchar* _tmp4_;
- const gchar* _tmp6_;
+ xmlNode* _tmp1_;
+ gchar* _tmp2_;
+ const gchar* _tmp3_;
+ const gchar* _tmp5_;
xmlNode* errcode = NULL;
- xmlNode* _tmp12_;
- gchar* _tmp13_;
+ xmlNode* _tmp10_;
+ gchar* _tmp11_;
+ gchar* _tmp12_;
+ xmlNode* _tmp13_;
gchar* _tmp14_;
- xmlNode* _tmp15_;
+ gchar* _tmp15_;
gchar* _tmp16_;
gchar* _tmp17_;
- gchar* _tmp18_;
- gchar* _tmp19_;
GError * _inner_error_ = NULL;
#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_XML_DOCUMENT (doc), NULL);
#line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp0_ = doc;
-#line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp1_ = publishing_rest_support_xml_document_get_root_node (_tmp0_);
+ _tmp0_ = publishing_rest_support_xml_document_get_root_node (doc);
#line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- root = _tmp1_;
+ root = _tmp0_;
#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp2_ = root;
+ _tmp1_ = root;
#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp3_ = (gchar*) xmlGetProp (_tmp2_, (xmlChar*) "stat");
+ _tmp2_ = (gchar*) xmlGetProp (_tmp1_, (xmlChar*) "stat");
#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- status = _tmp3_;
+ status = _tmp2_;
#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp4_ = status;
+ _tmp3_ = status;
#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- if (_tmp4_ == NULL) {
-#line 3251 "FlickrPublishing.c"
- gchar* _tmp5_;
+ if (_tmp3_ == NULL) {
+#line 3488 "FlickrPublishing.c"
+ gchar* _tmp4_;
#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp5_ = g_strdup ("No status property in root node");
+ _tmp4_ = g_strdup ("No status property in root node");
#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- result = _tmp5_;
+ result = _tmp4_;
#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_g_free0 (status);
#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return result;
-#line 3261 "FlickrPublishing.c"
+#line 3498 "FlickrPublishing.c"
}
#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp6_ = status;
+ _tmp5_ = status;
#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- if (g_strcmp0 (_tmp6_, "ok") == 0) {
+ if (g_strcmp0 (_tmp5_, "ok") == 0) {
#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
result = NULL;
#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_g_free0 (status);
#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return result;
-#line 3273 "FlickrPublishing.c"
+#line 3510 "FlickrPublishing.c"
}
{
- xmlNode* _tmp7_ = NULL;
- PublishingRESTSupportXmlDocument* _tmp8_;
- xmlNode* _tmp9_;
- xmlNode* _tmp10_;
-#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp8_ = doc;
+ xmlNode* _tmp6_ = NULL;
+ xmlNode* _tmp7_;
+ xmlNode* _tmp8_;
#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp9_ = root;
+ _tmp7_ = root;
#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp10_ = publishing_rest_support_xml_document_get_named_child (_tmp8_, _tmp9_, "err", &_inner_error_);
+ _tmp8_ = publishing_rest_support_xml_document_get_named_child (doc, _tmp7_, "err", &_inner_error_);
#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp7_ = _tmp10_;
+ _tmp6_ = _tmp8_;
#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3292 "FlickrPublishing.c"
+#line 3526 "FlickrPublishing.c"
goto __catch16_spit_publishing_publishing_error;
}
#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -3314,32 +3548,32 @@ gchar* publishing_flickr_transaction_validate_xml (PublishingRESTSupportXmlDocum
g_clear_error (&_inner_error_);
#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return NULL;
-#line 3303 "FlickrPublishing.c"
+#line 3537 "FlickrPublishing.c"
}
#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- errcode = _tmp7_;
-#line 3307 "FlickrPublishing.c"
+ errcode = _tmp6_;
+#line 3541 "FlickrPublishing.c"
}
goto __finally16;
__catch16_spit_publishing_publishing_error:
{
GError* err = NULL;
- gchar* _tmp11_;
+ gchar* _tmp9_;
#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
err = _inner_error_;
#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_inner_error_ = NULL;
#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp11_ = g_strdup ("No error code specified");
+ _tmp9_ = g_strdup ("No error code specified");
#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- result = _tmp11_;
+ result = _tmp9_;
#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_g_error_free0 (err);
#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_g_free0 (status);
#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return result;
-#line 3328 "FlickrPublishing.c"
+#line 3562 "FlickrPublishing.c"
}
__finally16:
#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -3352,75 +3586,83 @@ gchar* publishing_flickr_transaction_validate_xml (PublishingRESTSupportXmlDocum
g_clear_error (&_inner_error_);
#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return NULL;
-#line 3341 "FlickrPublishing.c"
+#line 3575 "FlickrPublishing.c"
}
#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp12_ = errcode;
+ _tmp10_ = errcode;
#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp13_ = (gchar*) xmlGetProp (_tmp12_, (xmlChar*) "msg");
+ _tmp11_ = (gchar*) xmlGetProp (_tmp10_, (xmlChar*) "msg");
#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp14_ = _tmp13_;
+ _tmp12_ = _tmp11_;
#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp15_ = errcode;
+ _tmp13_ = errcode;
#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp16_ = (gchar*) xmlGetProp (_tmp15_, (xmlChar*) "code");
+ _tmp14_ = (gchar*) xmlGetProp (_tmp13_, (xmlChar*) "code");
#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp17_ = _tmp16_;
+ _tmp15_ = _tmp14_;
#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp18_ = g_strdup_printf ("%s (error code %s)", _tmp14_, _tmp17_);
+ _tmp16_ = g_strdup_printf ("%s (error code %s)", _tmp12_, _tmp15_);
#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp19_ = _tmp18_;
+ _tmp17_ = _tmp16_;
#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _g_free0 (_tmp17_);
+ _g_free0 (_tmp15_);
#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _g_free0 (_tmp14_);
+ _g_free0 (_tmp12_);
#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- result = _tmp19_;
+ result = _tmp17_;
#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_g_free0 (status);
#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return result;
-#line 3369 "FlickrPublishing.c"
+#line 3603 "FlickrPublishing.c"
}
-static gchar* _publishing_flickr_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response (PublishingRESTSupportXmlDocument* doc, gpointer self) {
+static gchar*
+_publishing_flickr_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response (PublishingRESTSupportXmlDocument* doc,
+ gpointer self)
+{
gchar* result;
result = publishing_flickr_transaction_validate_xml (doc);
#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return result;
-#line 3378 "FlickrPublishing.c"
+#line 3615 "FlickrPublishing.c"
}
-static gboolean string_contains (const gchar* self, const gchar* needle) {
+static gboolean
+string_contains (const gchar* self,
+ const gchar* needle)
+{
gboolean result = FALSE;
- const gchar* _tmp0_;
- gchar* _tmp1_;
-#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ gchar* _tmp0_;
+#line 1417 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, FALSE);
-#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1417 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (needle != NULL, FALSE);
-#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp0_ = needle;
-#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- result = _tmp1_ != NULL;
-#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1418 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp0_ = strstr ((gchar*) self, (gchar*) needle);
+#line 1418 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = _tmp0_ != NULL;
+#line 1418 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 3398 "FlickrPublishing.c"
+#line 3635 "FlickrPublishing.c"
}
-static gpointer _g_error_copy0 (gpointer self) {
+static gpointer
+_g_error_copy0 (gpointer self)
+{
#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return self ? g_error_copy (self) : NULL;
-#line 3405 "FlickrPublishing.c"
+#line 3644 "FlickrPublishing.c"
}
-PublishingRESTSupportXmlDocument* publishing_flickr_transaction_parse_flickr_response (const gchar* xml, GError** error) {
+PublishingRESTSupportXmlDocument*
+publishing_flickr_transaction_parse_flickr_response (const gchar* xml,
+ GError** error)
+{
PublishingRESTSupportXmlDocument* result = NULL;
PublishingRESTSupportXmlDocument* _result_ = NULL;
GError * _inner_error_ = NULL;
@@ -3428,23 +3670,20 @@ PublishingRESTSupportXmlDocument* publishing_flickr_transaction_parse_flickr_res
g_return_val_if_fail (xml != NULL, NULL);
#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_result_ = NULL;
-#line 3417 "FlickrPublishing.c"
+#line 3659 "FlickrPublishing.c"
{
PublishingRESTSupportXmlDocument* _tmp0_ = NULL;
- const gchar* _tmp1_;
+ PublishingRESTSupportXmlDocument* _tmp1_;
PublishingRESTSupportXmlDocument* _tmp2_;
- PublishingRESTSupportXmlDocument* _tmp3_;
#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp1_ = xml;
+ _tmp1_ = publishing_rest_support_xml_document_parse_string (xml, _publishing_flickr_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response, NULL, &_inner_error_);
#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp2_ = publishing_rest_support_xml_document_parse_string (_tmp1_, _publishing_flickr_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response, NULL, &_inner_error_);
-#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp0_ = _tmp2_;
+ _tmp0_ = _tmp1_;
#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3433 "FlickrPublishing.c"
+#line 3672 "FlickrPublishing.c"
goto __catch17_spit_publishing_publishing_error;
}
#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -3455,83 +3694,80 @@ PublishingRESTSupportXmlDocument* publishing_flickr_transaction_parse_flickr_res
g_clear_error (&_inner_error_);
#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return NULL;
-#line 3444 "FlickrPublishing.c"
+#line 3683 "FlickrPublishing.c"
}
#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp3_ = _tmp0_;
+ _tmp2_ = _tmp0_;
#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_tmp0_ = NULL;
#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_publishing_rest_support_xml_document_unref0 (_result_);
#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _result_ = _tmp3_;
+ _result_ = _tmp2_;
#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_publishing_rest_support_xml_document_unref0 (_tmp0_);
-#line 3456 "FlickrPublishing.c"
+#line 3695 "FlickrPublishing.c"
}
goto __finally17;
__catch17_spit_publishing_publishing_error:
{
GError* e = NULL;
- GError* _tmp4_;
- const gchar* _tmp5_;
+ GError* _tmp3_;
+ const gchar* _tmp4_;
+ gchar* _tmp5_;
gchar* _tmp6_;
- gchar* _tmp7_;
- gboolean _tmp8_;
- gboolean _tmp9_;
+ gboolean _tmp7_;
#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
e = _inner_error_;
#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_inner_error_ = NULL;
#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp4_ = e;
+ _tmp3_ = e;
#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp5_ = _tmp4_->message;
+ _tmp4_ = _tmp3_->message;
#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp6_ = g_strdup_printf ("(error code %s)", PUBLISHING_FLICKR_EXPIRED_SESSION_ERROR_CODE);
+ _tmp5_ = g_strdup_printf ("(error code %s)", PUBLISHING_FLICKR_EXPIRED_SESSION_ERROR_CODE);
#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp7_ = _tmp6_;
-#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp8_ = string_contains (_tmp5_, _tmp7_);
+ _tmp6_ = _tmp5_;
#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp9_ = _tmp8_;
+ _tmp7_ = string_contains (_tmp4_, _tmp6_);
#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _g_free0 (_tmp7_);
+ _g_free0 (_tmp6_);
#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- if (_tmp9_) {
-#line 3488 "FlickrPublishing.c"
+ if (_tmp7_) {
+#line 3724 "FlickrPublishing.c"
+ GError* _tmp8_;
+ const gchar* _tmp9_;
GError* _tmp10_;
- const gchar* _tmp11_;
- GError* _tmp12_;
#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp10_ = e;
+ _tmp8_ = e;
#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp11_ = _tmp10_->message;
+ _tmp9_ = _tmp8_->message;
#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp12_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_EXPIRED_SESSION, _tmp11_);
+ _tmp10_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_EXPIRED_SESSION, _tmp9_);
#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _inner_error_ = _tmp12_;
+ _inner_error_ = _tmp10_;
#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_g_error_free0 (e);
-#line 3502 "FlickrPublishing.c"
+#line 3738 "FlickrPublishing.c"
goto __finally17;
} else {
- GError* _tmp13_;
- GError* _tmp14_;
+ GError* _tmp11_;
+ GError* _tmp12_;
#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp13_ = e;
+ _tmp11_ = e;
#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp14_ = _g_error_copy0 (_tmp13_);
+ _tmp12_ = _g_error_copy0 (_tmp11_);
#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _inner_error_ = _tmp14_;
+ _inner_error_ = _tmp12_;
#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_g_error_free0 (e);
-#line 3515 "FlickrPublishing.c"
+#line 3751 "FlickrPublishing.c"
goto __finally17;
}
#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_g_error_free0 (e);
-#line 3520 "FlickrPublishing.c"
+#line 3756 "FlickrPublishing.c"
}
__finally17:
#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -3544,7 +3780,7 @@ PublishingRESTSupportXmlDocument* publishing_flickr_transaction_parse_flickr_res
_publishing_rest_support_xml_document_unref0 (_result_);
#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return NULL;
-#line 3533 "FlickrPublishing.c"
+#line 3769 "FlickrPublishing.c"
} else {
#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_publishing_rest_support_xml_document_unref0 (_result_);
@@ -3554,53 +3790,61 @@ PublishingRESTSupportXmlDocument* publishing_flickr_transaction_parse_flickr_res
g_clear_error (&_inner_error_);
#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return NULL;
-#line 3543 "FlickrPublishing.c"
+#line 3779 "FlickrPublishing.c"
}
}
#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
result = _result_;
#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return result;
-#line 3550 "FlickrPublishing.c"
+#line 3786 "FlickrPublishing.c"
}
-PublishingFlickrAccountInfoFetchTransaction* publishing_flickr_account_info_fetch_transaction_construct (GType object_type, PublishingRESTSupportOAuth1Session* session) {
+PublishingFlickrAccountInfoFetchTransaction*
+publishing_flickr_account_info_fetch_transaction_construct (GType object_type,
+ PublishingRESTSupportOAuth1Session* session)
+{
PublishingFlickrAccountInfoFetchTransaction* self = NULL;
- PublishingRESTSupportOAuth1Session* _tmp0_;
#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION (session), NULL);
#line 499 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp0_ = session;
-#line 499 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- self = (PublishingFlickrAccountInfoFetchTransaction*) publishing_rest_support_oauth1_transaction_construct (object_type, _tmp0_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET);
+ self = (PublishingFlickrAccountInfoFetchTransaction*) publishing_rest_support_oauth1_transaction_construct (object_type, session, PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET);
#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "method", "flickr.people.getUploadStatus");
#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return self;
-#line 3567 "FlickrPublishing.c"
+#line 3803 "FlickrPublishing.c"
}
-PublishingFlickrAccountInfoFetchTransaction* publishing_flickr_account_info_fetch_transaction_new (PublishingRESTSupportOAuth1Session* session) {
+PublishingFlickrAccountInfoFetchTransaction*
+publishing_flickr_account_info_fetch_transaction_new (PublishingRESTSupportOAuth1Session* session)
+{
#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return publishing_flickr_account_info_fetch_transaction_construct (PUBLISHING_FLICKR_TYPE_ACCOUNT_INFO_FETCH_TRANSACTION, session);
-#line 3574 "FlickrPublishing.c"
+#line 3812 "FlickrPublishing.c"
}
-static void publishing_flickr_account_info_fetch_transaction_class_init (PublishingFlickrAccountInfoFetchTransactionClass * klass) {
+static void
+publishing_flickr_account_info_fetch_transaction_class_init (PublishingFlickrAccountInfoFetchTransactionClass * klass)
+{
#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
publishing_flickr_account_info_fetch_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 3581 "FlickrPublishing.c"
+#line 3821 "FlickrPublishing.c"
}
-static void publishing_flickr_account_info_fetch_transaction_instance_init (PublishingFlickrAccountInfoFetchTransaction * self) {
+static void
+publishing_flickr_account_info_fetch_transaction_instance_init (PublishingFlickrAccountInfoFetchTransaction * self)
+{
}
-GType publishing_flickr_account_info_fetch_transaction_get_type (void) {
+GType
+publishing_flickr_account_info_fetch_transaction_get_type (void)
+{
static volatile gsize publishing_flickr_account_info_fetch_transaction_type_id__volatile = 0;
if (g_once_init_enter (&publishing_flickr_account_info_fetch_transaction_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingFlickrAccountInfoFetchTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_flickr_account_info_fetch_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingFlickrAccountInfoFetchTransaction), 0, (GInstanceInitFunc) publishing_flickr_account_info_fetch_transaction_instance_init, NULL };
@@ -3612,60 +3856,61 @@ GType publishing_flickr_account_info_fetch_transaction_get_type (void) {
}
-static gpointer _publishing_flickr_publishing_parameters_ref0 (gpointer self) {
+static gpointer
+_publishing_flickr_publishing_parameters_ref0 (gpointer self)
+{
#line 511 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return self ? publishing_flickr_publishing_parameters_ref (self) : NULL;
-#line 3604 "FlickrPublishing.c"
+#line 3850 "FlickrPublishing.c"
}
-static void _g_free0_ (gpointer var) {
+static void
+_g_free0_ (gpointer var)
+{
#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
var = (g_free (var), NULL);
-#line 3611 "FlickrPublishing.c"
+#line 3859 "FlickrPublishing.c"
}
-PublishingFlickrUploadTransaction* publishing_flickr_upload_transaction_construct (GType object_type, PublishingRESTSupportOAuth1Session* session, PublishingFlickrPublishingParameters* parameters, SpitPublishingPublishable* publishable) {
+PublishingFlickrUploadTransaction*
+publishing_flickr_upload_transaction_construct (GType object_type,
+ PublishingRESTSupportOAuth1Session* session,
+ PublishingFlickrPublishingParameters* parameters,
+ SpitPublishingPublishable* publishable)
+{
PublishingFlickrUploadTransaction* self = NULL;
- PublishingRESTSupportOAuth1Session* _tmp0_;
- SpitPublishingPublishable* _tmp1_;
- PublishingFlickrPublishingParameters* _tmp2_;
- PublishingFlickrPublishingParameters* _tmp3_;
- PublishingFlickrPublishingParameters* _tmp4_;
+ PublishingFlickrPublishingParameters* _tmp0_;
+ PublishingFlickrVisibilitySpecification* _tmp1_;
+ gint _tmp2_;
+ gchar* _tmp3_;
+ gchar* _tmp4_;
PublishingFlickrVisibilitySpecification* _tmp5_;
gint _tmp6_;
gchar* _tmp7_;
gchar* _tmp8_;
- PublishingFlickrPublishingParameters* _tmp9_;
- PublishingFlickrVisibilitySpecification* _tmp10_;
- gint _tmp11_;
+ PublishingFlickrVisibilitySpecification* _tmp9_;
+ gint _tmp10_;
+ gchar* _tmp11_;
gchar* _tmp12_;
- gchar* _tmp13_;
- PublishingFlickrPublishingParameters* _tmp14_;
- PublishingFlickrVisibilitySpecification* _tmp15_;
- gint _tmp16_;
- gchar* _tmp17_;
- gchar* _tmp18_;
GHashTable* disposition_table = NULL;
- GHashFunc _tmp19_;
- GEqualFunc _tmp20_;
- GHashTable* _tmp21_;
+ GHashFunc _tmp13_;
+ GEqualFunc _tmp14_;
+ GHashTable* _tmp15_;
gchar* filename = NULL;
- SpitPublishingPublishable* _tmp22_;
+ gchar* _tmp16_;
+ gboolean _tmp17_ = FALSE;
+ const gchar* _tmp18_;
+ GHashTable* _tmp21_;
+ gchar* _tmp22_;
gchar* _tmp23_;
- gboolean _tmp24_ = FALSE;
- const gchar* _tmp25_;
+ gchar* _tmp24_;
+ gchar* _tmp25_;
+ GHashTable* _tmp26_;
+ gchar* _tmp27_;
+ gchar* _tmp28_;
GHashTable* _tmp29_;
- gchar* _tmp30_;
- SpitPublishingPublishable* _tmp31_;
- gchar* _tmp32_;
- gchar* _tmp33_;
- gchar* _tmp34_;
- GHashTable* _tmp35_;
- gchar* _tmp36_;
- gchar* _tmp37_;
- GHashTable* _tmp38_;
#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION (session), NULL);
#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -3673,151 +3918,139 @@ PublishingFlickrUploadTransaction* publishing_flickr_upload_transaction_construc
#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL);
#line 509 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp0_ = session;
-#line 509 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp1_ = publishable;
-#line 509 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- self = (PublishingFlickrUploadTransaction*) publishing_rest_support_oauth1_upload_transaction_construct (object_type, _tmp0_, _tmp1_, "https://api.flickr.com/services/upload");
-#line 511 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp2_ = parameters;
+ self = (PublishingFlickrUploadTransaction*) publishing_rest_support_oauth1_upload_transaction_construct (object_type, session, publishable, "https://api.flickr.com/services/upload");
#line 511 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp3_ = _publishing_flickr_publishing_parameters_ref0 (_tmp2_);
+ _tmp0_ = _publishing_flickr_publishing_parameters_ref0 (parameters);
#line 511 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_publishing_flickr_publishing_parameters_unref0 (self->priv->parameters);
#line 511 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- self->priv->parameters = _tmp3_;
-#line 513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp4_ = parameters;
+ self->priv->parameters = _tmp0_;
#line 513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp5_ = _tmp4_->visibility_specification;
+ _tmp1_ = parameters->visibility_specification;
#line 513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp6_ = _tmp5_->everyone_level;
+ _tmp2_ = _tmp1_->everyone_level;
#line 513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp7_ = g_strdup_printf ("%d", _tmp6_);
+ _tmp3_ = g_strdup_printf ("%d", _tmp2_);
#line 513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp8_ = _tmp7_;
+ _tmp4_ = _tmp3_;
#line 513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "is_public", _tmp8_);
+ publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "is_public", _tmp4_);
#line 513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _g_free0 (_tmp8_);
-#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp9_ = parameters;
+ _g_free0 (_tmp4_);
#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp10_ = _tmp9_->visibility_specification;
+ _tmp5_ = parameters->visibility_specification;
#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp11_ = _tmp10_->friends_level;
+ _tmp6_ = _tmp5_->friends_level;
#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp12_ = g_strdup_printf ("%d", _tmp11_);
+ _tmp7_ = g_strdup_printf ("%d", _tmp6_);
#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp13_ = _tmp12_;
+ _tmp8_ = _tmp7_;
#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "is_friend", _tmp13_);
+ publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "is_friend", _tmp8_);
#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _g_free0 (_tmp13_);
-#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp14_ = parameters;
+ _g_free0 (_tmp8_);
#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp15_ = _tmp14_->visibility_specification;
+ _tmp9_ = parameters->visibility_specification;
#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp16_ = _tmp15_->family_level;
+ _tmp10_ = _tmp9_->family_level;
#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp17_ = g_strdup_printf ("%d", _tmp16_);
+ _tmp11_ = g_strdup_printf ("%d", _tmp10_);
#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp18_ = _tmp17_;
+ _tmp12_ = _tmp11_;
#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "is_family", _tmp18_);
+ publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "is_family", _tmp12_);
#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _g_free0 (_tmp18_);
+ _g_free0 (_tmp12_);
#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp19_ = g_str_hash;
+ _tmp13_ = g_str_hash;
#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp20_ = g_str_equal;
+ _tmp14_ = g_str_equal;
#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp21_ = g_hash_table_new_full (_tmp19_, _tmp20_, _g_free0_, _g_free0_);
+ _tmp15_ = g_hash_table_new_full (_tmp13_, _tmp14_, _g_free0_, _g_free0_);
#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- disposition_table = _tmp21_;
-#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp22_ = publishable;
+ disposition_table = _tmp15_;
#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp23_ = spit_publishing_publishable_get_publishing_name (_tmp22_);
+ _tmp16_ = spit_publishing_publishable_get_publishing_name (publishable);
#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- filename = _tmp23_;
+ filename = _tmp16_;
#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp25_ = filename;
+ _tmp18_ = filename;
#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- if (_tmp25_ == NULL) {
+ if (_tmp18_ == NULL) {
#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp24_ = TRUE;
-#line 3737 "FlickrPublishing.c"
+ _tmp17_ = TRUE;
+#line 3968 "FlickrPublishing.c"
} else {
- const gchar* _tmp26_;
+ const gchar* _tmp19_;
#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp26_ = filename;
+ _tmp19_ = filename;
#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp24_ = g_strcmp0 (_tmp26_, "") == 0;
-#line 3744 "FlickrPublishing.c"
+ _tmp17_ = g_strcmp0 (_tmp19_, "") == 0;
+#line 3975 "FlickrPublishing.c"
}
#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- if (_tmp24_) {
-#line 3748 "FlickrPublishing.c"
- SpitPublishingPublishable* _tmp27_;
- gchar* _tmp28_;
-#line 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp27_ = publishable;
+ if (_tmp17_) {
+#line 3979 "FlickrPublishing.c"
+ gchar* _tmp20_;
#line 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp28_ = spit_publishing_publishable_get_param_string (_tmp27_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME);
+ _tmp20_ = spit_publishing_publishable_get_param_string (publishable, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME);
#line 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_g_free0 (filename);
#line 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- filename = _tmp28_;
-#line 3759 "FlickrPublishing.c"
+ filename = _tmp20_;
+#line 3987 "FlickrPublishing.c"
}
#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp29_ = disposition_table;
-#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp30_ = g_strdup ("filename");
+ _tmp21_ = disposition_table;
#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp31_ = publishable;
+ _tmp22_ = g_strdup ("filename");
#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp32_ = spit_publishing_publishable_get_param_string (_tmp31_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME);
+ _tmp23_ = spit_publishing_publishable_get_param_string (publishable, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME);
#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp33_ = _tmp32_;
+ _tmp24_ = _tmp23_;
#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp34_ = soup_uri_encode (_tmp33_, NULL);
+ _tmp25_ = soup_uri_encode (_tmp24_, NULL);
#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- g_hash_table_insert (_tmp29_, _tmp30_, _tmp34_);
+ g_hash_table_insert (_tmp21_, _tmp22_, _tmp25_);
#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _g_free0 (_tmp33_);
+ _g_free0 (_tmp24_);
#line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp35_ = disposition_table;
+ _tmp26_ = disposition_table;
#line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp36_ = g_strdup ("name");
+ _tmp27_ = g_strdup ("name");
#line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp37_ = g_strdup ("photo");
+ _tmp28_ = g_strdup ("photo");
#line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- g_hash_table_insert (_tmp35_, _tmp36_, _tmp37_);
+ g_hash_table_insert (_tmp26_, _tmp27_, _tmp28_);
#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp38_ = disposition_table;
+ _tmp29_ = disposition_table;
#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- publishing_rest_support_upload_transaction_set_binary_disposition_table (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction), _tmp38_);
+ publishing_rest_support_upload_transaction_set_binary_disposition_table (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction), _tmp29_);
#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_g_free0 (filename);
#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_g_hash_table_unref0 (disposition_table);
#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return self;
-#line 3795 "FlickrPublishing.c"
+#line 4021 "FlickrPublishing.c"
}
-PublishingFlickrUploadTransaction* publishing_flickr_upload_transaction_new (PublishingRESTSupportOAuth1Session* session, PublishingFlickrPublishingParameters* parameters, SpitPublishingPublishable* publishable) {
+PublishingFlickrUploadTransaction*
+publishing_flickr_upload_transaction_new (PublishingRESTSupportOAuth1Session* session,
+ PublishingFlickrPublishingParameters* parameters,
+ SpitPublishingPublishable* publishable)
+{
#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return publishing_flickr_upload_transaction_construct (PUBLISHING_FLICKR_TYPE_UPLOAD_TRANSACTION, session, parameters, publishable);
-#line 3802 "FlickrPublishing.c"
+#line 4032 "FlickrPublishing.c"
}
-static void publishing_flickr_upload_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error) {
+static void
+publishing_flickr_upload_transaction_real_execute (PublishingRESTSupportTransaction* base,
+ GError** error)
+{
PublishingFlickrUploadTransaction * self;
GError * _inner_error_ = NULL;
#line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -3834,7 +4067,7 @@ static void publishing_flickr_upload_transaction_real_execute (PublishingRESTSup
g_propagate_error (error, _inner_error_);
#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return;
-#line 3823 "FlickrPublishing.c"
+#line 4056 "FlickrPublishing.c"
} else {
#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3842,13 +4075,15 @@ static void publishing_flickr_upload_transaction_real_execute (PublishingRESTSup
g_clear_error (&_inner_error_);
#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return;
-#line 3831 "FlickrPublishing.c"
+#line 4064 "FlickrPublishing.c"
}
}
}
-static void publishing_flickr_upload_transaction_class_init (PublishingFlickrUploadTransactionClass * klass) {
+static void
+publishing_flickr_upload_transaction_class_init (PublishingFlickrUploadTransactionClass * klass)
+{
#line 504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
publishing_flickr_upload_transaction_parent_class = g_type_class_peek_parent (klass);
#line 504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -3857,18 +4092,22 @@ static void publishing_flickr_upload_transaction_class_init (PublishingFlickrUpl
g_type_class_add_private (klass, sizeof (PublishingFlickrUploadTransactionPrivate));
#line 504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*) (PublishingRESTSupportTransaction *, GError**)) publishing_flickr_upload_transaction_real_execute;
-#line 3846 "FlickrPublishing.c"
+#line 4081 "FlickrPublishing.c"
}
-static void publishing_flickr_upload_transaction_instance_init (PublishingFlickrUploadTransaction * self) {
+static void
+publishing_flickr_upload_transaction_instance_init (PublishingFlickrUploadTransaction * self)
+{
#line 504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
self->priv = PUBLISHING_FLICKR_UPLOAD_TRANSACTION_GET_PRIVATE (self);
-#line 3853 "FlickrPublishing.c"
+#line 4090 "FlickrPublishing.c"
}
-static void publishing_flickr_upload_transaction_finalize (PublishingRESTSupportTransaction * obj) {
+static void
+publishing_flickr_upload_transaction_finalize (PublishingRESTSupportTransaction * obj)
+{
PublishingFlickrUploadTransaction * self;
#line 504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_TYPE_UPLOAD_TRANSACTION, PublishingFlickrUploadTransaction);
@@ -3876,11 +4115,13 @@ static void publishing_flickr_upload_transaction_finalize (PublishingRESTSupport
_publishing_flickr_publishing_parameters_unref0 (self->priv->parameters);
#line 504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_flickr_upload_transaction_parent_class)->finalize (obj);
-#line 3865 "FlickrPublishing.c"
+#line 4104 "FlickrPublishing.c"
}
-GType publishing_flickr_upload_transaction_get_type (void) {
+GType
+publishing_flickr_upload_transaction_get_type (void)
+{
static volatile gsize publishing_flickr_upload_transaction_type_id__volatile = 0;
if (g_once_init_enter (&publishing_flickr_upload_transaction_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingFlickrUploadTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_flickr_upload_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingFlickrUploadTransaction), 0, (GInstanceInitFunc) publishing_flickr_upload_transaction_instance_init, NULL };
@@ -3892,103 +4133,108 @@ GType publishing_flickr_upload_transaction_get_type (void) {
}
-static void _publishing_flickr_publishing_options_pane_on_visibility_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
+static void
+_publishing_flickr_publishing_options_pane_on_visibility_changed_gtk_combo_box_changed (GtkComboBox* _sender,
+ gpointer self)
+{
#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
publishing_flickr_publishing_options_pane_on_visibility_changed ((PublishingFlickrPublishingOptionsPane*) self);
-#line 3884 "FlickrPublishing.c"
+#line 4128 "FlickrPublishing.c"
}
-static void _publishing_flickr_publishing_options_pane_on_size_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
+static void
+_publishing_flickr_publishing_options_pane_on_size_changed_gtk_combo_box_changed (GtkComboBox* _sender,
+ gpointer self)
+{
#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
publishing_flickr_publishing_options_pane_on_size_changed ((PublishingFlickrPublishingOptionsPane*) self);
-#line 3891 "FlickrPublishing.c"
+#line 4138 "FlickrPublishing.c"
}
-static void _publishing_flickr_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+_publishing_flickr_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender,
+ gpointer self)
+{
#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
publishing_flickr_publishing_options_pane_on_logout_clicked ((PublishingFlickrPublishingOptionsPane*) self);
-#line 3898 "FlickrPublishing.c"
+#line 4148 "FlickrPublishing.c"
}
-static void _publishing_flickr_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+_publishing_flickr_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender,
+ gpointer self)
+{
#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
publishing_flickr_publishing_options_pane_on_publish_clicked ((PublishingFlickrPublishingOptionsPane*) self);
-#line 3905 "FlickrPublishing.c"
+#line 4158 "FlickrPublishing.c"
}
-PublishingFlickrPublishingOptionsPane* publishing_flickr_publishing_options_pane_construct (GType object_type, PublishingFlickrFlickrPublisher* publisher, PublishingFlickrPublishingParameters* parameters, SpitPublishingPublisherMediaType media_type, GtkBuilder* builder, gboolean strip_metadata) {
+PublishingFlickrPublishingOptionsPane*
+publishing_flickr_publishing_options_pane_construct (GType object_type,
+ PublishingFlickrFlickrPublisher* publisher,
+ PublishingFlickrPublishingParameters* parameters,
+ SpitPublishingPublisherMediaType media_type,
+ GtkBuilder* builder,
+ gboolean strip_metadata)
+{
PublishingFlickrPublishingOptionsPane * self = NULL;
GtkBuilder* _tmp0_;
- GtkBuilder* _tmp1_;
- GtkBuilder* _tmp2_;
+ GSList* _tmp1_;
+ GSList* _tmp2_;
GtkBuilder* _tmp3_;
- GSList* _tmp4_;
- GSList* _tmp5_;
- guint _tmp6_;
- GtkBuilder* _tmp7_;
- GObject* _tmp8_;
- GtkBox* _tmp9_;
- GtkBuilder* _tmp10_;
- GObject* _tmp11_;
- GtkLabel* _tmp12_;
- GtkBuilder* _tmp13_;
- GObject* _tmp14_;
- GtkLabel* _tmp15_;
- GtkBuilder* _tmp16_;
- GObject* _tmp17_;
- GtkButton* _tmp18_;
- GtkBuilder* _tmp19_;
- GObject* _tmp20_;
- GtkButton* _tmp21_;
- GtkBuilder* _tmp22_;
- GObject* _tmp23_;
- GtkComboBoxText* _tmp24_;
- GtkBuilder* _tmp25_;
- GObject* _tmp26_;
- GtkComboBoxText* _tmp27_;
- GtkBuilder* _tmp28_;
- GObject* _tmp29_;
- GtkLabel* _tmp30_;
- GtkBuilder* _tmp31_;
- GObject* _tmp32_;
- GtkCheckButton* _tmp33_;
- PublishingFlickrFlickrPublisher* _tmp34_;
- SpitPublishingAuthenticator* _tmp35_;
- SpitPublishingAuthenticator* _tmp36_;
- gboolean _tmp37_;
- gboolean _tmp38_;
- PublishingFlickrPublishingParameters* _tmp43_;
- PublishingFlickrPublishingParameters* _tmp44_;
- PublishingFlickrFlickrPublisher* _tmp45_;
- PublishingFlickrFlickrPublisher* _tmp46_;
- SpitPublishingPublisherMediaType _tmp47_;
- gint _tmp48_;
- PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp49_;
- gint _tmp50_;
- PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp51_;
+ GObject* _tmp4_;
+ GtkBox* _tmp5_;
+ GtkBuilder* _tmp6_;
+ GObject* _tmp7_;
+ GtkLabel* _tmp8_;
+ GtkBuilder* _tmp9_;
+ GObject* _tmp10_;
+ GtkLabel* _tmp11_;
+ GtkBuilder* _tmp12_;
+ GObject* _tmp13_;
+ GtkButton* _tmp14_;
+ GtkBuilder* _tmp15_;
+ GObject* _tmp16_;
+ GtkButton* _tmp17_;
+ GtkBuilder* _tmp18_;
+ GObject* _tmp19_;
+ GtkComboBoxText* _tmp20_;
+ GtkBuilder* _tmp21_;
+ GObject* _tmp22_;
+ GtkComboBoxText* _tmp23_;
+ GtkBuilder* _tmp24_;
+ GObject* _tmp25_;
+ GtkLabel* _tmp26_;
+ GtkBuilder* _tmp27_;
+ GObject* _tmp28_;
+ GtkCheckButton* _tmp29_;
+ SpitPublishingAuthenticator* _tmp30_;
+ SpitPublishingAuthenticator* _tmp31_;
+ gboolean _tmp32_;
+ PublishingFlickrPublishingParameters* _tmp37_;
+ PublishingFlickrFlickrPublisher* _tmp38_;
+ gint _tmp39_;
+ PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp40_;
+ gint _tmp41_;
+ PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp42_;
gchar* upload_label_text = NULL;
- PublishingFlickrPublishingParameters* _tmp52_;
- const gchar* _tmp53_;
- gchar* _tmp54_;
- PublishingFlickrPublishingParameters* _tmp55_;
- PublishingFlickrUserKind _tmp56_;
- GtkLabel* _tmp67_;
- const gchar* _tmp68_;
+ const gchar* _tmp43_;
+ gchar* _tmp44_;
+ PublishingFlickrUserKind _tmp45_;
+ GtkLabel* _tmp55_;
+ const gchar* _tmp56_;
gchar* visibility_label_text = NULL;
- gchar* _tmp69_;
- SpitPublishingPublisherMediaType _tmp70_;
- GtkLabel* _tmp74_;
- const gchar* _tmp75_;
- GtkComboBoxText* _tmp76_;
- SpitPublishingPublisherMediaType _tmp77_;
- GtkCheckButton* _tmp81_;
- gboolean _tmp82_;
- GtkButton* _tmp83_;
- GtkButton* _tmp84_;
+ gchar* _tmp57_;
+ GtkLabel* _tmp60_;
+ const gchar* _tmp61_;
+ GtkComboBoxText* _tmp62_;
+ GtkCheckButton* _tmp66_;
+ GtkButton* _tmp67_;
+ GtkButton* _tmp68_;
#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_return_val_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (publisher), NULL);
#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -3998,390 +4244,366 @@ PublishingFlickrPublishingOptionsPane* publishing_flickr_publishing_options_pane
#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
self = (PublishingFlickrPublishingOptionsPane*) g_object_new (object_type, NULL);
#line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp0_ = builder;
-#line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp1_ = _g_object_ref0 (_tmp0_);
+ _tmp0_ = _g_object_ref0 (builder);
#line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_g_object_unref0 (self->priv->builder);
#line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- self->priv->builder = _tmp1_;
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp2_ = builder;
+ self->priv->builder = _tmp0_;
#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _vala_assert (_tmp2_ != NULL, "builder != null");
+ _vala_assert (builder != NULL, "builder != null");
#line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp3_ = builder;
+ _tmp1_ = gtk_builder_get_objects (builder);
#line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp4_ = gtk_builder_get_objects (_tmp3_);
-#line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp5_ = _tmp4_;
-#line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp6_ = g_slist_length (_tmp5_);
+ _tmp2_ = _tmp1_;
#line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _vala_assert (_tmp6_ > ((guint) 0), "builder.get_objects().length() > 0");
+ _vala_assert (g_slist_length (_tmp2_) > ((guint) 0), "builder.get_objects().length() > 0");
#line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _g_slist_free0 (_tmp5_);
+ _g_slist_free0 (_tmp2_);
#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp7_ = self->priv->builder;
+ _tmp3_ = self->priv->builder;
#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp8_ = gtk_builder_get_object (_tmp7_, "flickr_pane");
+ _tmp4_ = gtk_builder_get_object (_tmp3_, "flickr_pane");
#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp9_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_box_get_type (), GtkBox));
+ _tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_box_get_type (), GtkBox));
#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_g_object_unref0 (self->priv->pane_widget);
#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- self->priv->pane_widget = _tmp9_;
+ self->priv->pane_widget = _tmp5_;
#line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp10_ = self->priv->builder;
+ _tmp6_ = self->priv->builder;
#line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp11_ = gtk_builder_get_object (_tmp10_, "visibility_label");
+ _tmp7_ = gtk_builder_get_object (_tmp6_, "visibility_label");
#line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp12_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_label_get_type (), GtkLabel));
+ _tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_label_get_type (), GtkLabel));
#line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_g_object_unref0 (self->priv->visibility_label);
#line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- self->priv->visibility_label = _tmp12_;
+ self->priv->visibility_label = _tmp8_;
#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp13_ = self->priv->builder;
+ _tmp9_ = self->priv->builder;
#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp14_ = gtk_builder_get_object (_tmp13_, "upload_info_label");
+ _tmp10_ = gtk_builder_get_object (_tmp9_, "upload_info_label");
#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp15_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_label_get_type (), GtkLabel));
+ _tmp11_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_label_get_type (), GtkLabel));
#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_g_object_unref0 (self->priv->upload_info_label);
#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- self->priv->upload_info_label = _tmp15_;
+ self->priv->upload_info_label = _tmp11_;
#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp16_ = self->priv->builder;
+ _tmp12_ = self->priv->builder;
#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp17_ = gtk_builder_get_object (_tmp16_, "logout_button");
+ _tmp13_ = gtk_builder_get_object (_tmp12_, "logout_button");
#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp18_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_button_get_type (), GtkButton));
+ _tmp14_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_button_get_type (), GtkButton));
#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_g_object_unref0 (self->priv->logout_button);
#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- self->priv->logout_button = _tmp18_;
+ self->priv->logout_button = _tmp14_;
#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp19_ = self->priv->builder;
+ _tmp15_ = self->priv->builder;
#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp20_ = gtk_builder_get_object (_tmp19_, "publish_button");
+ _tmp16_ = gtk_builder_get_object (_tmp15_, "publish_button");
#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp21_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_button_get_type (), GtkButton));
+ _tmp17_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_button_get_type (), GtkButton));
#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_g_object_unref0 (self->priv->publish_button);
#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- self->priv->publish_button = _tmp21_;
+ self->priv->publish_button = _tmp17_;
#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp22_ = self->priv->builder;
+ _tmp18_ = self->priv->builder;
#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp23_ = gtk_builder_get_object (_tmp22_, "visibility_combo");
+ _tmp19_ = gtk_builder_get_object (_tmp18_, "visibility_combo");
#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp24_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_combo_box_text_get_type (), GtkComboBoxText));
+ _tmp20_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_combo_box_text_get_type (), GtkComboBoxText));
#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_g_object_unref0 (self->priv->visibility_combo);
#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- self->priv->visibility_combo = _tmp24_;
+ self->priv->visibility_combo = _tmp20_;
#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp25_ = self->priv->builder;
+ _tmp21_ = self->priv->builder;
#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp26_ = gtk_builder_get_object (_tmp25_, "size_combo");
+ _tmp22_ = gtk_builder_get_object (_tmp21_, "size_combo");
#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp27_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_combo_box_text_get_type (), GtkComboBoxText));
+ _tmp23_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_combo_box_text_get_type (), GtkComboBoxText));
#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_g_object_unref0 (self->priv->size_combo);
#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- self->priv->size_combo = _tmp27_;
+ self->priv->size_combo = _tmp23_;
#line 593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp28_ = self->priv->builder;
+ _tmp24_ = self->priv->builder;
#line 593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp29_ = gtk_builder_get_object (_tmp28_, "size_label");
+ _tmp25_ = gtk_builder_get_object (_tmp24_, "size_label");
#line 593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp30_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_label_get_type (), GtkLabel));
+ _tmp26_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_label_get_type (), GtkLabel));
#line 593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_g_object_unref0 (self->priv->size_label);
#line 593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- self->priv->size_label = _tmp30_;
+ self->priv->size_label = _tmp26_;
#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp31_ = self->priv->builder;
+ _tmp27_ = self->priv->builder;
#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp32_ = gtk_builder_get_object (_tmp31_, "strip_metadata_check");
+ _tmp28_ = gtk_builder_get_object (_tmp27_, "strip_metadata_check");
#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp33_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_check_button_get_type (), GtkCheckButton));
+ _tmp29_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_check_button_get_type (), GtkCheckButton));
#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_g_object_unref0 (self->priv->strip_metadata_check);
#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- self->priv->strip_metadata_check = _tmp33_;
-#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp34_ = publisher;
+ self->priv->strip_metadata_check = _tmp29_;
#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp35_ = publishing_flickr_flickr_publisher_get_authenticator (_tmp34_);
+ _tmp30_ = publishing_flickr_flickr_publisher_get_authenticator (publisher);
#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp36_ = _tmp35_;
+ _tmp31_ = _tmp30_;
#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp37_ = spit_publishing_authenticator_can_logout (_tmp36_);
+ _tmp32_ = !spit_publishing_authenticator_can_logout (_tmp31_);
#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp38_ = !_tmp37_;
+ _g_object_unref0 (_tmp31_);
#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _g_object_unref0 (_tmp36_);
-#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- if (_tmp38_) {
-#line 4114 "FlickrPublishing.c"
- GtkButton* _tmp39_;
- GtkContainer* _tmp40_;
- GtkContainer* _tmp41_;
- GtkButton* _tmp42_;
+ if (_tmp32_) {
+#line 4348 "FlickrPublishing.c"
+ GtkButton* _tmp33_;
+ GtkContainer* _tmp34_;
+ GtkContainer* _tmp35_;
+ GtkButton* _tmp36_;
#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp39_ = self->priv->logout_button;
+ _tmp33_ = self->priv->logout_button;
#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp40_ = gtk_widget_get_parent (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_widget_get_type (), GtkWidget));
+ _tmp34_ = gtk_widget_get_parent (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_widget_get_type (), GtkWidget));
#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp41_ = _tmp40_;
+ _tmp35_ = _tmp34_;
#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp42_ = self->priv->logout_button;
+ _tmp36_ = self->priv->logout_button;
#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- gtk_container_remove (_tmp41_, G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_widget_get_type (), GtkWidget));
-#line 4129 "FlickrPublishing.c"
+ gtk_container_remove (_tmp35_, G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_widget_get_type (), GtkWidget));
+#line 4363 "FlickrPublishing.c"
}
#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp43_ = parameters;
-#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp44_ = _publishing_flickr_publishing_parameters_ref0 (_tmp43_);
+ _tmp37_ = _publishing_flickr_publishing_parameters_ref0 (parameters);
#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_publishing_flickr_publishing_parameters_unref0 (self->priv->parameters);
#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- self->priv->parameters = _tmp44_;
+ self->priv->parameters = _tmp37_;
#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp45_ = publisher;
-#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp46_ = _g_object_ref0 (_tmp45_);
+ _tmp38_ = _g_object_ref0 (publisher);
#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_g_object_unref0 (self->priv->publisher);
#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- self->priv->publisher = _tmp46_;
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp47_ = media_type;
+ self->priv->publisher = _tmp38_;
#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- self->priv->media_type = _tmp47_;
+ self->priv->media_type = media_type;
#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp49_ = publishing_flickr_publishing_options_pane_create_visibilities (self, &_tmp48_);
+ _tmp40_ = publishing_flickr_publishing_options_pane_create_visibilities (self, &_tmp39_);
#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
self->priv->visibilities = (_vala_array_free (self->priv->visibilities, self->priv->visibilities_length1, (GDestroyNotify) publishing_flickr_publishing_options_pane_visibility_entry_unref), NULL);
#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- self->priv->visibilities = _tmp49_;
+ self->priv->visibilities = _tmp40_;
#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- self->priv->visibilities_length1 = _tmp48_;
+ self->priv->visibilities_length1 = _tmp39_;
#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
self->priv->_visibilities_size_ = self->priv->visibilities_length1;
#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp51_ = publishing_flickr_publishing_options_pane_create_sizes (self, &_tmp50_);
+ _tmp42_ = publishing_flickr_publishing_options_pane_create_sizes (self, &_tmp41_);
#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
self->priv->sizes = (_vala_array_free (self->priv->sizes, self->priv->sizes_length1, (GDestroyNotify) publishing_flickr_publishing_options_pane_size_entry_unref), NULL);
#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- self->priv->sizes = _tmp51_;
+ self->priv->sizes = _tmp42_;
#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- self->priv->sizes_length1 = _tmp50_;
+ self->priv->sizes_length1 = _tmp41_;
#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
self->priv->_sizes_size_ = self->priv->sizes_length1;
#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp52_ = parameters;
+ _tmp43_ = parameters->username;
#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp53_ = _tmp52_->username;
+ _tmp44_ = g_strdup_printf (_ ("You are logged into Flickr as %s.\n\n"), _tmp43_);
#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp54_ = g_strdup_printf (_ ("You are logged into Flickr as %s.\n\n"), _tmp53_);
-#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- upload_label_text = _tmp54_;
-#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp55_ = parameters;
+ upload_label_text = _tmp44_;
#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp56_ = _tmp55_->user_kind;
+ _tmp45_ = parameters->user_kind;
#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- if (_tmp56_ == PUBLISHING_FLICKR_USER_KIND_FREE) {
-#line 4185 "FlickrPublishing.c"
- const gchar* _tmp57_;
- PublishingFlickrPublishingParameters* _tmp58_;
- gint64 _tmp59_;
- gchar* _tmp60_;
- gchar* _tmp61_;
- gchar* _tmp62_;
- gchar* _tmp63_;
- gchar* _tmp64_;
-#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp57_ = upload_label_text;
+ if (_tmp45_ == PUBLISHING_FLICKR_USER_KIND_FREE) {
+#line 4409 "FlickrPublishing.c"
+ const gchar* _tmp46_;
+ gint64 _tmp47_;
+ gchar* _tmp48_;
+ gchar* _tmp49_;
+ gchar* _tmp50_;
+ gchar* _tmp51_;
+ gchar* _tmp52_;
#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp58_ = parameters;
+ _tmp46_ = upload_label_text;
#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp59_ = _tmp58_->quota_free_bytes;
+ _tmp47_ = parameters->quota_free_bytes;
#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp60_ = g_format_size_full ((guint64) _tmp59_, G_FORMAT_SIZE_LONG_FORMAT | G_FORMAT_SIZE_IEC_UNITS);
+ _tmp48_ = g_format_size_full ((guint64) _tmp47_, G_FORMAT_SIZE_LONG_FORMAT | G_FORMAT_SIZE_IEC_UNITS);
#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp61_ = _tmp60_;
+ _tmp49_ = _tmp48_;
#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp62_ = g_strdup_printf (_ ("Your free Flickr account limits how much data you can upload per month" \
+ _tmp50_ = g_strdup_printf (_ ("Your free Flickr account limits how much data you can upload per month" \
".\n" \
-"This month you have %s remaining in your upload quota."), _tmp61_);
+"This month you have %s remaining in your upload quota."), _tmp49_);
#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp63_ = _tmp62_;
+ _tmp51_ = _tmp50_;
#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp64_ = g_strconcat (_tmp57_, _tmp63_, NULL);
+ _tmp52_ = g_strconcat (_tmp46_, _tmp51_, NULL);
#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_g_free0 (upload_label_text);
#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- upload_label_text = _tmp64_;
+ upload_label_text = _tmp52_;
#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _g_free0 (_tmp63_);
+ _g_free0 (_tmp51_);
#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _g_free0 (_tmp61_);
-#line 4218 "FlickrPublishing.c"
+ _g_free0 (_tmp49_);
+#line 4439 "FlickrPublishing.c"
} else {
- const gchar* _tmp65_;
- gchar* _tmp66_;
+ const gchar* _tmp53_;
+ gchar* _tmp54_;
#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp65_ = upload_label_text;
+ _tmp53_ = upload_label_text;
#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp66_ = g_strconcat (_tmp65_, _ ("Your Flickr Pro account entitles you to unlimited uploads."), NULL);
+ _tmp54_ = g_strconcat (_tmp53_, _ ("Your Flickr Pro account entitles you to unlimited uploads."), NULL);
#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_g_free0 (upload_label_text);
#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- upload_label_text = _tmp66_;
-#line 4230 "FlickrPublishing.c"
+ upload_label_text = _tmp54_;
+#line 4451 "FlickrPublishing.c"
}
#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp67_ = self->priv->upload_info_label;
+ _tmp55_ = self->priv->upload_info_label;
#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp68_ = upload_label_text;
+ _tmp56_ = upload_label_text;
#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- gtk_label_set_label (_tmp67_, _tmp68_);
+ gtk_label_set_label (_tmp55_, _tmp56_);
#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp69_ = g_strdup (_ ("Photos _visible to:"));
+ _tmp57_ = g_strdup (_ ("Photos _visible to:"));
#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- visibility_label_text = _tmp69_;
+ visibility_label_text = _tmp57_;
#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp70_ = media_type;
-#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- if (_tmp70_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 4246 "FlickrPublishing.c"
- gchar* _tmp71_;
+ if (media_type == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
+#line 4465 "FlickrPublishing.c"
+ gchar* _tmp58_;
#line 618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp71_ = g_strdup (_ ("Videos _visible to:"));
+ _tmp58_ = g_strdup (_ ("Videos _visible to:"));
#line 618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_g_free0 (visibility_label_text);
#line 618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- visibility_label_text = _tmp71_;
-#line 4254 "FlickrPublishing.c"
+ visibility_label_text = _tmp58_;
+#line 4473 "FlickrPublishing.c"
} else {
- SpitPublishingPublisherMediaType _tmp72_;
-#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp72_ = media_type;
#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- if (_tmp72_ == (SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO | SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO)) {
-#line 4261 "FlickrPublishing.c"
- gchar* _tmp73_;
+ if (media_type == (SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO | SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO)) {
+#line 4477 "FlickrPublishing.c"
+ gchar* _tmp59_;
#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp73_ = g_strdup (_ ("Photos and videos _visible to:"));
+ _tmp59_ = g_strdup (_ ("Photos and videos _visible to:"));
#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_g_free0 (visibility_label_text);
#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- visibility_label_text = _tmp73_;
-#line 4269 "FlickrPublishing.c"
+ visibility_label_text = _tmp59_;
+#line 4485 "FlickrPublishing.c"
}
}
#line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp74_ = self->priv->visibility_label;
+ _tmp60_ = self->priv->visibility_label;
#line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp75_ = visibility_label_text;
+ _tmp61_ = visibility_label_text;
#line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- gtk_label_set_label (_tmp74_, _tmp75_);
+ gtk_label_set_label (_tmp60_, _tmp61_);
#line 626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
publishing_flickr_publishing_options_pane_populate_visibility_combo (self);
#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp76_ = self->priv->visibility_combo;
+ _tmp62_ = self->priv->visibility_combo;
#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _publishing_flickr_publishing_options_pane_on_visibility_changed_gtk_combo_box_changed, self, 0);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _publishing_flickr_publishing_options_pane_on_visibility_changed_gtk_combo_box_changed, self, 0);
#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp77_ = media_type;
-#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- if (_tmp77_ != SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 4288 "FlickrPublishing.c"
- GtkComboBoxText* _tmp78_;
+ if (media_type != SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
+#line 4502 "FlickrPublishing.c"
+ GtkComboBoxText* _tmp63_;
#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
publishing_flickr_publishing_options_pane_populate_size_combo (self);
#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp78_ = self->priv->size_combo;
+ _tmp63_ = self->priv->size_combo;
#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp78_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _publishing_flickr_publishing_options_pane_on_size_changed_gtk_combo_box_changed, self, 0);
-#line 4296 "FlickrPublishing.c"
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _publishing_flickr_publishing_options_pane_on_size_changed_gtk_combo_box_changed, self, 0);
+#line 4510 "FlickrPublishing.c"
} else {
- GtkComboBoxText* _tmp79_;
- GtkLabel* _tmp80_;
+ GtkComboBoxText* _tmp64_;
+ GtkLabel* _tmp65_;
#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp79_ = self->priv->size_combo;
+ _tmp64_ = self->priv->size_combo;
#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, gtk_widget_get_type (), GtkWidget), FALSE);
+ gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, gtk_widget_get_type (), GtkWidget), FALSE);
#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp80_ = self->priv->size_label;
+ _tmp65_ = self->priv->size_label;
#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 4308 "FlickrPublishing.c"
+ gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 4522 "FlickrPublishing.c"
}
#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp81_ = self->priv->strip_metadata_check;
-#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp82_ = strip_metadata;
+ _tmp66_ = self->priv->strip_metadata_check;
#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp81_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp82_);
+ gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, gtk_toggle_button_get_type (), GtkToggleButton), strip_metadata);
#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp83_ = self->priv->logout_button;
+ _tmp67_ = self->priv->logout_button;
#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- g_signal_connect_object (_tmp83_, "clicked", (GCallback) _publishing_flickr_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0);
+ g_signal_connect_object (_tmp67_, "clicked", (GCallback) _publishing_flickr_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0);
#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp84_ = self->priv->publish_button;
+ _tmp68_ = self->priv->publish_button;
#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- g_signal_connect_object (_tmp84_, "clicked", (GCallback) _publishing_flickr_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0);
+ g_signal_connect_object (_tmp68_, "clicked", (GCallback) _publishing_flickr_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0);
#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_g_free0 (visibility_label_text);
#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_g_free0 (upload_label_text);
#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return self;
-#line 4330 "FlickrPublishing.c"
+#line 4542 "FlickrPublishing.c"
}
-PublishingFlickrPublishingOptionsPane* publishing_flickr_publishing_options_pane_new (PublishingFlickrFlickrPublisher* publisher, PublishingFlickrPublishingParameters* parameters, SpitPublishingPublisherMediaType media_type, GtkBuilder* builder, gboolean strip_metadata) {
+PublishingFlickrPublishingOptionsPane*
+publishing_flickr_publishing_options_pane_new (PublishingFlickrFlickrPublisher* publisher,
+ PublishingFlickrPublishingParameters* parameters,
+ SpitPublishingPublisherMediaType media_type,
+ GtkBuilder* builder,
+ gboolean strip_metadata)
+{
#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return publishing_flickr_publishing_options_pane_construct (PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, publisher, parameters, media_type, builder, strip_metadata);
-#line 4337 "FlickrPublishing.c"
+#line 4555 "FlickrPublishing.c"
}
-static void publishing_flickr_publishing_options_pane_on_logout_clicked (PublishingFlickrPublishingOptionsPane* self) {
+static void
+publishing_flickr_publishing_options_pane_on_logout_clicked (PublishingFlickrPublishingOptionsPane* self)
+{
#line 644 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self));
#line 645 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_signal_emit (self, publishing_flickr_publishing_options_pane_signals[PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL], 0);
-#line 4346 "FlickrPublishing.c"
+#line 4566 "FlickrPublishing.c"
}
-static gpointer _publishing_flickr_visibility_specification_ref0 (gpointer self) {
+static gpointer
+_publishing_flickr_visibility_specification_ref0 (gpointer self)
+{
#line 649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return self ? publishing_flickr_visibility_specification_ref (self) : NULL;
-#line 4353 "FlickrPublishing.c"
+#line 4575 "FlickrPublishing.c"
}
-static void publishing_flickr_publishing_options_pane_on_publish_clicked (PublishingFlickrPublishingOptionsPane* self) {
+static void
+publishing_flickr_publishing_options_pane_on_publish_clicked (PublishingFlickrPublishingOptionsPane* self)
+{
PublishingFlickrPublishingParameters* _tmp0_;
PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp1_;
gint _tmp1__length1;
GtkComboBoxText* _tmp2_;
- gint _tmp3_;
- PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp4_;
+ PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp3_;
+ PublishingFlickrVisibilitySpecification* _tmp4_;
PublishingFlickrVisibilitySpecification* _tmp5_;
- PublishingFlickrVisibilitySpecification* _tmp6_;
- SpitPublishingPublisherMediaType _tmp7_;
- GtkCheckButton* _tmp14_;
- gboolean _tmp15_;
+ SpitPublishingPublisherMediaType _tmp6_;
+ GtkCheckButton* _tmp12_;
#line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self));
#line 649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -4393,143 +4615,164 @@ static void publishing_flickr_publishing_options_pane_on_publish_clicked (Publis
#line 649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_tmp2_ = self->priv->visibility_combo;
#line 649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp3_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox));
+ _tmp3_ = _tmp1_[gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox))];
#line 649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp4_ = _tmp1_[_tmp3_];
+ _tmp4_ = _tmp3_->specification;
#line 649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp5_ = _tmp4_->specification;
-#line 649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp6_ = _publishing_flickr_visibility_specification_ref0 (_tmp5_);
+ _tmp5_ = _publishing_flickr_visibility_specification_ref0 (_tmp4_);
#line 649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_publishing_flickr_visibility_specification_unref0 (_tmp0_->visibility_specification);
#line 649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp0_->visibility_specification = _tmp6_;
+ _tmp0_->visibility_specification = _tmp5_;
#line 652 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp7_ = self->priv->media_type;
+ _tmp6_ = self->priv->media_type;
#line 652 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- if ((_tmp7_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) != 0) {
-#line 4395 "FlickrPublishing.c"
- PublishingFlickrPublishingParameters* _tmp8_;
- PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp9_;
- gint _tmp9__length1;
- GtkComboBoxText* _tmp10_;
+ if ((_tmp6_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) != 0) {
+#line 4615 "FlickrPublishing.c"
+ PublishingFlickrPublishingParameters* _tmp7_;
+ PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp8_;
+ gint _tmp8__length1;
+ GtkComboBoxText* _tmp9_;
+ PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp10_;
gint _tmp11_;
- PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp12_;
- gint _tmp13_;
-#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp8_ = self->priv->parameters;
#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp9_ = self->priv->sizes;
+ _tmp7_ = self->priv->parameters;
#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp9__length1 = self->priv->sizes_length1;
+ _tmp8_ = self->priv->sizes;
#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp10_ = self->priv->size_combo;
+ _tmp8__length1 = self->priv->sizes_length1;
#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp11_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_combo_box_get_type (), GtkComboBox));
+ _tmp9_ = self->priv->size_combo;
#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp12_ = _tmp9_[_tmp11_];
+ _tmp10_ = _tmp8_[gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_combo_box_get_type (), GtkComboBox))];
#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp13_ = _tmp12_->size;
+ _tmp11_ = _tmp10_->size;
#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp8_->photo_major_axis_size = _tmp13_;
-#line 4419 "FlickrPublishing.c"
+ _tmp7_->photo_major_axis_size = _tmp11_;
+#line 4636 "FlickrPublishing.c"
}
#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp14_ = self->priv->strip_metadata_check;
-#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp15_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_toggle_button_get_type (), GtkToggleButton));
+ _tmp12_ = self->priv->strip_metadata_check;
#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- g_signal_emit (self, publishing_flickr_publishing_options_pane_signals[PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0, _tmp15_);
-#line 4427 "FlickrPublishing.c"
+ g_signal_emit (self, publishing_flickr_publishing_options_pane_signals[PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0, gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_toggle_button_get_type (), GtkToggleButton)));
+#line 4642 "FlickrPublishing.c"
}
-static void _vala_array_add20 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) {
+static void
+_vala_array_add20 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array,
+ int* length,
+ int* size,
+ PublishingFlickrPublishingOptionsPaneVisibilityEntry* value)
+{
#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
if ((*length) == (*size)) {
#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
*array = g_renew (PublishingFlickrPublishingOptionsPaneVisibilityEntry*, *array, (*size) + 1);
-#line 4438 "FlickrPublishing.c"
+#line 4658 "FlickrPublishing.c"
}
#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
(*array)[(*length)++] = value;
#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
(*array)[*length] = NULL;
-#line 4444 "FlickrPublishing.c"
+#line 4664 "FlickrPublishing.c"
}
-static void _vala_array_add21 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) {
+static void
+_vala_array_add21 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array,
+ int* length,
+ int* size,
+ PublishingFlickrPublishingOptionsPaneVisibilityEntry* value)
+{
#line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
if ((*length) == (*size)) {
#line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
*array = g_renew (PublishingFlickrPublishingOptionsPaneVisibilityEntry*, *array, (*size) + 1);
-#line 4455 "FlickrPublishing.c"
+#line 4680 "FlickrPublishing.c"
}
#line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
(*array)[(*length)++] = value;
#line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
(*array)[*length] = NULL;
-#line 4461 "FlickrPublishing.c"
+#line 4686 "FlickrPublishing.c"
}
-static void _vala_array_add22 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) {
+static void
+_vala_array_add22 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array,
+ int* length,
+ int* size,
+ PublishingFlickrPublishingOptionsPaneVisibilityEntry* value)
+{
#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
if ((*length) == (*size)) {
#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
*array = g_renew (PublishingFlickrPublishingOptionsPaneVisibilityEntry*, *array, (*size) + 1);
-#line 4472 "FlickrPublishing.c"
+#line 4702 "FlickrPublishing.c"
}
#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
(*array)[(*length)++] = value;
#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
(*array)[*length] = NULL;
-#line 4478 "FlickrPublishing.c"
+#line 4708 "FlickrPublishing.c"
}
-static void _vala_array_add23 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) {
+static void
+_vala_array_add23 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array,
+ int* length,
+ int* size,
+ PublishingFlickrPublishingOptionsPaneVisibilityEntry* value)
+{
#line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
if ((*length) == (*size)) {
#line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
*array = g_renew (PublishingFlickrPublishingOptionsPaneVisibilityEntry*, *array, (*size) + 1);
-#line 4489 "FlickrPublishing.c"
+#line 4724 "FlickrPublishing.c"
}
#line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
(*array)[(*length)++] = value;
#line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
(*array)[*length] = NULL;
-#line 4495 "FlickrPublishing.c"
+#line 4730 "FlickrPublishing.c"
}
-static void _vala_array_add24 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) {
+static void
+_vala_array_add24 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array,
+ int* length,
+ int* size,
+ PublishingFlickrPublishingOptionsPaneVisibilityEntry* value)
+{
#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
if ((*length) == (*size)) {
#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
*array = g_renew (PublishingFlickrPublishingOptionsPaneVisibilityEntry*, *array, (*size) + 1);
-#line 4506 "FlickrPublishing.c"
+#line 4746 "FlickrPublishing.c"
}
#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
(*array)[(*length)++] = value;
#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
(*array)[*length] = NULL;
-#line 4512 "FlickrPublishing.c"
+#line 4752 "FlickrPublishing.c"
}
-static PublishingFlickrPublishingOptionsPaneVisibilityEntry** publishing_flickr_publishing_options_pane_create_visibilities (PublishingFlickrPublishingOptionsPane* self, int* result_length1) {
+static PublishingFlickrPublishingOptionsPaneVisibilityEntry**
+publishing_flickr_publishing_options_pane_create_visibilities (PublishingFlickrPublishingOptionsPane* self,
+ int* result_length1)
+{
PublishingFlickrPublishingOptionsPaneVisibilityEntry** result = NULL;
PublishingFlickrPublishingOptionsPaneVisibilityEntry** _result_ = NULL;
PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp0_;
@@ -4650,31 +4893,34 @@ static PublishingFlickrPublishingOptionsPaneVisibilityEntry** publishing_flickr_
if (result_length1) {
#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
*result_length1 = _tmp21__length1;
-#line 4637 "FlickrPublishing.c"
+#line 4880 "FlickrPublishing.c"
}
#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
result = _tmp21_;
#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return result;
-#line 4643 "FlickrPublishing.c"
+#line 4886 "FlickrPublishing.c"
}
-static gpointer _publishing_flickr_publishing_options_pane_visibility_entry_ref0 (gpointer self) {
+static gpointer
+_publishing_flickr_publishing_options_pane_visibility_entry_ref0 (gpointer self)
+{
#line 674 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return self ? publishing_flickr_publishing_options_pane_visibility_entry_ref (self) : NULL;
-#line 4650 "FlickrPublishing.c"
+#line 4895 "FlickrPublishing.c"
}
-static void publishing_flickr_publishing_options_pane_populate_visibility_combo (PublishingFlickrPublishingOptionsPane* self) {
+static void
+publishing_flickr_publishing_options_pane_populate_visibility_combo (PublishingFlickrPublishingOptionsPane* self)
+{
PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp0_;
gint _tmp0__length1;
PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp3_;
gint _tmp3__length1;
GtkComboBoxText* _tmp8_;
PublishingFlickrFlickrPublisher* _tmp9_;
- gint _tmp10_;
#line 670 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self));
#line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -4683,7 +4929,7 @@ static void publishing_flickr_publishing_options_pane_populate_visibility_combo
_tmp0__length1 = self->priv->visibilities_length1;
#line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
if (_tmp0_ == NULL) {
-#line 4670 "FlickrPublishing.c"
+#line 4916 "FlickrPublishing.c"
gint _tmp1_;
PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp2_;
#line 672 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -4696,13 +4942,13 @@ static void publishing_flickr_publishing_options_pane_populate_visibility_combo
self->priv->visibilities_length1 = _tmp1_;
#line 672 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
self->priv->_visibilities_size_ = self->priv->visibilities_length1;
-#line 4683 "FlickrPublishing.c"
+#line 4929 "FlickrPublishing.c"
}
#line 674 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_tmp3_ = self->priv->visibilities;
#line 674 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_tmp3__length1 = self->priv->visibilities_length1;
-#line 4689 "FlickrPublishing.c"
+#line 4935 "FlickrPublishing.c"
{
PublishingFlickrPublishingOptionsPaneVisibilityEntry** v_collection = NULL;
gint v_collection_length1 = 0;
@@ -4714,14 +4960,14 @@ static void publishing_flickr_publishing_options_pane_populate_visibility_combo
v_collection_length1 = _tmp3__length1;
#line 674 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
for (v_it = 0; v_it < _tmp3__length1; v_it = v_it + 1) {
-#line 4701 "FlickrPublishing.c"
+#line 4947 "FlickrPublishing.c"
PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp4_;
PublishingFlickrPublishingOptionsPaneVisibilityEntry* v = NULL;
#line 674 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_tmp4_ = _publishing_flickr_publishing_options_pane_visibility_entry_ref0 (v_collection[v_it]);
#line 674 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
v = _tmp4_;
-#line 4708 "FlickrPublishing.c"
+#line 4954 "FlickrPublishing.c"
{
GtkComboBoxText* _tmp5_;
PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp6_;
@@ -4736,7 +4982,7 @@ static void publishing_flickr_publishing_options_pane_populate_visibility_combo
gtk_combo_box_text_append_text (_tmp5_, _tmp7_);
#line 674 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_publishing_flickr_publishing_options_pane_visibility_entry_unref0 (v);
-#line 4723 "FlickrPublishing.c"
+#line 4969 "FlickrPublishing.c"
}
}
}
@@ -4745,99 +4991,125 @@ static void publishing_flickr_publishing_options_pane_populate_visibility_combo
#line 677 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_tmp9_ = self->priv->publisher;
#line 677 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp10_ = publishing_flickr_flickr_publisher_get_persistent_visibility (_tmp9_);
-#line 677 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_combo_box_get_type (), GtkComboBox), _tmp10_);
-#line 4735 "FlickrPublishing.c"
+ gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_combo_box_get_type (), GtkComboBox), publishing_flickr_flickr_publisher_get_persistent_visibility (_tmp9_));
+#line 4979 "FlickrPublishing.c"
}
-static void _vala_array_add25 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) {
+static void
+_vala_array_add25 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array,
+ int* length,
+ int* size,
+ PublishingFlickrPublishingOptionsPaneSizeEntry* value)
+{
#line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
if ((*length) == (*size)) {
#line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
*array = g_renew (PublishingFlickrPublishingOptionsPaneSizeEntry*, *array, (*size) + 1);
-#line 4746 "FlickrPublishing.c"
+#line 4995 "FlickrPublishing.c"
}
#line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
(*array)[(*length)++] = value;
#line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
(*array)[*length] = NULL;
-#line 4752 "FlickrPublishing.c"
+#line 5001 "FlickrPublishing.c"
}
-static void _vala_array_add26 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) {
+static void
+_vala_array_add26 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array,
+ int* length,
+ int* size,
+ PublishingFlickrPublishingOptionsPaneSizeEntry* value)
+{
#line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
if ((*length) == (*size)) {
#line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
*array = g_renew (PublishingFlickrPublishingOptionsPaneSizeEntry*, *array, (*size) + 1);
-#line 4763 "FlickrPublishing.c"
+#line 5017 "FlickrPublishing.c"
}
#line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
(*array)[(*length)++] = value;
#line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
(*array)[*length] = NULL;
-#line 4769 "FlickrPublishing.c"
+#line 5023 "FlickrPublishing.c"
}
-static void _vala_array_add27 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) {
+static void
+_vala_array_add27 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array,
+ int* length,
+ int* size,
+ PublishingFlickrPublishingOptionsPaneSizeEntry* value)
+{
#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
if ((*length) == (*size)) {
#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
*array = g_renew (PublishingFlickrPublishingOptionsPaneSizeEntry*, *array, (*size) + 1);
-#line 4780 "FlickrPublishing.c"
+#line 5039 "FlickrPublishing.c"
}
#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
(*array)[(*length)++] = value;
#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
(*array)[*length] = NULL;
-#line 4786 "FlickrPublishing.c"
+#line 5045 "FlickrPublishing.c"
}
-static void _vala_array_add28 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) {
+static void
+_vala_array_add28 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array,
+ int* length,
+ int* size,
+ PublishingFlickrPublishingOptionsPaneSizeEntry* value)
+{
#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
if ((*length) == (*size)) {
#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
*array = g_renew (PublishingFlickrPublishingOptionsPaneSizeEntry*, *array, (*size) + 1);
-#line 4797 "FlickrPublishing.c"
+#line 5061 "FlickrPublishing.c"
}
#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
(*array)[(*length)++] = value;
#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
(*array)[*length] = NULL;
-#line 4803 "FlickrPublishing.c"
+#line 5067 "FlickrPublishing.c"
}
-static void _vala_array_add29 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) {
+static void
+_vala_array_add29 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array,
+ int* length,
+ int* size,
+ PublishingFlickrPublishingOptionsPaneSizeEntry* value)
+{
#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
if ((*length) == (*size)) {
#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
*array = g_renew (PublishingFlickrPublishingOptionsPaneSizeEntry*, *array, (*size) + 1);
-#line 4814 "FlickrPublishing.c"
+#line 5083 "FlickrPublishing.c"
}
#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
(*array)[(*length)++] = value;
#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
(*array)[*length] = NULL;
-#line 4820 "FlickrPublishing.c"
+#line 5089 "FlickrPublishing.c"
}
-static PublishingFlickrPublishingOptionsPaneSizeEntry** publishing_flickr_publishing_options_pane_create_sizes (PublishingFlickrPublishingOptionsPane* self, int* result_length1) {
+static PublishingFlickrPublishingOptionsPaneSizeEntry**
+publishing_flickr_publishing_options_pane_create_sizes (PublishingFlickrPublishingOptionsPane* self,
+ int* result_length1)
+{
PublishingFlickrPublishingOptionsPaneSizeEntry** result = NULL;
PublishingFlickrPublishingOptionsPaneSizeEntry** _result_ = NULL;
PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp0_;
@@ -4918,31 +5190,34 @@ static PublishingFlickrPublishingOptionsPaneSizeEntry** publishing_flickr_publis
if (result_length1) {
#line 689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
*result_length1 = _tmp11__length1;
-#line 4905 "FlickrPublishing.c"
+#line 5177 "FlickrPublishing.c"
}
#line 689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
result = _tmp11_;
#line 689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return result;
-#line 4911 "FlickrPublishing.c"
+#line 5183 "FlickrPublishing.c"
}
-static gpointer _publishing_flickr_publishing_options_pane_size_entry_ref0 (gpointer self) {
+static gpointer
+_publishing_flickr_publishing_options_pane_size_entry_ref0 (gpointer self)
+{
#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return self ? publishing_flickr_publishing_options_pane_size_entry_ref (self) : NULL;
-#line 4918 "FlickrPublishing.c"
+#line 5192 "FlickrPublishing.c"
}
-static void publishing_flickr_publishing_options_pane_populate_size_combo (PublishingFlickrPublishingOptionsPane* self) {
+static void
+publishing_flickr_publishing_options_pane_populate_size_combo (PublishingFlickrPublishingOptionsPane* self)
+{
PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp0_;
gint _tmp0__length1;
PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp3_;
gint _tmp3__length1;
GtkComboBoxText* _tmp8_;
PublishingFlickrFlickrPublisher* _tmp9_;
- gint _tmp10_;
#line 692 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self));
#line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -4951,7 +5226,7 @@ static void publishing_flickr_publishing_options_pane_populate_size_combo (Publi
_tmp0__length1 = self->priv->sizes_length1;
#line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
if (_tmp0_ == NULL) {
-#line 4938 "FlickrPublishing.c"
+#line 5213 "FlickrPublishing.c"
gint _tmp1_;
PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp2_;
#line 694 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -4964,13 +5239,13 @@ static void publishing_flickr_publishing_options_pane_populate_size_combo (Publi
self->priv->sizes_length1 = _tmp1_;
#line 694 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
self->priv->_sizes_size_ = self->priv->sizes_length1;
-#line 4951 "FlickrPublishing.c"
+#line 5226 "FlickrPublishing.c"
}
#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_tmp3_ = self->priv->sizes;
#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_tmp3__length1 = self->priv->sizes_length1;
-#line 4957 "FlickrPublishing.c"
+#line 5232 "FlickrPublishing.c"
{
PublishingFlickrPublishingOptionsPaneSizeEntry** e_collection = NULL;
gint e_collection_length1 = 0;
@@ -4982,14 +5257,14 @@ static void publishing_flickr_publishing_options_pane_populate_size_combo (Publi
e_collection_length1 = _tmp3__length1;
#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
for (e_it = 0; e_it < _tmp3__length1; e_it = e_it + 1) {
-#line 4969 "FlickrPublishing.c"
+#line 5244 "FlickrPublishing.c"
PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp4_;
PublishingFlickrPublishingOptionsPaneSizeEntry* e = NULL;
#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_tmp4_ = _publishing_flickr_publishing_options_pane_size_entry_ref0 (e_collection[e_it]);
#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
e = _tmp4_;
-#line 4976 "FlickrPublishing.c"
+#line 5251 "FlickrPublishing.c"
{
GtkComboBoxText* _tmp5_;
PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp6_;
@@ -5004,7 +5279,7 @@ static void publishing_flickr_publishing_options_pane_populate_size_combo (Publi
gtk_combo_box_text_append_text (_tmp5_, _tmp7_);
#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_publishing_flickr_publishing_options_pane_size_entry_unref0 (e);
-#line 4991 "FlickrPublishing.c"
+#line 5266 "FlickrPublishing.c"
}
}
}
@@ -5013,17 +5288,16 @@ static void publishing_flickr_publishing_options_pane_populate_size_combo (Publi
#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_tmp9_ = self->priv->publisher;
#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp10_ = publishing_flickr_flickr_publisher_get_persistent_default_size (_tmp9_);
-#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_combo_box_get_type (), GtkComboBox), _tmp10_);
-#line 5003 "FlickrPublishing.c"
+ gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_combo_box_get_type (), GtkComboBox), publishing_flickr_flickr_publisher_get_persistent_default_size (_tmp9_));
+#line 5276 "FlickrPublishing.c"
}
-static void publishing_flickr_publishing_options_pane_on_size_changed (PublishingFlickrPublishingOptionsPane* self) {
+static void
+publishing_flickr_publishing_options_pane_on_size_changed (PublishingFlickrPublishingOptionsPane* self)
+{
PublishingFlickrFlickrPublisher* _tmp0_;
GtkComboBoxText* _tmp1_;
- gint _tmp2_;
#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self));
#line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -5031,17 +5305,16 @@ static void publishing_flickr_publishing_options_pane_on_size_changed (Publishin
#line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_tmp1_ = self->priv->size_combo;
#line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp2_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox));
-#line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- publishing_flickr_flickr_publisher_set_persistent_default_size (_tmp0_, _tmp2_);
-#line 5021 "FlickrPublishing.c"
+ publishing_flickr_flickr_publisher_set_persistent_default_size (_tmp0_, gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox)));
+#line 5293 "FlickrPublishing.c"
}
-static void publishing_flickr_publishing_options_pane_on_visibility_changed (PublishingFlickrPublishingOptionsPane* self) {
+static void
+publishing_flickr_publishing_options_pane_on_visibility_changed (PublishingFlickrPublishingOptionsPane* self)
+{
PublishingFlickrFlickrPublisher* _tmp0_;
GtkComboBoxText* _tmp1_;
- gint _tmp2_;
#line 706 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self));
#line 707 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -5049,38 +5322,39 @@ static void publishing_flickr_publishing_options_pane_on_visibility_changed (Pub
#line 707 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_tmp1_ = self->priv->visibility_combo;
#line 707 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp2_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox));
-#line 707 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- publishing_flickr_flickr_publisher_set_persistent_visibility (_tmp0_, _tmp2_);
-#line 5039 "FlickrPublishing.c"
+ publishing_flickr_flickr_publisher_set_persistent_visibility (_tmp0_, gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox)));
+#line 5310 "FlickrPublishing.c"
}
-void publishing_flickr_publishing_options_pane_notify_publish (PublishingFlickrPublishingOptionsPane* self) {
+void
+publishing_flickr_publishing_options_pane_notify_publish (PublishingFlickrPublishingOptionsPane* self)
+{
GtkCheckButton* _tmp0_;
- gboolean _tmp1_;
#line 710 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self));
#line 711 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_tmp0_ = self->priv->strip_metadata_check;
#line 711 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp1_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 711 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- g_signal_emit (self, publishing_flickr_publishing_options_pane_signals[PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0, _tmp1_);
-#line 5054 "FlickrPublishing.c"
+ g_signal_emit (self, publishing_flickr_publishing_options_pane_signals[PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0, gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_button_get_type (), GtkToggleButton)));
+#line 5324 "FlickrPublishing.c"
}
-void publishing_flickr_publishing_options_pane_notify_logout (PublishingFlickrPublishingOptionsPane* self) {
+void
+publishing_flickr_publishing_options_pane_notify_logout (PublishingFlickrPublishingOptionsPane* self)
+{
#line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self));
#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_signal_emit (self, publishing_flickr_publishing_options_pane_signals[PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL], 0);
-#line 5063 "FlickrPublishing.c"
+#line 5335 "FlickrPublishing.c"
}
-static GtkWidget* publishing_flickr_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base) {
+static GtkWidget*
+publishing_flickr_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base)
+{
PublishingFlickrPublishingOptionsPane * self;
GtkWidget* result = NULL;
GtkBox* _tmp0_;
@@ -5095,11 +5369,13 @@ static GtkWidget* publishing_flickr_publishing_options_pane_real_get_widget (Spi
result = _tmp1_;
#line 719 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return result;
-#line 5082 "FlickrPublishing.c"
+#line 5356 "FlickrPublishing.c"
}
-static SpitPublishingDialogPaneGeometryOptions publishing_flickr_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) {
+static SpitPublishingDialogPaneGeometryOptions
+publishing_flickr_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base)
+{
PublishingFlickrPublishingOptionsPane * self;
SpitPublishingDialogPaneGeometryOptions result = 0;
#line 722 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -5108,25 +5384,34 @@ static SpitPublishingDialogPaneGeometryOptions publishing_flickr_publishing_opti
result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
#line 723 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return result;
-#line 5095 "FlickrPublishing.c"
+#line 5371 "FlickrPublishing.c"
}
-static void _publishing_flickr_publishing_options_pane_notify_publish_publishing_flickr_publishing_options_pane_publish (PublishingFlickrPublishingOptionsPane* _sender, gboolean strip_metadata, gpointer self) {
+static void
+_publishing_flickr_publishing_options_pane_notify_publish_publishing_flickr_publishing_options_pane_publish (PublishingFlickrPublishingOptionsPane* _sender,
+ gboolean strip_metadata,
+ gpointer self)
+{
#line 727 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
publishing_flickr_publishing_options_pane_notify_publish ((PublishingFlickrPublishingOptionsPane*) self);
-#line 5102 "FlickrPublishing.c"
+#line 5382 "FlickrPublishing.c"
}
-static void _publishing_flickr_publishing_options_pane_notify_logout_publishing_flickr_publishing_options_pane_logout (PublishingFlickrPublishingOptionsPane* _sender, gpointer self) {
+static void
+_publishing_flickr_publishing_options_pane_notify_logout_publishing_flickr_publishing_options_pane_logout (PublishingFlickrPublishingOptionsPane* _sender,
+ gpointer self)
+{
#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
publishing_flickr_publishing_options_pane_notify_logout ((PublishingFlickrPublishingOptionsPane*) self);
-#line 5109 "FlickrPublishing.c"
+#line 5392 "FlickrPublishing.c"
}
-static void publishing_flickr_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base) {
+static void
+publishing_flickr_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base)
+{
PublishingFlickrPublishingOptionsPane * self;
#line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, PublishingFlickrPublishingOptionsPane);
@@ -5134,11 +5419,13 @@ static void publishing_flickr_publishing_options_pane_real_on_pane_installed (Sp
g_signal_connect_object (self, "publish", (GCallback) _publishing_flickr_publishing_options_pane_notify_publish_publishing_flickr_publishing_options_pane_publish, self, 0);
#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_signal_connect_object (self, "logout", (GCallback) _publishing_flickr_publishing_options_pane_notify_logout_publishing_flickr_publishing_options_pane_logout, self, 0);
-#line 5121 "FlickrPublishing.c"
+#line 5406 "FlickrPublishing.c"
}
-static void publishing_flickr_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) {
+static void
+publishing_flickr_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base)
+{
PublishingFlickrPublishingOptionsPane * self;
guint _tmp0_;
guint _tmp1_;
@@ -5152,142 +5439,168 @@ static void publishing_flickr_publishing_options_pane_real_on_pane_uninstalled (
g_signal_parse_name ("logout", PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp1_, NULL, FALSE);
#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_signal_handlers_disconnect_matched (self, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_flickr_publishing_options_pane_notify_logout_publishing_flickr_publishing_options_pane_logout, self);
-#line 5139 "FlickrPublishing.c"
+#line 5426 "FlickrPublishing.c"
}
-static PublishingFlickrPublishingOptionsPaneSizeEntry* publishing_flickr_publishing_options_pane_size_entry_construct (GType object_type, const gchar* creator_title, gint creator_size) {
+static PublishingFlickrPublishingOptionsPaneSizeEntry*
+publishing_flickr_publishing_options_pane_size_entry_construct (GType object_type,
+ const gchar* creator_title,
+ gint creator_size)
+{
PublishingFlickrPublishingOptionsPaneSizeEntry* self = NULL;
- const gchar* _tmp0_;
- gchar* _tmp1_;
- gint _tmp2_;
+ gchar* _tmp0_;
#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_return_val_if_fail (creator_title != NULL, NULL);
#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
self = (PublishingFlickrPublishingOptionsPaneSizeEntry*) g_type_create_instance (object_type);
#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp0_ = creator_title;
-#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp1_ = g_strdup (_tmp0_);
+ _tmp0_ = g_strdup (creator_title);
#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_g_free0 (self->title);
#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- self->title = _tmp1_;
-#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp2_ = creator_size;
+ self->title = _tmp0_;
#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- self->size = _tmp2_;
+ self->size = creator_size;
#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return self;
-#line 5166 "FlickrPublishing.c"
+#line 5451 "FlickrPublishing.c"
}
-static PublishingFlickrPublishingOptionsPaneSizeEntry* publishing_flickr_publishing_options_pane_size_entry_new (const gchar* creator_title, gint creator_size) {
+static PublishingFlickrPublishingOptionsPaneSizeEntry*
+publishing_flickr_publishing_options_pane_size_entry_new (const gchar* creator_title,
+ gint creator_size)
+{
#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return publishing_flickr_publishing_options_pane_size_entry_construct (PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_ENTRY, creator_title, creator_size);
-#line 5173 "FlickrPublishing.c"
+#line 5461 "FlickrPublishing.c"
}
-static void publishing_flickr_publishing_options_pane_value_size_entry_init (GValue* value) {
+static void
+publishing_flickr_publishing_options_pane_value_size_entry_init (GValue* value)
+{
#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 5180 "FlickrPublishing.c"
+#line 5470 "FlickrPublishing.c"
}
-static void publishing_flickr_publishing_options_pane_value_size_entry_free_value (GValue* value) {
+static void
+publishing_flickr_publishing_options_pane_value_size_entry_free_value (GValue* value)
+{
#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
if (value->data[0].v_pointer) {
#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
publishing_flickr_publishing_options_pane_size_entry_unref (value->data[0].v_pointer);
-#line 5189 "FlickrPublishing.c"
+#line 5481 "FlickrPublishing.c"
}
}
-static void publishing_flickr_publishing_options_pane_value_size_entry_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+publishing_flickr_publishing_options_pane_value_size_entry_copy_value (const GValue* src_value,
+ GValue* dest_value)
+{
#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
if (src_value->data[0].v_pointer) {
#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
dest_value->data[0].v_pointer = publishing_flickr_publishing_options_pane_size_entry_ref (src_value->data[0].v_pointer);
-#line 5199 "FlickrPublishing.c"
+#line 5494 "FlickrPublishing.c"
} else {
#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
dest_value->data[0].v_pointer = NULL;
-#line 5203 "FlickrPublishing.c"
+#line 5498 "FlickrPublishing.c"
}
}
-static gpointer publishing_flickr_publishing_options_pane_value_size_entry_peek_pointer (const GValue* value) {
+static gpointer
+publishing_flickr_publishing_options_pane_value_size_entry_peek_pointer (const GValue* value)
+{
#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return value->data[0].v_pointer;
-#line 5211 "FlickrPublishing.c"
+#line 5508 "FlickrPublishing.c"
}
-static gchar* publishing_flickr_publishing_options_pane_value_size_entry_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_flickr_publishing_options_pane_value_size_entry_collect_value (GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
if (collect_values[0].v_pointer) {
-#line 5218 "FlickrPublishing.c"
+#line 5520 "FlickrPublishing.c"
PublishingFlickrPublishingOptionsPaneSizeEntry * object;
object = collect_values[0].v_pointer;
#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
if (object->parent_instance.g_class == NULL) {
#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 5225 "FlickrPublishing.c"
+#line 5527 "FlickrPublishing.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 5229 "FlickrPublishing.c"
+#line 5531 "FlickrPublishing.c"
}
#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
value->data[0].v_pointer = publishing_flickr_publishing_options_pane_size_entry_ref (object);
-#line 5233 "FlickrPublishing.c"
+#line 5535 "FlickrPublishing.c"
} else {
#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 5237 "FlickrPublishing.c"
+#line 5539 "FlickrPublishing.c"
}
#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return NULL;
-#line 5241 "FlickrPublishing.c"
+#line 5543 "FlickrPublishing.c"
}
-static gchar* publishing_flickr_publishing_options_pane_value_size_entry_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_flickr_publishing_options_pane_value_size_entry_lcopy_value (const GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
PublishingFlickrPublishingOptionsPaneSizeEntry ** object_p;
object_p = collect_values[0].v_pointer;
#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
if (!object_p) {
#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 5252 "FlickrPublishing.c"
+#line 5559 "FlickrPublishing.c"
}
#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
if (!value->data[0].v_pointer) {
#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
*object_p = NULL;
-#line 5258 "FlickrPublishing.c"
+#line 5565 "FlickrPublishing.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
*object_p = value->data[0].v_pointer;
-#line 5262 "FlickrPublishing.c"
+#line 5569 "FlickrPublishing.c"
} else {
#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
*object_p = publishing_flickr_publishing_options_pane_size_entry_ref (value->data[0].v_pointer);
-#line 5266 "FlickrPublishing.c"
+#line 5573 "FlickrPublishing.c"
}
#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return NULL;
-#line 5270 "FlickrPublishing.c"
+#line 5577 "FlickrPublishing.c"
}
-static GParamSpec* publishing_flickr_publishing_options_pane_param_spec_size_entry (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+static GParamSpec*
+publishing_flickr_publishing_options_pane_param_spec_size_entry (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags)
+{
PublishingFlickrPublishingOptionsPaneParamSpecSizeEntry* spec;
#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_ENTRY), NULL);
@@ -5297,20 +5610,25 @@ static GParamSpec* publishing_flickr_publishing_options_pane_param_spec_size_ent
G_PARAM_SPEC (spec)->value_type = object_type;
#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return G_PARAM_SPEC (spec);
-#line 5284 "FlickrPublishing.c"
+#line 5597 "FlickrPublishing.c"
}
-static gpointer publishing_flickr_publishing_options_pane_value_get_size_entry (const GValue* value) {
+static gpointer
+publishing_flickr_publishing_options_pane_value_get_size_entry (const GValue* value)
+{
#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_ENTRY), NULL);
#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return value->data[0].v_pointer;
-#line 5293 "FlickrPublishing.c"
+#line 5608 "FlickrPublishing.c"
}
-static void publishing_flickr_publishing_options_pane_value_set_size_entry (GValue* value, gpointer v_object) {
+static void
+publishing_flickr_publishing_options_pane_value_set_size_entry (GValue* value,
+ gpointer v_object)
+{
PublishingFlickrPublishingOptionsPaneSizeEntry * old;
#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_ENTRY));
@@ -5326,22 +5644,25 @@ static void publishing_flickr_publishing_options_pane_value_set_size_entry (GVal
value->data[0].v_pointer = v_object;
#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
publishing_flickr_publishing_options_pane_size_entry_ref (value->data[0].v_pointer);
-#line 5313 "FlickrPublishing.c"
+#line 5631 "FlickrPublishing.c"
} else {
#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 5317 "FlickrPublishing.c"
+#line 5635 "FlickrPublishing.c"
}
#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
if (old) {
#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
publishing_flickr_publishing_options_pane_size_entry_unref (old);
-#line 5323 "FlickrPublishing.c"
+#line 5641 "FlickrPublishing.c"
}
}
-static void publishing_flickr_publishing_options_pane_value_take_size_entry (GValue* value, gpointer v_object) {
+static void
+publishing_flickr_publishing_options_pane_value_take_size_entry (GValue* value,
+ gpointer v_object)
+{
PublishingFlickrPublishingOptionsPaneSizeEntry * old;
#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_ENTRY));
@@ -5355,38 +5676,44 @@ static void publishing_flickr_publishing_options_pane_value_take_size_entry (GVa
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
value->data[0].v_pointer = v_object;
-#line 5342 "FlickrPublishing.c"
+#line 5663 "FlickrPublishing.c"
} else {
#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 5346 "FlickrPublishing.c"
+#line 5667 "FlickrPublishing.c"
}
#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
if (old) {
#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
publishing_flickr_publishing_options_pane_size_entry_unref (old);
-#line 5352 "FlickrPublishing.c"
+#line 5673 "FlickrPublishing.c"
}
}
-static void publishing_flickr_publishing_options_pane_size_entry_class_init (PublishingFlickrPublishingOptionsPaneSizeEntryClass * klass) {
+static void
+publishing_flickr_publishing_options_pane_size_entry_class_init (PublishingFlickrPublishingOptionsPaneSizeEntryClass * klass)
+{
#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
publishing_flickr_publishing_options_pane_size_entry_parent_class = g_type_class_peek_parent (klass);
#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
((PublishingFlickrPublishingOptionsPaneSizeEntryClass *) klass)->finalize = publishing_flickr_publishing_options_pane_size_entry_finalize;
-#line 5362 "FlickrPublishing.c"
+#line 5685 "FlickrPublishing.c"
}
-static void publishing_flickr_publishing_options_pane_size_entry_instance_init (PublishingFlickrPublishingOptionsPaneSizeEntry * self) {
+static void
+publishing_flickr_publishing_options_pane_size_entry_instance_init (PublishingFlickrPublishingOptionsPaneSizeEntry * self)
+{
#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
self->ref_count = 1;
-#line 5369 "FlickrPublishing.c"
+#line 5694 "FlickrPublishing.c"
}
-static void publishing_flickr_publishing_options_pane_size_entry_finalize (PublishingFlickrPublishingOptionsPaneSizeEntry * obj) {
+static void
+publishing_flickr_publishing_options_pane_size_entry_finalize (PublishingFlickrPublishingOptionsPaneSizeEntry * obj)
+{
PublishingFlickrPublishingOptionsPaneSizeEntry * self;
#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_ENTRY, PublishingFlickrPublishingOptionsPaneSizeEntry);
@@ -5394,11 +5721,13 @@ static void publishing_flickr_publishing_options_pane_size_entry_finalize (Publi
g_signal_handlers_destroy (self);
#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_g_free0 (self->title);
-#line 5381 "FlickrPublishing.c"
+#line 5708 "FlickrPublishing.c"
}
-static GType publishing_flickr_publishing_options_pane_size_entry_get_type (void) {
+static GType
+publishing_flickr_publishing_options_pane_size_entry_get_type (void)
+{
static volatile gsize publishing_flickr_publishing_options_pane_size_entry_type_id__volatile = 0;
if (g_once_init_enter (&publishing_flickr_publishing_options_pane_size_entry_type_id__volatile)) {
static const GTypeValueTable g_define_type_value_table = { publishing_flickr_publishing_options_pane_value_size_entry_init, publishing_flickr_publishing_options_pane_value_size_entry_free_value, publishing_flickr_publishing_options_pane_value_size_entry_copy_value, publishing_flickr_publishing_options_pane_value_size_entry_peek_pointer, "p", publishing_flickr_publishing_options_pane_value_size_entry_collect_value, "p", publishing_flickr_publishing_options_pane_value_size_entry_lcopy_value };
@@ -5412,18 +5741,22 @@ static GType publishing_flickr_publishing_options_pane_size_entry_get_type (void
}
-static gpointer publishing_flickr_publishing_options_pane_size_entry_ref (gpointer instance) {
+static gpointer
+publishing_flickr_publishing_options_pane_size_entry_ref (gpointer instance)
+{
PublishingFlickrPublishingOptionsPaneSizeEntry * self;
self = instance;
#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_atomic_int_inc (&self->ref_count);
#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return instance;
-#line 5406 "FlickrPublishing.c"
+#line 5737 "FlickrPublishing.c"
}
-static void publishing_flickr_publishing_options_pane_size_entry_unref (gpointer instance) {
+static void
+publishing_flickr_publishing_options_pane_size_entry_unref (gpointer instance)
+{
PublishingFlickrPublishingOptionsPaneSizeEntry * self;
self = instance;
#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -5432,17 +5765,19 @@ static void publishing_flickr_publishing_options_pane_size_entry_unref (gpointer
PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_SIZE_ENTRY_GET_CLASS (self)->finalize (self);
#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 5419 "FlickrPublishing.c"
+#line 5752 "FlickrPublishing.c"
}
}
-static PublishingFlickrPublishingOptionsPaneVisibilityEntry* publishing_flickr_publishing_options_pane_visibility_entry_construct (GType object_type, const gchar* creator_title, PublishingFlickrVisibilitySpecification* creator_specification) {
+static PublishingFlickrPublishingOptionsPaneVisibilityEntry*
+publishing_flickr_publishing_options_pane_visibility_entry_construct (GType object_type,
+ const gchar* creator_title,
+ PublishingFlickrVisibilitySpecification* creator_specification)
+{
PublishingFlickrPublishingOptionsPaneVisibilityEntry* self = NULL;
PublishingFlickrVisibilitySpecification* _tmp0_;
- PublishingFlickrVisibilitySpecification* _tmp1_;
- const gchar* _tmp2_;
- gchar* _tmp3_;
+ gchar* _tmp1_;
#line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_return_val_if_fail (creator_title != NULL, NULL);
#line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -5450,132 +5785,156 @@ static PublishingFlickrPublishingOptionsPaneVisibilityEntry* publishing_flickr_p
#line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
self = (PublishingFlickrPublishingOptionsPaneVisibilityEntry*) g_type_create_instance (object_type);
#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp0_ = creator_specification;
-#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp1_ = _publishing_flickr_visibility_specification_ref0 (_tmp0_);
+ _tmp0_ = _publishing_flickr_visibility_specification_ref0 (creator_specification);
#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_publishing_flickr_visibility_specification_unref0 (self->specification);
#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- self->specification = _tmp1_;
+ self->specification = _tmp0_;
#line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp2_ = creator_title;
-#line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp3_ = g_strdup (_tmp2_);
+ _tmp1_ = g_strdup (creator_title);
#line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_g_free0 (self->title);
#line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- self->title = _tmp3_;
+ self->title = _tmp1_;
#line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return self;
-#line 5454 "FlickrPublishing.c"
+#line 5785 "FlickrPublishing.c"
}
-static PublishingFlickrPublishingOptionsPaneVisibilityEntry* publishing_flickr_publishing_options_pane_visibility_entry_new (const gchar* creator_title, PublishingFlickrVisibilitySpecification* creator_specification) {
+static PublishingFlickrPublishingOptionsPaneVisibilityEntry*
+publishing_flickr_publishing_options_pane_visibility_entry_new (const gchar* creator_title,
+ PublishingFlickrVisibilitySpecification* creator_specification)
+{
#line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return publishing_flickr_publishing_options_pane_visibility_entry_construct (PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_VISIBILITY_ENTRY, creator_title, creator_specification);
-#line 5461 "FlickrPublishing.c"
+#line 5795 "FlickrPublishing.c"
}
-static void publishing_flickr_publishing_options_pane_value_visibility_entry_init (GValue* value) {
+static void
+publishing_flickr_publishing_options_pane_value_visibility_entry_init (GValue* value)
+{
#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 5468 "FlickrPublishing.c"
+#line 5804 "FlickrPublishing.c"
}
-static void publishing_flickr_publishing_options_pane_value_visibility_entry_free_value (GValue* value) {
+static void
+publishing_flickr_publishing_options_pane_value_visibility_entry_free_value (GValue* value)
+{
#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
if (value->data[0].v_pointer) {
#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
publishing_flickr_publishing_options_pane_visibility_entry_unref (value->data[0].v_pointer);
-#line 5477 "FlickrPublishing.c"
+#line 5815 "FlickrPublishing.c"
}
}
-static void publishing_flickr_publishing_options_pane_value_visibility_entry_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+publishing_flickr_publishing_options_pane_value_visibility_entry_copy_value (const GValue* src_value,
+ GValue* dest_value)
+{
#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
if (src_value->data[0].v_pointer) {
#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
dest_value->data[0].v_pointer = publishing_flickr_publishing_options_pane_visibility_entry_ref (src_value->data[0].v_pointer);
-#line 5487 "FlickrPublishing.c"
+#line 5828 "FlickrPublishing.c"
} else {
#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
dest_value->data[0].v_pointer = NULL;
-#line 5491 "FlickrPublishing.c"
+#line 5832 "FlickrPublishing.c"
}
}
-static gpointer publishing_flickr_publishing_options_pane_value_visibility_entry_peek_pointer (const GValue* value) {
+static gpointer
+publishing_flickr_publishing_options_pane_value_visibility_entry_peek_pointer (const GValue* value)
+{
#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return value->data[0].v_pointer;
-#line 5499 "FlickrPublishing.c"
+#line 5842 "FlickrPublishing.c"
}
-static gchar* publishing_flickr_publishing_options_pane_value_visibility_entry_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_flickr_publishing_options_pane_value_visibility_entry_collect_value (GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
if (collect_values[0].v_pointer) {
-#line 5506 "FlickrPublishing.c"
+#line 5854 "FlickrPublishing.c"
PublishingFlickrPublishingOptionsPaneVisibilityEntry * object;
object = collect_values[0].v_pointer;
#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
if (object->parent_instance.g_class == NULL) {
#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 5513 "FlickrPublishing.c"
+#line 5861 "FlickrPublishing.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 5517 "FlickrPublishing.c"
+#line 5865 "FlickrPublishing.c"
}
#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
value->data[0].v_pointer = publishing_flickr_publishing_options_pane_visibility_entry_ref (object);
-#line 5521 "FlickrPublishing.c"
+#line 5869 "FlickrPublishing.c"
} else {
#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 5525 "FlickrPublishing.c"
+#line 5873 "FlickrPublishing.c"
}
#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return NULL;
-#line 5529 "FlickrPublishing.c"
+#line 5877 "FlickrPublishing.c"
}
-static gchar* publishing_flickr_publishing_options_pane_value_visibility_entry_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_flickr_publishing_options_pane_value_visibility_entry_lcopy_value (const GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
PublishingFlickrPublishingOptionsPaneVisibilityEntry ** object_p;
object_p = collect_values[0].v_pointer;
#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
if (!object_p) {
#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 5540 "FlickrPublishing.c"
+#line 5893 "FlickrPublishing.c"
}
#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
if (!value->data[0].v_pointer) {
#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
*object_p = NULL;
-#line 5546 "FlickrPublishing.c"
+#line 5899 "FlickrPublishing.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
*object_p = value->data[0].v_pointer;
-#line 5550 "FlickrPublishing.c"
+#line 5903 "FlickrPublishing.c"
} else {
#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
*object_p = publishing_flickr_publishing_options_pane_visibility_entry_ref (value->data[0].v_pointer);
-#line 5554 "FlickrPublishing.c"
+#line 5907 "FlickrPublishing.c"
}
#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return NULL;
-#line 5558 "FlickrPublishing.c"
+#line 5911 "FlickrPublishing.c"
}
-static GParamSpec* publishing_flickr_publishing_options_pane_param_spec_visibility_entry (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+static GParamSpec*
+publishing_flickr_publishing_options_pane_param_spec_visibility_entry (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags)
+{
PublishingFlickrPublishingOptionsPaneParamSpecVisibilityEntry* spec;
#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_VISIBILITY_ENTRY), NULL);
@@ -5585,20 +5944,25 @@ static GParamSpec* publishing_flickr_publishing_options_pane_param_spec_visibili
G_PARAM_SPEC (spec)->value_type = object_type;
#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return G_PARAM_SPEC (spec);
-#line 5572 "FlickrPublishing.c"
+#line 5931 "FlickrPublishing.c"
}
-static gpointer publishing_flickr_publishing_options_pane_value_get_visibility_entry (const GValue* value) {
+static gpointer
+publishing_flickr_publishing_options_pane_value_get_visibility_entry (const GValue* value)
+{
#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_VISIBILITY_ENTRY), NULL);
#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return value->data[0].v_pointer;
-#line 5581 "FlickrPublishing.c"
+#line 5942 "FlickrPublishing.c"
}
-static void publishing_flickr_publishing_options_pane_value_set_visibility_entry (GValue* value, gpointer v_object) {
+static void
+publishing_flickr_publishing_options_pane_value_set_visibility_entry (GValue* value,
+ gpointer v_object)
+{
PublishingFlickrPublishingOptionsPaneVisibilityEntry * old;
#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_VISIBILITY_ENTRY));
@@ -5614,22 +5978,25 @@ static void publishing_flickr_publishing_options_pane_value_set_visibility_entry
value->data[0].v_pointer = v_object;
#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
publishing_flickr_publishing_options_pane_visibility_entry_ref (value->data[0].v_pointer);
-#line 5601 "FlickrPublishing.c"
+#line 5965 "FlickrPublishing.c"
} else {
#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 5605 "FlickrPublishing.c"
+#line 5969 "FlickrPublishing.c"
}
#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
if (old) {
#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
publishing_flickr_publishing_options_pane_visibility_entry_unref (old);
-#line 5611 "FlickrPublishing.c"
+#line 5975 "FlickrPublishing.c"
}
}
-static void publishing_flickr_publishing_options_pane_value_take_visibility_entry (GValue* value, gpointer v_object) {
+static void
+publishing_flickr_publishing_options_pane_value_take_visibility_entry (GValue* value,
+ gpointer v_object)
+{
PublishingFlickrPublishingOptionsPaneVisibilityEntry * old;
#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_VISIBILITY_ENTRY));
@@ -5643,38 +6010,44 @@ static void publishing_flickr_publishing_options_pane_value_take_visibility_entr
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
value->data[0].v_pointer = v_object;
-#line 5630 "FlickrPublishing.c"
+#line 5997 "FlickrPublishing.c"
} else {
#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 5634 "FlickrPublishing.c"
+#line 6001 "FlickrPublishing.c"
}
#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
if (old) {
#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
publishing_flickr_publishing_options_pane_visibility_entry_unref (old);
-#line 5640 "FlickrPublishing.c"
+#line 6007 "FlickrPublishing.c"
}
}
-static void publishing_flickr_publishing_options_pane_visibility_entry_class_init (PublishingFlickrPublishingOptionsPaneVisibilityEntryClass * klass) {
+static void
+publishing_flickr_publishing_options_pane_visibility_entry_class_init (PublishingFlickrPublishingOptionsPaneVisibilityEntryClass * klass)
+{
#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
publishing_flickr_publishing_options_pane_visibility_entry_parent_class = g_type_class_peek_parent (klass);
#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
((PublishingFlickrPublishingOptionsPaneVisibilityEntryClass *) klass)->finalize = publishing_flickr_publishing_options_pane_visibility_entry_finalize;
-#line 5650 "FlickrPublishing.c"
+#line 6019 "FlickrPublishing.c"
}
-static void publishing_flickr_publishing_options_pane_visibility_entry_instance_init (PublishingFlickrPublishingOptionsPaneVisibilityEntry * self) {
+static void
+publishing_flickr_publishing_options_pane_visibility_entry_instance_init (PublishingFlickrPublishingOptionsPaneVisibilityEntry * self)
+{
#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
self->ref_count = 1;
-#line 5657 "FlickrPublishing.c"
+#line 6028 "FlickrPublishing.c"
}
-static void publishing_flickr_publishing_options_pane_visibility_entry_finalize (PublishingFlickrPublishingOptionsPaneVisibilityEntry * obj) {
+static void
+publishing_flickr_publishing_options_pane_visibility_entry_finalize (PublishingFlickrPublishingOptionsPaneVisibilityEntry * obj)
+{
PublishingFlickrPublishingOptionsPaneVisibilityEntry * self;
#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_VISIBILITY_ENTRY, PublishingFlickrPublishingOptionsPaneVisibilityEntry);
@@ -5684,11 +6057,13 @@ static void publishing_flickr_publishing_options_pane_visibility_entry_finalize
_publishing_flickr_visibility_specification_unref0 (self->specification);
#line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_g_free0 (self->title);
-#line 5671 "FlickrPublishing.c"
+#line 6044 "FlickrPublishing.c"
}
-static GType publishing_flickr_publishing_options_pane_visibility_entry_get_type (void) {
+static GType
+publishing_flickr_publishing_options_pane_visibility_entry_get_type (void)
+{
static volatile gsize publishing_flickr_publishing_options_pane_visibility_entry_type_id__volatile = 0;
if (g_once_init_enter (&publishing_flickr_publishing_options_pane_visibility_entry_type_id__volatile)) {
static const GTypeValueTable g_define_type_value_table = { publishing_flickr_publishing_options_pane_value_visibility_entry_init, publishing_flickr_publishing_options_pane_value_visibility_entry_free_value, publishing_flickr_publishing_options_pane_value_visibility_entry_copy_value, publishing_flickr_publishing_options_pane_value_visibility_entry_peek_pointer, "p", publishing_flickr_publishing_options_pane_value_visibility_entry_collect_value, "p", publishing_flickr_publishing_options_pane_value_visibility_entry_lcopy_value };
@@ -5702,18 +6077,22 @@ static GType publishing_flickr_publishing_options_pane_visibility_entry_get_type
}
-static gpointer publishing_flickr_publishing_options_pane_visibility_entry_ref (gpointer instance) {
+static gpointer
+publishing_flickr_publishing_options_pane_visibility_entry_ref (gpointer instance)
+{
PublishingFlickrPublishingOptionsPaneVisibilityEntry * self;
self = instance;
#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_atomic_int_inc (&self->ref_count);
#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return instance;
-#line 5696 "FlickrPublishing.c"
+#line 6073 "FlickrPublishing.c"
}
-static void publishing_flickr_publishing_options_pane_visibility_entry_unref (gpointer instance) {
+static void
+publishing_flickr_publishing_options_pane_visibility_entry_unref (gpointer instance)
+{
PublishingFlickrPublishingOptionsPaneVisibilityEntry * self;
self = instance;
#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -5722,12 +6101,14 @@ static void publishing_flickr_publishing_options_pane_visibility_entry_unref (gp
PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_VISIBILITY_ENTRY_GET_CLASS (self)->finalize (self);
#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 5709 "FlickrPublishing.c"
+#line 6088 "FlickrPublishing.c"
}
}
-static void publishing_flickr_publishing_options_pane_class_init (PublishingFlickrPublishingOptionsPaneClass * klass) {
+static void
+publishing_flickr_publishing_options_pane_class_init (PublishingFlickrPublishingOptionsPaneClass * klass)
+{
#line 539 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
publishing_flickr_publishing_options_pane_parent_class = g_type_class_peek_parent (klass);
#line 539 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -5738,11 +6119,13 @@ static void publishing_flickr_publishing_options_pane_class_init (PublishingFlic
publishing_flickr_publishing_options_pane_signals[PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL] = g_signal_new ("publish", PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
#line 539 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
publishing_flickr_publishing_options_pane_signals[PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL] = g_signal_new ("logout", PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 5725 "FlickrPublishing.c"
+#line 6106 "FlickrPublishing.c"
}
-static void publishing_flickr_publishing_options_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) {
+static void
+publishing_flickr_publishing_options_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface)
+{
#line 539 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
publishing_flickr_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
#line 539 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -5753,11 +6136,13 @@ static void publishing_flickr_publishing_options_pane_spit_publishing_dialog_pan
iface->on_pane_installed = (void (*) (SpitPublishingDialogPane *)) publishing_flickr_publishing_options_pane_real_on_pane_installed;
#line 539 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
iface->on_pane_uninstalled = (void (*) (SpitPublishingDialogPane *)) publishing_flickr_publishing_options_pane_real_on_pane_uninstalled;
-#line 5740 "FlickrPublishing.c"
+#line 6123 "FlickrPublishing.c"
}
-static void publishing_flickr_publishing_options_pane_instance_init (PublishingFlickrPublishingOptionsPane * self) {
+static void
+publishing_flickr_publishing_options_pane_instance_init (PublishingFlickrPublishingOptionsPane * self)
+{
#line 539 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
self->priv = PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_GET_PRIVATE (self);
#line 561 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -5794,11 +6179,13 @@ static void publishing_flickr_publishing_options_pane_instance_init (PublishingF
self->priv->parameters = NULL;
#line 573 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
self->priv->publisher = NULL;
-#line 5781 "FlickrPublishing.c"
+#line 6166 "FlickrPublishing.c"
}
-static void publishing_flickr_publishing_options_pane_finalize (GObject * obj) {
+static void
+publishing_flickr_publishing_options_pane_finalize (GObject * obj)
+{
PublishingFlickrPublishingOptionsPane * self;
#line 539 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, PublishingFlickrPublishingOptionsPane);
@@ -5832,11 +6219,13 @@ static void publishing_flickr_publishing_options_pane_finalize (GObject * obj) {
_g_object_unref0 (self->priv->publisher);
#line 539 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
G_OBJECT_CLASS (publishing_flickr_publishing_options_pane_parent_class)->finalize (obj);
-#line 5819 "FlickrPublishing.c"
+#line 6206 "FlickrPublishing.c"
}
-GType publishing_flickr_publishing_options_pane_get_type (void) {
+GType
+publishing_flickr_publishing_options_pane_get_type (void)
+{
static volatile gsize publishing_flickr_publishing_options_pane_type_id__volatile = 0;
if (g_once_init_enter (&publishing_flickr_publishing_options_pane_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingFlickrPublishingOptionsPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_flickr_publishing_options_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingFlickrPublishingOptionsPane), 0, (GInstanceInitFunc) publishing_flickr_publishing_options_pane_instance_init, NULL };
@@ -5850,129 +6239,122 @@ GType publishing_flickr_publishing_options_pane_get_type (void) {
}
-PublishingFlickrUploader* publishing_flickr_uploader_construct (GType object_type, PublishingRESTSupportOAuth1Session* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingFlickrPublishingParameters* parameters, gboolean strip_metadata) {
+PublishingFlickrUploader*
+publishing_flickr_uploader_construct (GType object_type,
+ PublishingRESTSupportOAuth1Session* session,
+ SpitPublishingPublishable** publishables,
+ int publishables_length1,
+ PublishingFlickrPublishingParameters* parameters,
+ gboolean strip_metadata)
+{
PublishingFlickrUploader* self = NULL;
- PublishingRESTSupportOAuth1Session* _tmp0_;
- SpitPublishingPublishable** _tmp1_;
- gint _tmp1__length1;
- PublishingFlickrPublishingParameters* _tmp2_;
- PublishingFlickrPublishingParameters* _tmp3_;
- gboolean _tmp4_;
+ PublishingFlickrPublishingParameters* _tmp0_;
#line 741 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION (session), NULL);
#line 741 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_return_val_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_PARAMETERS (parameters), NULL);
#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp0_ = session;
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp1_ = publishables;
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp1__length1 = publishables_length1;
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- self = (PublishingFlickrUploader*) publishing_rest_support_batch_uploader_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, _tmp1__length1);
+ self = (PublishingFlickrUploader*) publishing_rest_support_batch_uploader_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), publishables, publishables_length1);
#line 745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp2_ = parameters;
-#line 745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp3_ = _publishing_flickr_publishing_parameters_ref0 (_tmp2_);
+ _tmp0_ = _publishing_flickr_publishing_parameters_ref0 (parameters);
#line 745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_publishing_flickr_publishing_parameters_unref0 (self->priv->parameters);
#line 745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- self->priv->parameters = _tmp3_;
-#line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp4_ = strip_metadata;
+ self->priv->parameters = _tmp0_;
#line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- self->priv->strip_metadata = _tmp4_;
+ self->priv->strip_metadata = strip_metadata;
#line 741 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return self;
-#line 5871 "FlickrPublishing.c"
+#line 6252 "FlickrPublishing.c"
}
-PublishingFlickrUploader* publishing_flickr_uploader_new (PublishingRESTSupportOAuth1Session* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingFlickrPublishingParameters* parameters, gboolean strip_metadata) {
+PublishingFlickrUploader*
+publishing_flickr_uploader_new (PublishingRESTSupportOAuth1Session* session,
+ SpitPublishingPublishable** publishables,
+ int publishables_length1,
+ PublishingFlickrPublishingParameters* parameters,
+ gboolean strip_metadata)
+{
#line 741 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return publishing_flickr_uploader_construct (PUBLISHING_FLICKR_TYPE_UPLOADER, session, publishables, publishables_length1, parameters, strip_metadata);
-#line 5878 "FlickrPublishing.c"
+#line 6265 "FlickrPublishing.c"
}
-static void _vala_array_add30 (gchar** * array, int* length, int* size, gchar* value) {
+static void
+_vala_array_add30 (gchar** * array,
+ int* length,
+ int* size,
+ gchar* value)
+{
#line 795 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
if ((*length) == (*size)) {
#line 795 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 795 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
*array = g_renew (gchar*, *array, (*size) + 1);
-#line 5889 "FlickrPublishing.c"
+#line 6281 "FlickrPublishing.c"
}
#line 795 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
(*array)[(*length)++] = value;
#line 795 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
(*array)[*length] = NULL;
-#line 5895 "FlickrPublishing.c"
+#line 6287 "FlickrPublishing.c"
}
-static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrUploader* self, SpitPublishingPublishable* publishable) {
- SpitPublishingPublishable* _tmp0_;
- SpitPublishingPublisherMediaType _tmp1_;
+static void
+publishing_flickr_uploader_preprocess_publishable (PublishingFlickrUploader* self,
+ SpitPublishingPublishable* publishable)
+{
GExiv2Metadata* publishable_metadata = NULL;
- GExiv2Metadata* _tmp2_;
- GExiv2Metadata* _tmp14_;
- gboolean _tmp15_;
- GExiv2Metadata* _tmp16_;
- gboolean _tmp17_;
- GExiv2Metadata* _tmp24_;
- gboolean _tmp25_;
- GExiv2Metadata* _tmp32_;
- gboolean _tmp33_;
+ GExiv2Metadata* _tmp0_;
+ GExiv2Metadata* _tmp10_;
+ GExiv2Metadata* _tmp11_;
+ GExiv2Metadata* _tmp18_;
+ GExiv2Metadata* _tmp25_;
GError * _inner_error_ = NULL;
#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_return_if_fail (PUBLISHING_FLICKR_IS_UPLOADER (self));
#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable));
#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp0_ = publishable;
-#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp1_ = spit_publishing_publishable_get_media_type (_tmp0_);
-#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- if (_tmp1_ != SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) {
+ if (spit_publishing_publishable_get_media_type (publishable) != SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) {
#line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return;
-#line 5925 "FlickrPublishing.c"
+#line 6310 "FlickrPublishing.c"
}
#line 753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp2_ = gexiv2_metadata_new ();
+ _tmp0_ = gexiv2_metadata_new ();
#line 753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- publishable_metadata = _tmp2_;
-#line 5931 "FlickrPublishing.c"
+ publishable_metadata = _tmp0_;
+#line 6316 "FlickrPublishing.c"
{
- GExiv2Metadata* _tmp3_;
- SpitPublishingPublishable* _tmp4_;
- GFile* _tmp5_;
- GFile* _tmp6_;
- gchar* _tmp7_;
- gchar* _tmp8_;
-#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp3_ = publishable_metadata;
+ GExiv2Metadata* _tmp1_;
+ GFile* _tmp2_;
+ GFile* _tmp3_;
+ gchar* _tmp4_;
+ gchar* _tmp5_;
#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp4_ = publishable;
+ _tmp1_ = publishable_metadata;
#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp5_ = spit_publishing_publishable_get_serialized_file (_tmp4_);
+ _tmp2_ = spit_publishing_publishable_get_serialized_file (publishable);
#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp6_ = _tmp5_;
+ _tmp3_ = _tmp2_;
#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp7_ = g_file_get_path (_tmp6_);
+ _tmp4_ = g_file_get_path (_tmp3_);
#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp8_ = _tmp7_;
+ _tmp5_ = _tmp4_;
#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- gexiv2_metadata_open_path (_tmp3_, _tmp8_, &_inner_error_);
+ gexiv2_metadata_open_path (_tmp1_, _tmp5_, &_inner_error_);
#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _g_free0 (_tmp8_);
+ _g_free0 (_tmp5_);
#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _g_object_unref0 (_tmp6_);
+ _g_object_unref0 (_tmp3_);
#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5959 "FlickrPublishing.c"
+#line 6341 "FlickrPublishing.c"
goto __catch18_g_error;
}
}
@@ -5980,35 +6362,32 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU
__catch18_g_error:
{
GError* err = NULL;
- SpitPublishingPublishable* _tmp9_;
- GFile* _tmp10_;
- GFile* _tmp11_;
- gchar* _tmp12_;
- gchar* _tmp13_;
+ GFile* _tmp6_;
+ GFile* _tmp7_;
+ gchar* _tmp8_;
+ gchar* _tmp9_;
#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
err = _inner_error_;
#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_inner_error_ = NULL;
#line 757 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp9_ = publishable;
-#line 757 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp10_ = spit_publishing_publishable_get_serialized_file (_tmp9_);
+ _tmp6_ = spit_publishing_publishable_get_serialized_file (publishable);
#line 757 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp11_ = _tmp10_;
+ _tmp7_ = _tmp6_;
#line 757 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp12_ = g_file_get_path (_tmp11_);
+ _tmp8_ = g_file_get_path (_tmp7_);
#line 757 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp13_ = _tmp12_;
+ _tmp9_ = _tmp8_;
#line 757 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_warning ("FlickrPublishing.vala:757: couldn't read metadata from file '%s' for u" \
-"pload preprocessing.", _tmp13_);
+"pload preprocessing.", _tmp9_);
#line 757 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _g_free0 (_tmp13_);
+ _g_free0 (_tmp9_);
#line 757 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _g_object_unref0 (_tmp11_);
+ _g_object_unref0 (_tmp7_);
#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_g_error_free0 (err);
-#line 5994 "FlickrPublishing.c"
+#line 6373 "FlickrPublishing.c"
}
__finally18:
#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -6021,333 +6400,322 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU
g_clear_error (&_inner_error_);
#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return;
-#line 6007 "FlickrPublishing.c"
+#line 6386 "FlickrPublishing.c"
}
#line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp14_ = publishable_metadata;
-#line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp15_ = gexiv2_metadata_has_iptc (_tmp14_);
+ _tmp10_ = publishable_metadata;
#line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- if (!_tmp15_) {
+ if (!gexiv2_metadata_has_iptc (_tmp10_)) {
#line 766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_g_object_unref0 (publishable_metadata);
#line 766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return;
-#line 6019 "FlickrPublishing.c"
+#line 6396 "FlickrPublishing.c"
}
#line 768 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp16_ = publishable_metadata;
+ _tmp11_ = publishable_metadata;
#line 768 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp17_ = gexiv2_metadata_has_tag (_tmp16_, "Iptc.Application2.Caption");
-#line 768 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- if (_tmp17_) {
-#line 6027 "FlickrPublishing.c"
- GExiv2Metadata* _tmp18_;
- GExiv2Metadata* _tmp19_;
- gchar* _tmp20_;
- gchar* _tmp21_;
- gchar* _tmp22_;
- gchar* _tmp23_;
+ if (gexiv2_metadata_has_tag (_tmp11_, "Iptc.Application2.Caption")) {
+#line 6402 "FlickrPublishing.c"
+ GExiv2Metadata* _tmp12_;
+ GExiv2Metadata* _tmp13_;
+ gchar* _tmp14_;
+ gchar* _tmp15_;
+ gchar* _tmp16_;
+ gchar* _tmp17_;
#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp18_ = publishable_metadata;
+ _tmp12_ = publishable_metadata;
#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp19_ = publishable_metadata;
+ _tmp13_ = publishable_metadata;
#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp20_ = gexiv2_metadata_get_tag_string (_tmp19_, "Iptc.Application2.Caption");
+ _tmp14_ = gexiv2_metadata_get_tag_string (_tmp13_, "Iptc.Application2.Caption");
#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp21_ = _tmp20_;
+ _tmp15_ = _tmp14_;
#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp22_ = publishing_rest_support_asciify_string (_tmp21_);
+ _tmp16_ = publishing_rest_support_asciify_string (_tmp15_);
#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp23_ = _tmp22_;
+ _tmp17_ = _tmp16_;
#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- gexiv2_metadata_set_tag_string (_tmp18_, "Iptc.Application2.Caption", _tmp23_);
+ gexiv2_metadata_set_tag_string (_tmp12_, "Iptc.Application2.Caption", _tmp17_);
#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _g_free0 (_tmp23_);
+ _g_free0 (_tmp17_);
#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _g_free0 (_tmp21_);
-#line 6052 "FlickrPublishing.c"
+ _g_free0 (_tmp15_);
+#line 6427 "FlickrPublishing.c"
}
#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp24_ = publishable_metadata;
-#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp25_ = gexiv2_metadata_has_tag (_tmp24_, "Iptc.Application2.Headline");
+ _tmp18_ = publishable_metadata;
#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- if (_tmp25_) {
-#line 6060 "FlickrPublishing.c"
- GExiv2Metadata* _tmp26_;
- GExiv2Metadata* _tmp27_;
- gchar* _tmp28_;
- gchar* _tmp29_;
- gchar* _tmp30_;
- gchar* _tmp31_;
+ if (gexiv2_metadata_has_tag (_tmp18_, "Iptc.Application2.Headline")) {
+#line 6433 "FlickrPublishing.c"
+ GExiv2Metadata* _tmp19_;
+ GExiv2Metadata* _tmp20_;
+ gchar* _tmp21_;
+ gchar* _tmp22_;
+ gchar* _tmp23_;
+ gchar* _tmp24_;
#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp26_ = publishable_metadata;
+ _tmp19_ = publishable_metadata;
#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp27_ = publishable_metadata;
+ _tmp20_ = publishable_metadata;
#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp28_ = gexiv2_metadata_get_tag_string (_tmp27_, "Iptc.Application2.Headline");
+ _tmp21_ = gexiv2_metadata_get_tag_string (_tmp20_, "Iptc.Application2.Headline");
#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp29_ = _tmp28_;
+ _tmp22_ = _tmp21_;
#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp30_ = publishing_rest_support_asciify_string (_tmp29_);
+ _tmp23_ = publishing_rest_support_asciify_string (_tmp22_);
#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp31_ = _tmp30_;
+ _tmp24_ = _tmp23_;
#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- gexiv2_metadata_set_tag_string (_tmp26_, "Iptc.Application2.Headline", _tmp31_);
+ gexiv2_metadata_set_tag_string (_tmp19_, "Iptc.Application2.Headline", _tmp24_);
#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _g_free0 (_tmp31_);
+ _g_free0 (_tmp24_);
#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _g_free0 (_tmp29_);
-#line 6085 "FlickrPublishing.c"
+ _g_free0 (_tmp22_);
+#line 6458 "FlickrPublishing.c"
}
#line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp32_ = publishable_metadata;
+ _tmp25_ = publishable_metadata;
#line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp33_ = gexiv2_metadata_has_tag (_tmp32_, "Iptc.Application2.Keywords");
-#line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- if (_tmp33_) {
-#line 6093 "FlickrPublishing.c"
+ if (gexiv2_metadata_has_tag (_tmp25_, "Iptc.Application2.Keywords")) {
+#line 6464 "FlickrPublishing.c"
GeeSet* keyword_set = NULL;
- GeeHashSet* _tmp34_;
+ GeeHashSet* _tmp26_;
gchar** iptc_keywords = NULL;
- GExiv2Metadata* _tmp35_;
- gchar** _tmp36_;
- gchar** _tmp37_;
+ GExiv2Metadata* _tmp27_;
+ gchar** _tmp28_;
+ gchar** _tmp29_;
gint iptc_keywords_length1;
gint _iptc_keywords_size_;
- gchar** _tmp38_;
- gint _tmp38__length1;
+ gchar** _tmp30_;
+ gint _tmp30__length1;
gchar** xmp_keywords = NULL;
- GExiv2Metadata* _tmp43_;
- gchar** _tmp44_;
- gchar** _tmp45_;
+ GExiv2Metadata* _tmp35_;
+ gchar** _tmp36_;
+ gchar** _tmp37_;
gint xmp_keywords_length1;
gint _xmp_keywords_size_;
- gchar** _tmp46_;
- gint _tmp46__length1;
+ gchar** _tmp38_;
+ gint _tmp38__length1;
gchar** all_keywords = NULL;
- GeeSet* _tmp51_;
- gint _tmp52_;
- gpointer* _tmp53_;
+ GeeSet* _tmp43_;
+ gint _tmp44_;
+ gpointer* _tmp45_;
gint all_keywords_length1;
gint _all_keywords_size_;
- gchar** _tmp54_;
- gint _tmp54__length1;
+ gchar** _tmp46_;
+ gint _tmp46__length1;
gchar** no_keywords = NULL;
- gchar** _tmp55_;
+ gchar** _tmp47_;
gint no_keywords_length1;
gint _no_keywords_size_;
- gchar** _tmp56_;
- gint _tmp56__length1;
- gchar* _tmp57_;
- GExiv2Metadata* _tmp58_;
- gchar** _tmp59_;
- gint _tmp59__length1;
- GExiv2Metadata* _tmp60_;
- gchar** _tmp61_;
- gint _tmp61__length1;
+ gchar** _tmp48_;
+ gint _tmp48__length1;
+ gchar* _tmp49_;
+ GExiv2Metadata* _tmp50_;
+ gchar** _tmp51_;
+ gint _tmp51__length1;
+ GExiv2Metadata* _tmp52_;
+ gchar** _tmp53_;
+ gint _tmp53__length1;
#line 779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp34_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL);
+ _tmp26_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL);
#line 779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- keyword_set = G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_SET, GeeSet);
+ keyword_set = G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_SET, GeeSet);
#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp35_ = publishable_metadata;
+ _tmp27_ = publishable_metadata;
#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp37_ = _tmp36_ = gexiv2_metadata_get_tag_multiple (_tmp35_, "Iptc.Application2.Keywords");
+ _tmp29_ = _tmp28_ = gexiv2_metadata_get_tag_multiple (_tmp27_, "Iptc.Application2.Keywords");
#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- iptc_keywords = _tmp37_;
+ iptc_keywords = _tmp29_;
#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- iptc_keywords_length1 = _vala_array_length (_tmp36_);
+ iptc_keywords_length1 = _vala_array_length (_tmp28_);
#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_iptc_keywords_size_ = iptc_keywords_length1;
#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp38_ = iptc_keywords;
+ _tmp30_ = iptc_keywords;
#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp38__length1 = iptc_keywords_length1;
+ _tmp30__length1 = iptc_keywords_length1;
#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- if (_tmp38_ != NULL) {
-#line 6153 "FlickrPublishing.c"
- gchar** _tmp39_;
- gint _tmp39__length1;
+ if (_tmp30_ != NULL) {
+#line 6524 "FlickrPublishing.c"
+ gchar** _tmp31_;
+ gint _tmp31__length1;
#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp39_ = iptc_keywords;
+ _tmp31_ = iptc_keywords;
#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp39__length1 = iptc_keywords_length1;
-#line 6160 "FlickrPublishing.c"
+ _tmp31__length1 = iptc_keywords_length1;
+#line 6531 "FlickrPublishing.c"
{
gchar** keyword_collection = NULL;
gint keyword_collection_length1 = 0;
gint _keyword_collection_size_ = 0;
gint keyword_it = 0;
#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- keyword_collection = _tmp39_;
+ keyword_collection = _tmp31_;
#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- keyword_collection_length1 = _tmp39__length1;
+ keyword_collection_length1 = _tmp31__length1;
#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- for (keyword_it = 0; keyword_it < _tmp39__length1; keyword_it = keyword_it + 1) {
-#line 6172 "FlickrPublishing.c"
- gchar* _tmp40_;
+ for (keyword_it = 0; keyword_it < _tmp31__length1; keyword_it = keyword_it + 1) {
+#line 6543 "FlickrPublishing.c"
+ gchar* _tmp32_;
gchar* keyword = NULL;
#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp40_ = g_strdup (keyword_collection[keyword_it]);
+ _tmp32_ = g_strdup (keyword_collection[keyword_it]);
#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- keyword = _tmp40_;
-#line 6179 "FlickrPublishing.c"
+ keyword = _tmp32_;
+#line 6550 "FlickrPublishing.c"
{
- GeeSet* _tmp41_;
- const gchar* _tmp42_;
+ GeeSet* _tmp33_;
+ const gchar* _tmp34_;
#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp41_ = keyword_set;
+ _tmp33_ = keyword_set;
#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp42_ = keyword;
+ _tmp34_ = keyword;
#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GEE_TYPE_COLLECTION, GeeCollection), _tmp42_);
+ gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_COLLECTION, GeeCollection), _tmp34_);
#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_g_free0 (keyword);
-#line 6191 "FlickrPublishing.c"
+#line 6562 "FlickrPublishing.c"
}
}
}
}
#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp43_ = publishable_metadata;
+ _tmp35_ = publishable_metadata;
#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp45_ = _tmp44_ = gexiv2_metadata_get_tag_multiple (_tmp43_, "Xmp.dc.subject");
+ _tmp37_ = _tmp36_ = gexiv2_metadata_get_tag_multiple (_tmp35_, "Xmp.dc.subject");
#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- xmp_keywords = _tmp45_;
+ xmp_keywords = _tmp37_;
#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- xmp_keywords_length1 = _vala_array_length (_tmp44_);
+ xmp_keywords_length1 = _vala_array_length (_tmp36_);
#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_xmp_keywords_size_ = xmp_keywords_length1;
#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp46_ = xmp_keywords;
+ _tmp38_ = xmp_keywords;
#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp46__length1 = xmp_keywords_length1;
+ _tmp38__length1 = xmp_keywords_length1;
#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- if (_tmp46_ != NULL) {
-#line 6212 "FlickrPublishing.c"
- gchar** _tmp47_;
- gint _tmp47__length1;
+ if (_tmp38_ != NULL) {
+#line 6583 "FlickrPublishing.c"
+ gchar** _tmp39_;
+ gint _tmp39__length1;
#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp47_ = xmp_keywords;
+ _tmp39_ = xmp_keywords;
#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp47__length1 = xmp_keywords_length1;
-#line 6219 "FlickrPublishing.c"
+ _tmp39__length1 = xmp_keywords_length1;
+#line 6590 "FlickrPublishing.c"
{
gchar** keyword_collection = NULL;
gint keyword_collection_length1 = 0;
gint _keyword_collection_size_ = 0;
gint keyword_it = 0;
#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- keyword_collection = _tmp47_;
+ keyword_collection = _tmp39_;
#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- keyword_collection_length1 = _tmp47__length1;
+ keyword_collection_length1 = _tmp39__length1;
#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- for (keyword_it = 0; keyword_it < _tmp47__length1; keyword_it = keyword_it + 1) {
-#line 6231 "FlickrPublishing.c"
- gchar* _tmp48_;
+ for (keyword_it = 0; keyword_it < _tmp39__length1; keyword_it = keyword_it + 1) {
+#line 6602 "FlickrPublishing.c"
+ gchar* _tmp40_;
gchar* keyword = NULL;
#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp48_ = g_strdup (keyword_collection[keyword_it]);
+ _tmp40_ = g_strdup (keyword_collection[keyword_it]);
#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- keyword = _tmp48_;
-#line 6238 "FlickrPublishing.c"
+ keyword = _tmp40_;
+#line 6609 "FlickrPublishing.c"
{
- GeeSet* _tmp49_;
- const gchar* _tmp50_;
+ GeeSet* _tmp41_;
+ const gchar* _tmp42_;
#line 788 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp49_ = keyword_set;
+ _tmp41_ = keyword_set;
#line 788 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp50_ = keyword;
+ _tmp42_ = keyword;
#line 788 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GEE_TYPE_COLLECTION, GeeCollection), _tmp50_);
+ gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GEE_TYPE_COLLECTION, GeeCollection), _tmp42_);
#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_g_free0 (keyword);
-#line 6250 "FlickrPublishing.c"
+#line 6621 "FlickrPublishing.c"
}
}
}
}
#line 790 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp51_ = keyword_set;
+ _tmp43_ = keyword_set;
#line 790 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp53_ = gee_collection_to_array (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, GEE_TYPE_COLLECTION, GeeCollection), &_tmp52_);
+ _tmp45_ = gee_collection_to_array (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, GEE_TYPE_COLLECTION, GeeCollection), &_tmp44_);
#line 790 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- all_keywords = _tmp53_;
+ all_keywords = _tmp45_;
#line 790 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- all_keywords_length1 = _tmp52_;
+ all_keywords_length1 = _tmp44_;
#line 790 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_all_keywords_size_ = all_keywords_length1;
#line 795 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp54_ = all_keywords;
+ _tmp46_ = all_keywords;
#line 795 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp54__length1 = all_keywords_length1;
+ _tmp46__length1 = all_keywords_length1;
#line 795 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_vala_array_add30 (&all_keywords, &all_keywords_length1, &_all_keywords_size_, NULL);
#line 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp55_ = g_new0 (gchar*, 1 + 1);
+ _tmp47_ = g_new0 (gchar*, 1 + 1);
#line 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- no_keywords = _tmp55_;
+ no_keywords = _tmp47_;
#line 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
no_keywords_length1 = 1;
#line 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_no_keywords_size_ = no_keywords_length1;
#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp56_ = no_keywords;
+ _tmp48_ = no_keywords;
#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp56__length1 = no_keywords_length1;
+ _tmp48__length1 = no_keywords_length1;
#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _g_free0 (_tmp56_[0]);
+ _g_free0 (_tmp48_[0]);
#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp56_[0] = NULL;
+ _tmp48_[0] = NULL;
#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp57_ = _tmp56_[0];
+ _tmp49_ = _tmp48_[0];
#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp58_ = publishable_metadata;
+ _tmp50_ = publishable_metadata;
#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp59_ = all_keywords;
+ _tmp51_ = all_keywords;
#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp59__length1 = all_keywords_length1;
+ _tmp51__length1 = all_keywords_length1;
#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- gexiv2_metadata_set_tag_multiple (_tmp58_, "Xmp.dc.subject", _tmp59_);
+ gexiv2_metadata_set_tag_multiple (_tmp50_, "Xmp.dc.subject", _tmp51_);
#line 805 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp60_ = publishable_metadata;
+ _tmp52_ = publishable_metadata;
#line 805 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp61_ = no_keywords;
+ _tmp53_ = no_keywords;
#line 805 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp61__length1 = no_keywords_length1;
+ _tmp53__length1 = no_keywords_length1;
#line 805 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- gexiv2_metadata_set_tag_multiple (_tmp60_, "Iptc.Application2.Keywords", _tmp61_);
-#line 6305 "FlickrPublishing.c"
+ gexiv2_metadata_set_tag_multiple (_tmp52_, "Iptc.Application2.Keywords", _tmp53_);
+#line 6676 "FlickrPublishing.c"
{
- GExiv2Metadata* _tmp62_;
- SpitPublishingPublishable* _tmp63_;
- GFile* _tmp64_;
- GFile* _tmp65_;
- gchar* _tmp66_;
- gchar* _tmp67_;
-#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp62_ = publishable_metadata;
+ GExiv2Metadata* _tmp54_;
+ GFile* _tmp55_;
+ GFile* _tmp56_;
+ gchar* _tmp57_;
+ gchar* _tmp58_;
#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp63_ = publishable;
+ _tmp54_ = publishable_metadata;
#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp64_ = spit_publishing_publishable_get_serialized_file (_tmp63_);
+ _tmp55_ = spit_publishing_publishable_get_serialized_file (publishable);
#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp65_ = _tmp64_;
+ _tmp56_ = _tmp55_;
#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp66_ = g_file_get_path (_tmp65_);
+ _tmp57_ = g_file_get_path (_tmp56_);
#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp67_ = _tmp66_;
+ _tmp58_ = _tmp57_;
#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- gexiv2_metadata_save_file (_tmp62_, _tmp67_, &_inner_error_);
+ gexiv2_metadata_save_file (_tmp54_, _tmp58_, &_inner_error_);
#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _g_free0 (_tmp67_);
+ _g_free0 (_tmp58_);
#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _g_object_unref0 (_tmp65_);
+ _g_object_unref0 (_tmp56_);
#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6333 "FlickrPublishing.c"
+#line 6701 "FlickrPublishing.c"
goto __catch19_g_error;
}
}
@@ -6355,35 +6723,32 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU
__catch19_g_error:
{
GError* err = NULL;
- SpitPublishingPublishable* _tmp68_;
- GFile* _tmp69_;
- GFile* _tmp70_;
- gchar* _tmp71_;
- gchar* _tmp72_;
+ GFile* _tmp59_;
+ GFile* _tmp60_;
+ gchar* _tmp61_;
+ gchar* _tmp62_;
#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
err = _inner_error_;
#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_inner_error_ = NULL;
#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp68_ = publishable;
-#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp69_ = spit_publishing_publishable_get_serialized_file (_tmp68_);
+ _tmp59_ = spit_publishing_publishable_get_serialized_file (publishable);
#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp70_ = _tmp69_;
+ _tmp60_ = _tmp59_;
#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp71_ = g_file_get_path (_tmp70_);
+ _tmp61_ = g_file_get_path (_tmp60_);
#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp72_ = _tmp71_;
+ _tmp62_ = _tmp61_;
#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
g_warning ("FlickrPublishing.vala:810: couldn't write metadata to file '%s' for up" \
-"load preprocessing.", _tmp72_);
+"load preprocessing.", _tmp62_);
#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _g_free0 (_tmp72_);
+ _g_free0 (_tmp62_);
#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _g_object_unref0 (_tmp70_);
+ _g_object_unref0 (_tmp60_);
#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_g_error_free0 (err);
-#line 6368 "FlickrPublishing.c"
+#line 6733 "FlickrPublishing.c"
}
__finally19:
#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -6406,7 +6771,7 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU
g_clear_error (&_inner_error_);
#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return;
-#line 6391 "FlickrPublishing.c"
+#line 6756 "FlickrPublishing.c"
}
#line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
no_keywords = (_vala_array_free (no_keywords, no_keywords_length1, (GDestroyNotify) g_free), NULL);
@@ -6418,15 +6783,18 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU
iptc_keywords = (_vala_array_free (iptc_keywords, iptc_keywords_length1, (GDestroyNotify) g_free), NULL);
#line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_g_object_unref0 (keyword_set);
-#line 6403 "FlickrPublishing.c"
+#line 6768 "FlickrPublishing.c"
}
#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_g_object_unref0 (publishable_metadata);
-#line 6407 "FlickrPublishing.c"
+#line 6772 "FlickrPublishing.c"
}
-static PublishingRESTSupportTransaction* publishing_flickr_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base, SpitPublishingPublishable* publishable) {
+static PublishingRESTSupportTransaction*
+publishing_flickr_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base,
+ SpitPublishingPublishable* publishable)
+{
PublishingFlickrUploader * self;
PublishingRESTSupportTransaction* result = NULL;
SpitPublishingPublishable* _tmp0_;
@@ -6472,11 +6840,13 @@ static PublishingRESTSupportTransaction* publishing_flickr_uploader_real_create_
result = _tmp8_;
#line 819 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
return result;
-#line 6457 "FlickrPublishing.c"
+#line 6825 "FlickrPublishing.c"
}
-static void publishing_flickr_uploader_class_init (PublishingFlickrUploaderClass * klass) {
+static void
+publishing_flickr_uploader_class_init (PublishingFlickrUploaderClass * klass)
+{
#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
publishing_flickr_uploader_parent_class = g_type_class_peek_parent (klass);
#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -6485,18 +6855,22 @@ static void publishing_flickr_uploader_class_init (PublishingFlickrUploaderClass
g_type_class_add_private (klass, sizeof (PublishingFlickrUploaderPrivate));
#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = (PublishingRESTSupportTransaction* (*) (PublishingRESTSupportBatchUploader *, SpitPublishingPublishable*)) publishing_flickr_uploader_real_create_transaction;
-#line 6470 "FlickrPublishing.c"
+#line 6840 "FlickrPublishing.c"
}
-static void publishing_flickr_uploader_instance_init (PublishingFlickrUploader * self) {
+static void
+publishing_flickr_uploader_instance_init (PublishingFlickrUploader * self)
+{
#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
self->priv = PUBLISHING_FLICKR_UPLOADER_GET_PRIVATE (self);
-#line 6477 "FlickrPublishing.c"
+#line 6849 "FlickrPublishing.c"
}
-static void publishing_flickr_uploader_finalize (PublishingRESTSupportBatchUploader * obj) {
+static void
+publishing_flickr_uploader_finalize (PublishingRESTSupportBatchUploader * obj)
+{
PublishingFlickrUploader * self;
#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_TYPE_UPLOADER, PublishingFlickrUploader);
@@ -6504,11 +6878,13 @@ static void publishing_flickr_uploader_finalize (PublishingRESTSupportBatchUploa
_publishing_flickr_publishing_parameters_unref0 (self->priv->parameters);
#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_CLASS (publishing_flickr_uploader_parent_class)->finalize (obj);
-#line 6489 "FlickrPublishing.c"
+#line 6863 "FlickrPublishing.c"
}
-GType publishing_flickr_uploader_get_type (void) {
+GType
+publishing_flickr_uploader_get_type (void)
+{
static volatile gsize publishing_flickr_uploader_type_id__volatile = 0;
if (g_once_init_enter (&publishing_flickr_uploader_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingFlickrUploaderClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_flickr_uploader_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingFlickrUploader), 0, (GInstanceInitFunc) publishing_flickr_uploader_instance_init, NULL };
@@ -6520,7 +6896,11 @@ GType publishing_flickr_uploader_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) {
@@ -6532,13 +6912,19 @@ 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);
}
-static gint _vala_array_length (gpointer array) {
+static gint
+_vala_array_length (gpointer array)
+{
int length;
length = 0;
if (array) {
diff --git a/plugins/shotwell-publishing/PicasaPublishing.c b/plugins/shotwell-publishing/PicasaPublishing.c
index 2c4cce2..4f597b8 100644
--- a/plugins/shotwell-publishing/PicasaPublishing.c
+++ b/plugins/shotwell-publishing/PicasaPublishing.c
@@ -1,4 +1,4 @@
-/* PicasaPublishing.c generated by valac 0.36.6, the Vala compiler
+/* PicasaPublishing.c generated by valac 0.40.4, the Vala compiler
* generated from PicasaPublishing.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>
@@ -35,6 +36,11 @@
typedef struct _PicasaService PicasaService;
typedef struct _PicasaServiceClass PicasaServiceClass;
typedef struct _PicasaServicePrivate PicasaServicePrivate;
+enum {
+ PICASA_SERVICE_0_PROPERTY,
+ PICASA_SERVICE_NUM_PROPERTIES
+};
+static GParamSpec* picasa_service_properties[PICASA_SERVICE_NUM_PROPERTIES];
#define _g_free0(var) (var = (g_free (var), NULL))
#define PUBLISHING_PICASA_TYPE_PICASA_PUBLISHER (publishing_picasa_picasa_publisher_get_type ())
@@ -57,6 +63,11 @@ typedef struct _PublishingPicasaPicasaPublisherPrivate PublishingPicasaPicasaPub
typedef struct _PublishingPicasaPublishingParameters PublishingPicasaPublishingParameters;
typedef struct _PublishingPicasaPublishingParametersClass PublishingPicasaPublishingParametersClass;
+enum {
+ PUBLISHING_PICASA_PICASA_PUBLISHER_0_PROPERTY,
+ PUBLISHING_PICASA_PICASA_PUBLISHER_NUM_PROPERTIES
+};
+static GParamSpec* publishing_picasa_picasa_publisher_properties[PUBLISHING_PICASA_PICASA_PUBLISHER_NUM_PROPERTIES];
#define _publishing_picasa_publishing_parameters_unref0(var) ((var == NULL) ? NULL : (var = (publishing_picasa_publishing_parameters_unref (var), NULL)))
#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
@@ -132,6 +143,11 @@ typedef struct _PublishingPicasaPublishingOptionsPanePrivate PublishingPicasaPub
typedef struct _PublishingPicasaPublishingOptionsPaneSizeDescription PublishingPicasaPublishingOptionsPaneSizeDescription;
typedef struct _PublishingPicasaPublishingOptionsPaneSizeDescriptionClass PublishingPicasaPublishingOptionsPaneSizeDescriptionClass;
+enum {
+ PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_0_PROPERTY,
+ PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_NUM_PROPERTIES
+};
+static GParamSpec* publishing_picasa_publishing_options_pane_properties[PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_NUM_PROPERTIES];
#define _g_slist_free0(var) ((var == NULL) ? NULL : (var = (g_slist_free (var), NULL)))
typedef struct _PublishingPicasaPublishingOptionsPaneSizeDescriptionPrivate PublishingPicasaPublishingOptionsPaneSizeDescriptionPrivate;
#define _publishing_picasa_publishing_options_pane_size_description_unref0(var) ((var == NULL) ? NULL : (var = (publishing_picasa_publishing_options_pane_size_description_unref (var), NULL)))
@@ -139,9 +155,9 @@ typedef struct _PublishingPicasaPublishingOptionsPaneParamSpecSizeDescription Pu
enum {
PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL,
PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL,
- PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL
+ PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_NUM_SIGNALS
};
-static guint publishing_picasa_publishing_options_pane_signals[PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL] = {0};
+static guint publishing_picasa_publishing_options_pane_signals[PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_NUM_SIGNALS] = {0};
typedef struct _PublishingPicasaPublishingParametersPrivate PublishingPicasaPublishingParametersPrivate;
#define _g_regex_unref0(var) ((var == NULL) ? NULL : (var = (g_regex_unref (var), NULL)))
typedef struct _PublishingPicasaParamSpecPublishingParameters PublishingPicasaParamSpecPublishingParameters;
@@ -326,187 +342,284 @@ static gpointer publishing_picasa_publishing_parameters_parent_class = NULL;
static gpointer publishing_picasa_uploader_parent_class = NULL;
GType picasa_service_get_type (void) G_GNUC_CONST;
-enum {
- PICASA_SERVICE_DUMMY_PROPERTY
-};
#define PICASA_SERVICE_ICON_FILENAME "picasa.png"
PicasaService* picasa_service_new (GFile* resource_directory);
-PicasaService* picasa_service_construct (GType object_type, GFile* resource_directory);
-static gint picasa_service_real_get_pluggable_interface (SpitPluggable* base, gint min_host_interface, gint max_host_interface);
+PicasaService* picasa_service_construct (GType object_type,
+ GFile* resource_directory);
+static gint picasa_service_real_get_pluggable_interface (SpitPluggable* base,
+ gint min_host_interface,
+ gint max_host_interface);
static const gchar* picasa_service_real_get_id (SpitPluggable* base);
static const gchar* picasa_service_real_get_pluggable_name (SpitPluggable* base);
-static void picasa_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info);
-static GdkPixbuf** _vala_array_dup4 (GdkPixbuf** self, int length);
-static SpitPublishingPublisher* picasa_service_real_create_publisher (SpitPublishingService* base, SpitPublishingPluginHost* host);
-PublishingPicasaPicasaPublisher* publishing_picasa_picasa_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host);
-PublishingPicasaPicasaPublisher* publishing_picasa_picasa_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host);
+static void picasa_service_real_get_info (SpitPluggable* base,
+ SpitPluggableInfo* info);
+static GdkPixbuf** _vala_array_dup4 (GdkPixbuf** self,
+ int length);
+static SpitPublishingPublisher* picasa_service_real_create_publisher (SpitPublishingService* base,
+ SpitPublishingPluginHost* host);
+PublishingPicasaPicasaPublisher* publishing_picasa_picasa_publisher_new (SpitPublishingService* service,
+ SpitPublishingPluginHost* host);
+PublishingPicasaPicasaPublisher* publishing_picasa_picasa_publisher_construct (GType object_type,
+ SpitPublishingService* service,
+ SpitPublishingPluginHost* host);
GType publishing_picasa_picasa_publisher_get_type (void) G_GNUC_CONST;
static SpitPublishingPublisherMediaType picasa_service_real_get_supported_media (SpitPublishingService* base);
-static void picasa_service_real_activation (SpitPluggable* base, gboolean enabled);
+static void picasa_service_real_activation (SpitPluggable* base,
+ gboolean enabled);
static void picasa_service_finalize (GObject * obj);
#define PUBLISHING_PICASA_DEFAULT_ALBUM_NAME _ ("Shotwell Connect")
gpointer publishing_picasa_publishing_parameters_ref (gpointer instance);
void publishing_picasa_publishing_parameters_unref (gpointer instance);
-GParamSpec* publishing_picasa_param_spec_publishing_parameters (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void publishing_picasa_value_set_publishing_parameters (GValue* value, gpointer v_object);
-void publishing_picasa_value_take_publishing_parameters (GValue* value, gpointer v_object);
+GParamSpec* publishing_picasa_param_spec_publishing_parameters (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void publishing_picasa_value_set_publishing_parameters (GValue* value,
+ gpointer v_object);
+void publishing_picasa_value_take_publishing_parameters (GValue* value,
+ gpointer v_object);
gpointer publishing_picasa_value_get_publishing_parameters (const GValue* value);
GType publishing_picasa_publishing_parameters_get_type (void) G_GNUC_CONST;
#define PUBLISHING_PICASA_PICASA_PUBLISHER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_PICASA_TYPE_PICASA_PUBLISHER, PublishingPicasaPicasaPublisherPrivate))
-enum {
- PUBLISHING_PICASA_PICASA_PUBLISHER_DUMMY_PROPERTY
-};
#define PUBLISHING_PICASA_PICASA_PUBLISHER_DEFAULT_ALBUM_FEED_URL "https://picasaweb.google.com/data/feed/api/user/default/albumid/defaul" \
"t"
PublishingPicasaPublishingParameters* publishing_picasa_publishing_parameters_new (void);
PublishingPicasaPublishingParameters* publishing_picasa_publishing_parameters_construct (GType object_type);
-static void publishing_picasa_picasa_publisher_load_parameters_from_configuration_system (PublishingPicasaPicasaPublisher* self, PublishingPicasaPublishingParameters* parameters);
-void publishing_picasa_publishing_parameters_set_media_type (PublishingPicasaPublishingParameters* self, SpitPublishingPublisherMediaType media_type);
+static void publishing_picasa_picasa_publisher_load_parameters_from_configuration_system (PublishingPicasaPicasaPublisher* self,
+ PublishingPicasaPublishingParameters* parameters);
+void publishing_picasa_publishing_parameters_set_media_type (PublishingPicasaPublishingParameters* self,
+ SpitPublishingPublisherMediaType media_type);
gpointer publishing_picasa_album_ref (gpointer instance);
void publishing_picasa_album_unref (gpointer instance);
-GParamSpec* publishing_picasa_param_spec_album (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void publishing_picasa_value_set_album (GValue* value, gpointer v_object);
-void publishing_picasa_value_take_album (GValue* value, gpointer v_object);
+GParamSpec* publishing_picasa_param_spec_album (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void publishing_picasa_value_set_album (GValue* value,
+ gpointer v_object);
+void publishing_picasa_value_take_album (GValue* value,
+ gpointer v_object);
gpointer publishing_picasa_value_get_album (const GValue* value);
GType publishing_picasa_album_get_type (void) G_GNUC_CONST;
-static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums_helper (PublishingPicasaPicasaPublisher* self, xmlNode* document_root, int* result_length1, GError** error);
-PublishingPicasaAlbum* publishing_picasa_album_new (const gchar* name, const gchar* url);
-PublishingPicasaAlbum* publishing_picasa_album_construct (GType object_type, const gchar* name, const gchar* url);
-static void _vala_array_add13 (PublishingPicasaAlbum** * array, int* length, int* size, PublishingPicasaAlbum* value);
-static void _vala_array_add14 (PublishingPicasaAlbum** * array, int* length, int* size, PublishingPicasaAlbum* value);
-void publishing_picasa_publishing_parameters_set_major_axis_size_selection_id (PublishingPicasaPublishingParameters* self, gint selection_id);
-void publishing_picasa_publishing_parameters_set_strip_metadata (PublishingPicasaPublishingParameters* self, gboolean strip_metadata);
-void publishing_picasa_publishing_parameters_set_target_album_name (PublishingPicasaPublishingParameters* self, const gchar* target_album_name);
-static void publishing_picasa_picasa_publisher_save_parameters_to_configuration_system (PublishingPicasaPicasaPublisher* self, PublishingPicasaPublishingParameters* parameters);
+static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums_helper (PublishingPicasaPicasaPublisher* self,
+ xmlNode* document_root,
+ int* result_length1,
+ GError** error);
+PublishingPicasaAlbum* publishing_picasa_album_new (const gchar* name,
+ const gchar* url);
+PublishingPicasaAlbum* publishing_picasa_album_construct (GType object_type,
+ const gchar* name,
+ const gchar* url);
+static void _vala_array_add13 (PublishingPicasaAlbum** * array,
+ int* length,
+ int* size,
+ PublishingPicasaAlbum* value);
+static void _vala_array_add14 (PublishingPicasaAlbum** * array,
+ int* length,
+ int* size,
+ PublishingPicasaAlbum* value);
+void publishing_picasa_publishing_parameters_set_major_axis_size_selection_id (PublishingPicasaPublishingParameters* self,
+ gint selection_id);
+void publishing_picasa_publishing_parameters_set_strip_metadata (PublishingPicasaPublishingParameters* self,
+ gboolean strip_metadata);
+void publishing_picasa_publishing_parameters_set_target_album_name (PublishingPicasaPublishingParameters* self,
+ const gchar* target_album_name);
+static void publishing_picasa_picasa_publisher_save_parameters_to_configuration_system (PublishingPicasaPicasaPublisher* self,
+ PublishingPicasaPublishingParameters* parameters);
gint publishing_picasa_publishing_parameters_get_major_axis_size_selection_id (PublishingPicasaPublishingParameters* self);
gboolean publishing_picasa_publishing_parameters_get_strip_metadata (PublishingPicasaPublishingParameters* self);
gchar* publishing_picasa_publishing_parameters_get_target_album_name (PublishingPicasaPublishingParameters* self);
static void publishing_picasa_picasa_publisher_real_on_login_flow_complete (PublishingRESTSupportGooglePublisher* base);
-void publishing_picasa_publishing_parameters_set_user_name (PublishingPicasaPublishingParameters* self, const gchar* user_name);
+void publishing_picasa_publishing_parameters_set_user_name (PublishingPicasaPublishingParameters* self,
+ const gchar* user_name);
static void publishing_picasa_picasa_publisher_do_fetch_account_information (PublishingPicasaPicasaPublisher* self);
-static void publishing_picasa_picasa_publisher_on_initial_album_fetch_complete (PublishingPicasaPicasaPublisher* self, PublishingRESTSupportTransaction* txn);
-static void _publishing_picasa_picasa_publisher_on_initial_album_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
-static void publishing_picasa_picasa_publisher_on_initial_album_fetch_error (PublishingPicasaPicasaPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err);
-static void _publishing_picasa_picasa_publisher_on_initial_album_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self);
+static void publishing_picasa_picasa_publisher_on_initial_album_fetch_complete (PublishingPicasaPicasaPublisher* self,
+ PublishingRESTSupportTransaction* txn);
+static void _publishing_picasa_picasa_publisher_on_initial_album_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+ gpointer self);
+static void publishing_picasa_picasa_publisher_on_initial_album_fetch_error (PublishingPicasaPicasaPublisher* self,
+ PublishingRESTSupportTransaction* bad_txn,
+ GError* err);
+static void _publishing_picasa_picasa_publisher_on_initial_album_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+ GError* err,
+ gpointer self);
GType publishing_picasa_album_directory_transaction_get_type (void) G_GNUC_CONST;
-static void publishing_picasa_picasa_publisher_do_parse_and_display_account_information (PublishingPicasaPicasaPublisher* self, PublishingPicasaAlbumDirectoryTransaction* transaction);
+static void publishing_picasa_picasa_publisher_do_parse_and_display_account_information (PublishingPicasaPicasaPublisher* self,
+ PublishingPicasaAlbumDirectoryTransaction* transaction);
static void publishing_picasa_picasa_publisher_on_publishing_options_logout (PublishingPicasaPicasaPublisher* self);
static void publishing_picasa_picasa_publisher_on_publishing_options_publish (PublishingPicasaPicasaPublisher* self);
static void publishing_picasa_picasa_publisher_do_upload (PublishingPicasaPicasaPublisher* self);
-static void publishing_picasa_picasa_publisher_on_upload_status_updated (PublishingPicasaPicasaPublisher* self, gint file_number, gdouble completed_fraction);
-static void publishing_picasa_picasa_publisher_on_upload_complete (PublishingPicasaPicasaPublisher* self, PublishingRESTSupportBatchUploader* uploader, gint num_published);
-static void _publishing_picasa_picasa_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender, gint num_photos_published, gpointer self);
-static void publishing_picasa_picasa_publisher_on_upload_error (PublishingPicasaPicasaPublisher* self, PublishingRESTSupportBatchUploader* uploader, GError* err);
-static void _publishing_picasa_picasa_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender, GError* err, gpointer self);
+static void publishing_picasa_picasa_publisher_on_upload_status_updated (PublishingPicasaPicasaPublisher* self,
+ gint file_number,
+ gdouble completed_fraction);
+static void publishing_picasa_picasa_publisher_on_upload_complete (PublishingPicasaPicasaPublisher* self,
+ PublishingRESTSupportBatchUploader* uploader,
+ gint num_published);
+static void _publishing_picasa_picasa_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender,
+ gint num_photos_published,
+ gpointer self);
+static void publishing_picasa_picasa_publisher_on_upload_error (PublishingPicasaPicasaPublisher* self,
+ PublishingRESTSupportBatchUploader* uploader,
+ GError* err);
+static void _publishing_picasa_picasa_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender,
+ GError* err,
+ gpointer self);
static void publishing_picasa_picasa_publisher_do_show_success_pane (PublishingPicasaPicasaPublisher* self);
PublishingPicasaAlbumDirectoryTransaction* publishing_picasa_album_directory_transaction_new (PublishingRESTSupportGoogleSession* session);
-PublishingPicasaAlbumDirectoryTransaction* publishing_picasa_album_directory_transaction_construct (GType object_type, PublishingRESTSupportGoogleSession* session);
+PublishingPicasaAlbumDirectoryTransaction* publishing_picasa_album_directory_transaction_construct (GType object_type,
+ PublishingRESTSupportGoogleSession* session);
gchar* publishing_picasa_album_directory_transaction_validate_xml (PublishingRESTSupportXmlDocument* doc);
-static gchar* _publishing_picasa_album_directory_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response (PublishingRESTSupportXmlDocument* doc, gpointer self);
-void publishing_picasa_publishing_parameters_set_albums (PublishingPicasaPublishingParameters* self, PublishingPicasaAlbum** albums, int albums_length1);
+static gchar* _publishing_picasa_album_directory_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response (PublishingRESTSupportXmlDocument* doc,
+ gpointer self);
+void publishing_picasa_publishing_parameters_set_albums (PublishingPicasaPublishingParameters* self,
+ PublishingPicasaAlbum** albums,
+ int albums_length1);
static void publishing_picasa_picasa_publisher_do_show_publishing_options_pane (PublishingPicasaPicasaPublisher* self);
GType publishing_picasa_publishing_options_pane_get_type (void) G_GNUC_CONST;
-PublishingPicasaPublishingOptionsPane* publishing_picasa_publishing_options_pane_new (GtkBuilder* builder, PublishingPicasaPublishingParameters* parameters, gboolean can_logout);
-PublishingPicasaPublishingOptionsPane* publishing_picasa_publishing_options_pane_construct (GType object_type, GtkBuilder* builder, PublishingPicasaPublishingParameters* parameters, gboolean can_logout);
-static void _publishing_picasa_picasa_publisher_on_publishing_options_publish_publishing_picasa_publishing_options_pane_publish (PublishingPicasaPublishingOptionsPane* _sender, gpointer self);
-static void _publishing_picasa_picasa_publisher_on_publishing_options_logout_publishing_picasa_publishing_options_pane_logout (PublishingPicasaPublishingOptionsPane* _sender, gpointer self);
+PublishingPicasaPublishingOptionsPane* publishing_picasa_publishing_options_pane_new (GtkBuilder* builder,
+ PublishingPicasaPublishingParameters* parameters,
+ gboolean can_logout);
+PublishingPicasaPublishingOptionsPane* publishing_picasa_publishing_options_pane_construct (GType object_type,
+ GtkBuilder* builder,
+ PublishingPicasaPublishingParameters* parameters,
+ gboolean can_logout);
+static void _publishing_picasa_picasa_publisher_on_publishing_options_publish_publishing_picasa_publishing_options_pane_publish (PublishingPicasaPublishingOptionsPane* _sender,
+ gpointer self);
+static void _publishing_picasa_picasa_publisher_on_publishing_options_logout_publishing_picasa_publishing_options_pane_logout (PublishingPicasaPublishingOptionsPane* _sender,
+ gpointer self);
gint publishing_picasa_publishing_parameters_get_major_axis_size_pixels (PublishingPicasaPublishingParameters* self);
GType publishing_picasa_uploader_get_type (void) G_GNUC_CONST;
-PublishingPicasaUploader* publishing_picasa_uploader_new (PublishingRESTSupportGoogleSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingPicasaPublishingParameters* parameters);
-PublishingPicasaUploader* publishing_picasa_uploader_construct (GType object_type, PublishingRESTSupportGoogleSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingPicasaPublishingParameters* parameters);
-static void _publishing_picasa_picasa_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self);
+PublishingPicasaUploader* publishing_picasa_uploader_new (PublishingRESTSupportGoogleSession* session,
+ SpitPublishingPublishable** publishables,
+ int publishables_length1,
+ PublishingPicasaPublishingParameters* parameters);
+PublishingPicasaUploader* publishing_picasa_uploader_construct (GType object_type,
+ PublishingRESTSupportGoogleSession* session,
+ SpitPublishingPublishable** publishables,
+ int publishables_length1,
+ PublishingPicasaPublishingParameters* parameters);
+static void _publishing_picasa_picasa_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number,
+ gdouble fraction_complete,
+ gpointer self);
static void publishing_picasa_picasa_publisher_real_do_logout (PublishingRESTSupportGooglePublisher* base);
static gboolean publishing_picasa_picasa_publisher_real_is_running (PublishingRESTSupportGooglePublisher* base);
static void publishing_picasa_picasa_publisher_real_start (PublishingRESTSupportGooglePublisher* base);
static void publishing_picasa_picasa_publisher_real_stop (PublishingRESTSupportGooglePublisher* base);
static SpitPublishingAuthenticator* publishing_picasa_picasa_publisher_real_get_authenticator (PublishingRESTSupportGooglePublisher* base);
static void publishing_picasa_picasa_publisher_finalize (GObject * obj);
-enum {
- PUBLISHING_PICASA_ALBUM_DUMMY_PROPERTY
-};
static void publishing_picasa_album_finalize (PublishingPicasaAlbum * obj);
-enum {
- PUBLISHING_PICASA_ALBUM_DIRECTORY_TRANSACTION_DUMMY_PROPERTY
-};
#define PUBLISHING_PICASA_ALBUM_DIRECTORY_TRANSACTION_ENDPOINT_URL "https://picasaweb.google.com/data/feed/api/user/" "default"
GType publishing_picasa_upload_transaction_get_type (void) G_GNUC_CONST;
#define PUBLISHING_PICASA_UPLOAD_TRANSACTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_PICASA_TYPE_UPLOAD_TRANSACTION, PublishingPicasaUploadTransactionPrivate))
-enum {
- PUBLISHING_PICASA_UPLOAD_TRANSACTION_DUMMY_PROPERTY
-};
#define PUBLISHING_PICASA_UPLOAD_TRANSACTION_METADATA_TEMPLATE "<?xml version=\"1.0\" ?><atom:entry xmlns:atom='http://www.w3.org/2005" \
"/Atom' xmlns:mrss='http://search.yahoo.com/mrss/'> <atom:title>%s</ato" \
"m:title> %s <atom:category scheme='http://schemas.google.com/g/2005#ki" \
"nd' term='http://schemas.google.com/photos/2007#photo'/> %s </atom:ent" \
"ry>"
-PublishingPicasaUploadTransaction* publishing_picasa_upload_transaction_new (PublishingRESTSupportGoogleSession* session, PublishingPicasaPublishingParameters* parameters, SpitPublishingPublishable* publishable);
-PublishingPicasaUploadTransaction* publishing_picasa_upload_transaction_construct (GType object_type, PublishingRESTSupportGoogleSession* session, PublishingPicasaPublishingParameters* parameters, SpitPublishingPublishable* publishable);
+PublishingPicasaUploadTransaction* publishing_picasa_upload_transaction_new (PublishingRESTSupportGoogleSession* session,
+ PublishingPicasaPublishingParameters* parameters,
+ SpitPublishingPublishable* publishable);
+PublishingPicasaUploadTransaction* publishing_picasa_upload_transaction_construct (GType object_type,
+ PublishingRESTSupportGoogleSession* session,
+ PublishingPicasaPublishingParameters* parameters,
+ SpitPublishingPublishable* publishable);
gchar* publishing_picasa_publishing_parameters_get_target_album_feed_url (PublishingPicasaPublishingParameters* self);
-static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error);
+static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSupportTransaction* base,
+ GError** error);
static void _vala_SoupBuffer_free (SoupBuffer* self);
static void _vala_SoupMultipart_free (SoupMultipart* self);
static void publishing_picasa_upload_transaction_finalize (PublishingRESTSupportTransaction * obj);
static gpointer publishing_picasa_publishing_options_pane_size_description_ref (gpointer instance);
static void publishing_picasa_publishing_options_pane_size_description_unref (gpointer instance);
-static GParamSpec* publishing_picasa_publishing_options_pane_param_spec_size_description (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) G_GNUC_UNUSED;
-static void publishing_picasa_publishing_options_pane_value_set_size_description (GValue* value, gpointer v_object) G_GNUC_UNUSED;
-static void publishing_picasa_publishing_options_pane_value_take_size_description (GValue* value, gpointer v_object) G_GNUC_UNUSED;
+static GParamSpec* publishing_picasa_publishing_options_pane_param_spec_size_description (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags) G_GNUC_UNUSED;
+static void publishing_picasa_publishing_options_pane_value_set_size_description (GValue* value,
+ gpointer v_object) G_GNUC_UNUSED;
+static void publishing_picasa_publishing_options_pane_value_take_size_description (GValue* value,
+ gpointer v_object) G_GNUC_UNUSED;
static gpointer publishing_picasa_publishing_options_pane_value_get_size_description (const GValue* value) G_GNUC_UNUSED;
static GType publishing_picasa_publishing_options_pane_size_description_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
#define PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_PICASA_TYPE_PUBLISHING_OPTIONS_PANE, PublishingPicasaPublishingOptionsPanePrivate))
-enum {
- PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_DUMMY_PROPERTY
-};
#define PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_DEFAULT_SIZE_CONFIG_KEY "default_size"
#define PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_LAST_ALBUM_CONFIG_KEY "last_album"
-static PublishingPicasaPublishingOptionsPaneSizeDescription** publishing_picasa_publishing_options_pane_create_size_descriptions (PublishingPicasaPublishingOptionsPane* self, int* result_length1);
+static PublishingPicasaPublishingOptionsPaneSizeDescription** publishing_picasa_publishing_options_pane_create_size_descriptions (PublishingPicasaPublishingOptionsPane* self,
+ int* result_length1);
gchar* publishing_picasa_publishing_parameters_get_user_name (PublishingPicasaPublishingParameters* self);
SpitPublishingPublisherMediaType publishing_picasa_publishing_parameters_get_media_type (PublishingPicasaPublishingParameters* self);
static void publishing_picasa_publishing_options_pane_on_logout_clicked (PublishingPicasaPublishingOptionsPane* self);
-static void _publishing_picasa_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void _publishing_picasa_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender,
+ gpointer self);
static void publishing_picasa_publishing_options_pane_on_publish_clicked (PublishingPicasaPublishingOptionsPane* self);
-static void _publishing_picasa_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
-void publishing_picasa_publishing_parameters_set_major_axis_size_pixels (PublishingPicasaPublishingParameters* self, gint pixels);
-PublishingPicasaAlbum** publishing_picasa_publishing_parameters_get_albums (PublishingPicasaPublishingParameters* self, int* result_length1);
-void publishing_picasa_publishing_parameters_set_target_album_entry_url (PublishingPicasaPublishingParameters* self, const gchar* target_album_url);
-static PublishingPicasaPublishingOptionsPaneSizeDescription* publishing_picasa_publishing_options_pane_size_description_new (const gchar* name, gint major_axis_pixels);
-static PublishingPicasaPublishingOptionsPaneSizeDescription* publishing_picasa_publishing_options_pane_size_description_construct (GType object_type, const gchar* name, gint major_axis_pixels);
-static void _vala_array_add15 (PublishingPicasaPublishingOptionsPaneSizeDescription** * array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value);
-static void _vala_array_add16 (PublishingPicasaPublishingOptionsPaneSizeDescription** * array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value);
-static void _vala_array_add17 (PublishingPicasaPublishingOptionsPaneSizeDescription** * array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value);
-static void _vala_array_add18 (PublishingPicasaPublishingOptionsPaneSizeDescription** * array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value);
+static void _publishing_picasa_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender,
+ gpointer self);
+void publishing_picasa_publishing_parameters_set_major_axis_size_pixels (PublishingPicasaPublishingParameters* self,
+ gint pixels);
+PublishingPicasaAlbum** publishing_picasa_publishing_parameters_get_albums (PublishingPicasaPublishingParameters* self,
+ int* result_length1);
+void publishing_picasa_publishing_parameters_set_target_album_entry_url (PublishingPicasaPublishingParameters* self,
+ const gchar* target_album_url);
+static PublishingPicasaPublishingOptionsPaneSizeDescription* publishing_picasa_publishing_options_pane_size_description_new (const gchar* name,
+ gint major_axis_pixels);
+static PublishingPicasaPublishingOptionsPaneSizeDescription* publishing_picasa_publishing_options_pane_size_description_construct (GType object_type,
+ const gchar* name,
+ gint major_axis_pixels);
+static void _vala_array_add15 (PublishingPicasaPublishingOptionsPaneSizeDescription** * array,
+ int* length,
+ int* size,
+ PublishingPicasaPublishingOptionsPaneSizeDescription* value);
+static void _vala_array_add16 (PublishingPicasaPublishingOptionsPaneSizeDescription** * array,
+ int* length,
+ int* size,
+ PublishingPicasaPublishingOptionsPaneSizeDescription* value);
+static void _vala_array_add17 (PublishingPicasaPublishingOptionsPaneSizeDescription** * array,
+ int* length,
+ int* size,
+ PublishingPicasaPublishingOptionsPaneSizeDescription* value);
+static void _vala_array_add18 (PublishingPicasaPublishingOptionsPaneSizeDescription** * array,
+ int* length,
+ int* size,
+ PublishingPicasaPublishingOptionsPaneSizeDescription* value);
#define PUBLISHING_PICASA_PUBLISHING_PARAMETERS_ORIGINAL_SIZE -1
-static void _vala_array_add19 (PublishingPicasaPublishingOptionsPaneSizeDescription** * array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value);
+static void _vala_array_add19 (PublishingPicasaPublishingOptionsPaneSizeDescription** * array,
+ int* length,
+ int* size,
+ PublishingPicasaPublishingOptionsPaneSizeDescription* value);
void publishing_picasa_publishing_options_pane_installed (PublishingPicasaPublishingOptionsPane* self);
static GtkWidget* publishing_picasa_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base);
static SpitPublishingDialogPaneGeometryOptions publishing_picasa_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base);
static void publishing_picasa_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base);
static void publishing_picasa_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base);
-enum {
- PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_SIZE_DESCRIPTION_DUMMY_PROPERTY
-};
static void publishing_picasa_publishing_options_pane_size_description_finalize (PublishingPicasaPublishingOptionsPaneSizeDescription * obj);
static void publishing_picasa_publishing_options_pane_finalize (GObject * obj);
#define PUBLISHING_PICASA_PUBLISHING_PARAMETERS_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_PICASA_TYPE_PUBLISHING_PARAMETERS, PublishingPicasaPublishingParametersPrivate))
-enum {
- PUBLISHING_PICASA_PUBLISHING_PARAMETERS_DUMMY_PROPERTY
-};
gchar* publishing_picasa_publishing_parameters_get_target_album_entry_url (PublishingPicasaPublishingParameters* self);
-static PublishingPicasaAlbum** _vala_array_dup5 (PublishingPicasaAlbum** self, int length);
-static PublishingPicasaAlbum** _vala_array_dup6 (PublishingPicasaAlbum** self, int length);
+static PublishingPicasaAlbum** _vala_array_dup5 (PublishingPicasaAlbum** self,
+ int length);
+static PublishingPicasaAlbum** _vala_array_dup6 (PublishingPicasaAlbum** self,
+ int length);
static void publishing_picasa_publishing_parameters_finalize (PublishingPicasaPublishingParameters * obj);
#define PUBLISHING_PICASA_UPLOADER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_PICASA_TYPE_UPLOADER, PublishingPicasaUploaderPrivate))
-enum {
- PUBLISHING_PICASA_UPLOADER_DUMMY_PROPERTY
-};
-static PublishingRESTSupportTransaction* publishing_picasa_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base, SpitPublishingPublishable* publishable);
+static PublishingRESTSupportTransaction* publishing_picasa_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base,
+ SpitPublishingPublishable* publishable);
static void publishing_picasa_uploader_finalize (PublishingRESTSupportBatchUploader * 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 gint _vala_array_length (gpointer array);
-PicasaService* picasa_service_construct (GType object_type, GFile* resource_directory) {
+PicasaService*
+picasa_service_construct (GType object_type,
+ GFile* resource_directory)
+{
PicasaService * self = NULL;
GdkPixbuf** _tmp0_;
gint _tmp0__length1;
@@ -520,7 +633,7 @@ PicasaService* picasa_service_construct (GType object_type, GFile* resource_dire
_tmp0__length1 = picasa_service_icon_pixbuf_set_length1;
#line 13 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (_tmp0_ == NULL) {
-#line 519 "PicasaPublishing.c"
+#line 632 "PicasaPublishing.c"
gint _tmp1_;
GdkPixbuf** _tmp2_;
#line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -533,44 +646,43 @@ PicasaService* picasa_service_construct (GType object_type, GFile* resource_dire
picasa_service_icon_pixbuf_set_length1 = _tmp1_;
#line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_picasa_service_icon_pixbuf_set_size_ = picasa_service_icon_pixbuf_set_length1;
-#line 532 "PicasaPublishing.c"
+#line 645 "PicasaPublishing.c"
}
#line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return self;
-#line 536 "PicasaPublishing.c"
+#line 649 "PicasaPublishing.c"
}
-PicasaService* picasa_service_new (GFile* resource_directory) {
+PicasaService*
+picasa_service_new (GFile* resource_directory)
+{
#line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return picasa_service_construct (TYPE_PICASA_SERVICE, resource_directory);
-#line 543 "PicasaPublishing.c"
+#line 658 "PicasaPublishing.c"
}
-static gint picasa_service_real_get_pluggable_interface (SpitPluggable* base, gint min_host_interface, gint max_host_interface) {
+static gint
+picasa_service_real_get_pluggable_interface (SpitPluggable* base,
+ gint min_host_interface,
+ gint max_host_interface)
+{
PicasaService * self;
gint result = 0;
- gint _tmp0_;
- gint _tmp1_;
- gint _tmp2_;
#line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PICASA_SERVICE, PicasaService);
#line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp0_ = min_host_interface;
-#line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp1_ = max_host_interface;
-#line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp2_ = spit_negotiate_interfaces (_tmp0_, _tmp1_, SPIT_PUBLISHING_CURRENT_INTERFACE);
-#line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- result = _tmp2_;
+ result = spit_negotiate_interfaces (min_host_interface, max_host_interface, SPIT_PUBLISHING_CURRENT_INTERFACE);
#line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return result;
-#line 565 "PicasaPublishing.c"
+#line 675 "PicasaPublishing.c"
}
-static const gchar* picasa_service_real_get_id (SpitPluggable* base) {
+static const gchar*
+picasa_service_real_get_id (SpitPluggable* base)
+{
PicasaService * self;
const gchar* result = NULL;
#line 23 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -579,11 +691,13 @@ static const gchar* picasa_service_real_get_id (SpitPluggable* base) {
result = "org.yorba.shotwell.publishing.picasa";
#line 24 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return result;
-#line 578 "PicasaPublishing.c"
+#line 690 "PicasaPublishing.c"
}
-static const gchar* picasa_service_real_get_pluggable_name (SpitPluggable* base) {
+static const gchar*
+picasa_service_real_get_pluggable_name (SpitPluggable* base)
+{
PicasaService * self;
const gchar* result = NULL;
#line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -592,39 +706,47 @@ static const gchar* picasa_service_real_get_pluggable_name (SpitPluggable* base)
result = "Picasa Web Albums";
#line 28 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return result;
-#line 591 "PicasaPublishing.c"
+#line 705 "PicasaPublishing.c"
}
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return self ? g_object_ref (self) : NULL;
-#line 598 "PicasaPublishing.c"
+#line 714 "PicasaPublishing.c"
}
-static GdkPixbuf** _vala_array_dup4 (GdkPixbuf** self, int length) {
+static GdkPixbuf**
+_vala_array_dup4 (GdkPixbuf** self,
+ int length)
+{
GdkPixbuf** result;
int i;
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
result = g_new0 (GdkPixbuf*, length + 1);
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
for (i = 0; i < length; i++) {
-#line 609 "PicasaPublishing.c"
+#line 728 "PicasaPublishing.c"
GdkPixbuf* _tmp0_;
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp0_ = _g_object_ref0 (self[i]);
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
result[i] = _tmp0_;
-#line 615 "PicasaPublishing.c"
+#line 734 "PicasaPublishing.c"
}
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return result;
-#line 619 "PicasaPublishing.c"
+#line 738 "PicasaPublishing.c"
}
-static void picasa_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info) {
+static void
+picasa_service_real_get_info (SpitPluggable* base,
+ SpitPluggableInfo* info)
+{
PicasaService * self;
gchar* _tmp0_;
gchar* _tmp1_;
@@ -699,32 +821,34 @@ static void picasa_service_real_get_info (SpitPluggable* base, SpitPluggableInfo
(*info).icons = _tmp8_;
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
(*info).icons_length1 = _tmp8__length1;
-#line 698 "PicasaPublishing.c"
+#line 820 "PicasaPublishing.c"
}
-static SpitPublishingPublisher* picasa_service_real_create_publisher (SpitPublishingService* base, SpitPublishingPluginHost* host) {
+static SpitPublishingPublisher*
+picasa_service_real_create_publisher (SpitPublishingService* base,
+ SpitPublishingPluginHost* host)
+{
PicasaService * self;
SpitPublishingPublisher* result = NULL;
- SpitPublishingPluginHost* _tmp0_;
- PublishingPicasaPicasaPublisher* _tmp1_;
+ PublishingPicasaPicasaPublisher* _tmp0_;
#line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PICASA_SERVICE, PicasaService);
#line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL);
#line 44 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp0_ = host;
+ _tmp0_ = publishing_picasa_picasa_publisher_new (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_SERVICE, SpitPublishingService), host);
#line 44 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp1_ = publishing_picasa_picasa_publisher_new (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_SERVICE, SpitPublishingService), _tmp0_);
-#line 44 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher);
+ result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher);
#line 44 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return result;
-#line 719 "PicasaPublishing.c"
+#line 841 "PicasaPublishing.c"
}
-static SpitPublishingPublisherMediaType picasa_service_real_get_supported_media (SpitPublishingService* base) {
+static SpitPublishingPublisherMediaType
+picasa_service_real_get_supported_media (SpitPublishingService* base)
+{
PicasaService * self;
SpitPublishingPublisherMediaType result = 0;
#line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -733,28 +857,35 @@ static SpitPublishingPublisherMediaType picasa_service_real_get_supported_media
result = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO | SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO;
#line 48 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return result;
-#line 732 "PicasaPublishing.c"
+#line 856 "PicasaPublishing.c"
}
-static void picasa_service_real_activation (SpitPluggable* base, gboolean enabled) {
+static void
+picasa_service_real_activation (SpitPluggable* base,
+ gboolean enabled)
+{
PicasaService * self;
#line 52 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PICASA_SERVICE, PicasaService);
-#line 740 "PicasaPublishing.c"
+#line 867 "PicasaPublishing.c"
}
-static void picasa_service_class_init (PicasaServiceClass * klass) {
+static void
+picasa_service_class_init (PicasaServiceClass * klass)
+{
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
picasa_service_parent_class = g_type_class_peek_parent (klass);
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
G_OBJECT_CLASS (klass)->finalize = picasa_service_finalize;
-#line 749 "PicasaPublishing.c"
+#line 878 "PicasaPublishing.c"
}
-static void picasa_service_spit_pluggable_interface_init (SpitPluggableIface * iface) {
+static void
+picasa_service_spit_pluggable_interface_init (SpitPluggableIface * iface)
+{
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
picasa_service_spit_pluggable_parent_iface = g_type_interface_peek_parent (iface);
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -767,36 +898,44 @@ static void picasa_service_spit_pluggable_interface_init (SpitPluggableIface * i
iface->get_info = (void (*) (SpitPluggable *, SpitPluggableInfo*)) picasa_service_real_get_info;
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
iface->activation = (void (*) (SpitPluggable *, gboolean)) picasa_service_real_activation;
-#line 766 "PicasaPublishing.c"
+#line 897 "PicasaPublishing.c"
}
-static void picasa_service_spit_publishing_service_interface_init (SpitPublishingServiceIface * iface) {
+static void
+picasa_service_spit_publishing_service_interface_init (SpitPublishingServiceIface * iface)
+{
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
picasa_service_spit_publishing_service_parent_iface = g_type_interface_peek_parent (iface);
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
iface->create_publisher = (SpitPublishingPublisher* (*) (SpitPublishingService *, SpitPublishingPluginHost*)) picasa_service_real_create_publisher;
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
iface->get_supported_media = (SpitPublishingPublisherMediaType (*) (SpitPublishingService *)) picasa_service_real_get_supported_media;
-#line 777 "PicasaPublishing.c"
+#line 910 "PicasaPublishing.c"
}
-static void picasa_service_instance_init (PicasaService * self) {
+static void
+picasa_service_instance_init (PicasaService * self)
+{
}
-static void picasa_service_finalize (GObject * obj) {
+static void
+picasa_service_finalize (GObject * obj)
+{
PicasaService * self;
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PICASA_SERVICE, PicasaService);
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
G_OBJECT_CLASS (picasa_service_parent_class)->finalize (obj);
-#line 791 "PicasaPublishing.c"
+#line 928 "PicasaPublishing.c"
}
-GType picasa_service_get_type (void) {
+GType
+picasa_service_get_type (void)
+{
static volatile gsize picasa_service_type_id__volatile = 0;
if (g_once_init_enter (&picasa_service_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PicasaServiceClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) picasa_service_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PicasaService), 0, (GInstanceInitFunc) picasa_service_instance_init, NULL };
@@ -812,91 +951,83 @@ GType picasa_service_get_type (void) {
}
-PublishingPicasaPicasaPublisher* publishing_picasa_picasa_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host) {
+PublishingPicasaPicasaPublisher*
+publishing_picasa_picasa_publisher_construct (GType object_type,
+ SpitPublishingService* service,
+ SpitPublishingPluginHost* host)
+{
PublishingPicasaPicasaPublisher * self = NULL;
- SpitPublishingService* _tmp0_;
- SpitPublishingPluginHost* _tmp1_;
- PublishingPicasaPublishingParameters* _tmp2_;
- PublishingPicasaPublishingParameters* _tmp3_;
+ PublishingPicasaPublishingParameters* _tmp0_;
+ PublishingPicasaPublishingParameters* _tmp1_;
SpitPublishingPublisherMediaType media_type = 0;
- SpitPublishingPluginHost* _tmp4_;
- gint _tmp5_;
- SpitPublishingPublishable** _tmp6_;
- PublishingPicasaPublishingParameters* _tmp11_;
- SpitPublishingPublisherMediaType _tmp12_;
+ gint _tmp2_;
+ SpitPublishingPublishable** _tmp3_;
+ PublishingPicasaPublishingParameters* _tmp7_;
+ SpitPublishingPublisherMediaType _tmp8_;
#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_return_val_if_fail (SPIT_PUBLISHING_IS_SERVICE (service), NULL);
#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL);
#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp0_ = service;
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp1_ = host;
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- self = (PublishingPicasaPicasaPublisher*) publishing_rest_support_google_publisher_construct (object_type, _tmp0_, _tmp1_, "https://picasaweb.google.com/data/");
+ self = (PublishingPicasaPicasaPublisher*) publishing_rest_support_google_publisher_construct (object_type, service, host, "https://picasaweb.google.com/data/");
#line 71 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp2_ = publishing_picasa_publishing_parameters_new ();
+ _tmp0_ = publishing_picasa_publishing_parameters_new ();
#line 71 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_publishing_picasa_publishing_parameters_unref0 (self->priv->publishing_parameters);
#line 71 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- self->priv->publishing_parameters = _tmp2_;
+ self->priv->publishing_parameters = _tmp0_;
#line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp3_ = self->priv->publishing_parameters;
+ _tmp1_ = self->priv->publishing_parameters;
#line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- publishing_picasa_picasa_publisher_load_parameters_from_configuration_system (self, _tmp3_);
+ publishing_picasa_picasa_publisher_load_parameters_from_configuration_system (self, _tmp1_);
#line 74 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
media_type = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_NONE;
#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp4_ = host;
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp6_ = spit_publishing_plugin_host_get_publishables (_tmp4_, &_tmp5_);
-#line 849 "PicasaPublishing.c"
+ _tmp3_ = spit_publishing_plugin_host_get_publishables (host, &_tmp2_);
+#line 983 "PicasaPublishing.c"
{
SpitPublishingPublishable** p_collection = NULL;
gint p_collection_length1 = 0;
gint _p_collection_size_ = 0;
gint p_it = 0;
#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- p_collection = _tmp6_;
+ p_collection = _tmp3_;
#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- p_collection_length1 = _tmp5_;
+ p_collection_length1 = _tmp2_;
#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- for (p_it = 0; p_it < _tmp5_; p_it = p_it + 1) {
-#line 861 "PicasaPublishing.c"
- SpitPublishingPublishable* _tmp7_;
+ for (p_it = 0; p_it < _tmp2_; p_it = p_it + 1) {
+#line 995 "PicasaPublishing.c"
+ SpitPublishingPublishable* _tmp4_;
SpitPublishingPublishable* p = NULL;
#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp7_ = _g_object_ref0 (p_collection[p_it]);
+ _tmp4_ = _g_object_ref0 (p_collection[p_it]);
#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- p = _tmp7_;
-#line 868 "PicasaPublishing.c"
+ p = _tmp4_;
+#line 1002 "PicasaPublishing.c"
{
- SpitPublishingPublisherMediaType _tmp8_;
- SpitPublishingPublishable* _tmp9_;
- SpitPublishingPublisherMediaType _tmp10_;
+ SpitPublishingPublisherMediaType _tmp5_;
+ SpitPublishingPublishable* _tmp6_;
#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp8_ = media_type;
+ _tmp5_ = media_type;
#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp9_ = p;
+ _tmp6_ = p;
#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp10_ = spit_publishing_publishable_get_media_type (_tmp9_);
-#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- media_type = _tmp8_ | _tmp10_;
+ media_type = _tmp5_ | spit_publishing_publishable_get_media_type (_tmp6_);
#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_g_object_unref0 (p);
-#line 883 "PicasaPublishing.c"
+#line 1014 "PicasaPublishing.c"
}
}
#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
p_collection = (_vala_array_free (p_collection, p_collection_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 888 "PicasaPublishing.c"
+#line 1019 "PicasaPublishing.c"
}
#line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp11_ = self->priv->publishing_parameters;
+ _tmp7_ = self->priv->publishing_parameters;
#line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp12_ = media_type;
+ _tmp8_ = media_type;
#line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- publishing_picasa_publishing_parameters_set_media_type (_tmp11_, _tmp12_);
+ publishing_picasa_publishing_parameters_set_media_type (_tmp7_, _tmp8_);
#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
(self->priv->progress_reporter_target_destroy_notify == NULL) ? NULL : (self->priv->progress_reporter_target_destroy_notify (self->priv->progress_reporter_target), NULL);
#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -913,65 +1044,82 @@ PublishingPicasaPicasaPublisher* publishing_picasa_picasa_publisher_construct (G
self->priv->progress_reporter_target_destroy_notify = NULL;
#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return self;
-#line 912 "PicasaPublishing.c"
+#line 1043 "PicasaPublishing.c"
}
-PublishingPicasaPicasaPublisher* publishing_picasa_picasa_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host) {
+PublishingPicasaPicasaPublisher*
+publishing_picasa_picasa_publisher_new (SpitPublishingService* service,
+ SpitPublishingPluginHost* host)
+{
#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return publishing_picasa_picasa_publisher_construct (PUBLISHING_PICASA_TYPE_PICASA_PUBLISHER, service, host);
-#line 919 "PicasaPublishing.c"
+#line 1053 "PicasaPublishing.c"
}
-static void _vala_array_add13 (PublishingPicasaAlbum** * array, int* length, int* size, PublishingPicasaAlbum* value) {
+static void
+_vala_array_add13 (PublishingPicasaAlbum** * array,
+ int* length,
+ int* size,
+ PublishingPicasaAlbum* value)
+{
#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if ((*length) == (*size)) {
#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
*array = g_renew (PublishingPicasaAlbum*, *array, (*size) + 1);
-#line 930 "PicasaPublishing.c"
+#line 1069 "PicasaPublishing.c"
}
#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
(*array)[(*length)++] = value;
#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
(*array)[*length] = NULL;
-#line 936 "PicasaPublishing.c"
+#line 1075 "PicasaPublishing.c"
}
-static void _vala_array_add14 (PublishingPicasaAlbum** * array, int* length, int* size, PublishingPicasaAlbum* value) {
+static void
+_vala_array_add14 (PublishingPicasaAlbum** * array,
+ int* length,
+ int* size,
+ PublishingPicasaAlbum* value)
+{
#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if ((*length) == (*size)) {
#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
*array = g_renew (PublishingPicasaAlbum*, *array, (*size) + 1);
-#line 947 "PicasaPublishing.c"
+#line 1091 "PicasaPublishing.c"
}
#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
(*array)[(*length)++] = value;
#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
(*array)[*length] = NULL;
-#line 953 "PicasaPublishing.c"
+#line 1097 "PicasaPublishing.c"
}
-static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums_helper (PublishingPicasaPicasaPublisher* self, xmlNode* document_root, int* result_length1, GError** error) {
+static PublishingPicasaAlbum**
+publishing_picasa_picasa_publisher_extract_albums_helper (PublishingPicasaPicasaPublisher* self,
+ xmlNode* document_root,
+ int* result_length1,
+ GError** error)
+{
PublishingPicasaAlbum** result = NULL;
PublishingPicasaAlbum** _result_ = NULL;
PublishingPicasaAlbum** _tmp0_;
gint _result__length1;
gint __result__size_;
xmlNode* doc_node_iter = NULL;
- xmlNode* _tmp1_;
- const gchar* _tmp2_;
- PublishingPicasaAlbum** _tmp9_;
- gint _tmp9__length1;
- PublishingPicasaAlbum* _tmp10_;
- PublishingPicasaAlbum** _tmp39_;
- gint _tmp39__length1;
+ const gchar* _tmp1_;
+ PublishingPicasaAlbum** _tmp5_;
+ gint _tmp5__length1;
+ PublishingPicasaAlbum* _tmp6_;
+ PublishingPicasaAlbum** _tmp35_;
+ gint _tmp35__length1;
GError * _inner_error_ = NULL;
#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_return_val_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self), NULL);
@@ -986,43 +1134,31 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums
#line 86 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
doc_node_iter = NULL;
#line 87 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp1_ = document_root;
+ _tmp1_ = document_root->name;
#line 87 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp2_ = _tmp1_->name;
-#line 87 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- if (g_strcmp0 (_tmp2_, "feed") == 0) {
-#line 990 "PicasaPublishing.c"
- xmlNode* _tmp3_;
- xmlNode* _tmp4_;
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp3_ = document_root;
+ if (g_strcmp0 (_tmp1_, "feed") == 0) {
+#line 1136 "PicasaPublishing.c"
+ xmlNode* _tmp2_;
#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp4_ = _tmp3_->children;
+ _tmp2_ = document_root->children;
#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- doc_node_iter = _tmp4_;
-#line 999 "PicasaPublishing.c"
+ doc_node_iter = _tmp2_;
+#line 1142 "PicasaPublishing.c"
} else {
- xmlNode* _tmp5_;
- const gchar* _tmp6_;
-#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp5_ = document_root;
+ const gchar* _tmp3_;
#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp6_ = _tmp5_->name;
+ _tmp3_ = document_root->name;
#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- if (g_strcmp0 (_tmp6_, "entry") == 0) {
-#line 1009 "PicasaPublishing.c"
- xmlNode* _tmp7_;
+ if (g_strcmp0 (_tmp3_, "entry") == 0) {
#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp7_ = document_root;
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- doc_node_iter = _tmp7_;
-#line 1015 "PicasaPublishing.c"
+ doc_node_iter = document_root;
+#line 1151 "PicasaPublishing.c"
} else {
- GError* _tmp8_;
+ GError* _tmp4_;
#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp8_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "response root node " "isn't a <feed> or <entry>");
+ _tmp4_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "response root node " "isn't a <feed> or <entry>");
#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _inner_error_ = _tmp8_;
+ _inner_error_ = _tmp4_;
#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -1031,7 +1167,7 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums
_result_ = (_vala_array_free (_result_, _result__length1, (GDestroyNotify) publishing_picasa_album_unref), NULL);
#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return NULL;
-#line 1030 "PicasaPublishing.c"
+#line 1166 "PicasaPublishing.c"
} else {
#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_result_ = (_vala_array_free (_result_, _result__length1, (GDestroyNotify) publishing_picasa_album_unref), NULL);
@@ -1041,282 +1177,268 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums
g_clear_error (&_inner_error_);
#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return NULL;
-#line 1040 "PicasaPublishing.c"
+#line 1176 "PicasaPublishing.c"
}
}
}
#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp9_ = _result_;
+ _tmp5_ = _result_;
#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp9__length1 = _result__length1;
+ _tmp5__length1 = _result__length1;
#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp10_ = publishing_picasa_album_new (_ ("Default album"), PUBLISHING_PICASA_PICASA_PUBLISHER_DEFAULT_ALBUM_FEED_URL);
+ _tmp6_ = publishing_picasa_album_new (_ ("Default album"), PUBLISHING_PICASA_PICASA_PUBLISHER_DEFAULT_ALBUM_FEED_URL);
#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _vala_array_add13 (&_result_, &_result__length1, &__result__size_, _tmp10_);
-#line 1052 "PicasaPublishing.c"
+ _vala_array_add13 (&_result_, &_result__length1, &__result__size_, _tmp6_);
+#line 1188 "PicasaPublishing.c"
{
- gboolean _tmp11_ = FALSE;
+ gboolean _tmp7_ = FALSE;
#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp11_ = TRUE;
+ _tmp7_ = TRUE;
#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
while (TRUE) {
-#line 1059 "PicasaPublishing.c"
- xmlNode* _tmp14_;
- xmlNode* _tmp15_;
- const gchar* _tmp16_;
+#line 1195 "PicasaPublishing.c"
+ xmlNode* _tmp10_;
+ xmlNode* _tmp11_;
+ const gchar* _tmp12_;
gchar* name_val = NULL;
gchar* url_val = NULL;
xmlNode* album_node_iter = NULL;
- xmlNode* _tmp17_;
- xmlNode* _tmp18_;
- const gchar* _tmp34_;
- PublishingPicasaAlbum** _tmp35_;
- gint _tmp35__length1;
- const gchar* _tmp36_;
- const gchar* _tmp37_;
- PublishingPicasaAlbum* _tmp38_;
+ xmlNode* _tmp13_;
+ xmlNode* _tmp14_;
+ const gchar* _tmp30_;
+ PublishingPicasaAlbum** _tmp31_;
+ gint _tmp31__length1;
+ const gchar* _tmp32_;
+ const gchar* _tmp33_;
+ PublishingPicasaAlbum* _tmp34_;
#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- if (!_tmp11_) {
-#line 1076 "PicasaPublishing.c"
- xmlNode* _tmp12_;
- xmlNode* _tmp13_;
+ if (!_tmp7_) {
+#line 1212 "PicasaPublishing.c"
+ xmlNode* _tmp8_;
+ xmlNode* _tmp9_;
#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp12_ = doc_node_iter;
+ _tmp8_ = doc_node_iter;
#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp13_ = _tmp12_->next;
+ _tmp9_ = _tmp8_->next;
#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- doc_node_iter = _tmp13_;
-#line 1085 "PicasaPublishing.c"
+ doc_node_iter = _tmp9_;
+#line 1221 "PicasaPublishing.c"
}
#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp11_ = FALSE;
+ _tmp7_ = FALSE;
#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp14_ = doc_node_iter;
+ _tmp10_ = doc_node_iter;
#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- if (!(_tmp14_ != NULL)) {
+ if (!(_tmp10_ != NULL)) {
#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
break;
-#line 1095 "PicasaPublishing.c"
+#line 1231 "PicasaPublishing.c"
}
#line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp15_ = doc_node_iter;
+ _tmp11_ = doc_node_iter;
#line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp16_ = _tmp15_->name;
+ _tmp12_ = _tmp11_->name;
#line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- if (g_strcmp0 (_tmp16_, "entry") != 0) {
+ if (g_strcmp0 (_tmp12_, "entry") != 0) {
#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
continue;
-#line 1105 "PicasaPublishing.c"
+#line 1241 "PicasaPublishing.c"
}
#line 102 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
name_val = NULL;
#line 103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
url_val = NULL;
#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp17_ = doc_node_iter;
+ _tmp13_ = doc_node_iter;
#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp18_ = _tmp17_->children;
+ _tmp14_ = _tmp13_->children;
#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- album_node_iter = _tmp18_;
-#line 1117 "PicasaPublishing.c"
+ album_node_iter = _tmp14_;
+#line 1253 "PicasaPublishing.c"
{
- gboolean _tmp19_ = FALSE;
+ gboolean _tmp15_ = FALSE;
#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp19_ = TRUE;
+ _tmp15_ = TRUE;
#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
while (TRUE) {
-#line 1124 "PicasaPublishing.c"
- xmlNode* _tmp22_;
- xmlNode* _tmp23_;
- const gchar* _tmp24_;
+#line 1260 "PicasaPublishing.c"
+ xmlNode* _tmp18_;
+ xmlNode* _tmp19_;
+ const gchar* _tmp20_;
#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- if (!_tmp19_) {
-#line 1130 "PicasaPublishing.c"
- xmlNode* _tmp20_;
- xmlNode* _tmp21_;
+ if (!_tmp15_) {
+#line 1266 "PicasaPublishing.c"
+ xmlNode* _tmp16_;
+ xmlNode* _tmp17_;
#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp20_ = album_node_iter;
+ _tmp16_ = album_node_iter;
#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp21_ = _tmp20_->next;
+ _tmp17_ = _tmp16_->next;
#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- album_node_iter = _tmp21_;
-#line 1139 "PicasaPublishing.c"
+ album_node_iter = _tmp17_;
+#line 1275 "PicasaPublishing.c"
}
#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp19_ = FALSE;
+ _tmp15_ = FALSE;
#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp22_ = album_node_iter;
+ _tmp18_ = album_node_iter;
#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- if (!(_tmp22_ != NULL)) {
+ if (!(_tmp18_ != NULL)) {
#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
break;
-#line 1149 "PicasaPublishing.c"
+#line 1285 "PicasaPublishing.c"
}
#line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp23_ = album_node_iter;
+ _tmp19_ = album_node_iter;
#line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp24_ = _tmp23_->name;
+ _tmp20_ = _tmp19_->name;
#line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- if (g_strcmp0 (_tmp24_, "title") == 0) {
-#line 1157 "PicasaPublishing.c"
- xmlNode* _tmp25_;
- gchar* _tmp26_;
+ if (g_strcmp0 (_tmp20_, "title") == 0) {
+#line 1293 "PicasaPublishing.c"
+ xmlNode* _tmp21_;
+ gchar* _tmp22_;
#line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp25_ = album_node_iter;
+ _tmp21_ = album_node_iter;
#line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp26_ = (gchar*) xmlNodeGetContent (_tmp25_);
+ _tmp22_ = (gchar*) xmlNodeGetContent (_tmp21_);
#line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_g_free0 (name_val);
#line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- name_val = _tmp26_;
-#line 1168 "PicasaPublishing.c"
+ name_val = _tmp22_;
+#line 1304 "PicasaPublishing.c"
} else {
- xmlNode* _tmp27_;
- const gchar* _tmp28_;
+ xmlNode* _tmp23_;
+ const gchar* _tmp24_;
#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp27_ = album_node_iter;
+ _tmp23_ = album_node_iter;
#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp28_ = _tmp27_->name;
+ _tmp24_ = _tmp23_->name;
#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- if (g_strcmp0 (_tmp28_, "id") == 0) {
-#line 1178 "PicasaPublishing.c"
- xmlNode* _tmp29_;
- xmlNs* _tmp30_;
- const gchar* _tmp31_;
- xmlNode* _tmp32_;
- gchar* _tmp33_;
+ if (g_strcmp0 (_tmp24_, "id") == 0) {
+#line 1314 "PicasaPublishing.c"
+ xmlNode* _tmp25_;
+ xmlNs* _tmp26_;
+ const gchar* _tmp27_;
+ xmlNode* _tmp28_;
+ gchar* _tmp29_;
#line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp29_ = album_node_iter;
+ _tmp25_ = album_node_iter;
#line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp30_ = _tmp29_->ns;
+ _tmp26_ = _tmp25_->ns;
#line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp31_ = _tmp30_->prefix;
+ _tmp27_ = _tmp26_->prefix;
#line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- if (_tmp31_ != NULL) {
+ if (_tmp27_ != NULL) {
#line 113 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
continue;
-#line 1194 "PicasaPublishing.c"
+#line 1330 "PicasaPublishing.c"
}
#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp32_ = album_node_iter;
+ _tmp28_ = album_node_iter;
#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp33_ = (gchar*) xmlNodeGetContent (_tmp32_);
+ _tmp29_ = (gchar*) xmlNodeGetContent (_tmp28_);
#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_g_free0 (url_val);
#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- url_val = _tmp33_;
-#line 1204 "PicasaPublishing.c"
+ url_val = _tmp29_;
+#line 1340 "PicasaPublishing.c"
}
}
}
}
#line 119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp34_ = url_val;
+ _tmp30_ = url_val;
#line 119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- if (g_strcmp0 (_tmp34_, PUBLISHING_PICASA_PICASA_PUBLISHER_DEFAULT_ALBUM_FEED_URL) == 0) {
+ if (g_strcmp0 (_tmp30_, PUBLISHING_PICASA_PICASA_PUBLISHER_DEFAULT_ALBUM_FEED_URL) == 0) {
#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_g_free0 (url_val);
#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_g_free0 (name_val);
#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
continue;
-#line 1219 "PicasaPublishing.c"
+#line 1355 "PicasaPublishing.c"
}
#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp35_ = _result_;
+ _tmp31_ = _result_;
#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp35__length1 = _result__length1;
+ _tmp31__length1 = _result__length1;
#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp36_ = name_val;
+ _tmp32_ = name_val;
#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp37_ = url_val;
+ _tmp33_ = url_val;
#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp38_ = publishing_picasa_album_new (_tmp36_, _tmp37_);
+ _tmp34_ = publishing_picasa_album_new (_tmp32_, _tmp33_);
#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _vala_array_add14 (&_result_, &_result__length1, &__result__size_, _tmp38_);
+ _vala_array_add14 (&_result_, &_result__length1, &__result__size_, _tmp34_);
#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_g_free0 (url_val);
#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_g_free0 (name_val);
-#line 1237 "PicasaPublishing.c"
+#line 1373 "PicasaPublishing.c"
}
}
#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp39_ = _result_;
+ _tmp35_ = _result_;
#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp39__length1 = _result__length1;
+ _tmp35__length1 = _result__length1;
#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (result_length1) {
#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- *result_length1 = _tmp39__length1;
-#line 1248 "PicasaPublishing.c"
+ *result_length1 = _tmp35__length1;
+#line 1384 "PicasaPublishing.c"
}
#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- result = _tmp39_;
+ result = _tmp35_;
#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return result;
-#line 1254 "PicasaPublishing.c"
+#line 1390 "PicasaPublishing.c"
}
-static void publishing_picasa_picasa_publisher_load_parameters_from_configuration_system (PublishingPicasaPicasaPublisher* self, PublishingPicasaPublishingParameters* parameters) {
- PublishingPicasaPublishingParameters* _tmp0_;
+static void
+publishing_picasa_picasa_publisher_load_parameters_from_configuration_system (PublishingPicasaPicasaPublisher* self,
+ PublishingPicasaPublishingParameters* parameters)
+{
+ SpitPublishingPluginHost* _tmp0_;
SpitPublishingPluginHost* _tmp1_;
- gint _tmp2_;
- PublishingPicasaPublishingParameters* _tmp3_;
- SpitPublishingPluginHost* _tmp4_;
- gboolean _tmp5_;
- PublishingPicasaPublishingParameters* _tmp6_;
- SpitPublishingPluginHost* _tmp7_;
- gchar* _tmp8_;
- gchar* _tmp9_;
+ SpitPublishingPluginHost* _tmp2_;
+ gchar* _tmp3_;
+ gchar* _tmp4_;
#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self));
#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (parameters));
#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp0_ = parameters;
-#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp1_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp2_ = spit_host_interface_get_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "default-size", 0);
+ _tmp0_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- publishing_picasa_publishing_parameters_set_major_axis_size_selection_id (_tmp0_, _tmp2_);
+ publishing_picasa_publishing_parameters_set_major_axis_size_selection_id (parameters, spit_host_interface_get_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "default-size", 0));
#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp3_ = parameters;
-#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp4_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp5_ = spit_host_interface_get_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "strip-metadata", FALSE);
+ _tmp1_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- publishing_picasa_publishing_parameters_set_strip_metadata (_tmp3_, _tmp5_);
+ publishing_picasa_publishing_parameters_set_strip_metadata (parameters, spit_host_interface_get_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "strip-metadata", FALSE));
#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp6_ = parameters;
+ _tmp2_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp7_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp8_ = spit_host_interface_get_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-album", NULL);
+ _tmp3_ = spit_host_interface_get_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-album", NULL);
#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp9_ = _tmp8_;
+ _tmp4_ = _tmp3_;
#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- publishing_picasa_publishing_parameters_set_target_album_name (_tmp6_, _tmp9_);
+ publishing_picasa_publishing_parameters_set_target_album_name (parameters, _tmp4_);
#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _g_free0 (_tmp9_);
-#line 1301 "PicasaPublishing.c"
+ _g_free0 (_tmp4_);
+#line 1425 "PicasaPublishing.c"
}
-static void publishing_picasa_picasa_publisher_save_parameters_to_configuration_system (PublishingPicasaPicasaPublisher* self, PublishingPicasaPublishingParameters* parameters) {
+static void
+publishing_picasa_picasa_publisher_save_parameters_to_configuration_system (PublishingPicasaPicasaPublisher* self,
+ PublishingPicasaPublishingParameters* parameters)
+{
SpitPublishingPluginHost* _tmp0_;
- PublishingPicasaPublishingParameters* _tmp1_;
- gint _tmp2_;
- SpitPublishingPluginHost* _tmp3_;
- PublishingPicasaPublishingParameters* _tmp4_;
- gboolean _tmp5_;
- SpitPublishingPluginHost* _tmp6_;
- PublishingPicasaPublishingParameters* _tmp7_;
- gchar* _tmp8_;
- gchar* _tmp9_;
+ SpitPublishingPluginHost* _tmp1_;
+ SpitPublishingPluginHost* _tmp2_;
+ gchar* _tmp3_;
+ gchar* _tmp4_;
#line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self));
#line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -1324,36 +1446,28 @@ static void publishing_picasa_picasa_publisher_save_parameters_to_configuration_
#line 136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp0_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
#line 136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp1_ = parameters;
-#line 136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp2_ = publishing_picasa_publishing_parameters_get_major_axis_size_selection_id (_tmp1_);
-#line 136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "default-size", _tmp2_);
-#line 137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp3_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
+ spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "default-size", publishing_picasa_publishing_parameters_get_major_axis_size_selection_id (parameters));
#line 137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp4_ = parameters;
-#line 137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp5_ = publishing_picasa_publishing_parameters_get_strip_metadata (_tmp4_);
+ _tmp1_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
#line 137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "strip_metadata", _tmp5_);
-#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp6_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
+ spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "strip_metadata", publishing_picasa_publishing_parameters_get_strip_metadata (parameters));
#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp7_ = parameters;
+ _tmp2_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp8_ = publishing_picasa_publishing_parameters_get_target_album_name (_tmp7_);
+ _tmp3_ = publishing_picasa_publishing_parameters_get_target_album_name (parameters);
#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp9_ = _tmp8_;
+ _tmp4_ = _tmp3_;
#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-album", _tmp9_);
+ spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-album", _tmp4_);
#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _g_free0 (_tmp9_);
-#line 1348 "PicasaPublishing.c"
+ _g_free0 (_tmp4_);
+#line 1460 "PicasaPublishing.c"
}
-static void publishing_picasa_picasa_publisher_real_on_login_flow_complete (PublishingRESTSupportGooglePublisher* base) {
+static void
+publishing_picasa_picasa_publisher_real_on_login_flow_complete (PublishingRESTSupportGooglePublisher* base)
+{
PublishingPicasaPicasaPublisher * self;
PublishingPicasaPublishingParameters* _tmp0_;
PublishingRESTSupportGoogleSession* _tmp1_;
@@ -1382,351 +1496,307 @@ static void publishing_picasa_picasa_publisher_real_on_login_flow_complete (Publ
_publishing_rest_support_session_unref0 (_tmp2_);
#line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_picasa_picasa_publisher_do_fetch_account_information (self);
-#line 1381 "PicasaPublishing.c"
+#line 1495 "PicasaPublishing.c"
}
-static void _publishing_picasa_picasa_publisher_on_initial_album_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
+static void
+_publishing_picasa_picasa_publisher_on_initial_album_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+ gpointer self)
+{
#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_picasa_picasa_publisher_on_initial_album_fetch_complete ((PublishingPicasaPicasaPublisher*) self, _sender);
-#line 1388 "PicasaPublishing.c"
+#line 1505 "PicasaPublishing.c"
}
-static void _publishing_picasa_picasa_publisher_on_initial_album_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
+static void
+_publishing_picasa_picasa_publisher_on_initial_album_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+ GError* err,
+ gpointer self)
+{
#line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_picasa_picasa_publisher_on_initial_album_fetch_error ((PublishingPicasaPicasaPublisher*) self, _sender, err);
-#line 1395 "PicasaPublishing.c"
+#line 1516 "PicasaPublishing.c"
}
-static void publishing_picasa_picasa_publisher_on_initial_album_fetch_complete (PublishingPicasaPicasaPublisher* self, PublishingRESTSupportTransaction* txn) {
- PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_picasa_picasa_publisher_on_initial_album_fetch_complete (PublishingPicasaPicasaPublisher* self,
+ PublishingRESTSupportTransaction* txn)
+{
+ guint _tmp0_;
guint _tmp1_;
- PublishingRESTSupportTransaction* _tmp2_;
- guint _tmp3_;
- gboolean _tmp4_;
- PublishingRESTSupportTransaction* _tmp5_;
#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self));
#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp0_ = txn;
-#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
+ g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_picasa_picasa_publisher_on_initial_album_fetch_complete_publishing_rest_support_transaction_completed, self);
+ g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_picasa_picasa_publisher_on_initial_album_fetch_complete_publishing_rest_support_transaction_completed, self);
#line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp2_ = txn;
+ g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
#line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_picasa_picasa_publisher_on_initial_album_fetch_error_publishing_rest_support_transaction_network_error, self);
-#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp4_ = publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
+ g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_picasa_picasa_publisher_on_initial_album_fetch_error_publishing_rest_support_transaction_network_error, self);
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- if (!_tmp4_) {
+ if (!publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher))) {
#line 155 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return;
-#line 1428 "PicasaPublishing.c"
+#line 1542 "PicasaPublishing.c"
}
#line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_debug ("PicasaPublishing.vala:157: EVENT: finished fetching account and album " \
"information.");
#line 159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp5_ = txn;
-#line 159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- publishing_picasa_picasa_publisher_do_parse_and_display_account_information (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_PICASA_TYPE_ALBUM_DIRECTORY_TRANSACTION, PublishingPicasaAlbumDirectoryTransaction));
-#line 1436 "PicasaPublishing.c"
+ publishing_picasa_picasa_publisher_do_parse_and_display_account_information (self, G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_PICASA_TYPE_ALBUM_DIRECTORY_TRANSACTION, PublishingPicasaAlbumDirectoryTransaction));
+#line 1548 "PicasaPublishing.c"
}
-static void publishing_picasa_picasa_publisher_on_initial_album_fetch_error (PublishingPicasaPicasaPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) {
- PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_picasa_picasa_publisher_on_initial_album_fetch_error (PublishingPicasaPicasaPublisher* self,
+ PublishingRESTSupportTransaction* bad_txn,
+ GError* err)
+{
+ guint _tmp0_;
guint _tmp1_;
- PublishingRESTSupportTransaction* _tmp2_;
- guint _tmp3_;
- gboolean _tmp4_;
- PublishingRESTSupportTransaction* _tmp5_;
- gchar* _tmp6_;
- gchar* _tmp7_;
- gboolean _tmp8_ = FALSE;
- PublishingRESTSupportTransaction* _tmp9_;
- guint _tmp10_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
+ gboolean _tmp4_ = FALSE;
#line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self));
#line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (bad_txn));
#line 164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp0_ = bad_txn;
+ g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
#line 164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_picasa_picasa_publisher_on_initial_album_fetch_complete_publishing_rest_support_transaction_completed, self);
-#line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp2_ = bad_txn;
+ g_signal_handlers_disconnect_matched (bad_txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_picasa_picasa_publisher_on_initial_album_fetch_complete_publishing_rest_support_transaction_completed, self);
#line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
+ g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
#line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_picasa_picasa_publisher_on_initial_album_fetch_error_publishing_rest_support_transaction_network_error, self);
-#line 167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp4_ = publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
+ g_signal_handlers_disconnect_matched (bad_txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_picasa_picasa_publisher_on_initial_album_fetch_error_publishing_rest_support_transaction_network_error, self);
#line 167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- if (!_tmp4_) {
+ if (!publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher))) {
#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return;
-#line 1474 "PicasaPublishing.c"
+#line 1578 "PicasaPublishing.c"
}
#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp5_ = bad_txn;
+ _tmp2_ = publishing_rest_support_transaction_get_response (bad_txn);
#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp6_ = publishing_rest_support_transaction_get_response (_tmp5_);
-#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp7_ = _tmp6_;
+ _tmp3_ = _tmp2_;
#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_debug ("PicasaPublishing.vala:170: EVENT: fetching account and album informati" \
-"on failed; response = '%s'.", _tmp7_);
+"on failed; response = '%s'.", _tmp3_);
#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _g_free0 (_tmp7_);
-#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp9_ = bad_txn;
-#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp10_ = publishing_rest_support_transaction_get_status_code (_tmp9_);
+ _g_free0 (_tmp3_);
#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- if (_tmp10_ == ((guint) 403)) {
+ if (publishing_rest_support_transaction_get_status_code (bad_txn) == ((guint) 403)) {
#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp8_ = TRUE;
-#line 1494 "PicasaPublishing.c"
+ _tmp4_ = TRUE;
+#line 1592 "PicasaPublishing.c"
} else {
- PublishingRESTSupportTransaction* _tmp11_;
- guint _tmp12_;
-#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp11_ = bad_txn;
#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp12_ = publishing_rest_support_transaction_get_status_code (_tmp11_);
-#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp8_ = _tmp12_ == ((guint) 404);
-#line 1504 "PicasaPublishing.c"
+ _tmp4_ = publishing_rest_support_transaction_get_status_code (bad_txn) == ((guint) 404);
+#line 1596 "PicasaPublishing.c"
}
#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- if (_tmp8_) {
+ if (_tmp4_) {
#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_rest_support_google_publisher_do_logout (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 1510 "PicasaPublishing.c"
+#line 1602 "PicasaPublishing.c"
} else {
- SpitPublishingPluginHost* _tmp13_;
- GError* _tmp14_;
-#line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp13_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
+ SpitPublishingPluginHost* _tmp5_;
#line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp14_ = err;
+ _tmp5_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
#line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- spit_publishing_plugin_host_post_error (_tmp13_, _tmp14_);
-#line 1520 "PicasaPublishing.c"
+ spit_publishing_plugin_host_post_error (_tmp5_, err);
+#line 1609 "PicasaPublishing.c"
}
}
-static void publishing_picasa_picasa_publisher_on_publishing_options_logout (PublishingPicasaPicasaPublisher* self) {
- gboolean _tmp0_;
+static void
+publishing_picasa_picasa_publisher_on_publishing_options_logout (PublishingPicasaPicasaPublisher* self)
+{
#line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self));
#line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp0_ = publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- if (!_tmp0_) {
+ if (!publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher))) {
#line 183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return;
-#line 1535 "PicasaPublishing.c"
+#line 1623 "PicasaPublishing.c"
}
#line 185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_debug ("PicasaPublishing.vala:185: EVENT: user clicked 'Logout' in the publish" \
"ing options pane.");
#line 187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_rest_support_google_publisher_do_logout (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 1541 "PicasaPublishing.c"
+#line 1629 "PicasaPublishing.c"
}
-static void publishing_picasa_picasa_publisher_on_publishing_options_publish (PublishingPicasaPicasaPublisher* self) {
- gboolean _tmp0_;
- PublishingPicasaPublishingParameters* _tmp1_;
+static void
+publishing_picasa_picasa_publisher_on_publishing_options_publish (PublishingPicasaPicasaPublisher* self)
+{
+ PublishingPicasaPublishingParameters* _tmp0_;
#line 190 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self));
#line 191 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp0_ = publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 191 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- if (!_tmp0_) {
+ if (!publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher))) {
#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return;
-#line 1556 "PicasaPublishing.c"
+#line 1643 "PicasaPublishing.c"
}
#line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_debug ("PicasaPublishing.vala:194: EVENT: user clicked 'Publish' in the publis" \
"hing options pane.");
#line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp1_ = self->priv->publishing_parameters;
+ _tmp0_ = self->priv->publishing_parameters;
#line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- publishing_picasa_picasa_publisher_save_parameters_to_configuration_system (self, _tmp1_);
+ publishing_picasa_picasa_publisher_save_parameters_to_configuration_system (self, _tmp0_);
#line 198 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_picasa_picasa_publisher_do_upload (self);
-#line 1566 "PicasaPublishing.c"
+#line 1653 "PicasaPublishing.c"
}
-static void publishing_picasa_picasa_publisher_on_upload_status_updated (PublishingPicasaPicasaPublisher* self, gint file_number, gdouble completed_fraction) {
- gboolean _tmp0_;
- gdouble _tmp1_;
- SpitPublishingProgressCallback _tmp2_;
- void* _tmp2__target;
- SpitPublishingProgressCallback _tmp3_;
- void* _tmp3__target;
- gint _tmp4_;
- gdouble _tmp5_;
+static void
+publishing_picasa_picasa_publisher_on_upload_status_updated (PublishingPicasaPicasaPublisher* self,
+ gint file_number,
+ gdouble completed_fraction)
+{
+ SpitPublishingProgressCallback _tmp0_;
+ void* _tmp0__target;
+ SpitPublishingProgressCallback _tmp1_;
+ void* _tmp1__target;
#line 201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self));
#line 202 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp0_ = publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 202 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- if (!_tmp0_) {
+ if (!publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher))) {
#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return;
-#line 1587 "PicasaPublishing.c"
+#line 1672 "PicasaPublishing.c"
}
#line 205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp1_ = completed_fraction;
-#line 205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_debug ("PicasaPublishing.vala:205: EVENT: uploader reports upload %.2f percent" \
-" complete.", 100.0 * _tmp1_);
+" complete.", 100.0 * completed_fraction);
#line 207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp2_ = self->priv->progress_reporter;
+ _tmp0_ = self->priv->progress_reporter;
#line 207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp2__target = self->priv->progress_reporter_target;
+ _tmp0__target = self->priv->progress_reporter_target;
#line 207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _vala_assert (_tmp2_ != NULL, "progress_reporter != null");
-#line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp3_ = self->priv->progress_reporter;
-#line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp3__target = self->priv->progress_reporter_target;
+ _vala_assert (_tmp0_ != NULL, "progress_reporter != null");
#line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp4_ = file_number;
+ _tmp1_ = self->priv->progress_reporter;
#line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp5_ = completed_fraction;
+ _tmp1__target = self->priv->progress_reporter_target;
#line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp3_ (_tmp4_, _tmp5_, _tmp3__target);
-#line 1609 "PicasaPublishing.c"
+ _tmp1_ (file_number, completed_fraction, _tmp1__target);
+#line 1688 "PicasaPublishing.c"
}
-static void _publishing_picasa_picasa_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender, gint num_photos_published, gpointer self) {
+static void
+_publishing_picasa_picasa_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender,
+ gint num_photos_published,
+ gpointer self)
+{
#line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_picasa_picasa_publisher_on_upload_complete ((PublishingPicasaPicasaPublisher*) self, _sender, num_photos_published);
-#line 1616 "PicasaPublishing.c"
+#line 1699 "PicasaPublishing.c"
}
-static void _publishing_picasa_picasa_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender, GError* err, gpointer self) {
+static void
+_publishing_picasa_picasa_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender,
+ GError* err,
+ gpointer self)
+{
#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_picasa_picasa_publisher_on_upload_error ((PublishingPicasaPicasaPublisher*) self, _sender, err);
-#line 1623 "PicasaPublishing.c"
+#line 1710 "PicasaPublishing.c"
}
-static void publishing_picasa_picasa_publisher_on_upload_complete (PublishingPicasaPicasaPublisher* self, PublishingRESTSupportBatchUploader* uploader, gint num_published) {
- gboolean _tmp0_;
- gint _tmp1_;
- PublishingRESTSupportBatchUploader* _tmp2_;
- guint _tmp3_;
- PublishingRESTSupportBatchUploader* _tmp4_;
- guint _tmp5_;
+static void
+publishing_picasa_picasa_publisher_on_upload_complete (PublishingPicasaPicasaPublisher* self,
+ PublishingRESTSupportBatchUploader* uploader,
+ gint num_published)
+{
+ guint _tmp0_;
+ guint _tmp1_;
#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self));
#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (uploader));
#line 214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp0_ = publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- if (!_tmp0_) {
+ if (!publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher))) {
#line 215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return;
-#line 1644 "PicasaPublishing.c"
+#line 1729 "PicasaPublishing.c"
}
#line 217 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp1_ = num_published;
-#line 217 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_debug ("PicasaPublishing.vala:217: EVENT: uploader reports upload complete; %d" \
-" items published.", _tmp1_);
-#line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp2_ = uploader;
+" items published.", num_published);
#line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp3_, NULL, FALSE);
+ g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp0_, NULL, FALSE);
#line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_picasa_picasa_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self);
+ g_signal_handlers_disconnect_matched (uploader, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_picasa_picasa_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self);
#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp4_ = uploader;
+ g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp1_, NULL, FALSE);
#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp5_, NULL, FALSE);
-#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _publishing_picasa_picasa_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self);
+ g_signal_handlers_disconnect_matched (uploader, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_picasa_picasa_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self);
#line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_picasa_picasa_publisher_do_show_success_pane (self);
-#line 1664 "PicasaPublishing.c"
+#line 1743 "PicasaPublishing.c"
}
-static void publishing_picasa_picasa_publisher_on_upload_error (PublishingPicasaPicasaPublisher* self, PublishingRESTSupportBatchUploader* uploader, GError* err) {
- gboolean _tmp0_;
- GError* _tmp1_;
- const gchar* _tmp2_;
- PublishingRESTSupportBatchUploader* _tmp3_;
- guint _tmp4_;
- PublishingRESTSupportBatchUploader* _tmp5_;
- guint _tmp6_;
- SpitPublishingPluginHost* _tmp7_;
- GError* _tmp8_;
+static void
+publishing_picasa_picasa_publisher_on_upload_error (PublishingPicasaPicasaPublisher* self,
+ PublishingRESTSupportBatchUploader* uploader,
+ GError* err)
+{
+ const gchar* _tmp0_;
+ guint _tmp1_;
+ guint _tmp2_;
+ SpitPublishingPluginHost* _tmp3_;
#line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self));
#line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (uploader));
#line 227 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp0_ = publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 227 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- if (!_tmp0_) {
+ if (!publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher))) {
#line 228 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return;
-#line 1688 "PicasaPublishing.c"
+#line 1764 "PicasaPublishing.c"
}
#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp1_ = err;
-#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp2_ = _tmp1_->message;
+ _tmp0_ = err->message;
#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_debug ("PicasaPublishing.vala:230: EVENT: uploader reports upload error = '%s'" \
-".", _tmp2_);
-#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp3_ = uploader;
+".", _tmp0_);
#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp4_, NULL, FALSE);
+ g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp1_, NULL, FALSE);
#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp3_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _publishing_picasa_picasa_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self);
+ g_signal_handlers_disconnect_matched (uploader, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_picasa_picasa_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self);
#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp5_ = uploader;
+ g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp2_, NULL, FALSE);
#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp6_, NULL, FALSE);
-#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp5_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp6_, 0, NULL, (GCallback) _publishing_picasa_picasa_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self);
-#line 235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp7_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
+ g_signal_handlers_disconnect_matched (uploader, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _publishing_picasa_picasa_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self);
#line 235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp8_ = err;
+ _tmp3_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
#line 235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- spit_publishing_plugin_host_post_error (_tmp7_, _tmp8_);
-#line 1714 "PicasaPublishing.c"
+ spit_publishing_plugin_host_post_error (_tmp3_, err);
+#line 1782 "PicasaPublishing.c"
}
-static void publishing_picasa_picasa_publisher_do_fetch_account_information (PublishingPicasaPicasaPublisher* self) {
+static void
+publishing_picasa_picasa_publisher_do_fetch_account_information (PublishingPicasaPicasaPublisher* self)
+{
SpitPublishingPluginHost* _tmp0_;
SpitPublishingPluginHost* _tmp1_;
PublishingPicasaAlbumDirectoryTransaction* directory_trans = NULL;
@@ -1764,7 +1834,7 @@ static void publishing_picasa_picasa_publisher_do_fetch_account_information (Pub
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (directory_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_picasa_picasa_publisher_on_initial_album_fetch_error_publishing_rest_support_transaction_network_error, self, 0);
#line 247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (directory_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_picasa_picasa_publisher_on_initial_album_fetch_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 1755 "PicasaPublishing.c"
+#line 1825 "PicasaPublishing.c"
{
#line 250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (directory_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
@@ -1772,7 +1842,7 @@ static void publishing_picasa_picasa_publisher_do_fetch_account_information (Pub
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 1763 "PicasaPublishing.c"
+#line 1833 "PicasaPublishing.c"
goto __catch6_spit_publishing_publishing_error;
}
#line 250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -1783,7 +1853,7 @@ static void publishing_picasa_picasa_publisher_do_fetch_account_information (Pub
g_clear_error (&_inner_error_);
#line 250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return;
-#line 1774 "PicasaPublishing.c"
+#line 1844 "PicasaPublishing.c"
}
}
goto __finally6;
@@ -1801,7 +1871,7 @@ static void publishing_picasa_picasa_publisher_do_fetch_account_information (Pub
publishing_picasa_picasa_publisher_on_initial_album_fetch_error (self, G_TYPE_CHECK_INSTANCE_CAST (directory_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp6_);
#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_g_error_free0 (err);
-#line 1792 "PicasaPublishing.c"
+#line 1862 "PicasaPublishing.c"
}
__finally6:
#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -1814,24 +1884,30 @@ static void publishing_picasa_picasa_publisher_do_fetch_account_information (Pub
g_clear_error (&_inner_error_);
#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return;
-#line 1805 "PicasaPublishing.c"
+#line 1875 "PicasaPublishing.c"
}
#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_publishing_rest_support_transaction_unref0 (directory_trans);
-#line 1809 "PicasaPublishing.c"
+#line 1879 "PicasaPublishing.c"
}
-static gchar* _publishing_picasa_album_directory_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response (PublishingRESTSupportXmlDocument* doc, gpointer self) {
+static gchar*
+_publishing_picasa_album_directory_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response (PublishingRESTSupportXmlDocument* doc,
+ gpointer self)
+{
gchar* result;
result = publishing_picasa_album_directory_transaction_validate_xml (doc);
#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return result;
-#line 1818 "PicasaPublishing.c"
+#line 1891 "PicasaPublishing.c"
}
-static void publishing_picasa_picasa_publisher_do_parse_and_display_account_information (PublishingPicasaPicasaPublisher* self, PublishingPicasaAlbumDirectoryTransaction* transaction) {
+static void
+publishing_picasa_picasa_publisher_do_parse_and_display_account_information (PublishingPicasaPicasaPublisher* self,
+ PublishingPicasaAlbumDirectoryTransaction* transaction)
+{
PublishingRESTSupportXmlDocument* response_doc = NULL;
GError * _inner_error_ = NULL;
#line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -1841,34 +1917,31 @@ static void publishing_picasa_picasa_publisher_do_parse_and_display_account_info
#line 260 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_debug ("PicasaPublishing.vala:260: ACTION: parsing account and album informati" \
"on from server response XML");
-#line 1831 "PicasaPublishing.c"
+#line 1907 "PicasaPublishing.c"
{
PublishingRESTSupportXmlDocument* _tmp0_ = NULL;
- PublishingPicasaAlbumDirectoryTransaction* _tmp1_;
+ gchar* _tmp1_;
gchar* _tmp2_;
- gchar* _tmp3_;
+ PublishingRESTSupportXmlDocument* _tmp3_;
PublishingRESTSupportXmlDocument* _tmp4_;
PublishingRESTSupportXmlDocument* _tmp5_;
- PublishingRESTSupportXmlDocument* _tmp6_;
#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp1_ = transaction;
+ _tmp1_ = publishing_rest_support_transaction_get_response (G_TYPE_CHECK_INSTANCE_CAST (transaction, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp2_ = publishing_rest_support_transaction_get_response (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
-#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp3_ = _tmp2_;
+ _tmp2_ = _tmp1_;
#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp4_ = publishing_rest_support_xml_document_parse_string (_tmp3_, _publishing_picasa_album_directory_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response, NULL, &_inner_error_);
+ _tmp3_ = publishing_rest_support_xml_document_parse_string (_tmp2_, _publishing_picasa_album_directory_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response, NULL, &_inner_error_);
#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp5_ = _tmp4_;
+ _tmp4_ = _tmp3_;
#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _g_free0 (_tmp3_);
+ _g_free0 (_tmp2_);
#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp0_ = _tmp5_;
+ _tmp0_ = _tmp4_;
#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 1858 "PicasaPublishing.c"
+#line 1931 "PicasaPublishing.c"
goto __catch7_spit_publishing_publishing_error;
}
#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -1879,43 +1952,43 @@ static void publishing_picasa_picasa_publisher_do_parse_and_display_account_info
g_clear_error (&_inner_error_);
#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return;
-#line 1869 "PicasaPublishing.c"
+#line 1942 "PicasaPublishing.c"
}
#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp6_ = _tmp0_;
+ _tmp5_ = _tmp0_;
#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp0_ = NULL;
#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_publishing_rest_support_xml_document_unref0 (response_doc);
#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- response_doc = _tmp6_;
+ response_doc = _tmp5_;
#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_publishing_rest_support_xml_document_unref0 (_tmp0_);
-#line 1881 "PicasaPublishing.c"
+#line 1954 "PicasaPublishing.c"
}
goto __finally7;
__catch7_spit_publishing_publishing_error:
{
GError* err = NULL;
- SpitPublishingPluginHost* _tmp7_;
- GError* _tmp8_;
+ SpitPublishingPluginHost* _tmp6_;
+ GError* _tmp7_;
#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
err = _inner_error_;
#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_inner_error_ = NULL;
#line 267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp7_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
+ _tmp6_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
#line 267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp8_ = err;
+ _tmp7_ = err;
#line 267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- spit_publishing_plugin_host_post_error (_tmp7_, _tmp8_);
+ spit_publishing_plugin_host_post_error (_tmp6_, _tmp7_);
#line 268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_g_error_free0 (err);
#line 268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_publishing_rest_support_xml_document_unref0 (response_doc);
#line 268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return;
-#line 1905 "PicasaPublishing.c"
+#line 1978 "PicasaPublishing.c"
}
__finally7:
#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -1928,34 +2001,34 @@ static void publishing_picasa_picasa_publisher_do_parse_and_display_account_info
g_clear_error (&_inner_error_);
#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return;
-#line 1918 "PicasaPublishing.c"
+#line 1991 "PicasaPublishing.c"
}
{
- PublishingPicasaAlbum** _tmp9_ = NULL;
- PublishingRESTSupportXmlDocument* _tmp10_;
- xmlNode* _tmp11_;
- gint _tmp12_;
- PublishingPicasaAlbum** _tmp13_;
- gint _tmp9__length1;
- gint __tmp9__size_;
- PublishingPicasaPublishingParameters* _tmp14_;
+ PublishingPicasaAlbum** _tmp8_ = NULL;
+ PublishingRESTSupportXmlDocument* _tmp9_;
+ xmlNode* _tmp10_;
+ gint _tmp11_;
+ PublishingPicasaAlbum** _tmp12_;
+ gint _tmp8__length1;
+ gint __tmp8__size_;
+ PublishingPicasaPublishingParameters* _tmp13_;
#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp10_ = response_doc;
+ _tmp9_ = response_doc;
#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp11_ = publishing_rest_support_xml_document_get_root_node (_tmp10_);
+ _tmp10_ = publishing_rest_support_xml_document_get_root_node (_tmp9_);
#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp13_ = publishing_picasa_picasa_publisher_extract_albums_helper (self, _tmp11_, &_tmp12_, &_inner_error_);
+ _tmp12_ = publishing_picasa_picasa_publisher_extract_albums_helper (self, _tmp10_, &_tmp11_, &_inner_error_);
#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp9_ = _tmp13_;
+ _tmp8_ = _tmp12_;
#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp9__length1 = _tmp12_;
+ _tmp8__length1 = _tmp11_;
#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- __tmp9__size_ = _tmp9__length1;
+ __tmp8__size_ = _tmp8__length1;
#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 1945 "PicasaPublishing.c"
+#line 2018 "PicasaPublishing.c"
goto __catch8_spit_publishing_publishing_error;
}
#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -1966,39 +2039,39 @@ static void publishing_picasa_picasa_publisher_do_parse_and_display_account_info
g_clear_error (&_inner_error_);
#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return;
-#line 1956 "PicasaPublishing.c"
+#line 2029 "PicasaPublishing.c"
}
#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp14_ = self->priv->publishing_parameters;
+ _tmp13_ = self->priv->publishing_parameters;
#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- publishing_picasa_publishing_parameters_set_albums (_tmp14_, _tmp9_, _tmp9__length1);
+ publishing_picasa_publishing_parameters_set_albums (_tmp13_, _tmp8_, _tmp8__length1);
#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp9_ = (_vala_array_free (_tmp9_, _tmp9__length1, (GDestroyNotify) publishing_picasa_album_unref), NULL);
-#line 1964 "PicasaPublishing.c"
+ _tmp8_ = (_vala_array_free (_tmp8_, _tmp8__length1, (GDestroyNotify) publishing_picasa_album_unref), NULL);
+#line 2037 "PicasaPublishing.c"
}
goto __finally8;
__catch8_spit_publishing_publishing_error:
{
GError* err = NULL;
- SpitPublishingPluginHost* _tmp15_;
- GError* _tmp16_;
+ SpitPublishingPluginHost* _tmp14_;
+ GError* _tmp15_;
#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
err = _inner_error_;
#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_inner_error_ = NULL;
#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp15_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
+ _tmp14_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp16_ = err;
+ _tmp15_ = err;
#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- spit_publishing_plugin_host_post_error (_tmp15_, _tmp16_);
+ spit_publishing_plugin_host_post_error (_tmp14_, _tmp15_);
#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_g_error_free0 (err);
#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_publishing_rest_support_xml_document_unref0 (response_doc);
#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return;
-#line 1988 "PicasaPublishing.c"
+#line 2061 "PicasaPublishing.c"
}
__finally8:
#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -2011,44 +2084,51 @@ static void publishing_picasa_picasa_publisher_do_parse_and_display_account_info
g_clear_error (&_inner_error_);
#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return;
-#line 2001 "PicasaPublishing.c"
+#line 2074 "PicasaPublishing.c"
}
#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_picasa_picasa_publisher_do_show_publishing_options_pane (self);
#line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 2007 "PicasaPublishing.c"
+#line 2080 "PicasaPublishing.c"
}
-static void _publishing_picasa_picasa_publisher_on_publishing_options_publish_publishing_picasa_publishing_options_pane_publish (PublishingPicasaPublishingOptionsPane* _sender, gpointer self) {
+static void
+_publishing_picasa_picasa_publisher_on_publishing_options_publish_publishing_picasa_publishing_options_pane_publish (PublishingPicasaPublishingOptionsPane* _sender,
+ gpointer self)
+{
#line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_picasa_picasa_publisher_on_publishing_options_publish ((PublishingPicasaPicasaPublisher*) self);
-#line 2014 "PicasaPublishing.c"
+#line 2090 "PicasaPublishing.c"
}
-static void _publishing_picasa_picasa_publisher_on_publishing_options_logout_publishing_picasa_publishing_options_pane_logout (PublishingPicasaPublishingOptionsPane* _sender, gpointer self) {
+static void
+_publishing_picasa_picasa_publisher_on_publishing_options_logout_publishing_picasa_publishing_options_pane_logout (PublishingPicasaPublishingOptionsPane* _sender,
+ gpointer self)
+{
#line 297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_picasa_picasa_publisher_on_publishing_options_logout ((PublishingPicasaPicasaPublisher*) self);
-#line 2021 "PicasaPublishing.c"
+#line 2100 "PicasaPublishing.c"
}
-static void publishing_picasa_picasa_publisher_do_show_publishing_options_pane (PublishingPicasaPicasaPublisher* self) {
+static void
+publishing_picasa_picasa_publisher_do_show_publishing_options_pane (PublishingPicasaPicasaPublisher* self)
+{
GtkBuilder* builder = NULL;
GtkBuilder* _tmp0_;
PublishingPicasaPublishingOptionsPane* opts_pane = NULL;
GtkBuilder* _tmp7_;
PublishingPicasaPublishingParameters* _tmp8_;
SpitPublishingAuthenticator* _tmp9_;
- gboolean _tmp10_;
+ PublishingPicasaPublishingOptionsPane* _tmp10_;
PublishingPicasaPublishingOptionsPane* _tmp11_;
PublishingPicasaPublishingOptionsPane* _tmp12_;
- PublishingPicasaPublishingOptionsPane* _tmp13_;
- SpitPublishingPluginHost* _tmp14_;
- PublishingPicasaPublishingOptionsPane* _tmp15_;
- SpitPublishingPluginHost* _tmp16_;
+ SpitPublishingPluginHost* _tmp13_;
+ PublishingPicasaPublishingOptionsPane* _tmp14_;
+ SpitPublishingPluginHost* _tmp15_;
GError * _inner_error_ = NULL;
#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self));
@@ -2058,7 +2138,7 @@ static void publishing_picasa_picasa_publisher_do_show_publishing_options_pane (
_tmp0_ = gtk_builder_new ();
#line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
builder = _tmp0_;
-#line 2048 "PicasaPublishing.c"
+#line 2128 "PicasaPublishing.c"
{
GtkBuilder* _tmp1_;
#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -2067,7 +2147,7 @@ static void publishing_picasa_picasa_publisher_do_show_publishing_options_pane (
gtk_builder_add_from_resource (_tmp1_, PLUGIN_RESOURCE_PATH "/" "picasa_publishing_options_pane.ui", &_inner_error_);
#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2057 "PicasaPublishing.c"
+#line 2137 "PicasaPublishing.c"
goto __catch9_g_error;
}
}
@@ -2107,7 +2187,7 @@ static void publishing_picasa_picasa_publisher_do_show_publishing_options_pane (
_g_object_unref0 (builder);
#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return;
-#line 2096 "PicasaPublishing.c"
+#line 2176 "PicasaPublishing.c"
}
__finally9:
#line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -2120,7 +2200,7 @@ static void publishing_picasa_picasa_publisher_do_show_publishing_options_pane (
g_clear_error (&_inner_error_);
#line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return;
-#line 2109 "PicasaPublishing.c"
+#line 2189 "PicasaPublishing.c"
}
#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp7_ = builder;
@@ -2129,72 +2209,73 @@ static void publishing_picasa_picasa_publisher_do_show_publishing_options_pane (
#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp9_ = self->priv->authenticator;
#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp10_ = spit_publishing_authenticator_can_logout (_tmp9_);
-#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp11_ = publishing_picasa_publishing_options_pane_new (_tmp7_, _tmp8_, _tmp10_);
+ _tmp10_ = publishing_picasa_publishing_options_pane_new (_tmp7_, _tmp8_, spit_publishing_authenticator_can_logout (_tmp9_));
#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- opts_pane = _tmp11_;
+ opts_pane = _tmp10_;
#line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp12_ = opts_pane;
+ _tmp11_ = opts_pane;
#line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- g_signal_connect_object (_tmp12_, "publish", (GCallback) _publishing_picasa_picasa_publisher_on_publishing_options_publish_publishing_picasa_publishing_options_pane_publish, self, 0);
+ g_signal_connect_object (_tmp11_, "publish", (GCallback) _publishing_picasa_picasa_publisher_on_publishing_options_publish_publishing_picasa_publishing_options_pane_publish, self, 0);
#line 297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp13_ = opts_pane;
+ _tmp12_ = opts_pane;
#line 297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- g_signal_connect_object (_tmp13_, "logout", (GCallback) _publishing_picasa_picasa_publisher_on_publishing_options_logout_publishing_picasa_publishing_options_pane_logout, self, 0);
+ g_signal_connect_object (_tmp12_, "logout", (GCallback) _publishing_picasa_picasa_publisher_on_publishing_options_logout_publishing_picasa_publishing_options_pane_logout, self, 0);
#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp14_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
+ _tmp13_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp15_ = opts_pane;
+ _tmp14_ = opts_pane;
#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- spit_publishing_plugin_host_install_dialog_pane (_tmp14_, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
+ spit_publishing_plugin_host_install_dialog_pane (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp16_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
+ _tmp15_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- spit_publishing_plugin_host_set_service_locked (_tmp16_, FALSE);
+ spit_publishing_plugin_host_set_service_locked (_tmp15_, FALSE);
#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_g_object_unref0 (opts_pane);
#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_g_object_unref0 (builder);
-#line 2145 "PicasaPublishing.c"
+#line 2223 "PicasaPublishing.c"
}
-static void _publishing_picasa_picasa_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self) {
+static void
+_publishing_picasa_picasa_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number,
+ gdouble fraction_complete,
+ gpointer self)
+{
#line 325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_picasa_picasa_publisher_on_upload_status_updated ((PublishingPicasaPicasaPublisher*) self, file_number, fraction_complete);
-#line 2152 "PicasaPublishing.c"
+#line 2234 "PicasaPublishing.c"
}
-static void publishing_picasa_picasa_publisher_do_upload (PublishingPicasaPicasaPublisher* self) {
+static void
+publishing_picasa_picasa_publisher_do_upload (PublishingPicasaPicasaPublisher* self)
+{
SpitPublishingPluginHost* _tmp0_;
SpitPublishingPluginHost* _tmp1_;
PublishingPicasaPublishingParameters* _tmp2_;
- gint _tmp3_;
- PublishingPicasaPublishingParameters* _tmp4_;
- gboolean _tmp5_;
- void* _tmp6_;
- GDestroyNotify _tmp7_;
- SpitPublishingProgressCallback _tmp8_;
- gboolean _tmp9_;
+ PublishingPicasaPublishingParameters* _tmp3_;
+ void* _tmp4_;
+ GDestroyNotify _tmp5_;
+ SpitPublishingProgressCallback _tmp6_;
SpitPublishingPublishable** publishables = NULL;
- SpitPublishingPluginHost* _tmp10_;
- gint _tmp11_;
- SpitPublishingPublishable** _tmp12_;
+ SpitPublishingPluginHost* _tmp7_;
+ gint _tmp8_;
+ SpitPublishingPublishable** _tmp9_;
gint publishables_length1;
gint _publishables_size_;
PublishingPicasaUploader* uploader = NULL;
- PublishingRESTSupportGoogleSession* _tmp13_;
- PublishingRESTSupportGoogleSession* _tmp14_;
- SpitPublishingPublishable** _tmp15_;
- gint _tmp15__length1;
- PublishingPicasaPublishingParameters* _tmp16_;
+ PublishingRESTSupportGoogleSession* _tmp10_;
+ PublishingRESTSupportGoogleSession* _tmp11_;
+ SpitPublishingPublishable** _tmp12_;
+ gint _tmp12__length1;
+ PublishingPicasaPublishingParameters* _tmp13_;
+ PublishingPicasaUploader* _tmp14_;
+ PublishingPicasaUploader* _tmp15_;
+ PublishingPicasaUploader* _tmp16_;
PublishingPicasaUploader* _tmp17_;
PublishingPicasaUploader* _tmp18_;
- PublishingPicasaUploader* _tmp19_;
- PublishingPicasaUploader* _tmp20_;
- PublishingPicasaUploader* _tmp21_;
#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self));
#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -2209,13 +2290,9 @@ static void publishing_picasa_picasa_publisher_do_upload (PublishingPicasaPicasa
#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp2_ = self->priv->publishing_parameters;
#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp3_ = publishing_picasa_publishing_parameters_get_major_axis_size_pixels (_tmp2_);
-#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp4_ = self->priv->publishing_parameters;
-#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp5_ = publishing_picasa_publishing_parameters_get_strip_metadata (_tmp4_);
+ _tmp3_ = self->priv->publishing_parameters;
#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp8_ = spit_publishing_plugin_host_serialize_publishables (_tmp1_, _tmp3_, _tmp5_, &_tmp6_, &_tmp7_);
+ _tmp6_ = spit_publishing_plugin_host_serialize_publishables (_tmp1_, publishing_picasa_publishing_parameters_get_major_axis_size_pixels (_tmp2_), publishing_picasa_publishing_parameters_get_strip_metadata (_tmp3_), &_tmp4_, &_tmp5_);
#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
(self->priv->progress_reporter_target_destroy_notify == NULL) ? NULL : (self->priv->progress_reporter_target_destroy_notify (self->priv->progress_reporter_target), NULL);
#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -2225,68 +2302,68 @@ static void publishing_picasa_picasa_publisher_do_upload (PublishingPicasaPicasa
#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
self->priv->progress_reporter_target_destroy_notify = NULL;
#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- self->priv->progress_reporter = _tmp8_;
+ self->priv->progress_reporter = _tmp6_;
#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- self->priv->progress_reporter_target = _tmp6_;
+ self->priv->progress_reporter_target = _tmp4_;
#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- self->priv->progress_reporter_target_destroy_notify = _tmp7_;
+ self->priv->progress_reporter_target_destroy_notify = _tmp5_;
#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp9_ = publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- if (!_tmp9_) {
+ if (!publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher))) {
#line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return;
-#line 2224 "PicasaPublishing.c"
+#line 2299 "PicasaPublishing.c"
}
#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp10_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
+ _tmp7_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp12_ = spit_publishing_plugin_host_get_publishables (_tmp10_, &_tmp11_);
+ _tmp9_ = spit_publishing_plugin_host_get_publishables (_tmp7_, &_tmp8_);
#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- publishables = _tmp12_;
+ publishables = _tmp9_;
#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- publishables_length1 = _tmp11_;
+ publishables_length1 = _tmp8_;
#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_publishables_size_ = publishables_length1;
#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp13_ = publishing_rest_support_google_publisher_get_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
+ _tmp10_ = publishing_rest_support_google_publisher_get_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp14_ = _tmp13_;
+ _tmp11_ = _tmp10_;
#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp15_ = publishables;
+ _tmp12_ = publishables;
#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp15__length1 = publishables_length1;
+ _tmp12__length1 = publishables_length1;
#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp16_ = self->priv->publishing_parameters;
+ _tmp13_ = self->priv->publishing_parameters;
#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp17_ = publishing_picasa_uploader_new (_tmp14_, _tmp15_, _tmp15__length1, _tmp16_);
+ _tmp14_ = publishing_picasa_uploader_new (_tmp11_, _tmp12_, _tmp12__length1, _tmp13_);
#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp18_ = _tmp17_;
+ _tmp15_ = _tmp14_;
#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _publishing_rest_support_session_unref0 (_tmp14_);
+ _publishing_rest_support_session_unref0 (_tmp11_);
#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- uploader = _tmp18_;
+ uploader = _tmp15_;
#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp19_ = uploader;
+ _tmp16_ = uploader;
#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), "upload-complete", (GCallback) _publishing_picasa_picasa_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self, 0);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), "upload-complete", (GCallback) _publishing_picasa_picasa_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self, 0);
#line 323 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp20_ = uploader;
+ _tmp17_ = uploader;
#line 323 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), "upload-error", (GCallback) _publishing_picasa_picasa_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self, 0);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), "upload-error", (GCallback) _publishing_picasa_picasa_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self, 0);
#line 325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp21_ = uploader;
+ _tmp18_ = uploader;
#line 325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- publishing_rest_support_batch_uploader_upload (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), _publishing_picasa_picasa_publisher_on_upload_status_updated_spit_publishing_progress_callback, self);
+ publishing_rest_support_batch_uploader_upload (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), _publishing_picasa_picasa_publisher_on_upload_status_updated_spit_publishing_progress_callback, self);
#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_publishing_rest_support_batch_uploader_unref0 (uploader);
#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishables = (_vala_array_free (publishables, publishables_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 2270 "PicasaPublishing.c"
+#line 2345 "PicasaPublishing.c"
}
-static void publishing_picasa_picasa_publisher_do_show_success_pane (PublishingPicasaPicasaPublisher* self) {
+static void
+publishing_picasa_picasa_publisher_do_show_success_pane (PublishingPicasaPicasaPublisher* self)
+{
SpitPublishingPluginHost* _tmp0_;
SpitPublishingPluginHost* _tmp1_;
#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -2301,16 +2378,17 @@ static void publishing_picasa_picasa_publisher_do_show_success_pane (PublishingP
_tmp1_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
#line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
spit_publishing_plugin_host_install_success_pane (_tmp1_);
-#line 2289 "PicasaPublishing.c"
+#line 2366 "PicasaPublishing.c"
}
-static void publishing_picasa_picasa_publisher_real_do_logout (PublishingRESTSupportGooglePublisher* base) {
+static void
+publishing_picasa_picasa_publisher_real_do_logout (PublishingRESTSupportGooglePublisher* base)
+{
PublishingPicasaPicasaPublisher * self;
PublishingRESTSupportGoogleSession* _tmp0_;
PublishingRESTSupportGoogleSession* _tmp1_;
SpitPublishingAuthenticator* _tmp2_;
- gboolean _tmp3_;
#line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PICASA_TYPE_PICASA_PUBLISHER, PublishingPicasaPicasaPublisher);
#line 336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -2326,26 +2404,26 @@ static void publishing_picasa_picasa_publisher_real_do_logout (PublishingRESTSup
#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp2_ = self->priv->authenticator;
#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp3_ = spit_publishing_authenticator_can_logout (_tmp2_);
-#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- if (_tmp3_) {
-#line 2317 "PicasaPublishing.c"
+ if (spit_publishing_authenticator_can_logout (_tmp2_)) {
+#line 2393 "PicasaPublishing.c"
+ SpitPublishingAuthenticator* _tmp3_;
SpitPublishingAuthenticator* _tmp4_;
- SpitPublishingAuthenticator* _tmp5_;
#line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp4_ = self->priv->authenticator;
+ _tmp3_ = self->priv->authenticator;
#line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- spit_publishing_authenticator_logout (_tmp4_);
+ spit_publishing_authenticator_logout (_tmp3_);
#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp5_ = self->priv->authenticator;
+ _tmp4_ = self->priv->authenticator;
#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- spit_publishing_authenticator_authenticate (_tmp5_);
-#line 2328 "PicasaPublishing.c"
+ spit_publishing_authenticator_authenticate (_tmp4_);
+#line 2404 "PicasaPublishing.c"
}
}
-static gboolean publishing_picasa_picasa_publisher_real_is_running (PublishingRESTSupportGooglePublisher* base) {
+static gboolean
+publishing_picasa_picasa_publisher_real_is_running (PublishingRESTSupportGooglePublisher* base)
+{
PublishingPicasaPicasaPublisher * self;
gboolean result = FALSE;
gboolean _tmp0_;
@@ -2357,37 +2435,38 @@ static gboolean publishing_picasa_picasa_publisher_real_is_running (PublishingRE
result = _tmp0_;
#line 346 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return result;
-#line 2345 "PicasaPublishing.c"
+#line 2423 "PicasaPublishing.c"
}
-static void publishing_picasa_picasa_publisher_real_start (PublishingRESTSupportGooglePublisher* base) {
+static void
+publishing_picasa_picasa_publisher_real_start (PublishingRESTSupportGooglePublisher* base)
+{
PublishingPicasaPicasaPublisher * self;
- gboolean _tmp0_;
- SpitPublishingAuthenticator* _tmp1_;
+ SpitPublishingAuthenticator* _tmp0_;
#line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PICASA_TYPE_PICASA_PUBLISHER, PublishingPicasaPicasaPublisher);
#line 350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_debug ("PicasaPublishing.vala:350: PicasaPublisher: start( ) invoked.");
#line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp0_ = publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- if (_tmp0_) {
+ if (publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher))) {
#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return;
-#line 2363 "PicasaPublishing.c"
+#line 2440 "PicasaPublishing.c"
}
#line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
self->priv->running = TRUE;
#line 357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp1_ = self->priv->authenticator;
+ _tmp0_ = self->priv->authenticator;
#line 357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- spit_publishing_authenticator_authenticate (_tmp1_);
-#line 2371 "PicasaPublishing.c"
+ spit_publishing_authenticator_authenticate (_tmp0_);
+#line 2448 "PicasaPublishing.c"
}
-static void publishing_picasa_picasa_publisher_real_stop (PublishingRESTSupportGooglePublisher* base) {
+static void
+publishing_picasa_picasa_publisher_real_stop (PublishingRESTSupportGooglePublisher* base)
+{
PublishingPicasaPicasaPublisher * self;
PublishingRESTSupportGoogleSession* _tmp0_;
PublishingRESTSupportGoogleSession* _tmp1_;
@@ -2405,11 +2484,13 @@ static void publishing_picasa_picasa_publisher_real_stop (PublishingRESTSupportG
_publishing_rest_support_session_unref0 (_tmp1_);
#line 365 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
self->priv->running = FALSE;
-#line 2393 "PicasaPublishing.c"
+#line 2472 "PicasaPublishing.c"
}
-static SpitPublishingAuthenticator* publishing_picasa_picasa_publisher_real_get_authenticator (PublishingRESTSupportGooglePublisher* base) {
+static SpitPublishingAuthenticator*
+publishing_picasa_picasa_publisher_real_get_authenticator (PublishingRESTSupportGooglePublisher* base)
+{
PublishingPicasaPicasaPublisher * self;
SpitPublishingAuthenticator* result = NULL;
SpitPublishingAuthenticator* _tmp0_;
@@ -2421,7 +2502,7 @@ static SpitPublishingAuthenticator* publishing_picasa_picasa_publisher_real_get_
_tmp0_ = self->priv->authenticator;
#line 369 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (_tmp0_ == NULL) {
-#line 2409 "PicasaPublishing.c"
+#line 2490 "PicasaPublishing.c"
PublishingAuthenticatorFactory* _tmp1_;
PublishingAuthenticatorFactory* _tmp2_;
SpitPublishingPluginHost* _tmp3_;
@@ -2440,7 +2521,7 @@ static SpitPublishingAuthenticator* publishing_picasa_picasa_publisher_real_get_
self->priv->authenticator = _tmp4_;
#line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_g_object_unref0 (_tmp2_);
-#line 2428 "PicasaPublishing.c"
+#line 2509 "PicasaPublishing.c"
}
#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp5_ = self->priv->authenticator;
@@ -2450,11 +2531,13 @@ static SpitPublishingAuthenticator* publishing_picasa_picasa_publisher_real_get_
result = _tmp6_;
#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return result;
-#line 2438 "PicasaPublishing.c"
+#line 2519 "PicasaPublishing.c"
}
-static void publishing_picasa_picasa_publisher_class_init (PublishingPicasaPicasaPublisherClass * klass) {
+static void
+publishing_picasa_picasa_publisher_class_init (PublishingPicasaPicasaPublisherClass * klass)
+{
#line 60 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_picasa_picasa_publisher_parent_class = g_type_class_peek_parent (klass);
#line 60 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -2473,18 +2556,22 @@ static void publishing_picasa_picasa_publisher_class_init (PublishingPicasaPicas
((PublishingRESTSupportGooglePublisherClass *) klass)->get_authenticator = (SpitPublishingAuthenticator* (*) (PublishingRESTSupportGooglePublisher *)) publishing_picasa_picasa_publisher_real_get_authenticator;
#line 60 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
G_OBJECT_CLASS (klass)->finalize = publishing_picasa_picasa_publisher_finalize;
-#line 2461 "PicasaPublishing.c"
+#line 2544 "PicasaPublishing.c"
}
-static void publishing_picasa_picasa_publisher_instance_init (PublishingPicasaPicasaPublisher * self) {
+static void
+publishing_picasa_picasa_publisher_instance_init (PublishingPicasaPicasaPublisher * self)
+{
#line 60 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
self->priv = PUBLISHING_PICASA_PICASA_PUBLISHER_GET_PRIVATE (self);
-#line 2468 "PicasaPublishing.c"
+#line 2553 "PicasaPublishing.c"
}
-static void publishing_picasa_picasa_publisher_finalize (GObject * obj) {
+static void
+publishing_picasa_picasa_publisher_finalize (GObject * obj)
+{
PublishingPicasaPicasaPublisher * self;
#line 60 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PICASA_TYPE_PICASA_PUBLISHER, PublishingPicasaPicasaPublisher);
@@ -2502,11 +2589,13 @@ static void publishing_picasa_picasa_publisher_finalize (GObject * obj) {
_g_object_unref0 (self->priv->authenticator);
#line 60 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
G_OBJECT_CLASS (publishing_picasa_picasa_publisher_parent_class)->finalize (obj);
-#line 2490 "PicasaPublishing.c"
+#line 2577 "PicasaPublishing.c"
}
-GType publishing_picasa_picasa_publisher_get_type (void) {
+GType
+publishing_picasa_picasa_publisher_get_type (void)
+{
static volatile gsize publishing_picasa_picasa_publisher_type_id__volatile = 0;
if (g_once_init_enter (&publishing_picasa_picasa_publisher_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingPicasaPicasaPublisherClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_picasa_picasa_publisher_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingPicasaPicasaPublisher), 0, (GInstanceInitFunc) publishing_picasa_picasa_publisher_instance_init, NULL };
@@ -2518,12 +2607,14 @@ GType publishing_picasa_picasa_publisher_get_type (void) {
}
-PublishingPicasaAlbum* publishing_picasa_album_construct (GType object_type, const gchar* name, const gchar* url) {
+PublishingPicasaAlbum*
+publishing_picasa_album_construct (GType object_type,
+ const gchar* name,
+ const gchar* url)
+{
PublishingPicasaAlbum* self = NULL;
- const gchar* _tmp0_;
+ gchar* _tmp0_;
gchar* _tmp1_;
- const gchar* _tmp2_;
- gchar* _tmp3_;
#line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_return_val_if_fail (name != NULL, NULL);
#line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -2531,132 +2622,156 @@ PublishingPicasaAlbum* publishing_picasa_album_construct (GType object_type, con
#line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
self = (PublishingPicasaAlbum*) g_type_create_instance (object_type);
#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp0_ = name;
-#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp1_ = g_strdup (_tmp0_);
+ _tmp0_ = g_strdup (name);
#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_g_free0 (self->name);
#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- self->name = _tmp1_;
+ self->name = _tmp0_;
#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp2_ = url;
-#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp3_ = g_strdup (_tmp2_);
+ _tmp1_ = g_strdup (url);
#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_g_free0 (self->url);
#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- self->url = _tmp3_;
+ self->url = _tmp1_;
#line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return self;
-#line 2536 "PicasaPublishing.c"
+#line 2623 "PicasaPublishing.c"
}
-PublishingPicasaAlbum* publishing_picasa_album_new (const gchar* name, const gchar* url) {
+PublishingPicasaAlbum*
+publishing_picasa_album_new (const gchar* name,
+ const gchar* url)
+{
#line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return publishing_picasa_album_construct (PUBLISHING_PICASA_TYPE_ALBUM, name, url);
-#line 2543 "PicasaPublishing.c"
+#line 2633 "PicasaPublishing.c"
}
-static void publishing_picasa_value_album_init (GValue* value) {
+static void
+publishing_picasa_value_album_init (GValue* value)
+{
#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 2550 "PicasaPublishing.c"
+#line 2642 "PicasaPublishing.c"
}
-static void publishing_picasa_value_album_free_value (GValue* value) {
+static void
+publishing_picasa_value_album_free_value (GValue* value)
+{
#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (value->data[0].v_pointer) {
#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_picasa_album_unref (value->data[0].v_pointer);
-#line 2559 "PicasaPublishing.c"
+#line 2653 "PicasaPublishing.c"
}
}
-static void publishing_picasa_value_album_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+publishing_picasa_value_album_copy_value (const GValue* src_value,
+ GValue* dest_value)
+{
#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (src_value->data[0].v_pointer) {
#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
dest_value->data[0].v_pointer = publishing_picasa_album_ref (src_value->data[0].v_pointer);
-#line 2569 "PicasaPublishing.c"
+#line 2666 "PicasaPublishing.c"
} else {
#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
dest_value->data[0].v_pointer = NULL;
-#line 2573 "PicasaPublishing.c"
+#line 2670 "PicasaPublishing.c"
}
}
-static gpointer publishing_picasa_value_album_peek_pointer (const GValue* value) {
+static gpointer
+publishing_picasa_value_album_peek_pointer (const GValue* value)
+{
#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return value->data[0].v_pointer;
-#line 2581 "PicasaPublishing.c"
+#line 2680 "PicasaPublishing.c"
}
-static gchar* publishing_picasa_value_album_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_picasa_value_album_collect_value (GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (collect_values[0].v_pointer) {
-#line 2588 "PicasaPublishing.c"
+#line 2692 "PicasaPublishing.c"
PublishingPicasaAlbum * object;
object = collect_values[0].v_pointer;
#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (object->parent_instance.g_class == NULL) {
#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2595 "PicasaPublishing.c"
+#line 2699 "PicasaPublishing.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2599 "PicasaPublishing.c"
+#line 2703 "PicasaPublishing.c"
}
#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
value->data[0].v_pointer = publishing_picasa_album_ref (object);
-#line 2603 "PicasaPublishing.c"
+#line 2707 "PicasaPublishing.c"
} else {
#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 2607 "PicasaPublishing.c"
+#line 2711 "PicasaPublishing.c"
}
#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return NULL;
-#line 2611 "PicasaPublishing.c"
+#line 2715 "PicasaPublishing.c"
}
-static gchar* publishing_picasa_value_album_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_picasa_value_album_lcopy_value (const GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
PublishingPicasaAlbum ** object_p;
object_p = collect_values[0].v_pointer;
#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (!object_p) {
#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 2622 "PicasaPublishing.c"
+#line 2731 "PicasaPublishing.c"
}
#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (!value->data[0].v_pointer) {
#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
*object_p = NULL;
-#line 2628 "PicasaPublishing.c"
+#line 2737 "PicasaPublishing.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
*object_p = value->data[0].v_pointer;
-#line 2632 "PicasaPublishing.c"
+#line 2741 "PicasaPublishing.c"
} else {
#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
*object_p = publishing_picasa_album_ref (value->data[0].v_pointer);
-#line 2636 "PicasaPublishing.c"
+#line 2745 "PicasaPublishing.c"
}
#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return NULL;
-#line 2640 "PicasaPublishing.c"
+#line 2749 "PicasaPublishing.c"
}
-GParamSpec* publishing_picasa_param_spec_album (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+publishing_picasa_param_spec_album (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags)
+{
PublishingPicasaParamSpecAlbum* spec;
#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_PICASA_TYPE_ALBUM), NULL);
@@ -2666,20 +2781,25 @@ GParamSpec* publishing_picasa_param_spec_album (const gchar* name, const gchar*
G_PARAM_SPEC (spec)->value_type = object_type;
#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return G_PARAM_SPEC (spec);
-#line 2654 "PicasaPublishing.c"
+#line 2769 "PicasaPublishing.c"
}
-gpointer publishing_picasa_value_get_album (const GValue* value) {
+gpointer
+publishing_picasa_value_get_album (const GValue* value)
+{
#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PICASA_TYPE_ALBUM), NULL);
#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return value->data[0].v_pointer;
-#line 2663 "PicasaPublishing.c"
+#line 2780 "PicasaPublishing.c"
}
-void publishing_picasa_value_set_album (GValue* value, gpointer v_object) {
+void
+publishing_picasa_value_set_album (GValue* value,
+ gpointer v_object)
+{
PublishingPicasaAlbum * old;
#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PICASA_TYPE_ALBUM));
@@ -2695,22 +2815,25 @@ void publishing_picasa_value_set_album (GValue* value, gpointer v_object) {
value->data[0].v_pointer = v_object;
#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_picasa_album_ref (value->data[0].v_pointer);
-#line 2683 "PicasaPublishing.c"
+#line 2803 "PicasaPublishing.c"
} else {
#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 2687 "PicasaPublishing.c"
+#line 2807 "PicasaPublishing.c"
}
#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (old) {
#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_picasa_album_unref (old);
-#line 2693 "PicasaPublishing.c"
+#line 2813 "PicasaPublishing.c"
}
}
-void publishing_picasa_value_take_album (GValue* value, gpointer v_object) {
+void
+publishing_picasa_value_take_album (GValue* value,
+ gpointer v_object)
+{
PublishingPicasaAlbum * old;
#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PICASA_TYPE_ALBUM));
@@ -2724,38 +2847,44 @@ void publishing_picasa_value_take_album (GValue* value, gpointer v_object) {
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
value->data[0].v_pointer = v_object;
-#line 2712 "PicasaPublishing.c"
+#line 2835 "PicasaPublishing.c"
} else {
#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 2716 "PicasaPublishing.c"
+#line 2839 "PicasaPublishing.c"
}
#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (old) {
#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_picasa_album_unref (old);
-#line 2722 "PicasaPublishing.c"
+#line 2845 "PicasaPublishing.c"
}
}
-static void publishing_picasa_album_class_init (PublishingPicasaAlbumClass * klass) {
+static void
+publishing_picasa_album_class_init (PublishingPicasaAlbumClass * klass)
+{
#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_picasa_album_parent_class = g_type_class_peek_parent (klass);
#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
((PublishingPicasaAlbumClass *) klass)->finalize = publishing_picasa_album_finalize;
-#line 2732 "PicasaPublishing.c"
+#line 2857 "PicasaPublishing.c"
}
-static void publishing_picasa_album_instance_init (PublishingPicasaAlbum * self) {
+static void
+publishing_picasa_album_instance_init (PublishingPicasaAlbum * self)
+{
#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
self->ref_count = 1;
-#line 2739 "PicasaPublishing.c"
+#line 2866 "PicasaPublishing.c"
}
-static void publishing_picasa_album_finalize (PublishingPicasaAlbum * obj) {
+static void
+publishing_picasa_album_finalize (PublishingPicasaAlbum * obj)
+{
PublishingPicasaAlbum * self;
#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PICASA_TYPE_ALBUM, PublishingPicasaAlbum);
@@ -2765,11 +2894,13 @@ static void publishing_picasa_album_finalize (PublishingPicasaAlbum * obj) {
_g_free0 (self->name);
#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_g_free0 (self->url);
-#line 2753 "PicasaPublishing.c"
+#line 2882 "PicasaPublishing.c"
}
-GType publishing_picasa_album_get_type (void) {
+GType
+publishing_picasa_album_get_type (void)
+{
static volatile gsize publishing_picasa_album_type_id__volatile = 0;
if (g_once_init_enter (&publishing_picasa_album_type_id__volatile)) {
static const GTypeValueTable g_define_type_value_table = { publishing_picasa_value_album_init, publishing_picasa_value_album_free_value, publishing_picasa_value_album_copy_value, publishing_picasa_value_album_peek_pointer, "p", publishing_picasa_value_album_collect_value, "p", publishing_picasa_value_album_lcopy_value };
@@ -2783,18 +2914,22 @@ GType publishing_picasa_album_get_type (void) {
}
-gpointer publishing_picasa_album_ref (gpointer instance) {
+gpointer
+publishing_picasa_album_ref (gpointer instance)
+{
PublishingPicasaAlbum * self;
self = instance;
#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_atomic_int_inc (&self->ref_count);
#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return instance;
-#line 2778 "PicasaPublishing.c"
+#line 2911 "PicasaPublishing.c"
}
-void publishing_picasa_album_unref (gpointer instance) {
+void
+publishing_picasa_album_unref (gpointer instance)
+{
PublishingPicasaAlbum * self;
self = instance;
#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -2803,101 +2938,108 @@ void publishing_picasa_album_unref (gpointer instance) {
PUBLISHING_PICASA_ALBUM_GET_CLASS (self)->finalize (self);
#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 2791 "PicasaPublishing.c"
+#line 2926 "PicasaPublishing.c"
}
}
-PublishingPicasaAlbumDirectoryTransaction* publishing_picasa_album_directory_transaction_construct (GType object_type, PublishingRESTSupportGoogleSession* session) {
+PublishingPicasaAlbumDirectoryTransaction*
+publishing_picasa_album_directory_transaction_construct (GType object_type,
+ PublishingRESTSupportGoogleSession* session)
+{
PublishingPicasaAlbumDirectoryTransaction* self = NULL;
- PublishingRESTSupportGoogleSession* _tmp0_;
#line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (session), NULL);
#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp0_ = session;
-#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- self = (PublishingPicasaAlbumDirectoryTransaction*) publishing_rest_support_google_publisher_authenticated_transaction_construct (object_type, _tmp0_, PUBLISHING_PICASA_ALBUM_DIRECTORY_TRANSACTION_ENDPOINT_URL, PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET);
+ self = (PublishingPicasaAlbumDirectoryTransaction*) publishing_rest_support_google_publisher_authenticated_transaction_construct (object_type, session, PUBLISHING_PICASA_ALBUM_DIRECTORY_TRANSACTION_ENDPOINT_URL, PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET);
#line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return self;
-#line 2807 "PicasaPublishing.c"
+#line 2942 "PicasaPublishing.c"
}
-PublishingPicasaAlbumDirectoryTransaction* publishing_picasa_album_directory_transaction_new (PublishingRESTSupportGoogleSession* session) {
+PublishingPicasaAlbumDirectoryTransaction*
+publishing_picasa_album_directory_transaction_new (PublishingRESTSupportGoogleSession* session)
+{
#line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return publishing_picasa_album_directory_transaction_construct (PUBLISHING_PICASA_TYPE_ALBUM_DIRECTORY_TRANSACTION, session);
-#line 2814 "PicasaPublishing.c"
+#line 2951 "PicasaPublishing.c"
}
-gchar* publishing_picasa_album_directory_transaction_validate_xml (PublishingRESTSupportXmlDocument* doc) {
+gchar*
+publishing_picasa_album_directory_transaction_validate_xml (PublishingRESTSupportXmlDocument* doc)
+{
gchar* result = NULL;
xmlNode* document_root = NULL;
- PublishingRESTSupportXmlDocument* _tmp0_;
- xmlNode* _tmp1_;
- gboolean _tmp2_ = FALSE;
- xmlNode* _tmp3_;
- const gchar* _tmp4_;
+ xmlNode* _tmp0_;
+ gboolean _tmp1_ = FALSE;
+ xmlNode* _tmp2_;
+ const gchar* _tmp3_;
#line 396 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_XML_DOCUMENT (doc), NULL);
#line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp0_ = doc;
-#line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp1_ = publishing_rest_support_xml_document_get_root_node (_tmp0_);
+ _tmp0_ = publishing_rest_support_xml_document_get_root_node (doc);
#line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- document_root = _tmp1_;
+ document_root = _tmp0_;
#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp3_ = document_root;
+ _tmp2_ = document_root;
#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp4_ = _tmp3_->name;
+ _tmp3_ = _tmp2_->name;
#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- if (g_strcmp0 (_tmp4_, "feed") == 0) {
+ if (g_strcmp0 (_tmp3_, "feed") == 0) {
#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp2_ = TRUE;
-#line 2842 "PicasaPublishing.c"
+ _tmp1_ = TRUE;
+#line 2978 "PicasaPublishing.c"
} else {
- xmlNode* _tmp5_;
- const gchar* _tmp6_;
+ xmlNode* _tmp4_;
+ const gchar* _tmp5_;
#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp5_ = document_root;
+ _tmp4_ = document_root;
#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp6_ = _tmp5_->name;
+ _tmp5_ = _tmp4_->name;
#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp2_ = g_strcmp0 (_tmp6_, "entry") == 0;
-#line 2852 "PicasaPublishing.c"
+ _tmp1_ = g_strcmp0 (_tmp5_, "entry") == 0;
+#line 2988 "PicasaPublishing.c"
}
#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- if (_tmp2_) {
+ if (_tmp1_) {
#line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
result = NULL;
#line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return result;
-#line 2860 "PicasaPublishing.c"
+#line 2996 "PicasaPublishing.c"
} else {
- gchar* _tmp7_;
+ gchar* _tmp6_;
#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp7_ = g_strdup ("response root node isn't a <feed> or <entry>");
+ _tmp6_ = g_strdup ("response root node isn't a <feed> or <entry>");
#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- result = _tmp7_;
+ result = _tmp6_;
#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return result;
-#line 2869 "PicasaPublishing.c"
+#line 3005 "PicasaPublishing.c"
}
}
-static void publishing_picasa_album_directory_transaction_class_init (PublishingPicasaAlbumDirectoryTransactionClass * klass) {
+static void
+publishing_picasa_album_directory_transaction_class_init (PublishingPicasaAlbumDirectoryTransactionClass * klass)
+{
#line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_picasa_album_directory_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 2877 "PicasaPublishing.c"
+#line 3015 "PicasaPublishing.c"
}
-static void publishing_picasa_album_directory_transaction_instance_init (PublishingPicasaAlbumDirectoryTransaction * self) {
+static void
+publishing_picasa_album_directory_transaction_instance_init (PublishingPicasaAlbumDirectoryTransaction * self)
+{
}
-GType publishing_picasa_album_directory_transaction_get_type (void) {
+GType
+publishing_picasa_album_directory_transaction_get_type (void)
+{
static volatile gsize publishing_picasa_album_directory_transaction_type_id__volatile = 0;
if (g_once_init_enter (&publishing_picasa_album_directory_transaction_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingPicasaAlbumDirectoryTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_picasa_album_directory_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingPicasaAlbumDirectoryTransaction), 0, (GInstanceInitFunc) publishing_picasa_album_directory_transaction_instance_init, NULL };
@@ -2909,36 +3051,36 @@ GType publishing_picasa_album_directory_transaction_get_type (void) {
}
-static gpointer _publishing_rest_support_session_ref0 (gpointer self) {
+static gpointer
+_publishing_rest_support_session_ref0 (gpointer self)
+{
#line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return self ? publishing_rest_support_session_ref (self) : NULL;
-#line 2900 "PicasaPublishing.c"
+#line 3044 "PicasaPublishing.c"
}
-static gpointer _publishing_picasa_publishing_parameters_ref0 (gpointer self) {
+static gpointer
+_publishing_picasa_publishing_parameters_ref0 (gpointer self)
+{
#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return self ? publishing_picasa_publishing_parameters_ref (self) : NULL;
-#line 2907 "PicasaPublishing.c"
+#line 3053 "PicasaPublishing.c"
}
-PublishingPicasaUploadTransaction* publishing_picasa_upload_transaction_construct (GType object_type, PublishingRESTSupportGoogleSession* session, PublishingPicasaPublishingParameters* parameters, SpitPublishingPublishable* publishable) {
+PublishingPicasaUploadTransaction*
+publishing_picasa_upload_transaction_construct (GType object_type,
+ PublishingRESTSupportGoogleSession* session,
+ PublishingPicasaPublishingParameters* parameters,
+ SpitPublishingPublishable* publishable)
+{
PublishingPicasaUploadTransaction* self = NULL;
- PublishingRESTSupportGoogleSession* _tmp0_;
- PublishingPicasaPublishingParameters* _tmp1_;
- gchar* _tmp2_;
- gchar* _tmp3_;
- PublishingRESTSupportGoogleSession* _tmp4_;
- gboolean _tmp5_;
- PublishingRESTSupportGoogleSession* _tmp6_;
- PublishingRESTSupportGoogleSession* _tmp7_;
- PublishingPicasaPublishingParameters* _tmp8_;
- PublishingPicasaPublishingParameters* _tmp9_;
- SpitPublishingPublishable* _tmp10_;
- SpitPublishingPublishable* _tmp11_;
- SpitPublishingPublishable* _tmp12_;
- SpitPublishingPublisherMediaType _tmp13_;
+ gchar* _tmp0_;
+ gchar* _tmp1_;
+ PublishingRESTSupportGoogleSession* _tmp2_;
+ PublishingPicasaPublishingParameters* _tmp3_;
+ SpitPublishingPublishable* _tmp4_;
GError * _inner_error_ = NULL;
#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (session), NULL);
@@ -2947,115 +3089,97 @@ PublishingPicasaUploadTransaction* publishing_picasa_upload_transaction_construc
#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL);
#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp0_ = session;
+ _tmp0_ = publishing_picasa_publishing_parameters_get_target_album_feed_url (parameters);
#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp1_ = parameters;
-#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp2_ = publishing_picasa_publishing_parameters_get_target_album_feed_url (_tmp1_);
-#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp3_ = _tmp2_;
+ _tmp1_ = _tmp0_;
#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- self = (PublishingPicasaUploadTransaction*) publishing_rest_support_google_publisher_authenticated_transaction_construct (object_type, _tmp0_, _tmp3_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
+ self = (PublishingPicasaUploadTransaction*) publishing_rest_support_google_publisher_authenticated_transaction_construct (object_type, session, _tmp1_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _g_free0 (_tmp3_);
-#line 418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp4_ = session;
-#line 418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp5_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
+ _g_free0 (_tmp1_);
#line 418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _vala_assert (_tmp5_, "session.is_authenticated()");
+ _vala_assert (publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession)), "session.is_authenticated()");
#line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp6_ = session;
-#line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp7_ = _publishing_rest_support_session_ref0 (_tmp6_);
+ _tmp2_ = _publishing_rest_support_session_ref0 (session);
#line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_publishing_rest_support_session_unref0 (self->priv->session);
#line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- self->priv->session = _tmp7_;
-#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp8_ = parameters;
+ self->priv->session = _tmp2_;
#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp9_ = _publishing_picasa_publishing_parameters_ref0 (_tmp8_);
+ _tmp3_ = _publishing_picasa_publishing_parameters_ref0 (parameters);
#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_publishing_picasa_publishing_parameters_unref0 (self->priv->parameters);
#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- self->priv->parameters = _tmp9_;
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp10_ = publishable;
+ self->priv->parameters = _tmp3_;
#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp11_ = _g_object_ref0 (_tmp10_);
+ _tmp4_ = _g_object_ref0 (publishable);
#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_g_object_unref0 (self->priv->publishable);
#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- self->priv->publishable = _tmp11_;
-#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp12_ = publishable;
-#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp13_ = spit_publishing_publishable_get_media_type (_tmp12_);
+ self->priv->publishable = _tmp4_;
#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- if (_tmp13_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 2982 "PicasaPublishing.c"
+ if (spit_publishing_publishable_get_media_type (publishable) == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
+#line 3106 "PicasaPublishing.c"
{
GFileInfo* info = NULL;
- SpitPublishingPublishable* _tmp14_;
- GFile* _tmp15_;
- GFile* _tmp16_;
- GFileInfo* _tmp17_;
- GFileInfo* _tmp18_;
- GFileInfo* _tmp19_;
- const gchar* _tmp20_;
- gchar* _tmp21_;
+ SpitPublishingPublishable* _tmp5_;
+ GFile* _tmp6_;
+ GFile* _tmp7_;
+ GFileInfo* _tmp8_;
+ GFileInfo* _tmp9_;
+ GFileInfo* _tmp10_;
+ const gchar* _tmp11_;
+ gchar* _tmp12_;
#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp14_ = self->priv->publishable;
+ _tmp5_ = self->priv->publishable;
#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp15_ = spit_publishing_publishable_get_serialized_file (_tmp14_);
+ _tmp6_ = spit_publishing_publishable_get_serialized_file (_tmp5_);
#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp16_ = _tmp15_;
+ _tmp7_ = _tmp6_;
#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp17_ = g_file_query_info (_tmp16_, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE, G_FILE_QUERY_INFO_NONE, NULL, &_inner_error_);
+ _tmp8_ = g_file_query_info (_tmp7_, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE, G_FILE_QUERY_INFO_NONE, NULL, &_inner_error_);
#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp18_ = _tmp17_;
+ _tmp9_ = _tmp8_;
#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _g_object_unref0 (_tmp16_);
+ _g_object_unref0 (_tmp7_);
#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- info = _tmp18_;
+ info = _tmp9_;
#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3009 "PicasaPublishing.c"
+#line 3133 "PicasaPublishing.c"
goto __catch10_g_error;
}
#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp19_ = info;
+ _tmp10_ = info;
#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp20_ = g_file_info_get_content_type (_tmp19_);
+ _tmp11_ = g_file_info_get_content_type (_tmp10_);
#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp21_ = g_content_type_get_mime_type (_tmp20_);
+ _tmp12_ = g_content_type_get_mime_type (_tmp11_);
#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_g_free0 (self->priv->mime_type);
#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- self->priv->mime_type = _tmp21_;
+ self->priv->mime_type = _tmp12_;
#line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_g_object_unref0 (info);
-#line 3024 "PicasaPublishing.c"
+#line 3148 "PicasaPublishing.c"
}
goto __finally10;
__catch10_g_error:
{
GError* err = NULL;
- gchar* _tmp22_;
+ gchar* _tmp13_;
#line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
err = _inner_error_;
#line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_inner_error_ = NULL;
#line 427 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp22_ = g_strdup ("video/mpeg");
+ _tmp13_ = g_strdup ("video/mpeg");
#line 427 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_g_free0 (self->priv->mime_type);
#line 427 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- self->priv->mime_type = _tmp22_;
+ self->priv->mime_type = _tmp13_;
#line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_g_error_free0 (err);
-#line 3043 "PicasaPublishing.c"
+#line 3167 "PicasaPublishing.c"
}
__finally10:
#line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -3066,610 +3190,476 @@ PublishingPicasaUploadTransaction* publishing_picasa_upload_transaction_construc
g_clear_error (&_inner_error_);
#line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return NULL;
-#line 3054 "PicasaPublishing.c"
+#line 3178 "PicasaPublishing.c"
}
} else {
- gchar* _tmp23_;
+ gchar* _tmp14_;
#line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp23_ = g_strdup ("image/jpeg");
+ _tmp14_ = g_strdup ("image/jpeg");
#line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_g_free0 (self->priv->mime_type);
#line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- self->priv->mime_type = _tmp23_;
-#line 3064 "PicasaPublishing.c"
+ self->priv->mime_type = _tmp14_;
+#line 3188 "PicasaPublishing.c"
}
#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return self;
-#line 3068 "PicasaPublishing.c"
+#line 3192 "PicasaPublishing.c"
}
-PublishingPicasaUploadTransaction* publishing_picasa_upload_transaction_new (PublishingRESTSupportGoogleSession* session, PublishingPicasaPublishingParameters* parameters, SpitPublishingPublishable* publishable) {
+PublishingPicasaUploadTransaction*
+publishing_picasa_upload_transaction_new (PublishingRESTSupportGoogleSession* session,
+ PublishingPicasaPublishingParameters* parameters,
+ SpitPublishingPublishable* publishable)
+{
#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return publishing_picasa_upload_transaction_construct (PUBLISHING_PICASA_TYPE_UPLOAD_TRANSACTION, session, parameters, publishable);
-#line 3075 "PicasaPublishing.c"
+#line 3203 "PicasaPublishing.c"
}
-static glong string_strnlen (gchar* str, glong maxlen) {
+static glong
+string_strnlen (gchar* str,
+ glong maxlen)
+{
glong result = 0L;
gchar* end = NULL;
gchar* _tmp0_;
- glong _tmp1_;
- gchar* _tmp2_;
- gchar* _tmp3_;
-#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp0_ = str;
-#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp1_ = maxlen;
-#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- end = _tmp2_;
-#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp3_ = end;
-#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp3_ == NULL) {
-#line 3098 "PicasaPublishing.c"
- glong _tmp4_;
-#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp4_ = maxlen;
-#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- result = _tmp4_;
-#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ gchar* _tmp1_;
+#line 1336 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp0_ = memchr (str, 0, (gsize) maxlen);
+#line 1336 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ end = _tmp0_;
+#line 1337 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp1_ = end;
+#line 1337 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (_tmp1_ == NULL) {
+#line 1338 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = maxlen;
+#line 1338 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 3106 "PicasaPublishing.c"
+#line 3227 "PicasaPublishing.c"
} else {
- gchar* _tmp5_;
- gchar* _tmp6_;
-#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp5_ = end;
-#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp6_ = str;
-#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- result = (glong) (_tmp5_ - _tmp6_);
-#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ gchar* _tmp2_;
+#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp2_ = end;
+#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = (glong) (_tmp2_ - str);
+#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 3118 "PicasaPublishing.c"
+#line 3236 "PicasaPublishing.c"
}
}
-static gchar* string_substring (const gchar* self, glong offset, glong len) {
+static gchar*
+string_substring (const gchar* self,
+ glong offset,
+ glong len)
+{
gchar* result = NULL;
glong string_length = 0L;
gboolean _tmp0_ = FALSE;
- glong _tmp1_;
- glong _tmp8_;
- glong _tmp14_;
- glong _tmp17_;
- glong _tmp18_;
- glong _tmp19_;
- glong _tmp20_;
- glong _tmp21_;
- gchar* _tmp22_;
-#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ glong _tmp6_;
+ gchar* _tmp7_;
+#line 1347 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp1_ = offset;
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp1_ >= ((glong) 0)) {
-#line 3142 "PicasaPublishing.c"
- glong _tmp2_;
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp2_ = len;
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp0_ = _tmp2_ >= ((glong) 0);
-#line 3148 "PicasaPublishing.c"
+#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (offset >= ((glong) 0)) {
+#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp0_ = len >= ((glong) 0);
+#line 3257 "PicasaPublishing.c"
} else {
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp0_ = FALSE;
-#line 3152 "PicasaPublishing.c"
+#line 3261 "PicasaPublishing.c"
}
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
if (_tmp0_) {
-#line 3156 "PicasaPublishing.c"
- glong _tmp3_;
- glong _tmp4_;
- glong _tmp5_;
-#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp3_ = offset;
-#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp4_ = len;
-#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- string_length = _tmp5_;
-#line 3168 "PicasaPublishing.c"
+#line 1351 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ string_length = string_strnlen ((gchar*) self, offset + len);
+#line 3267 "PicasaPublishing.c"
} else {
- gint _tmp6_;
- gint _tmp7_;
-#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp6_ = strlen (self);
-#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp7_ = _tmp6_;
-#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- string_length = (glong) _tmp7_;
-#line 3178 "PicasaPublishing.c"
+ gint _tmp1_;
+ gint _tmp2_;
+#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp1_ = strlen (self);
+#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp2_ = _tmp1_;
+#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ string_length = (glong) _tmp2_;
+#line 3277 "PicasaPublishing.c"
}
-#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp8_ = offset;
-#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp8_ < ((glong) 0)) {
-#line 3184 "PicasaPublishing.c"
- glong _tmp9_;
- glong _tmp10_;
- glong _tmp11_;
-#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp9_ = string_length;
-#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp10_ = offset;
-#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- offset = _tmp9_ + _tmp10_;
-#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp11_ = offset;
-#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 3198 "PicasaPublishing.c"
+#line 1356 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (offset < ((glong) 0)) {
+#line 3281 "PicasaPublishing.c"
+ glong _tmp3_;
+#line 1357 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp3_ = string_length;
+#line 1357 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ offset = _tmp3_ + offset;
+#line 1358 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ g_return_val_if_fail (offset >= ((glong) 0), NULL);
+#line 3289 "PicasaPublishing.c"
} else {
- glong _tmp12_;
- glong _tmp13_;
-#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp12_ = offset;
-#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp13_ = string_length;
-#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 3208 "PicasaPublishing.c"
+ glong _tmp4_;
+#line 1360 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp4_ = string_length;
+#line 1360 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ g_return_val_if_fail (offset <= _tmp4_, NULL);
+#line 3296 "PicasaPublishing.c"
}
-#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp14_ = len;
-#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp14_ < ((glong) 0)) {
-#line 3214 "PicasaPublishing.c"
- glong _tmp15_;
- glong _tmp16_;
-#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp15_ = string_length;
-#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp16_ = offset;
-#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- len = _tmp15_ - _tmp16_;
-#line 3223 "PicasaPublishing.c"
+#line 1362 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (len < ((glong) 0)) {
+#line 3300 "PicasaPublishing.c"
+ glong _tmp5_;
+#line 1363 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp5_ = string_length;
+#line 1363 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ len = _tmp5_ - offset;
+#line 3306 "PicasaPublishing.c"
}
-#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp17_ = offset;
-#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp18_ = len;
-#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp19_ = string_length;
-#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp20_ = offset;
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp21_ = len;
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- result = _tmp22_;
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1365 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp6_ = string_length;
+#line 1365 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ g_return_val_if_fail ((offset + len) <= _tmp6_, NULL);
+#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp7_ = g_strndup (((gchar*) self) + offset, (gsize) len);
+#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = _tmp7_;
+#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 3243 "PicasaPublishing.c"
+#line 3318 "PicasaPublishing.c"
}
-static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int str_array_length1) {
+static gchar*
+_vala_g_strjoinv (const gchar* separator,
+ gchar** str_array,
+ int str_array_length1)
+{
gchar* result = NULL;
- const gchar* _tmp0_;
- gboolean _tmp1_ = FALSE;
- gboolean _tmp2_ = FALSE;
- gchar** _tmp3_;
- gint _tmp3__length1;
-#line 1078 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp0_ = separator;
-#line 1078 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp0_ == NULL) {
-#line 1079 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ gboolean _tmp0_ = FALSE;
+#line 1092 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (separator == NULL) {
+#line 1093 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
separator = "";
-#line 3260 "PicasaPublishing.c"
- }
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp3_ = str_array;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp3__length1 = str_array_length1;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp3_ != NULL) {
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp2_ = TRUE;
-#line 3270 "PicasaPublishing.c"
- } else {
- gchar** _tmp4_;
- gint _tmp4__length1;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp4_ = str_array;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp4__length1 = str_array_length1;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp2_ = _tmp4__length1 > 0;
-#line 3280 "PicasaPublishing.c"
+#line 3333 "PicasaPublishing.c"
}
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp2_) {
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp1_ = TRUE;
-#line 3286 "PicasaPublishing.c"
- } else {
- gboolean _tmp5_ = FALSE;
- gchar** _tmp6_;
- gint _tmp6__length1;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp6_ = str_array;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp6__length1 = str_array_length1;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp6__length1 == -1) {
-#line 3297 "PicasaPublishing.c"
- gchar** _tmp7_;
- gint _tmp7__length1;
- const gchar* _tmp8_;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp7_ = str_array;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp7__length1 = str_array_length1;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp8_ = _tmp7_[0];
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp5_ = _tmp8_ != NULL;
-#line 3309 "PicasaPublishing.c"
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (str_array != NULL) {
+#line 3337 "PicasaPublishing.c"
+ gboolean _tmp1_ = FALSE;
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (str_array_length1 > 0) {
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp1_ = TRUE;
+#line 3343 "PicasaPublishing.c"
} else {
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp5_ = FALSE;
-#line 3313 "PicasaPublishing.c"
+ gboolean _tmp2_ = FALSE;
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (str_array_length1 == -1) {
+#line 3348 "PicasaPublishing.c"
+ const gchar* _tmp3_;
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp3_ = str_array[0];
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp2_ = _tmp3_ != NULL;
+#line 3354 "PicasaPublishing.c"
+ } else {
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp2_ = FALSE;
+#line 3358 "PicasaPublishing.c"
+ }
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp1_ = _tmp2_;
+#line 3362 "PicasaPublishing.c"
}
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp1_ = _tmp5_;
-#line 3317 "PicasaPublishing.c"
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp0_ = _tmp1_;
+#line 3366 "PicasaPublishing.c"
+ } else {
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp0_ = FALSE;
+#line 3370 "PicasaPublishing.c"
}
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp1_) {
-#line 3321 "PicasaPublishing.c"
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (_tmp0_) {
+#line 3374 "PicasaPublishing.c"
gint i = 0;
gsize len = 0UL;
- gint _tmp31_;
- gint _tmp33_;
- gint _tmp34_;
- gsize _tmp35_;
- const gchar* _tmp36_;
- gint _tmp37_;
- gint _tmp38_;
- gint _tmp39_;
+ gint _tmp20_;
+ gint _tmp22_;
+ gint _tmp23_;
+ gsize _tmp24_;
+ gint _tmp25_;
+ gint _tmp26_;
+ gint _tmp27_;
const gchar* res = NULL;
- gsize _tmp40_;
- void* _tmp41_;
+ gsize _tmp28_;
+ void* _tmp29_;
void* ptr = NULL;
- const gchar* _tmp42_;
- gchar** _tmp43_;
- gint _tmp43__length1;
- const gchar* _tmp44_;
- void* _tmp45_;
- const gchar* _tmp62_;
-#line 1083 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ const gchar* _tmp30_;
+ const gchar* _tmp31_;
+ void* _tmp32_;
+ const gchar* _tmp45_;
+#line 1097 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
len = (gsize) 1;
-#line 3344 "PicasaPublishing.c"
+#line 3394 "PicasaPublishing.c"
{
- gboolean _tmp9_ = FALSE;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ gboolean _tmp4_ = FALSE;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
i = 0;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp9_ = TRUE;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp4_ = TRUE;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
while (TRUE) {
-#line 3353 "PicasaPublishing.c"
- gboolean _tmp11_ = FALSE;
- gboolean _tmp12_ = FALSE;
- gchar** _tmp13_;
- gint _tmp13__length1;
- gint _tmp21_ = 0;
- gchar** _tmp22_;
- gint _tmp22__length1;
- gint _tmp23_;
- const gchar* _tmp24_;
- gsize _tmp30_;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (!_tmp9_) {
-#line 3366 "PicasaPublishing.c"
- gint _tmp10_;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp10_ = i;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- i = _tmp10_ + 1;
-#line 3372 "PicasaPublishing.c"
+#line 3403 "PicasaPublishing.c"
+ gboolean _tmp6_ = FALSE;
+ gboolean _tmp7_ = FALSE;
+ gint _tmp12_ = 0;
+ gint _tmp13_;
+ const gchar* _tmp14_;
+ gsize _tmp19_;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (!_tmp4_) {
+#line 3412 "PicasaPublishing.c"
+ gint _tmp5_;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp5_ = i;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ i = _tmp5_ + 1;
+#line 3418 "PicasaPublishing.c"
}
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp9_ = FALSE;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp13_ = str_array;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp13__length1 = str_array_length1;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp13__length1 != -1) {
-#line 3382 "PicasaPublishing.c"
- gint _tmp14_;
- gchar** _tmp15_;
- gint _tmp15__length1;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp14_ = i;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp15_ = str_array;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp15__length1 = str_array_length1;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp12_ = _tmp14_ < _tmp15__length1;
-#line 3394 "PicasaPublishing.c"
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp4_ = FALSE;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (str_array_length1 != -1) {
+#line 3424 "PicasaPublishing.c"
+ gint _tmp8_;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp8_ = i;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp7_ = _tmp8_ < str_array_length1;
+#line 3430 "PicasaPublishing.c"
} else {
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp12_ = FALSE;
-#line 3398 "PicasaPublishing.c"
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp7_ = FALSE;
+#line 3434 "PicasaPublishing.c"
}
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp12_) {
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp11_ = TRUE;
-#line 3404 "PicasaPublishing.c"
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (_tmp7_) {
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp6_ = TRUE;
+#line 3440 "PicasaPublishing.c"
} else {
- gboolean _tmp16_ = FALSE;
- gchar** _tmp17_;
- gint _tmp17__length1;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp17_ = str_array;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp17__length1 = str_array_length1;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp17__length1 == -1) {
-#line 3415 "PicasaPublishing.c"
- gchar** _tmp18_;
- gint _tmp18__length1;
- gint _tmp19_;
- const gchar* _tmp20_;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp18_ = str_array;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp18__length1 = str_array_length1;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp19_ = i;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp20_ = _tmp18_[_tmp19_];
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp16_ = _tmp20_ != NULL;
-#line 3430 "PicasaPublishing.c"
+ gboolean _tmp9_ = FALSE;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (str_array_length1 == -1) {
+#line 3445 "PicasaPublishing.c"
+ gint _tmp10_;
+ const gchar* _tmp11_;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp10_ = i;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp11_ = str_array[_tmp10_];
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp9_ = _tmp11_ != NULL;
+#line 3454 "PicasaPublishing.c"
} else {
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp16_ = FALSE;
-#line 3434 "PicasaPublishing.c"
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp9_ = FALSE;
+#line 3458 "PicasaPublishing.c"
}
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp11_ = _tmp16_;
-#line 3438 "PicasaPublishing.c"
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp6_ = _tmp9_;
+#line 3462 "PicasaPublishing.c"
}
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (!_tmp11_) {
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (!_tmp6_) {
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
break;
-#line 3444 "PicasaPublishing.c"
+#line 3468 "PicasaPublishing.c"
}
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp22_ = str_array;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp22__length1 = str_array_length1;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp23_ = i;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp24_ = _tmp22_[_tmp23_];
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp24_ != NULL) {
-#line 3456 "PicasaPublishing.c"
- gchar** _tmp25_;
- gint _tmp25__length1;
- gint _tmp26_;
- const gchar* _tmp27_;
- gint _tmp28_;
- gint _tmp29_;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp25_ = str_array;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp25__length1 = str_array_length1;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp26_ = i;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp27_ = _tmp25_[_tmp26_];
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp28_ = strlen ((const gchar*) _tmp27_);
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp29_ = _tmp28_;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp21_ = _tmp29_;
-#line 3477 "PicasaPublishing.c"
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp13_ = i;
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp14_ = str_array[_tmp13_];
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (_tmp14_ != NULL) {
+#line 3476 "PicasaPublishing.c"
+ gint _tmp15_;
+ const gchar* _tmp16_;
+ gint _tmp17_;
+ gint _tmp18_;
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp15_ = i;
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp16_ = str_array[_tmp15_];
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp17_ = strlen ((const gchar*) _tmp16_);
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp18_ = _tmp17_;
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp12_ = _tmp18_;
+#line 3491 "PicasaPublishing.c"
} else {
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp21_ = 0;
-#line 3481 "PicasaPublishing.c"
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp12_ = 0;
+#line 3495 "PicasaPublishing.c"
}
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp30_ = len;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- len = _tmp30_ + _tmp21_;
-#line 3487 "PicasaPublishing.c"
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp19_ = len;
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ len = _tmp19_ + _tmp12_;
+#line 3501 "PicasaPublishing.c"
}
}
-#line 1087 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp31_ = i;
-#line 1087 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp31_ == 0) {
-#line 3494 "PicasaPublishing.c"
- gchar* _tmp32_;
-#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp32_ = g_strdup ("");
-#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- result = _tmp32_;
-#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1101 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp20_ = i;
+#line 1101 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (_tmp20_ == 0) {
+#line 3508 "PicasaPublishing.c"
+ gchar* _tmp21_;
+#line 1102 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp21_ = g_strdup ("");
+#line 1102 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = _tmp21_;
+#line 1102 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 3502 "PicasaPublishing.c"
+#line 3516 "PicasaPublishing.c"
}
-#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp33_ = i;
-#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- str_array_length1 = _tmp33_;
-#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp34_ = str_array_length1;
-#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp35_ = len;
-#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp36_ = separator;
-#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp37_ = strlen ((const gchar*) _tmp36_);
-#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp38_ = _tmp37_;
-#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp39_ = i;
-#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- len = _tmp35_ + (_tmp38_ * (_tmp39_ - 1));
-#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp40_ = len;
-#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp41_ = g_malloc (_tmp40_);
-#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- res = _tmp41_;
-#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp42_ = res;
-#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp43_ = str_array;
-#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp43__length1 = str_array_length1;
-#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp44_ = _tmp43_[0];
-#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_);
-#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- ptr = _tmp45_;
-#line 3540 "PicasaPublishing.c"
+#line 1104 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp22_ = i;
+#line 1104 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ str_array_length1 = _tmp22_;
+#line 1104 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp23_ = str_array_length1;
+#line 1105 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp24_ = len;
+#line 1105 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp25_ = strlen ((const gchar*) separator);
+#line 1105 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp26_ = _tmp25_;
+#line 1105 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp27_ = i;
+#line 1105 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ len = _tmp24_ + (_tmp26_ * (_tmp27_ - 1));
+#line 1107 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp28_ = len;
+#line 1107 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp29_ = g_malloc (_tmp28_);
+#line 1107 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ res = _tmp29_;
+#line 1108 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp30_ = res;
+#line 1108 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp31_ = str_array[0];
+#line 1108 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp32_ = g_stpcpy ((void*) _tmp30_, (const gchar*) _tmp31_);
+#line 1108 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ ptr = _tmp32_;
+#line 3548 "PicasaPublishing.c"
{
- gboolean _tmp46_ = FALSE;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ gboolean _tmp33_ = FALSE;
+#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
i = 1;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp46_ = TRUE;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp33_ = TRUE;
+#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
while (TRUE) {
-#line 3549 "PicasaPublishing.c"
- gint _tmp48_;
- gchar** _tmp49_;
- gint _tmp49__length1;
- void* _tmp50_;
- const gchar* _tmp51_;
- void* _tmp52_;
- const gchar* _tmp53_ = NULL;
- gchar** _tmp54_;
- gint _tmp54__length1;
- gint _tmp55_;
- const gchar* _tmp56_;
- void* _tmp60_;
- void* _tmp61_;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (!_tmp46_) {
-#line 3565 "PicasaPublishing.c"
- gint _tmp47_;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp47_ = i;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- i = _tmp47_ + 1;
-#line 3571 "PicasaPublishing.c"
+#line 3557 "PicasaPublishing.c"
+ gint _tmp35_;
+ void* _tmp36_;
+ void* _tmp37_;
+ const gchar* _tmp38_ = NULL;
+ gint _tmp39_;
+ const gchar* _tmp40_;
+ void* _tmp43_;
+ void* _tmp44_;
+#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (!_tmp33_) {
+#line 3568 "PicasaPublishing.c"
+ gint _tmp34_;
+#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp34_ = i;
+#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ i = _tmp34_ + 1;
+#line 3574 "PicasaPublishing.c"
}
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp46_ = FALSE;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp48_ = i;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp49_ = str_array;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp49__length1 = str_array_length1;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (!(_tmp48_ < _tmp49__length1)) {
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp33_ = FALSE;
+#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp35_ = i;
+#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (!(_tmp35_ < str_array_length1)) {
+#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
break;
-#line 3585 "PicasaPublishing.c"
+#line 3584 "PicasaPublishing.c"
}
-#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp50_ = ptr;
-#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp51_ = separator;
-#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp52_ = g_stpcpy (_tmp50_, (const gchar*) _tmp51_);
-#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- ptr = _tmp52_;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp54_ = str_array;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp54__length1 = str_array_length1;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp55_ = i;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp56_ = _tmp54_[_tmp55_];
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp56_ != NULL) {
-#line 3605 "PicasaPublishing.c"
- gchar** _tmp57_;
- gint _tmp57__length1;
- gint _tmp58_;
- const gchar* _tmp59_;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp57_ = str_array;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp57__length1 = str_array_length1;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp58_ = i;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp59_ = _tmp57_[_tmp58_];
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp53_ = (const gchar*) _tmp59_;
-#line 3620 "PicasaPublishing.c"
+#line 1110 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp36_ = ptr;
+#line 1110 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp37_ = g_stpcpy (_tmp36_, (const gchar*) separator);
+#line 1110 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ ptr = _tmp37_;
+#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp39_ = i;
+#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp40_ = str_array[_tmp39_];
+#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (_tmp40_ != NULL) {
+#line 3598 "PicasaPublishing.c"
+ gint _tmp41_;
+ const gchar* _tmp42_;
+#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp41_ = i;
+#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp42_ = str_array[_tmp41_];
+#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp38_ = (const gchar*) _tmp42_;
+#line 3607 "PicasaPublishing.c"
} else {
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp53_ = "";
-#line 3624 "PicasaPublishing.c"
+#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp38_ = "";
+#line 3611 "PicasaPublishing.c"
}
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp60_ = ptr;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp61_ = g_stpcpy (_tmp60_, _tmp53_);
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- ptr = _tmp61_;
-#line 3632 "PicasaPublishing.c"
+#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp43_ = ptr;
+#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp44_ = g_stpcpy (_tmp43_, _tmp38_);
+#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ ptr = _tmp44_;
+#line 3619 "PicasaPublishing.c"
}
}
-#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp62_ = res;
-#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1114 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp45_ = res;
+#line 1114 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
res = NULL;
-#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- result = (gchar*) _tmp62_;
-#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1114 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = (gchar*) _tmp45_;
+#line 1114 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 3643 "PicasaPublishing.c"
+#line 3630 "PicasaPublishing.c"
} else {
- gchar* _tmp63_;
-#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp63_ = g_strdup ("");
-#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- result = _tmp63_;
-#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ gchar* _tmp46_;
+#line 1116 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp46_ = g_strdup ("");
+#line 1116 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = _tmp46_;
+#line 1116 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 3652 "PicasaPublishing.c"
+#line 3639 "PicasaPublishing.c"
}
}
-static guint8* string_get_data (const gchar* self, int* result_length1) {
+static guint8*
+string_get_data (const gchar* self,
+ int* result_length1)
+{
guint8* result;
guint8* res = NULL;
gint res_length1;
@@ -3681,59 +3671,66 @@ static guint8* string_get_data (const gchar* self, int* result_length1) {
gint _tmp3__length1;
guint8* _tmp4_;
gint _tmp4__length1;
-#line 1428 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1442 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1443 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
res = (guint8*) self;
-#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1443 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
res_length1 = -1;
-#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1443 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_res_size_ = res_length1;
-#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1444 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp0_ = strlen (self);
-#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1444 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp1_ = _tmp0_;
-#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1444 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
res_length1 = (gint) _tmp1_;
-#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1444 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp2_ = res_length1;
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp3_ = res;
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp3__length1 = res_length1;
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp4_ = _tmp3_;
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp4__length1 = _tmp3__length1;
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
if (result_length1) {
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
*result_length1 = _tmp4__length1;
-#line 3697 "PicasaPublishing.c"
+#line 3687 "PicasaPublishing.c"
}
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
result = _tmp4_;
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 3703 "PicasaPublishing.c"
+#line 3693 "PicasaPublishing.c"
}
-static void _vala_SoupBuffer_free (SoupBuffer* self) {
+static void
+_vala_SoupBuffer_free (SoupBuffer* self)
+{
#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_boxed_free (soup_buffer_get_type (), self);
-#line 3710 "PicasaPublishing.c"
+#line 3702 "PicasaPublishing.c"
}
-static void _vala_SoupMultipart_free (SoupMultipart* self) {
+static void
+_vala_SoupMultipart_free (SoupMultipart* self)
+{
#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_boxed_free (soup_multipart_get_type (), self);
-#line 3717 "PicasaPublishing.c"
+#line 3711 "PicasaPublishing.c"
}
-static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error) {
+static void
+publishing_picasa_upload_transaction_real_execute (PublishingRESTSupportTransaction* base,
+ GError** error)
+{
PublishingPicasaUploadTransaction * self;
SoupMultipart* message_parts = NULL;
SoupMultipart* _tmp0_;
@@ -3754,53 +3751,52 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
gchar** _tmp16_;
gint _tmp16__length1;
gchar* metadata = NULL;
- SpitPublishingPublishable* _tmp51_;
+ SpitPublishingPublishable* _tmp50_;
+ gchar* _tmp51_;
gchar* _tmp52_;
gchar* _tmp53_;
gchar* _tmp54_;
- gchar* _tmp55_;
+ const gchar* _tmp55_;
const gchar* _tmp56_;
- const gchar* _tmp57_;
+ gchar* _tmp57_;
gchar* _tmp58_;
- gchar* _tmp59_;
SoupBuffer* metadata_buffer = NULL;
- const gchar* _tmp60_;
+ const gchar* _tmp59_;
+ guint8* _tmp60_;
+ gint _tmp60__length1;
guint8* _tmp61_;
gint _tmp61__length1;
- guint8* _tmp62_;
- gint _tmp62__length1;
- SoupBuffer* _tmp63_;
- SoupMultipart* _tmp64_;
- SoupBuffer* _tmp65_;
+ SoupBuffer* _tmp62_;
+ SoupMultipart* _tmp63_;
+ SoupBuffer* _tmp64_;
guint8* photo_data = NULL;
- GMappedFile* _tmp87_;
- gchar* _tmp88_;
+ GMappedFile* _tmp86_;
+ gchar* _tmp87_;
gint photo_data_length1;
gint _photo_data_size_;
- GMappedFile* _tmp89_;
- gsize _tmp90_;
- gint _tmp91_;
+ GMappedFile* _tmp88_;
+ gint _tmp89_;
SoupBuffer* bindable_data = NULL;
- SoupBuffer* _tmp92_;
- SoupMultipart* _tmp93_;
- SpitPublishingPublishable* _tmp94_;
- GFile* _tmp95_;
- GFile* _tmp96_;
- gchar* _tmp97_;
- gchar* _tmp98_;
- const gchar* _tmp99_;
+ SoupBuffer* _tmp90_;
+ SoupMultipart* _tmp91_;
+ SpitPublishingPublishable* _tmp92_;
+ GFile* _tmp93_;
+ GFile* _tmp94_;
+ gchar* _tmp95_;
+ gchar* _tmp96_;
+ const gchar* _tmp97_;
SoupMessage* outbound_message = NULL;
- gchar* _tmp100_;
- gchar* _tmp101_;
- SoupMultipart* _tmp102_;
- SoupMessage* _tmp103_;
- SoupMessage* _tmp104_;
- SoupMessageHeaders* _tmp105_;
- PublishingRESTSupportGoogleSession* _tmp106_;
+ gchar* _tmp98_;
+ gchar* _tmp99_;
+ SoupMultipart* _tmp100_;
+ SoupMessage* _tmp101_;
+ SoupMessage* _tmp102_;
+ SoupMessageHeaders* _tmp103_;
+ PublishingRESTSupportGoogleSession* _tmp104_;
+ gchar* _tmp105_;
+ gchar* _tmp106_;
gchar* _tmp107_;
gchar* _tmp108_;
- gchar* _tmp109_;
- gchar* _tmp110_;
GError * _inner_error_ = NULL;
#line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PICASA_TYPE_UPLOAD_TRANSACTION, PublishingPicasaUploadTransaction);
@@ -3824,7 +3820,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
_g_free0 (_tmp4_);
#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (_tmp5_) {
-#line 3812 "PicasaPublishing.c"
+#line 3808 "PicasaPublishing.c"
SpitPublishingPublishable* _tmp6_;
gchar* _tmp7_;
gchar* _tmp8_;
@@ -3851,7 +3847,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
_g_free0 (_tmp10_);
#line 440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_g_free0 (_tmp8_);
-#line 3839 "PicasaPublishing.c"
+#line 3835 "PicasaPublishing.c"
}
#line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp12_ = self->priv->publishable;
@@ -3873,23 +3869,23 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
_tmp16__length1 = keywords_length1;
#line 446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (_tmp16__length1 > 0) {
-#line 3861 "PicasaPublishing.c"
- const gchar* _tmp47_;
- gchar* _tmp48_;
- const gchar* _tmp49_;
- gchar* _tmp50_;
+#line 3857 "PicasaPublishing.c"
+ const gchar* _tmp46_;
+ gchar* _tmp47_;
+ const gchar* _tmp48_;
+ gchar* _tmp49_;
{
gint i = 0;
#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
i = 0;
-#line 3870 "PicasaPublishing.c"
+#line 3866 "PicasaPublishing.c"
{
gboolean _tmp17_ = FALSE;
#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp17_ = TRUE;
#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
while (TRUE) {
-#line 3877 "PicasaPublishing.c"
+#line 3873 "PicasaPublishing.c"
gint _tmp19_;
gchar** _tmp20_;
gint _tmp20__length1;
@@ -3900,19 +3896,18 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
gint _tmp21__length1;
gint _tmp22_;
const gchar* _tmp23_;
- gboolean _tmp24_;
- const gchar* _tmp37_;
+ const gchar* _tmp36_;
+ gint _tmp37_;
gint _tmp38_;
- gint _tmp39_;
#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (!_tmp17_) {
-#line 3894 "PicasaPublishing.c"
+#line 3889 "PicasaPublishing.c"
gint _tmp18_;
#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp18_ = i;
#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
i = _tmp18_ + 1;
-#line 3900 "PicasaPublishing.c"
+#line 3895 "PicasaPublishing.c"
}
#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp17_ = FALSE;
@@ -3926,7 +3921,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
if (!(_tmp19_ < _tmp20__length1)) {
#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
break;
-#line 3914 "PicasaPublishing.c"
+#line 3909 "PicasaPublishing.c"
}
#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp21_ = keywords;
@@ -3937,222 +3932,220 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp23_ = _tmp21_[_tmp22_];
#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp24_ = g_str_has_prefix (_tmp23_, "/");
-#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- if (_tmp24_) {
-#line 3928 "PicasaPublishing.c"
- gchar** _tmp25_;
- gint _tmp25__length1;
- gint _tmp26_;
- const gchar* _tmp27_;
+ if (g_str_has_prefix (_tmp23_, "/")) {
+#line 3921 "PicasaPublishing.c"
+ gchar** _tmp24_;
+ gint _tmp24__length1;
+ gint _tmp25_;
+ const gchar* _tmp26_;
+ gchar* _tmp27_;
gchar* _tmp28_;
- gchar* _tmp29_;
+ gchar** _tmp29_;
gchar** _tmp30_;
- gchar** _tmp31_;
#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp25_ = keywords;
+ _tmp24_ = keywords;
#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp25__length1 = keywords_length1;
+ _tmp24__length1 = keywords_length1;
#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp26_ = i;
+ _tmp25_ = i;
#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp27_ = _tmp25_[_tmp26_];
+ _tmp26_ = _tmp24_[_tmp25_];
#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp28_ = string_substring (_tmp27_, (glong) 1, (glong) -1);
+ _tmp27_ = string_substring (_tmp26_, (glong) 1, (glong) -1);
#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp29_ = _tmp28_;
+ _tmp28_ = _tmp27_;
#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp31_ = _tmp30_ = g_strsplit (_tmp29_, "/", 0);
+ _tmp30_ = _tmp29_ = g_strsplit (_tmp28_, "/", 0);
#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
tmp = (_vala_array_free (tmp, tmp_length1, (GDestroyNotify) g_free), NULL);
#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- tmp = _tmp31_;
+ tmp = _tmp30_;
#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- tmp_length1 = _vala_array_length (_tmp30_);
+ tmp_length1 = _vala_array_length (_tmp29_);
#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp_size_ = tmp_length1;
#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _g_free0 (_tmp29_);
-#line 3961 "PicasaPublishing.c"
+ _g_free0 (_tmp28_);
+#line 3954 "PicasaPublishing.c"
} else {
- gchar** _tmp32_;
- gint _tmp32__length1;
- gint _tmp33_;
- const gchar* _tmp34_;
+ gchar** _tmp31_;
+ gint _tmp31__length1;
+ gint _tmp32_;
+ const gchar* _tmp33_;
+ gchar** _tmp34_;
gchar** _tmp35_;
- gchar** _tmp36_;
#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp32_ = keywords;
+ _tmp31_ = keywords;
#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp32__length1 = keywords_length1;
+ _tmp31__length1 = keywords_length1;
#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp33_ = i;
+ _tmp32_ = i;
#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp34_ = _tmp32_[_tmp33_];
+ _tmp33_ = _tmp31_[_tmp32_];
#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp36_ = _tmp35_ = g_strsplit (_tmp34_, "/", 0);
+ _tmp35_ = _tmp34_ = g_strsplit (_tmp33_, "/", 0);
#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
tmp = (_vala_array_free (tmp, tmp_length1, (GDestroyNotify) g_free), NULL);
#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- tmp = _tmp36_;
+ tmp = _tmp35_;
#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- tmp_length1 = _vala_array_length (_tmp35_);
+ tmp_length1 = _vala_array_length (_tmp34_);
#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp_size_ = tmp_length1;
-#line 3987 "PicasaPublishing.c"
+#line 3980 "PicasaPublishing.c"
}
#line 455 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp37_ = keywords_string;
+ _tmp36_ = keywords_string;
#line 455 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp38_ = strlen (_tmp37_);
+ _tmp37_ = strlen (_tmp36_);
#line 455 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp39_ = _tmp38_;
+ _tmp38_ = _tmp37_;
#line 455 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- if (_tmp39_ > 0) {
-#line 3997 "PicasaPublishing.c"
- const gchar* _tmp40_;
- gchar** _tmp41_;
- gint _tmp41__length1;
+ if (_tmp38_ > 0) {
+#line 3990 "PicasaPublishing.c"
+ const gchar* _tmp39_;
+ gchar** _tmp40_;
+ gint _tmp40__length1;
+ gchar* _tmp41_;
gchar* _tmp42_;
gchar* _tmp43_;
- gchar* _tmp44_;
#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp40_ = keywords_string;
+ _tmp39_ = keywords_string;
#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp41_ = tmp;
+ _tmp40_ = tmp;
#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp41__length1 = tmp_length1;
+ _tmp40__length1 = tmp_length1;
#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp42_ = _vala_g_strjoinv (", ", _tmp41_, _tmp41__length1);
+ _tmp41_ = _vala_g_strjoinv (", ", _tmp40_, _tmp40__length1);
#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp43_ = _tmp42_;
+ _tmp42_ = _tmp41_;
#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp44_ = g_strjoin (", ", _tmp40_, _tmp43_, NULL);
+ _tmp43_ = g_strjoin (", ", _tmp39_, _tmp42_, NULL);
#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_g_free0 (keywords_string);
#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- keywords_string = _tmp44_;
+ keywords_string = _tmp43_;
#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _g_free0 (_tmp43_);
-#line 4022 "PicasaPublishing.c"
+ _g_free0 (_tmp42_);
+#line 4015 "PicasaPublishing.c"
} else {
- gchar** _tmp45_;
- gint _tmp45__length1;
- gchar* _tmp46_;
+ gchar** _tmp44_;
+ gint _tmp44__length1;
+ gchar* _tmp45_;
#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp45_ = tmp;
+ _tmp44_ = tmp;
#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp45__length1 = tmp_length1;
+ _tmp44__length1 = tmp_length1;
#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp46_ = _vala_g_strjoinv (", ", _tmp45_, _tmp45__length1);
+ _tmp45_ = _vala_g_strjoinv (", ", _tmp44_, _tmp44__length1);
#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_g_free0 (keywords_string);
#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- keywords_string = _tmp46_;
-#line 4037 "PicasaPublishing.c"
+ keywords_string = _tmp45_;
+#line 4030 "PicasaPublishing.c"
}
#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
tmp = (_vala_array_free (tmp, tmp_length1, (GDestroyNotify) g_free), NULL);
-#line 4041 "PicasaPublishing.c"
+#line 4034 "PicasaPublishing.c"
}
}
}
#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp47_ = keywords_string;
+ _tmp46_ = keywords_string;
#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp48_ = publishing_rest_support_decimal_entity_encode (_tmp47_);
+ _tmp47_ = publishing_rest_support_decimal_entity_encode (_tmp46_);
#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_g_free0 (keywords_string);
#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- keywords_string = _tmp48_;
+ keywords_string = _tmp47_;
#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp49_ = keywords_string;
+ _tmp48_ = keywords_string;
#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp50_ = g_strdup_printf ("<mrss:group><mrss:keywords>%s</mrss:keywords></mrss:group>", _tmp49_);
+ _tmp49_ = g_strdup_printf ("<mrss:group><mrss:keywords>%s</mrss:keywords></mrss:group>", _tmp48_);
#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_g_free0 (keywords_string);
#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- keywords_string = _tmp50_;
-#line 4061 "PicasaPublishing.c"
+ keywords_string = _tmp49_;
+#line 4054 "PicasaPublishing.c"
}
#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp51_ = self->priv->publishable;
+ _tmp50_ = self->priv->publishable;
#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp52_ = spit_publishing_publishable_get_param_string (_tmp51_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME);
+ _tmp51_ = spit_publishing_publishable_get_param_string (_tmp50_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME);
#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp53_ = _tmp52_;
+ _tmp52_ = _tmp51_;
#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp54_ = publishing_rest_support_decimal_entity_encode (_tmp53_);
+ _tmp53_ = publishing_rest_support_decimal_entity_encode (_tmp52_);
#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp55_ = _tmp54_;
+ _tmp54_ = _tmp53_;
#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp56_ = summary;
+ _tmp55_ = summary;
#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp57_ = keywords_string;
+ _tmp56_ = keywords_string;
#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp58_ = g_strdup_printf (PUBLISHING_PICASA_UPLOAD_TRANSACTION_METADATA_TEMPLATE, _tmp55_, _tmp56_, _tmp57_);
+ _tmp57_ = g_strdup_printf (PUBLISHING_PICASA_UPLOAD_TRANSACTION_METADATA_TEMPLATE, _tmp54_, _tmp55_, _tmp56_);
#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp59_ = _tmp58_;
+ _tmp58_ = _tmp57_;
#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _g_free0 (_tmp55_);
+ _g_free0 (_tmp54_);
#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _g_free0 (_tmp53_);
+ _g_free0 (_tmp52_);
#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- metadata = _tmp59_;
+ metadata = _tmp58_;
#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp60_ = metadata;
+ _tmp59_ = metadata;
#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp61_ = string_get_data (_tmp60_, &_tmp61__length1);
+ _tmp60_ = string_get_data (_tmp59_, &_tmp60__length1);
#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp62_ = _tmp61_;
+ _tmp61_ = _tmp60_;
#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp62__length1 = _tmp61__length1;
+ _tmp61__length1 = _tmp60__length1;
#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp63_ = soup_buffer_new (SOUP_MEMORY_COPY, _tmp62_, _tmp62__length1);
+ _tmp62_ = soup_buffer_new (SOUP_MEMORY_COPY, _tmp61_, _tmp61__length1);
#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- metadata_buffer = _tmp63_;
+ metadata_buffer = _tmp62_;
#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp64_ = message_parts;
+ _tmp63_ = message_parts;
#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp65_ = metadata_buffer;
+ _tmp64_ = metadata_buffer;
#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- soup_multipart_append_form_file (_tmp64_, "", "", "application/atom+xml", _tmp65_);
-#line 4105 "PicasaPublishing.c"
+ soup_multipart_append_form_file (_tmp63_, "", "", "application/atom+xml", _tmp64_);
+#line 4098 "PicasaPublishing.c"
{
- GMappedFile* _tmp66_ = NULL;
- SpitPublishingPublishable* _tmp67_;
+ GMappedFile* _tmp65_ = NULL;
+ SpitPublishingPublishable* _tmp66_;
+ GFile* _tmp67_;
GFile* _tmp68_;
- GFile* _tmp69_;
+ gchar* _tmp69_;
gchar* _tmp70_;
- gchar* _tmp71_;
+ GMappedFile* _tmp71_;
GMappedFile* _tmp72_;
GMappedFile* _tmp73_;
- GMappedFile* _tmp74_;
#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp67_ = self->priv->publishable;
+ _tmp66_ = self->priv->publishable;
#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp68_ = spit_publishing_publishable_get_serialized_file (_tmp67_);
+ _tmp67_ = spit_publishing_publishable_get_serialized_file (_tmp66_);
#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp69_ = _tmp68_;
+ _tmp68_ = _tmp67_;
#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp70_ = g_file_get_path (_tmp69_);
+ _tmp69_ = g_file_get_path (_tmp68_);
#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp71_ = _tmp70_;
+ _tmp70_ = _tmp69_;
#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp72_ = g_mapped_file_new (_tmp71_, FALSE, &_inner_error_);
+ _tmp71_ = g_mapped_file_new (_tmp70_, FALSE, &_inner_error_);
#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp73_ = _tmp72_;
+ _tmp72_ = _tmp71_;
#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _g_free0 (_tmp71_);
+ _g_free0 (_tmp70_);
#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _g_object_unref0 (_tmp69_);
+ _g_object_unref0 (_tmp68_);
#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp66_ = _tmp73_;
+ _tmp65_ = _tmp72_;
#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (_inner_error_->domain == G_FILE_ERROR) {
-#line 4140 "PicasaPublishing.c"
+#line 4133 "PicasaPublishing.c"
goto __catch11_g_file_error;
}
#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -4173,80 +4166,80 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
g_clear_error (&_inner_error_);
#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return;
-#line 4161 "PicasaPublishing.c"
+#line 4154 "PicasaPublishing.c"
}
#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp74_ = _tmp66_;
+ _tmp73_ = _tmp65_;
#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp66_ = NULL;
+ _tmp65_ = NULL;
#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_g_mapped_file_unref0 (self->priv->mapped_file);
#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- self->priv->mapped_file = _tmp74_;
+ self->priv->mapped_file = _tmp73_;
#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _g_mapped_file_unref0 (_tmp66_);
-#line 4173 "PicasaPublishing.c"
+ _g_mapped_file_unref0 (_tmp65_);
+#line 4166 "PicasaPublishing.c"
}
goto __finally11;
__catch11_g_file_error:
{
GError* e = NULL;
gchar* msg = NULL;
- SpitPublishingPublishable* _tmp75_;
+ SpitPublishingPublishable* _tmp74_;
+ GFile* _tmp75_;
GFile* _tmp76_;
- GFile* _tmp77_;
+ gchar* _tmp77_;
gchar* _tmp78_;
- gchar* _tmp79_;
- GError* _tmp80_;
- const gchar* _tmp81_;
+ GError* _tmp79_;
+ const gchar* _tmp80_;
+ gchar* _tmp81_;
gchar* _tmp82_;
- gchar* _tmp83_;
+ const gchar* _tmp83_;
const gchar* _tmp84_;
- const gchar* _tmp85_;
- GError* _tmp86_;
+ GError* _tmp85_;
#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
e = _inner_error_;
#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_inner_error_ = NULL;
#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp75_ = self->priv->publishable;
+ _tmp74_ = self->priv->publishable;
#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp76_ = spit_publishing_publishable_get_serialized_file (_tmp75_);
+ _tmp75_ = spit_publishing_publishable_get_serialized_file (_tmp74_);
#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp77_ = _tmp76_;
+ _tmp76_ = _tmp75_;
#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp78_ = g_file_get_path (_tmp77_);
+ _tmp77_ = g_file_get_path (_tmp76_);
#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp79_ = _tmp78_;
+ _tmp78_ = _tmp77_;
#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp80_ = e;
+ _tmp79_ = e;
#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp81_ = _tmp80_->message;
+ _tmp80_ = _tmp79_->message;
#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp82_ = g_strdup_printf ("Picasa: couldn't read data from %s: %s", _tmp79_, _tmp81_);
+ _tmp81_ = g_strdup_printf ("Picasa: couldn't read data from %s: %s", _tmp78_, _tmp80_);
#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp83_ = _tmp82_;
+ _tmp82_ = _tmp81_;
#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _g_free0 (_tmp79_);
+ _g_free0 (_tmp78_);
#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _g_object_unref0 (_tmp77_);
+ _g_object_unref0 (_tmp76_);
#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- msg = _tmp83_;
+ msg = _tmp82_;
#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp84_ = msg;
+ _tmp83_ = msg;
#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- g_warning ("PicasaPublishing.vala:477: %s", _tmp84_);
+ g_warning ("PicasaPublishing.vala:477: %s", _tmp83_);
#line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp85_ = msg;
+ _tmp84_ = msg;
#line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp86_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp85_);
+ _tmp85_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp84_);
#line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _inner_error_ = _tmp86_;
+ _inner_error_ = _tmp85_;
#line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_g_free0 (msg);
#line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_g_error_free0 (e);
-#line 4234 "PicasaPublishing.c"
+#line 4227 "PicasaPublishing.c"
goto __finally11;
}
__finally11:
@@ -4270,7 +4263,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
__vala_SoupMultipart_free0 (message_parts);
#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return;
-#line 4258 "PicasaPublishing.c"
+#line 4251 "PicasaPublishing.c"
} else {
#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
__vala_SoupBuffer_free0 (metadata_buffer);
@@ -4290,83 +4283,81 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
g_clear_error (&_inner_error_);
#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return;
-#line 4278 "PicasaPublishing.c"
+#line 4271 "PicasaPublishing.c"
}
}
#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp87_ = self->priv->mapped_file;
+ _tmp86_ = self->priv->mapped_file;
#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp88_ = g_mapped_file_get_contents (_tmp87_);
+ _tmp87_ = g_mapped_file_get_contents (_tmp86_);
#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- photo_data = (guint8*) _tmp88_;
+ photo_data = (guint8*) _tmp87_;
#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
photo_data_length1 = sizeof (gchar) / sizeof (guint8);
#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_photo_data_size_ = photo_data_length1;
#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp89_ = self->priv->mapped_file;
-#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp90_ = g_mapped_file_get_length (_tmp89_);
+ _tmp88_ = self->priv->mapped_file;
#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- photo_data_length1 = (gint) _tmp90_;
+ photo_data_length1 = (gint) g_mapped_file_get_length (_tmp88_);
#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp91_ = photo_data_length1;
+ _tmp89_ = photo_data_length1;
#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp92_ = soup_buffer_new (SOUP_MEMORY_TEMPORARY, photo_data, photo_data_length1);
+ _tmp90_ = soup_buffer_new (SOUP_MEMORY_TEMPORARY, photo_data, photo_data_length1);
#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- bindable_data = _tmp92_;
+ bindable_data = _tmp90_;
#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp93_ = message_parts;
+ _tmp91_ = message_parts;
#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp94_ = self->priv->publishable;
+ _tmp92_ = self->priv->publishable;
#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp95_ = spit_publishing_publishable_get_serialized_file (_tmp94_);
+ _tmp93_ = spit_publishing_publishable_get_serialized_file (_tmp92_);
#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp96_ = _tmp95_;
+ _tmp94_ = _tmp93_;
#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp97_ = g_file_get_path (_tmp96_);
+ _tmp95_ = g_file_get_path (_tmp94_);
#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp98_ = _tmp97_;
+ _tmp96_ = _tmp95_;
#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp99_ = self->priv->mime_type;
+ _tmp97_ = self->priv->mime_type;
#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- soup_multipart_append_form_file (_tmp93_, "", _tmp98_, _tmp99_, bindable_data);
+ soup_multipart_append_form_file (_tmp91_, "", _tmp96_, _tmp97_, bindable_data);
#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _g_free0 (_tmp98_);
+ _g_free0 (_tmp96_);
#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _g_object_unref0 (_tmp96_);
+ _g_object_unref0 (_tmp94_);
#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp100_ = publishing_rest_support_transaction_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
+ _tmp98_ = publishing_rest_support_transaction_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp101_ = _tmp100_;
+ _tmp99_ = _tmp98_;
#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp102_ = message_parts;
+ _tmp100_ = message_parts;
#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp103_ = soup_form_request_new_from_multipart (_tmp101_, _tmp102_);
+ _tmp101_ = soup_form_request_new_from_multipart (_tmp99_, _tmp100_);
#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp104_ = _tmp103_;
+ _tmp102_ = _tmp101_;
#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _g_free0 (_tmp101_);
+ _g_free0 (_tmp99_);
#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- outbound_message = _tmp104_;
+ outbound_message = _tmp102_;
#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp105_ = outbound_message->request_headers;
+ _tmp103_ = outbound_message->request_headers;
#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp106_ = self->priv->session;
+ _tmp104_ = self->priv->session;
#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp107_ = publishing_rest_support_google_session_get_access_token (_tmp106_);
+ _tmp105_ = publishing_rest_support_google_session_get_access_token (_tmp104_);
#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp108_ = _tmp107_;
+ _tmp106_ = _tmp105_;
#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp109_ = g_strconcat ("Bearer ", _tmp108_, NULL);
+ _tmp107_ = g_strconcat ("Bearer ", _tmp106_, NULL);
#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp110_ = _tmp109_;
-#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- soup_message_headers_append (_tmp105_, "Authorization", _tmp110_);
+ _tmp108_ = _tmp107_;
#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _g_free0 (_tmp110_);
+ soup_message_headers_append (_tmp103_, "Authorization", _tmp108_);
#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_g_free0 (_tmp108_);
+#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+ _g_free0 (_tmp106_);
#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_rest_support_transaction_set_message (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), outbound_message);
#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -4397,7 +4388,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
__vala_SoupMultipart_free0 (message_parts);
#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return;
-#line 4385 "PicasaPublishing.c"
+#line 4376 "PicasaPublishing.c"
} else {
#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_g_object_unref0 (outbound_message);
@@ -4421,7 +4412,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
g_clear_error (&_inner_error_);
#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return;
-#line 4409 "PicasaPublishing.c"
+#line 4400 "PicasaPublishing.c"
}
}
#line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -4440,11 +4431,13 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
_g_free0 (summary);
#line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
__vala_SoupMultipart_free0 (message_parts);
-#line 4428 "PicasaPublishing.c"
+#line 4419 "PicasaPublishing.c"
}
-static void publishing_picasa_upload_transaction_class_init (PublishingPicasaUploadTransactionClass * klass) {
+static void
+publishing_picasa_upload_transaction_class_init (PublishingPicasaUploadTransactionClass * klass)
+{
#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_picasa_upload_transaction_parent_class = g_type_class_peek_parent (klass);
#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -4453,18 +4446,22 @@ static void publishing_picasa_upload_transaction_class_init (PublishingPicasaUpl
g_type_class_add_private (klass, sizeof (PublishingPicasaUploadTransactionPrivate));
#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*) (PublishingRESTSupportTransaction *, GError**)) publishing_picasa_upload_transaction_real_execute;
-#line 4441 "PicasaPublishing.c"
+#line 4434 "PicasaPublishing.c"
}
-static void publishing_picasa_upload_transaction_instance_init (PublishingPicasaUploadTransaction * self) {
+static void
+publishing_picasa_upload_transaction_instance_init (PublishingPicasaUploadTransaction * self)
+{
#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
self->priv = PUBLISHING_PICASA_UPLOAD_TRANSACTION_GET_PRIVATE (self);
-#line 4448 "PicasaPublishing.c"
+#line 4443 "PicasaPublishing.c"
}
-static void publishing_picasa_upload_transaction_finalize (PublishingRESTSupportTransaction * obj) {
+static void
+publishing_picasa_upload_transaction_finalize (PublishingRESTSupportTransaction * obj)
+{
PublishingPicasaUploadTransaction * self;
#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PICASA_TYPE_UPLOAD_TRANSACTION, PublishingPicasaUploadTransaction);
@@ -4480,11 +4477,13 @@ static void publishing_picasa_upload_transaction_finalize (PublishingRESTSupport
_g_mapped_file_unref0 (self->priv->mapped_file);
#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_picasa_upload_transaction_parent_class)->finalize (obj);
-#line 4468 "PicasaPublishing.c"
+#line 4465 "PicasaPublishing.c"
}
-GType publishing_picasa_upload_transaction_get_type (void) {
+GType
+publishing_picasa_upload_transaction_get_type (void)
+{
static volatile gsize publishing_picasa_upload_transaction_type_id__volatile = 0;
if (g_once_init_enter (&publishing_picasa_upload_transaction_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingPicasaUploadTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_picasa_upload_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingPicasaUploadTransaction), 0, (GInstanceInitFunc) publishing_picasa_upload_transaction_instance_init, NULL };
@@ -4496,81 +4495,75 @@ GType publishing_picasa_upload_transaction_get_type (void) {
}
-static gpointer _publishing_picasa_publishing_options_pane_size_description_ref0 (gpointer self) {
+static gpointer
+_publishing_picasa_publishing_options_pane_size_description_ref0 (gpointer self)
+{
#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return self ? publishing_picasa_publishing_options_pane_size_description_ref (self) : NULL;
-#line 4487 "PicasaPublishing.c"
+#line 4488 "PicasaPublishing.c"
}
-static void _publishing_picasa_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+_publishing_picasa_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender,
+ gpointer self)
+{
#line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_picasa_publishing_options_pane_on_logout_clicked ((PublishingPicasaPublishingOptionsPane*) self);
-#line 4494 "PicasaPublishing.c"
+#line 4498 "PicasaPublishing.c"
}
-static void _publishing_picasa_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+_publishing_picasa_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender,
+ gpointer self)
+{
#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_picasa_publishing_options_pane_on_publish_clicked ((PublishingPicasaPublishingOptionsPane*) self);
-#line 4501 "PicasaPublishing.c"
+#line 4508 "PicasaPublishing.c"
}
-PublishingPicasaPublishingOptionsPane* publishing_picasa_publishing_options_pane_construct (GType object_type, GtkBuilder* builder, PublishingPicasaPublishingParameters* parameters, gboolean can_logout) {
+PublishingPicasaPublishingOptionsPane*
+publishing_picasa_publishing_options_pane_construct (GType object_type,
+ GtkBuilder* builder,
+ PublishingPicasaPublishingParameters* parameters,
+ gboolean can_logout)
+{
PublishingPicasaPublishingOptionsPane * self = NULL;
gint _tmp0_;
PublishingPicasaPublishingOptionsPaneSizeDescription** _tmp1_;
GtkBuilder* _tmp2_;
- GtkBuilder* _tmp3_;
- GtkBuilder* _tmp4_;
- GtkBuilder* _tmp5_;
- GSList* _tmp6_;
- GSList* _tmp7_;
- guint _tmp8_;
- PublishingPicasaPublishingParameters* _tmp9_;
- PublishingPicasaPublishingParameters* _tmp10_;
- GtkBuilder* _tmp11_;
+ GSList* _tmp3_;
+ GSList* _tmp4_;
+ PublishingPicasaPublishingParameters* _tmp5_;
+ GObject* _tmp6_;
+ GtkBox* _tmp7_;
+ GObject* _tmp8_;
+ GtkLabel* _tmp9_;
+ GObject* _tmp10_;
+ GtkLabel* _tmp11_;
GObject* _tmp12_;
- GtkBox* _tmp13_;
- GtkBuilder* _tmp14_;
- GObject* _tmp15_;
- GtkLabel* _tmp16_;
- GtkBuilder* _tmp17_;
- GObject* _tmp18_;
- GtkLabel* _tmp19_;
- GtkBuilder* _tmp20_;
+ GtkComboBoxText* _tmp13_;
+ GObject* _tmp14_;
+ GtkCheckButton* _tmp15_;
+ GObject* _tmp16_;
+ GtkComboBoxText* _tmp17_;
+ GtkBuilder* _tmp18_;
+ GObject* _tmp19_;
+ GtkCheckButton* _tmp20_;
GObject* _tmp21_;
- GtkComboBoxText* _tmp22_;
- GtkBuilder* _tmp23_;
- GObject* _tmp24_;
- GtkCheckButton* _tmp25_;
- GtkBuilder* _tmp26_;
- GObject* _tmp27_;
- GtkComboBoxText* _tmp28_;
- GtkBuilder* _tmp29_;
- GObject* _tmp30_;
- GtkCheckButton* _tmp31_;
- GtkBuilder* _tmp32_;
- GObject* _tmp33_;
- GtkButton* _tmp34_;
- GtkBuilder* _tmp35_;
- GObject* _tmp36_;
- GtkButton* _tmp37_;
- gboolean _tmp38_;
- GtkLabel* _tmp43_;
- PublishingPicasaPublishingParameters* _tmp44_;
- gchar* _tmp45_;
- gchar* _tmp46_;
- gchar* _tmp47_;
- gchar* _tmp48_;
- GtkCheckButton* _tmp49_;
- PublishingPicasaPublishingParameters* _tmp50_;
- gboolean _tmp51_;
- PublishingPicasaPublishingParameters* _tmp52_;
- SpitPublishingPublisherMediaType _tmp53_;
- GtkButton* _tmp68_;
- GtkButton* _tmp69_;
+ GtkButton* _tmp22_;
+ GObject* _tmp23_;
+ GtkButton* _tmp24_;
+ GtkLabel* _tmp29_;
+ gchar* _tmp30_;
+ gchar* _tmp31_;
+ gchar* _tmp32_;
+ gchar* _tmp33_;
+ GtkCheckButton* _tmp34_;
+ GtkButton* _tmp47_;
+ GtkButton* _tmp48_;
#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_return_val_if_fail (GTK_IS_BUILDER (builder), NULL);
#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -4588,507 +4581,484 @@ PublishingPicasaPublishingOptionsPane* publishing_picasa_publishing_options_pane
#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
self->priv->_size_descriptions_size_ = self->priv->size_descriptions_length1;
#line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp2_ = builder;
-#line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp3_ = _g_object_ref0 (_tmp2_);
+ _tmp2_ = _g_object_ref0 (builder);
#line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_g_object_unref0 (self->priv->builder);
#line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- self->priv->builder = _tmp3_;
-#line 539 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp4_ = builder;
+ self->priv->builder = _tmp2_;
#line 539 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _vala_assert (_tmp4_ != NULL, "builder != null");
-#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp5_ = builder;
-#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp6_ = gtk_builder_get_objects (_tmp5_);
+ _vala_assert (builder != NULL, "builder != null");
#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp7_ = _tmp6_;
+ _tmp3_ = gtk_builder_get_objects (builder);
#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp8_ = g_slist_length (_tmp7_);
+ _tmp4_ = _tmp3_;
#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _vala_assert (_tmp8_ > ((guint) 0), "builder.get_objects().length() > 0");
+ _vala_assert (g_slist_length (_tmp4_) > ((guint) 0), "builder.get_objects().length() > 0");
#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _g_slist_free0 (_tmp7_);
-#line 542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp9_ = parameters;
+ _g_slist_free0 (_tmp4_);
#line 542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp10_ = _publishing_picasa_publishing_parameters_ref0 (_tmp9_);
+ _tmp5_ = _publishing_picasa_publishing_parameters_ref0 (parameters);
#line 542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_publishing_picasa_publishing_parameters_unref0 (self->priv->parameters);
#line 542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- self->priv->parameters = _tmp10_;
-#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp11_ = builder;
+ self->priv->parameters = _tmp5_;
#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp12_ = gtk_builder_get_object (_tmp11_, "picasa_pane_widget");
+ _tmp6_ = gtk_builder_get_object (builder, "picasa_pane_widget");
#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp13_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_box_get_type (), GtkBox));
+ _tmp7_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_box_get_type (), GtkBox));
#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_g_object_unref0 (self->priv->pane_widget);
#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- self->priv->pane_widget = _tmp13_;
+ self->priv->pane_widget = _tmp7_;
#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp14_ = builder;
+ _tmp8_ = gtk_builder_get_object (builder, "login_identity_label");
#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp15_ = gtk_builder_get_object (_tmp14_, "login_identity_label");
-#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp16_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_label_get_type (), GtkLabel));
+ _tmp9_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_label_get_type (), GtkLabel));
#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_g_object_unref0 (self->priv->login_identity_label);
#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- self->priv->login_identity_label = _tmp16_;
-#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp17_ = builder;
+ self->priv->login_identity_label = _tmp9_;
#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp18_ = gtk_builder_get_object (_tmp17_, "publish_to_label");
+ _tmp10_ = gtk_builder_get_object (builder, "publish_to_label");
#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp19_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_label_get_type (), GtkLabel));
+ _tmp11_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_label_get_type (), GtkLabel));
#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_g_object_unref0 (self->priv->publish_to_label);
#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- self->priv->publish_to_label = _tmp19_;
-#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp20_ = builder;
+ self->priv->publish_to_label = _tmp11_;
#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp21_ = gtk_builder_get_object (_tmp20_, "existing_albums_combo");
+ _tmp12_ = gtk_builder_get_object (builder, "existing_albums_combo");
#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp22_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_combo_box_text_get_type (), GtkComboBoxText));
+ _tmp13_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_combo_box_text_get_type (), GtkComboBoxText));
#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_g_object_unref0 (self->priv->existing_albums_combo);
#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- self->priv->existing_albums_combo = _tmp22_;
+ self->priv->existing_albums_combo = _tmp13_;
#line 549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp23_ = builder;
+ _tmp14_ = gtk_builder_get_object (builder, "public_check");
#line 549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp24_ = gtk_builder_get_object (_tmp23_, "public_check");
-#line 549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp25_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_check_button_get_type (), GtkCheckButton));
+ _tmp15_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_check_button_get_type (), GtkCheckButton));
#line 549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_g_object_unref0 (self->priv->public_check);
#line 549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- self->priv->public_check = _tmp25_;
-#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp26_ = builder;
+ self->priv->public_check = _tmp15_;
#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp27_ = gtk_builder_get_object (_tmp26_, "size_combo");
+ _tmp16_ = gtk_builder_get_object (builder, "size_combo");
#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp28_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_combo_box_text_get_type (), GtkComboBoxText));
+ _tmp17_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_combo_box_text_get_type (), GtkComboBoxText));
#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_g_object_unref0 (self->priv->size_combo);
#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- self->priv->size_combo = _tmp28_;
+ self->priv->size_combo = _tmp17_;
#line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp29_ = self->priv->builder;
+ _tmp18_ = self->priv->builder;
#line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp30_ = gtk_builder_get_object (_tmp29_, "strip_metadata_check");
+ _tmp19_ = gtk_builder_get_object (_tmp18_, "strip_metadata_check");
#line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp31_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_check_button_get_type (), GtkCheckButton));
+ _tmp20_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_check_button_get_type (), GtkCheckButton));
#line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_g_object_unref0 (self->priv->strip_metadata_check);
#line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- self->priv->strip_metadata_check = _tmp31_;
-#line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp32_ = builder;
+ self->priv->strip_metadata_check = _tmp20_;
#line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp33_ = gtk_builder_get_object (_tmp32_, "publish_button");
+ _tmp21_ = gtk_builder_get_object (builder, "publish_button");
#line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp34_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_button_get_type (), GtkButton));
+ _tmp22_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_button_get_type (), GtkButton));
#line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_g_object_unref0 (self->priv->publish_button);
#line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- self->priv->publish_button = _tmp34_;
+ self->priv->publish_button = _tmp22_;
#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp35_ = builder;
+ _tmp23_ = gtk_builder_get_object (builder, "logout_button");
#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp36_ = gtk_builder_get_object (_tmp35_, "logout_button");
-#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp37_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_button_get_type (), GtkButton));
+ _tmp24_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_button_get_type (), GtkButton));
#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_g_object_unref0 (self->priv->logout_button);
#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- self->priv->logout_button = _tmp37_;
-#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp38_ = can_logout;
+ self->priv->logout_button = _tmp24_;
#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- if (!_tmp38_) {
-#line 4701 "PicasaPublishing.c"
- GtkButton* _tmp39_;
- GtkContainer* _tmp40_;
- GtkContainer* _tmp41_;
- GtkButton* _tmp42_;
+ if (!can_logout) {
+#line 4666 "PicasaPublishing.c"
+ GtkButton* _tmp25_;
+ GtkContainer* _tmp26_;
+ GtkContainer* _tmp27_;
+ GtkButton* _tmp28_;
#line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp39_ = self->priv->logout_button;
+ _tmp25_ = self->priv->logout_button;
#line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp40_ = gtk_widget_get_parent (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_widget_get_type (), GtkWidget));
+ _tmp26_ = gtk_widget_get_parent (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget));
#line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp41_ = _tmp40_;
+ _tmp27_ = _tmp26_;
#line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp42_ = self->priv->logout_button;
+ _tmp28_ = self->priv->logout_button;
#line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- gtk_container_remove (_tmp41_, G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_widget_get_type (), GtkWidget));
-#line 4716 "PicasaPublishing.c"
+ gtk_container_remove (_tmp27_, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget));
+#line 4681 "PicasaPublishing.c"
}
#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp43_ = self->priv->login_identity_label;
+ _tmp29_ = self->priv->login_identity_label;
#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp44_ = parameters;
+ _tmp30_ = publishing_picasa_publishing_parameters_get_user_name (parameters);
#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp45_ = publishing_picasa_publishing_parameters_get_user_name (_tmp44_);
+ _tmp31_ = _tmp30_;
#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp46_ = _tmp45_;
+ _tmp32_ = g_strdup_printf (_ ("You are logged into Picasa Web Albums as %s."), _tmp31_);
#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp47_ = g_strdup_printf (_ ("You are logged into Picasa Web Albums as %s."), _tmp46_);
+ _tmp33_ = _tmp32_;
#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp48_ = _tmp47_;
+ gtk_label_set_label (_tmp29_, _tmp33_);
#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- gtk_label_set_label (_tmp43_, _tmp48_);
+ _g_free0 (_tmp33_);
#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _g_free0 (_tmp48_);
-#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _g_free0 (_tmp46_);
-#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp49_ = self->priv->strip_metadata_check;
+ _g_free0 (_tmp31_);
#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp50_ = parameters;
+ _tmp34_ = self->priv->strip_metadata_check;
#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp51_ = publishing_picasa_publishing_parameters_get_strip_metadata (_tmp50_);
-#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp51_);
-#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp52_ = parameters;
-#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp53_ = publishing_picasa_publishing_parameters_get_media_type (_tmp52_);
+ gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_toggle_button_get_type (), GtkToggleButton), publishing_picasa_publishing_parameters_get_strip_metadata (parameters));
#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- if ((_tmp53_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) == 0) {
-#line 4750 "PicasaPublishing.c"
- GtkLabel* _tmp54_;
- GtkComboBoxText* _tmp55_;
- GtkComboBoxText* _tmp56_;
+ if ((publishing_picasa_publishing_parameters_get_media_type (parameters) & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) == 0) {
+#line 4705 "PicasaPublishing.c"
+ GtkLabel* _tmp35_;
+ GtkComboBoxText* _tmp36_;
+ GtkComboBoxText* _tmp37_;
#line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp54_ = self->priv->publish_to_label;
+ _tmp35_ = self->priv->publish_to_label;
#line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- gtk_label_set_label (_tmp54_, _ ("Videos will appear in:"));
+ gtk_label_set_label (_tmp35_, _ ("Videos will appear in:"));
#line 567 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp55_ = self->priv->size_combo;
+ _tmp36_ = self->priv->size_combo;
#line 567 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, gtk_widget_get_type (), GtkWidget), FALSE);
+ gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_widget_get_type (), GtkWidget), FALSE);
#line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp56_ = self->priv->size_combo;
+ _tmp37_ = self->priv->size_combo;
#line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 4766 "PicasaPublishing.c"
+ gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 4721 "PicasaPublishing.c"
} else {
- GtkLabel* _tmp57_;
- PublishingPicasaPublishingOptionsPaneSizeDescription** _tmp58_;
- gint _tmp58__length1;
- GtkComboBoxText* _tmp63_;
- GtkComboBoxText* _tmp64_;
- GtkComboBoxText* _tmp65_;
- PublishingPicasaPublishingParameters* _tmp66_;
- gint _tmp67_;
+ GtkLabel* _tmp38_;
+ PublishingPicasaPublishingOptionsPaneSizeDescription** _tmp39_;
+ gint _tmp39__length1;
+ GtkComboBoxText* _tmp44_;
+ GtkComboBoxText* _tmp45_;
+ GtkComboBoxText* _tmp46_;
#line 571 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp57_ = self->priv->publish_to_label;
+ _tmp38_ = self->priv->publish_to_label;
#line 571 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- gtk_label_set_label (_tmp57_, _ ("Photos will appear in:"));
+ gtk_label_set_label (_tmp38_, _ ("Photos will appear in:"));
#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp58_ = self->priv->size_descriptions;
+ _tmp39_ = self->priv->size_descriptions;
#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp58__length1 = self->priv->size_descriptions_length1;
-#line 4784 "PicasaPublishing.c"
+ _tmp39__length1 = self->priv->size_descriptions_length1;
+#line 4737 "PicasaPublishing.c"
{
PublishingPicasaPublishingOptionsPaneSizeDescription** desc_collection = NULL;
gint desc_collection_length1 = 0;
gint _desc_collection_size_ = 0;
gint desc_it = 0;
#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- desc_collection = _tmp58_;
+ desc_collection = _tmp39_;
#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- desc_collection_length1 = _tmp58__length1;
+ desc_collection_length1 = _tmp39__length1;
#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- for (desc_it = 0; desc_it < _tmp58__length1; desc_it = desc_it + 1) {
-#line 4796 "PicasaPublishing.c"
- PublishingPicasaPublishingOptionsPaneSizeDescription* _tmp59_;
+ for (desc_it = 0; desc_it < _tmp39__length1; desc_it = desc_it + 1) {
+#line 4749 "PicasaPublishing.c"
+ PublishingPicasaPublishingOptionsPaneSizeDescription* _tmp40_;
PublishingPicasaPublishingOptionsPaneSizeDescription* desc = NULL;
#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp59_ = _publishing_picasa_publishing_options_pane_size_description_ref0 (desc_collection[desc_it]);
+ _tmp40_ = _publishing_picasa_publishing_options_pane_size_description_ref0 (desc_collection[desc_it]);
#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- desc = _tmp59_;
-#line 4803 "PicasaPublishing.c"
+ desc = _tmp40_;
+#line 4756 "PicasaPublishing.c"
{
- GtkComboBoxText* _tmp60_;
- PublishingPicasaPublishingOptionsPaneSizeDescription* _tmp61_;
- const gchar* _tmp62_;
+ GtkComboBoxText* _tmp41_;
+ PublishingPicasaPublishingOptionsPaneSizeDescription* _tmp42_;
+ const gchar* _tmp43_;
#line 573 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp60_ = self->priv->size_combo;
+ _tmp41_ = self->priv->size_combo;
#line 573 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp61_ = desc;
+ _tmp42_ = desc;
#line 573 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp62_ = _tmp61_->name;
+ _tmp43_ = _tmp42_->name;
#line 573 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- gtk_combo_box_text_append_text (_tmp60_, _tmp62_);
+ gtk_combo_box_text_append_text (_tmp41_, _tmp43_);
#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_publishing_picasa_publishing_options_pane_size_description_unref0 (desc);
-#line 4818 "PicasaPublishing.c"
+#line 4771 "PicasaPublishing.c"
}
}
}
#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp63_ = self->priv->size_combo;
+ _tmp44_ = self->priv->size_combo;
#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, gtk_widget_get_type (), GtkWidget), TRUE);
+ gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_widget_get_type (), GtkWidget), TRUE);
#line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp64_ = self->priv->size_combo;
+ _tmp45_ = self->priv->size_combo;
#line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, gtk_widget_get_type (), GtkWidget), TRUE);
+ gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_widget_get_type (), GtkWidget), TRUE);
#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp65_ = self->priv->size_combo;
+ _tmp46_ = self->priv->size_combo;
#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp66_ = parameters;
-#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp67_ = publishing_picasa_publishing_parameters_get_major_axis_size_selection_id (_tmp66_);
-#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, gtk_combo_box_get_type (), GtkComboBox), _tmp67_);
-#line 4838 "PicasaPublishing.c"
+ gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_combo_box_get_type (), GtkComboBox), publishing_picasa_publishing_parameters_get_major_axis_size_selection_id (parameters));
+#line 4787 "PicasaPublishing.c"
}
#line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp68_ = self->priv->logout_button;
+ _tmp47_ = self->priv->logout_button;
#line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- g_signal_connect_object (_tmp68_, "clicked", (GCallback) _publishing_picasa_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0);
+ g_signal_connect_object (_tmp47_, "clicked", (GCallback) _publishing_picasa_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0);
#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp69_ = self->priv->publish_button;
+ _tmp48_ = self->priv->publish_button;
#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- g_signal_connect_object (_tmp69_, "clicked", (GCallback) _publishing_picasa_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0);
+ g_signal_connect_object (_tmp48_, "clicked", (GCallback) _publishing_picasa_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0);
#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return self;
-#line 4850 "PicasaPublishing.c"
+#line 4799 "PicasaPublishing.c"
}
-PublishingPicasaPublishingOptionsPane* publishing_picasa_publishing_options_pane_new (GtkBuilder* builder, PublishingPicasaPublishingParameters* parameters, gboolean can_logout) {
+PublishingPicasaPublishingOptionsPane*
+publishing_picasa_publishing_options_pane_new (GtkBuilder* builder,
+ PublishingPicasaPublishingParameters* parameters,
+ gboolean can_logout)
+{
#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return publishing_picasa_publishing_options_pane_construct (PUBLISHING_PICASA_TYPE_PUBLISHING_OPTIONS_PANE, builder, parameters, can_logout);
-#line 4857 "PicasaPublishing.c"
+#line 4810 "PicasaPublishing.c"
}
-static void publishing_picasa_publishing_options_pane_on_publish_clicked (PublishingPicasaPublishingOptionsPane* self) {
+static void
+publishing_picasa_publishing_options_pane_on_publish_clicked (PublishingPicasaPublishingOptionsPane* self)
+{
gint _tmp0_ = 0;
GtkComboBoxText* _tmp1_;
- gint _tmp2_;
gint size_combo_last_active = 0;
- PublishingPicasaPublishingParameters* _tmp5_;
- PublishingPicasaPublishingParameters* _tmp6_;
- PublishingPicasaPublishingOptionsPaneSizeDescription** _tmp7_;
- gint _tmp7__length1;
- PublishingPicasaPublishingOptionsPaneSizeDescription* _tmp8_;
- gint _tmp9_;
- PublishingPicasaPublishingParameters* _tmp10_;
- GtkCheckButton* _tmp11_;
- gboolean _tmp12_;
+ PublishingPicasaPublishingParameters* _tmp3_;
+ PublishingPicasaPublishingParameters* _tmp4_;
+ PublishingPicasaPublishingOptionsPaneSizeDescription** _tmp5_;
+ gint _tmp5__length1;
+ PublishingPicasaPublishingOptionsPaneSizeDescription* _tmp6_;
+ gint _tmp7_;
+ PublishingPicasaPublishingParameters* _tmp8_;
+ GtkCheckButton* _tmp9_;
PublishingPicasaAlbum** albums = NULL;
- PublishingPicasaPublishingParameters* _tmp13_;
- gint _tmp14_;
- PublishingPicasaAlbum** _tmp15_;
+ PublishingPicasaPublishingParameters* _tmp10_;
+ gint _tmp11_;
+ PublishingPicasaAlbum** _tmp12_;
gint albums_length1;
gint _albums_size_;
- PublishingPicasaPublishingParameters* _tmp16_;
- GtkComboBoxText* _tmp17_;
- gint _tmp18_;
+ PublishingPicasaPublishingParameters* _tmp13_;
+ GtkComboBoxText* _tmp14_;
+ PublishingPicasaAlbum* _tmp15_;
+ const gchar* _tmp16_;
+ PublishingPicasaPublishingParameters* _tmp17_;
+ GtkComboBoxText* _tmp18_;
PublishingPicasaAlbum* _tmp19_;
const gchar* _tmp20_;
- PublishingPicasaPublishingParameters* _tmp21_;
- GtkComboBoxText* _tmp22_;
- gint _tmp23_;
- PublishingPicasaAlbum* _tmp24_;
- const gchar* _tmp25_;
#line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_OPTIONS_PANE (self));
#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp1_ = self->priv->size_combo;
#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp2_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox));
+ if (gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox)) >= 0) {
+#line 4848 "PicasaPublishing.c"
+ GtkComboBoxText* _tmp2_;
#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- if (_tmp2_ >= 0) {
-#line 4899 "PicasaPublishing.c"
- GtkComboBoxText* _tmp3_;
- gint _tmp4_;
+ _tmp2_ = self->priv->size_combo;
#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp3_ = self->priv->size_combo;
-#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp4_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_combo_box_get_type (), GtkComboBox));
-#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp0_ = _tmp4_;
-#line 4908 "PicasaPublishing.c"
+ _tmp0_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox));
+#line 4854 "PicasaPublishing.c"
} else {
#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp0_ = 0;
-#line 4912 "PicasaPublishing.c"
+#line 4858 "PicasaPublishing.c"
}
#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
size_combo_last_active = _tmp0_;
#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp5_ = self->priv->parameters;
+ _tmp3_ = self->priv->parameters;
#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- publishing_picasa_publishing_parameters_set_major_axis_size_selection_id (_tmp5_, size_combo_last_active);
+ publishing_picasa_publishing_parameters_set_major_axis_size_selection_id (_tmp3_, size_combo_last_active);
#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp6_ = self->priv->parameters;
+ _tmp4_ = self->priv->parameters;
#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp7_ = self->priv->size_descriptions;
+ _tmp5_ = self->priv->size_descriptions;
#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp7__length1 = self->priv->size_descriptions_length1;
+ _tmp5__length1 = self->priv->size_descriptions_length1;
#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp8_ = _tmp7_[size_combo_last_active];
+ _tmp6_ = _tmp5_[size_combo_last_active];
#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp9_ = _tmp8_->major_axis_pixels;
+ _tmp7_ = _tmp6_->major_axis_pixels;
#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- publishing_picasa_publishing_parameters_set_major_axis_size_pixels (_tmp6_, _tmp9_);
+ publishing_picasa_publishing_parameters_set_major_axis_size_pixels (_tmp4_, _tmp7_);
#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp10_ = self->priv->parameters;
+ _tmp8_ = self->priv->parameters;
#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp11_ = self->priv->strip_metadata_check;
+ _tmp9_ = self->priv->strip_metadata_check;
#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp12_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- publishing_picasa_publishing_parameters_set_strip_metadata (_tmp10_, _tmp12_);
+ publishing_picasa_publishing_parameters_set_strip_metadata (_tmp8_, gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_toggle_button_get_type (), GtkToggleButton)));
#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp13_ = self->priv->parameters;
+ _tmp10_ = self->priv->parameters;
#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp15_ = publishing_picasa_publishing_parameters_get_albums (_tmp13_, &_tmp14_);
+ _tmp12_ = publishing_picasa_publishing_parameters_get_albums (_tmp10_, &_tmp11_);
#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- albums = _tmp15_;
+ albums = _tmp12_;
#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- albums_length1 = _tmp14_;
+ albums_length1 = _tmp11_;
#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_albums_size_ = albums_length1;
#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp16_ = self->priv->parameters;
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp17_ = self->priv->existing_albums_combo;
+ _tmp13_ = self->priv->parameters;
#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp18_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_combo_box_get_type (), GtkComboBox));
+ _tmp14_ = self->priv->existing_albums_combo;
#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp19_ = albums[_tmp18_];
+ _tmp15_ = albums[gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_combo_box_get_type (), GtkComboBox))];
#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp20_ = _tmp19_->name;
+ _tmp16_ = _tmp15_->name;
#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- publishing_picasa_publishing_parameters_set_target_album_name (_tmp16_, _tmp20_);
-#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp21_ = self->priv->parameters;
+ publishing_picasa_publishing_parameters_set_target_album_name (_tmp13_, _tmp16_);
#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp22_ = self->priv->existing_albums_combo;
+ _tmp17_ = self->priv->parameters;
#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp23_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_combo_box_get_type (), GtkComboBox));
+ _tmp18_ = self->priv->existing_albums_combo;
#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp24_ = albums[_tmp23_];
+ _tmp19_ = albums[gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_combo_box_get_type (), GtkComboBox))];
#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp25_ = _tmp24_->url;
+ _tmp20_ = _tmp19_->url;
#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- publishing_picasa_publishing_parameters_set_target_album_entry_url (_tmp21_, _tmp25_);
+ publishing_picasa_publishing_parameters_set_target_album_entry_url (_tmp17_, _tmp20_);
#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_signal_emit (self, publishing_picasa_publishing_options_pane_signals[PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0);
#line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
albums = (_vala_array_free (albums, albums_length1, (GDestroyNotify) publishing_picasa_album_unref), NULL);
-#line 4978 "PicasaPublishing.c"
+#line 4918 "PicasaPublishing.c"
}
-static void publishing_picasa_publishing_options_pane_on_logout_clicked (PublishingPicasaPublishingOptionsPane* self) {
+static void
+publishing_picasa_publishing_options_pane_on_logout_clicked (PublishingPicasaPublishingOptionsPane* self)
+{
#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_OPTIONS_PANE (self));
#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_signal_emit (self, publishing_picasa_publishing_options_pane_signals[PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL], 0);
-#line 4987 "PicasaPublishing.c"
+#line 4929 "PicasaPublishing.c"
}
-static void _vala_array_add15 (PublishingPicasaPublishingOptionsPaneSizeDescription** * array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value) {
+static void
+_vala_array_add15 (PublishingPicasaPublishingOptionsPaneSizeDescription** * array,
+ int* length,
+ int* size,
+ PublishingPicasaPublishingOptionsPaneSizeDescription* value)
+{
#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if ((*length) == (*size)) {
#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
*array = g_renew (PublishingPicasaPublishingOptionsPaneSizeDescription*, *array, (*size) + 1);
-#line 4998 "PicasaPublishing.c"
+#line 4945 "PicasaPublishing.c"
}
#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
(*array)[(*length)++] = value;
#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
(*array)[*length] = NULL;
-#line 5004 "PicasaPublishing.c"
+#line 4951 "PicasaPublishing.c"
}
-static void _vala_array_add16 (PublishingPicasaPublishingOptionsPaneSizeDescription** * array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value) {
+static void
+_vala_array_add16 (PublishingPicasaPublishingOptionsPaneSizeDescription** * array,
+ int* length,
+ int* size,
+ PublishingPicasaPublishingOptionsPaneSizeDescription* value)
+{
#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if ((*length) == (*size)) {
#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
*array = g_renew (PublishingPicasaPublishingOptionsPaneSizeDescription*, *array, (*size) + 1);
-#line 5015 "PicasaPublishing.c"
+#line 4967 "PicasaPublishing.c"
}
#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
(*array)[(*length)++] = value;
#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
(*array)[*length] = NULL;
-#line 5021 "PicasaPublishing.c"
+#line 4973 "PicasaPublishing.c"
}
-static void _vala_array_add17 (PublishingPicasaPublishingOptionsPaneSizeDescription** * array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value) {
+static void
+_vala_array_add17 (PublishingPicasaPublishingOptionsPaneSizeDescription** * array,
+ int* length,
+ int* size,
+ PublishingPicasaPublishingOptionsPaneSizeDescription* value)
+{
#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if ((*length) == (*size)) {
#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
*array = g_renew (PublishingPicasaPublishingOptionsPaneSizeDescription*, *array, (*size) + 1);
-#line 5032 "PicasaPublishing.c"
+#line 4989 "PicasaPublishing.c"
}
#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
(*array)[(*length)++] = value;
#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
(*array)[*length] = NULL;
-#line 5038 "PicasaPublishing.c"
+#line 4995 "PicasaPublishing.c"
}
-static void _vala_array_add18 (PublishingPicasaPublishingOptionsPaneSizeDescription** * array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value) {
+static void
+_vala_array_add18 (PublishingPicasaPublishingOptionsPaneSizeDescription** * array,
+ int* length,
+ int* size,
+ PublishingPicasaPublishingOptionsPaneSizeDescription* value)
+{
#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if ((*length) == (*size)) {
#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
*array = g_renew (PublishingPicasaPublishingOptionsPaneSizeDescription*, *array, (*size) + 1);
-#line 5049 "PicasaPublishing.c"
+#line 5011 "PicasaPublishing.c"
}
#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
(*array)[(*length)++] = value;
#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
(*array)[*length] = NULL;
-#line 5055 "PicasaPublishing.c"
+#line 5017 "PicasaPublishing.c"
}
-static void _vala_array_add19 (PublishingPicasaPublishingOptionsPaneSizeDescription** * array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value) {
+static void
+_vala_array_add19 (PublishingPicasaPublishingOptionsPaneSizeDescription** * array,
+ int* length,
+ int* size,
+ PublishingPicasaPublishingOptionsPaneSizeDescription* value)
+{
#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if ((*length) == (*size)) {
#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
*array = g_renew (PublishingPicasaPublishingOptionsPaneSizeDescription*, *array, (*size) + 1);
-#line 5066 "PicasaPublishing.c"
+#line 5033 "PicasaPublishing.c"
}
#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
(*array)[(*length)++] = value;
#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
(*array)[*length] = NULL;
-#line 5072 "PicasaPublishing.c"
+#line 5039 "PicasaPublishing.c"
}
-static PublishingPicasaPublishingOptionsPaneSizeDescription** publishing_picasa_publishing_options_pane_create_size_descriptions (PublishingPicasaPublishingOptionsPane* self, int* result_length1) {
+static PublishingPicasaPublishingOptionsPaneSizeDescription**
+publishing_picasa_publishing_options_pane_create_size_descriptions (PublishingPicasaPublishingOptionsPane* self,
+ int* result_length1)
+{
PublishingPicasaPublishingOptionsPaneSizeDescription** result = NULL;
PublishingPicasaPublishingOptionsPaneSizeDescription** _result_ = NULL;
PublishingPicasaPublishingOptionsPaneSizeDescription** _tmp0_;
@@ -5169,17 +5139,19 @@ static PublishingPicasaPublishingOptionsPaneSizeDescription** publishing_picasa_
if (result_length1) {
#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
*result_length1 = _tmp11__length1;
-#line 5157 "PicasaPublishing.c"
+#line 5127 "PicasaPublishing.c"
}
#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
result = _tmp11_;
#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return result;
-#line 5163 "PicasaPublishing.c"
+#line 5133 "PicasaPublishing.c"
}
-void publishing_picasa_publishing_options_pane_installed (PublishingPicasaPublishingOptionsPane* self) {
+void
+publishing_picasa_publishing_options_pane_installed (PublishingPicasaPublishingOptionsPane* self)
+{
gint default_album_id = 0;
gchar* last_album = NULL;
PublishingPicasaPublishingParameters* _tmp0_;
@@ -5211,19 +5183,19 @@ void publishing_picasa_publishing_options_pane_installed (PublishingPicasaPublis
albums_length1 = _tmp3_;
#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_albums_size_ = albums_length1;
-#line 5199 "PicasaPublishing.c"
+#line 5171 "PicasaPublishing.c"
{
gint i = 0;
#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
i = 0;
-#line 5204 "PicasaPublishing.c"
+#line 5176 "PicasaPublishing.c"
{
gboolean _tmp5_ = FALSE;
#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp5_ = TRUE;
#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
while (TRUE) {
-#line 5211 "PicasaPublishing.c"
+#line 5183 "PicasaPublishing.c"
gint _tmp7_;
PublishingPicasaAlbum** _tmp8_;
gint _tmp8__length1;
@@ -5242,13 +5214,13 @@ void publishing_picasa_publishing_options_pane_installed (PublishingPicasaPublis
const gchar* _tmp19_;
#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (!_tmp5_) {
-#line 5230 "PicasaPublishing.c"
+#line 5202 "PicasaPublishing.c"
gint _tmp6_;
#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp6_ = i;
#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
i = _tmp6_ + 1;
-#line 5236 "PicasaPublishing.c"
+#line 5208 "PicasaPublishing.c"
}
#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp5_ = FALSE;
@@ -5262,7 +5234,7 @@ void publishing_picasa_publishing_options_pane_installed (PublishingPicasaPublis
if (!(_tmp7_ < _tmp8__length1)) {
#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
break;
-#line 5250 "PicasaPublishing.c"
+#line 5222 "PicasaPublishing.c"
}
#line 626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp9_ = self->priv->existing_albums_combo;
@@ -5294,7 +5266,7 @@ void publishing_picasa_publishing_options_pane_installed (PublishingPicasaPublis
if (g_strcmp0 (_tmp18_, _tmp19_) == 0) {
#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp14_ = TRUE;
-#line 5282 "PicasaPublishing.c"
+#line 5254 "PicasaPublishing.c"
} else {
gboolean _tmp20_ = FALSE;
gboolean _tmp21_ = FALSE;
@@ -5317,7 +5289,7 @@ void publishing_picasa_publishing_options_pane_installed (PublishingPicasaPublis
if (g_strcmp0 (_tmp25_, PUBLISHING_PICASA_DEFAULT_ALBUM_NAME) == 0) {
#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp21_ = TRUE;
-#line 5305 "PicasaPublishing.c"
+#line 5277 "PicasaPublishing.c"
} else {
PublishingPicasaAlbum** _tmp26_;
gint _tmp26__length1;
@@ -5336,35 +5308,35 @@ void publishing_picasa_publishing_options_pane_installed (PublishingPicasaPublis
_tmp29_ = _tmp28_->name;
#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp21_ = g_strcmp0 (_tmp29_, _ ("Default album")) == 0;
-#line 5324 "PicasaPublishing.c"
+#line 5296 "PicasaPublishing.c"
}
#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (_tmp21_) {
-#line 5328 "PicasaPublishing.c"
+#line 5300 "PicasaPublishing.c"
gint _tmp30_;
#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp30_ = default_album_id;
#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp20_ = _tmp30_ == -1;
-#line 5334 "PicasaPublishing.c"
+#line 5306 "PicasaPublishing.c"
} else {
#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp20_ = FALSE;
-#line 5338 "PicasaPublishing.c"
+#line 5310 "PicasaPublishing.c"
}
#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp14_ = _tmp20_;
-#line 5342 "PicasaPublishing.c"
+#line 5314 "PicasaPublishing.c"
}
#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (_tmp14_) {
-#line 5346 "PicasaPublishing.c"
+#line 5318 "PicasaPublishing.c"
gint _tmp31_;
#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp31_ = i;
#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
default_album_id = _tmp31_;
-#line 5352 "PicasaPublishing.c"
+#line 5324 "PicasaPublishing.c"
}
}
}
@@ -5373,7 +5345,7 @@ void publishing_picasa_publishing_options_pane_installed (PublishingPicasaPublis
_tmp32_ = default_album_id;
#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (_tmp32_ >= 0) {
-#line 5361 "PicasaPublishing.c"
+#line 5333 "PicasaPublishing.c"
GtkComboBoxText* _tmp33_;
gint _tmp34_;
#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -5382,17 +5354,19 @@ void publishing_picasa_publishing_options_pane_installed (PublishingPicasaPublis
_tmp34_ = default_album_id;
#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_combo_box_get_type (), GtkComboBox), _tmp34_);
-#line 5370 "PicasaPublishing.c"
+#line 5342 "PicasaPublishing.c"
}
#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
albums = (_vala_array_free (albums, albums_length1, (GDestroyNotify) publishing_picasa_album_unref), NULL);
#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_g_free0 (last_album);
-#line 5376 "PicasaPublishing.c"
+#line 5348 "PicasaPublishing.c"
}
-static GtkWidget* publishing_picasa_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base) {
+static GtkWidget*
+publishing_picasa_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base)
+{
PublishingPicasaPublishingOptionsPane * self;
GtkWidget* result = NULL;
GtkBox* _tmp0_;
@@ -5407,11 +5381,13 @@ static GtkWidget* publishing_picasa_publishing_options_pane_real_get_widget (Spi
result = _tmp1_;
#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return result;
-#line 5395 "PicasaPublishing.c"
+#line 5369 "PicasaPublishing.c"
}
-static SpitPublishingDialogPaneGeometryOptions publishing_picasa_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) {
+static SpitPublishingDialogPaneGeometryOptions
+publishing_picasa_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base)
+{
PublishingPicasaPublishingOptionsPane * self;
SpitPublishingDialogPaneGeometryOptions result = 0;
#line 643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -5420,131 +5396,155 @@ static SpitPublishingDialogPaneGeometryOptions publishing_picasa_publishing_opti
result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
#line 644 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return result;
-#line 5408 "PicasaPublishing.c"
+#line 5384 "PicasaPublishing.c"
}
-static void publishing_picasa_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base) {
+static void
+publishing_picasa_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base)
+{
PublishingPicasaPublishingOptionsPane * self;
#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PICASA_TYPE_PUBLISHING_OPTIONS_PANE, PublishingPicasaPublishingOptionsPane);
#line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_picasa_publishing_options_pane_installed (self);
-#line 5418 "PicasaPublishing.c"
+#line 5396 "PicasaPublishing.c"
}
-static void publishing_picasa_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) {
+static void
+publishing_picasa_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base)
+{
PublishingPicasaPublishingOptionsPane * self;
#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PICASA_TYPE_PUBLISHING_OPTIONS_PANE, PublishingPicasaPublishingOptionsPane);
-#line 5426 "PicasaPublishing.c"
+#line 5406 "PicasaPublishing.c"
}
-static PublishingPicasaPublishingOptionsPaneSizeDescription* publishing_picasa_publishing_options_pane_size_description_construct (GType object_type, const gchar* name, gint major_axis_pixels) {
+static PublishingPicasaPublishingOptionsPaneSizeDescription*
+publishing_picasa_publishing_options_pane_size_description_construct (GType object_type,
+ const gchar* name,
+ gint major_axis_pixels)
+{
PublishingPicasaPublishingOptionsPaneSizeDescription* self = NULL;
- const gchar* _tmp0_;
- gchar* _tmp1_;
- gint _tmp2_;
+ gchar* _tmp0_;
#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_return_val_if_fail (name != NULL, NULL);
#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
self = (PublishingPicasaPublishingOptionsPaneSizeDescription*) g_type_create_instance (object_type);
#line 511 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp0_ = name;
-#line 511 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp1_ = g_strdup (_tmp0_);
+ _tmp0_ = g_strdup (name);
#line 511 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_g_free0 (self->name);
#line 511 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- self->name = _tmp1_;
+ self->name = _tmp0_;
#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp2_ = major_axis_pixels;
-#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- self->major_axis_pixels = _tmp2_;
+ self->major_axis_pixels = major_axis_pixels;
#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return self;
-#line 5453 "PicasaPublishing.c"
+#line 5431 "PicasaPublishing.c"
}
-static PublishingPicasaPublishingOptionsPaneSizeDescription* publishing_picasa_publishing_options_pane_size_description_new (const gchar* name, gint major_axis_pixels) {
+static PublishingPicasaPublishingOptionsPaneSizeDescription*
+publishing_picasa_publishing_options_pane_size_description_new (const gchar* name,
+ gint major_axis_pixels)
+{
#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return publishing_picasa_publishing_options_pane_size_description_construct (PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_DESCRIPTION, name, major_axis_pixels);
-#line 5460 "PicasaPublishing.c"
+#line 5441 "PicasaPublishing.c"
}
-static void publishing_picasa_publishing_options_pane_value_size_description_init (GValue* value) {
+static void
+publishing_picasa_publishing_options_pane_value_size_description_init (GValue* value)
+{
#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 5467 "PicasaPublishing.c"
+#line 5450 "PicasaPublishing.c"
}
-static void publishing_picasa_publishing_options_pane_value_size_description_free_value (GValue* value) {
+static void
+publishing_picasa_publishing_options_pane_value_size_description_free_value (GValue* value)
+{
#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (value->data[0].v_pointer) {
#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_picasa_publishing_options_pane_size_description_unref (value->data[0].v_pointer);
-#line 5476 "PicasaPublishing.c"
+#line 5461 "PicasaPublishing.c"
}
}
-static void publishing_picasa_publishing_options_pane_value_size_description_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+publishing_picasa_publishing_options_pane_value_size_description_copy_value (const GValue* src_value,
+ GValue* dest_value)
+{
#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (src_value->data[0].v_pointer) {
#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
dest_value->data[0].v_pointer = publishing_picasa_publishing_options_pane_size_description_ref (src_value->data[0].v_pointer);
-#line 5486 "PicasaPublishing.c"
+#line 5474 "PicasaPublishing.c"
} else {
#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
dest_value->data[0].v_pointer = NULL;
-#line 5490 "PicasaPublishing.c"
+#line 5478 "PicasaPublishing.c"
}
}
-static gpointer publishing_picasa_publishing_options_pane_value_size_description_peek_pointer (const GValue* value) {
+static gpointer
+publishing_picasa_publishing_options_pane_value_size_description_peek_pointer (const GValue* value)
+{
#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return value->data[0].v_pointer;
-#line 5498 "PicasaPublishing.c"
+#line 5488 "PicasaPublishing.c"
}
-static gchar* publishing_picasa_publishing_options_pane_value_size_description_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_picasa_publishing_options_pane_value_size_description_collect_value (GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (collect_values[0].v_pointer) {
-#line 5505 "PicasaPublishing.c"
+#line 5500 "PicasaPublishing.c"
PublishingPicasaPublishingOptionsPaneSizeDescription * object;
object = collect_values[0].v_pointer;
#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (object->parent_instance.g_class == NULL) {
#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 5512 "PicasaPublishing.c"
+#line 5507 "PicasaPublishing.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 5516 "PicasaPublishing.c"
+#line 5511 "PicasaPublishing.c"
}
#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
value->data[0].v_pointer = publishing_picasa_publishing_options_pane_size_description_ref (object);
-#line 5520 "PicasaPublishing.c"
+#line 5515 "PicasaPublishing.c"
} else {
#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 5524 "PicasaPublishing.c"
+#line 5519 "PicasaPublishing.c"
}
#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return NULL;
-#line 5528 "PicasaPublishing.c"
+#line 5523 "PicasaPublishing.c"
}
-static gchar* publishing_picasa_publishing_options_pane_value_size_description_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_picasa_publishing_options_pane_value_size_description_lcopy_value (const GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
PublishingPicasaPublishingOptionsPaneSizeDescription ** object_p;
object_p = collect_values[0].v_pointer;
#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -5573,7 +5573,13 @@ static gchar* publishing_picasa_publishing_options_pane_value_size_description_l
}
-static GParamSpec* publishing_picasa_publishing_options_pane_param_spec_size_description (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+static GParamSpec*
+publishing_picasa_publishing_options_pane_param_spec_size_description (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags)
+{
PublishingPicasaPublishingOptionsPaneParamSpecSizeDescription* spec;
#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_DESCRIPTION), NULL);
@@ -5583,20 +5589,25 @@ static GParamSpec* publishing_picasa_publishing_options_pane_param_spec_size_des
G_PARAM_SPEC (spec)->value_type = object_type;
#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return G_PARAM_SPEC (spec);
-#line 5571 "PicasaPublishing.c"
+#line 5577 "PicasaPublishing.c"
}
-static gpointer publishing_picasa_publishing_options_pane_value_get_size_description (const GValue* value) {
+static gpointer
+publishing_picasa_publishing_options_pane_value_get_size_description (const GValue* value)
+{
#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_DESCRIPTION), NULL);
#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return value->data[0].v_pointer;
-#line 5580 "PicasaPublishing.c"
+#line 5588 "PicasaPublishing.c"
}
-static void publishing_picasa_publishing_options_pane_value_set_size_description (GValue* value, gpointer v_object) {
+static void
+publishing_picasa_publishing_options_pane_value_set_size_description (GValue* value,
+ gpointer v_object)
+{
PublishingPicasaPublishingOptionsPaneSizeDescription * old;
#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_DESCRIPTION));
@@ -5612,22 +5623,25 @@ static void publishing_picasa_publishing_options_pane_value_set_size_description
value->data[0].v_pointer = v_object;
#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_picasa_publishing_options_pane_size_description_ref (value->data[0].v_pointer);
-#line 5600 "PicasaPublishing.c"
+#line 5611 "PicasaPublishing.c"
} else {
#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 5604 "PicasaPublishing.c"
+#line 5615 "PicasaPublishing.c"
}
#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (old) {
#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_picasa_publishing_options_pane_size_description_unref (old);
-#line 5610 "PicasaPublishing.c"
+#line 5621 "PicasaPublishing.c"
}
}
-static void publishing_picasa_publishing_options_pane_value_take_size_description (GValue* value, gpointer v_object) {
+static void
+publishing_picasa_publishing_options_pane_value_take_size_description (GValue* value,
+ gpointer v_object)
+{
PublishingPicasaPublishingOptionsPaneSizeDescription * old;
#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_DESCRIPTION));
@@ -5641,38 +5655,44 @@ static void publishing_picasa_publishing_options_pane_value_take_size_descriptio
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
value->data[0].v_pointer = v_object;
-#line 5629 "PicasaPublishing.c"
+#line 5643 "PicasaPublishing.c"
} else {
#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 5633 "PicasaPublishing.c"
+#line 5647 "PicasaPublishing.c"
}
#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (old) {
#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_picasa_publishing_options_pane_size_description_unref (old);
-#line 5639 "PicasaPublishing.c"
+#line 5653 "PicasaPublishing.c"
}
}
-static void publishing_picasa_publishing_options_pane_size_description_class_init (PublishingPicasaPublishingOptionsPaneSizeDescriptionClass * klass) {
+static void
+publishing_picasa_publishing_options_pane_size_description_class_init (PublishingPicasaPublishingOptionsPaneSizeDescriptionClass * klass)
+{
#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_picasa_publishing_options_pane_size_description_parent_class = g_type_class_peek_parent (klass);
#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
((PublishingPicasaPublishingOptionsPaneSizeDescriptionClass *) klass)->finalize = publishing_picasa_publishing_options_pane_size_description_finalize;
-#line 5649 "PicasaPublishing.c"
+#line 5665 "PicasaPublishing.c"
}
-static void publishing_picasa_publishing_options_pane_size_description_instance_init (PublishingPicasaPublishingOptionsPaneSizeDescription * self) {
+static void
+publishing_picasa_publishing_options_pane_size_description_instance_init (PublishingPicasaPublishingOptionsPaneSizeDescription * self)
+{
#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
self->ref_count = 1;
-#line 5656 "PicasaPublishing.c"
+#line 5674 "PicasaPublishing.c"
}
-static void publishing_picasa_publishing_options_pane_size_description_finalize (PublishingPicasaPublishingOptionsPaneSizeDescription * obj) {
+static void
+publishing_picasa_publishing_options_pane_size_description_finalize (PublishingPicasaPublishingOptionsPaneSizeDescription * obj)
+{
PublishingPicasaPublishingOptionsPaneSizeDescription * self;
#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_DESCRIPTION, PublishingPicasaPublishingOptionsPaneSizeDescription);
@@ -5680,11 +5700,13 @@ static void publishing_picasa_publishing_options_pane_size_description_finalize
g_signal_handlers_destroy (self);
#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_g_free0 (self->name);
-#line 5668 "PicasaPublishing.c"
+#line 5688 "PicasaPublishing.c"
}
-static GType publishing_picasa_publishing_options_pane_size_description_get_type (void) {
+static GType
+publishing_picasa_publishing_options_pane_size_description_get_type (void)
+{
static volatile gsize publishing_picasa_publishing_options_pane_size_description_type_id__volatile = 0;
if (g_once_init_enter (&publishing_picasa_publishing_options_pane_size_description_type_id__volatile)) {
static const GTypeValueTable g_define_type_value_table = { publishing_picasa_publishing_options_pane_value_size_description_init, publishing_picasa_publishing_options_pane_value_size_description_free_value, publishing_picasa_publishing_options_pane_value_size_description_copy_value, publishing_picasa_publishing_options_pane_value_size_description_peek_pointer, "p", publishing_picasa_publishing_options_pane_value_size_description_collect_value, "p", publishing_picasa_publishing_options_pane_value_size_description_lcopy_value };
@@ -5698,18 +5720,22 @@ static GType publishing_picasa_publishing_options_pane_size_description_get_type
}
-static gpointer publishing_picasa_publishing_options_pane_size_description_ref (gpointer instance) {
+static gpointer
+publishing_picasa_publishing_options_pane_size_description_ref (gpointer instance)
+{
PublishingPicasaPublishingOptionsPaneSizeDescription * self;
self = instance;
#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_atomic_int_inc (&self->ref_count);
#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return instance;
-#line 5693 "PicasaPublishing.c"
+#line 5717 "PicasaPublishing.c"
}
-static void publishing_picasa_publishing_options_pane_size_description_unref (gpointer instance) {
+static void
+publishing_picasa_publishing_options_pane_size_description_unref (gpointer instance)
+{
PublishingPicasaPublishingOptionsPaneSizeDescription * self;
self = instance;
#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -5718,12 +5744,14 @@ static void publishing_picasa_publishing_options_pane_size_description_unref (gp
PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_SIZE_DESCRIPTION_GET_CLASS (self)->finalize (self);
#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 5706 "PicasaPublishing.c"
+#line 5732 "PicasaPublishing.c"
}
}
-static void publishing_picasa_publishing_options_pane_class_init (PublishingPicasaPublishingOptionsPaneClass * klass) {
+static void
+publishing_picasa_publishing_options_pane_class_init (PublishingPicasaPublishingOptionsPaneClass * klass)
+{
#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_picasa_publishing_options_pane_parent_class = g_type_class_peek_parent (klass);
#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -5734,11 +5762,13 @@ static void publishing_picasa_publishing_options_pane_class_init (PublishingPica
publishing_picasa_publishing_options_pane_signals[PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL] = g_signal_new ("publish", PUBLISHING_PICASA_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_picasa_publishing_options_pane_signals[PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL] = g_signal_new ("logout", PUBLISHING_PICASA_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 5722 "PicasaPublishing.c"
+#line 5750 "PicasaPublishing.c"
}
-static void publishing_picasa_publishing_options_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) {
+static void
+publishing_picasa_publishing_options_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface)
+{
#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_picasa_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -5749,11 +5779,13 @@ static void publishing_picasa_publishing_options_pane_spit_publishing_dialog_pan
iface->on_pane_installed = (void (*) (SpitPublishingDialogPane *)) publishing_picasa_publishing_options_pane_real_on_pane_installed;
#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
iface->on_pane_uninstalled = (void (*) (SpitPublishingDialogPane *)) publishing_picasa_publishing_options_pane_real_on_pane_uninstalled;
-#line 5737 "PicasaPublishing.c"
+#line 5767 "PicasaPublishing.c"
}
-static void publishing_picasa_publishing_options_pane_instance_init (PublishingPicasaPublishingOptionsPane * self) {
+static void
+publishing_picasa_publishing_options_pane_instance_init (PublishingPicasaPublishingOptionsPane * self)
+{
#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
self->priv = PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_GET_PRIVATE (self);
#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -5776,11 +5808,13 @@ static void publishing_picasa_publishing_options_pane_instance_init (PublishingP
self->priv->publish_button = NULL;
#line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
self->priv->logout_button = NULL;
-#line 5764 "PicasaPublishing.c"
+#line 5796 "PicasaPublishing.c"
}
-static void publishing_picasa_publishing_options_pane_finalize (GObject * obj) {
+static void
+publishing_picasa_publishing_options_pane_finalize (GObject * obj)
+{
PublishingPicasaPublishingOptionsPane * self;
#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PICASA_TYPE_PUBLISHING_OPTIONS_PANE, PublishingPicasaPublishingOptionsPane);
@@ -5810,11 +5844,13 @@ static void publishing_picasa_publishing_options_pane_finalize (GObject * obj) {
_publishing_picasa_publishing_parameters_unref0 (self->priv->parameters);
#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
G_OBJECT_CLASS (publishing_picasa_publishing_options_pane_parent_class)->finalize (obj);
-#line 5798 "PicasaPublishing.c"
+#line 5832 "PicasaPublishing.c"
}
-GType publishing_picasa_publishing_options_pane_get_type (void) {
+GType
+publishing_picasa_publishing_options_pane_get_type (void)
+{
static volatile gsize publishing_picasa_publishing_options_pane_type_id__volatile = 0;
if (g_once_init_enter (&publishing_picasa_publishing_options_pane_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingPicasaPublishingOptionsPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_picasa_publishing_options_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingPicasaPublishingOptionsPane), 0, (GInstanceInitFunc) publishing_picasa_publishing_options_pane_instance_init, NULL };
@@ -5828,7 +5864,9 @@ GType publishing_picasa_publishing_options_pane_get_type (void) {
}
-PublishingPicasaPublishingParameters* publishing_picasa_publishing_parameters_construct (GType object_type) {
+PublishingPicasaPublishingParameters*
+publishing_picasa_publishing_parameters_construct (GType object_type)
+{
PublishingPicasaPublishingParameters* self = NULL;
gchar* _tmp0_;
#line 668 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -5867,18 +5905,22 @@ PublishingPicasaPublishingParameters* publishing_picasa_publishing_parameters_co
self->priv->media_type = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO;
#line 668 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return self;
-#line 5855 "PicasaPublishing.c"
+#line 5893 "PicasaPublishing.c"
}
-PublishingPicasaPublishingParameters* publishing_picasa_publishing_parameters_new (void) {
+PublishingPicasaPublishingParameters*
+publishing_picasa_publishing_parameters_new (void)
+{
#line 668 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return publishing_picasa_publishing_parameters_construct (PUBLISHING_PICASA_TYPE_PUBLISHING_PARAMETERS);
-#line 5862 "PicasaPublishing.c"
+#line 5902 "PicasaPublishing.c"
}
-gchar* publishing_picasa_publishing_parameters_get_target_album_name (PublishingPicasaPublishingParameters* self) {
+gchar*
+publishing_picasa_publishing_parameters_get_target_album_name (PublishingPicasaPublishingParameters* self)
+{
gchar* result = NULL;
const gchar* _tmp0_;
gchar* _tmp1_;
@@ -5892,49 +5934,51 @@ gchar* publishing_picasa_publishing_parameters_get_target_album_name (Publishing
result = _tmp1_;
#line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return result;
-#line 5880 "PicasaPublishing.c"
+#line 5922 "PicasaPublishing.c"
}
-void publishing_picasa_publishing_parameters_set_target_album_name (PublishingPicasaPublishingParameters* self, const gchar* target_album_name) {
- const gchar* _tmp0_;
- gchar* _tmp1_;
+void
+publishing_picasa_publishing_parameters_set_target_album_name (PublishingPicasaPublishingParameters* self,
+ const gchar* target_album_name)
+{
+ gchar* _tmp0_;
#line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self));
#line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_return_if_fail (target_album_name != NULL);
#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp0_ = target_album_name;
-#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp1_ = g_strdup (_tmp0_);
+ _tmp0_ = g_strdup (target_album_name);
#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_g_free0 (self->priv->target_album_name);
#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- self->priv->target_album_name = _tmp1_;
-#line 5899 "PicasaPublishing.c"
+ self->priv->target_album_name = _tmp0_;
+#line 5941 "PicasaPublishing.c"
}
-void publishing_picasa_publishing_parameters_set_target_album_entry_url (PublishingPicasaPublishingParameters* self, const gchar* target_album_url) {
- const gchar* _tmp0_;
- gchar* _tmp1_;
+void
+publishing_picasa_publishing_parameters_set_target_album_entry_url (PublishingPicasaPublishingParameters* self,
+ const gchar* target_album_url)
+{
+ gchar* _tmp0_;
#line 688 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self));
#line 688 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_return_if_fail (target_album_url != NULL);
#line 689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp0_ = target_album_url;
-#line 689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp1_ = g_strdup (_tmp0_);
+ _tmp0_ = g_strdup (target_album_url);
#line 689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_g_free0 (self->priv->target_album_url);
#line 689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- self->priv->target_album_url = _tmp1_;
-#line 5918 "PicasaPublishing.c"
+ self->priv->target_album_url = _tmp0_;
+#line 5960 "PicasaPublishing.c"
}
-gchar* publishing_picasa_publishing_parameters_get_target_album_entry_url (PublishingPicasaPublishingParameters* self) {
+gchar*
+publishing_picasa_publishing_parameters_get_target_album_entry_url (PublishingPicasaPublishingParameters* self)
+{
gchar* result = NULL;
const gchar* _tmp0_;
gchar* _tmp1_;
@@ -5948,173 +5992,164 @@ gchar* publishing_picasa_publishing_parameters_get_target_album_entry_url (Publi
result = _tmp1_;
#line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return result;
-#line 5936 "PicasaPublishing.c"
+#line 5980 "PicasaPublishing.c"
}
-static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
+static gchar*
+string_replace (const gchar* self,
+ const gchar* old,
+ const gchar* replacement)
+{
gchar* result = NULL;
gboolean _tmp0_ = FALSE;
gboolean _tmp1_ = FALSE;
GError * _inner_error_ = NULL;
-#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (old != NULL, NULL);
-#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (replacement != NULL, NULL);
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
if ((*((gchar*) self)) == '\0') {
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp1_ = TRUE;
-#line 5955 "PicasaPublishing.c"
+#line 6003 "PicasaPublishing.c"
} else {
- const gchar* _tmp2_;
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp2_ = old;
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp1_ = (*((gchar*) _tmp2_)) == '\0';
-#line 5962 "PicasaPublishing.c"
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp1_ = (*((gchar*) old)) == '\0';
+#line 6007 "PicasaPublishing.c"
}
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
if (_tmp1_) {
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp0_ = TRUE;
-#line 5968 "PicasaPublishing.c"
+#line 6013 "PicasaPublishing.c"
} else {
- const gchar* _tmp3_;
- const gchar* _tmp4_;
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp3_ = old;
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp4_ = replacement;
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp0_ = g_strcmp0 (_tmp3_, _tmp4_) == 0;
-#line 5978 "PicasaPublishing.c"
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp0_ = g_strcmp0 (old, replacement) == 0;
+#line 6017 "PicasaPublishing.c"
}
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
if (_tmp0_) {
-#line 5982 "PicasaPublishing.c"
- gchar* _tmp5_;
-#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp5_ = g_strdup (self);
-#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- result = _tmp5_;
-#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 6021 "PicasaPublishing.c"
+ gchar* _tmp2_;
+#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp2_ = g_strdup (self);
+#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = _tmp2_;
+#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 5990 "PicasaPublishing.c"
+#line 6029 "PicasaPublishing.c"
}
{
GRegex* regex = NULL;
- const gchar* _tmp6_;
- gchar* _tmp7_;
- gchar* _tmp8_;
- GRegex* _tmp9_;
- GRegex* _tmp10_;
- gchar* _tmp11_ = NULL;
- GRegex* _tmp12_;
- const gchar* _tmp13_;
- gchar* _tmp14_;
- gchar* _tmp15_;
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp6_ = old;
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp7_ = g_regex_escape_string (_tmp6_, -1);
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp8_ = _tmp7_;
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp9_ = g_regex_new (_tmp8_, 0, 0, &_inner_error_);
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp10_ = _tmp9_;
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _g_free0 (_tmp8_);
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- regex = _tmp10_;
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ gchar* _tmp3_;
+ gchar* _tmp4_;
+ GRegex* _tmp5_;
+ GRegex* _tmp6_;
+ gchar* _tmp7_ = NULL;
+ GRegex* _tmp8_;
+ gchar* _tmp9_;
+ gchar* _tmp10_;
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp3_ = g_regex_escape_string (old, -1);
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp4_ = _tmp3_;
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp5_ = g_regex_new (_tmp4_, 0, 0, &_inner_error_);
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp6_ = _tmp5_;
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _g_free0 (_tmp4_);
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ regex = _tmp6_;
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 6022 "PicasaPublishing.c"
+#line 6057 "PicasaPublishing.c"
goto __catch12_g_regex_error;
}
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_clear_error (&_inner_error_);
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return NULL;
-#line 6031 "PicasaPublishing.c"
+#line 6066 "PicasaPublishing.c"
}
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp12_ = regex;
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp13_ = replacement;
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp14_ = g_regex_replace_literal (_tmp12_, self, (gssize) -1, 0, _tmp13_, 0, &_inner_error_);
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp11_ = _tmp14_;
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp8_ = regex;
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp9_ = g_regex_replace_literal (_tmp8_, self, (gssize) -1, 0, replacement, 0, &_inner_error_);
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp7_ = _tmp9_;
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_g_regex_unref0 (regex);
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 6047 "PicasaPublishing.c"
+#line 6080 "PicasaPublishing.c"
goto __catch12_g_regex_error;
}
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_g_regex_unref0 (regex);
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_clear_error (&_inner_error_);
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return NULL;
-#line 6058 "PicasaPublishing.c"
+#line 6091 "PicasaPublishing.c"
}
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp15_ = _tmp11_;
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp11_ = NULL;
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- result = _tmp15_;
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _g_free0 (_tmp11_);
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp10_ = _tmp7_;
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp7_ = NULL;
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = _tmp10_;
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _g_free0 (_tmp7_);
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_g_regex_unref0 (regex);
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 6072 "PicasaPublishing.c"
+#line 6105 "PicasaPublishing.c"
}
goto __finally12;
__catch12_g_regex_error:
{
GError* e = NULL;
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
e = _inner_error_;
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_inner_error_ = NULL;
-#line 1415 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1429 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_assert_not_reached ();
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_g_error_free0 (e);
-#line 6086 "PicasaPublishing.c"
+#line 6119 "PicasaPublishing.c"
}
__finally12:
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_clear_error (&_inner_error_);
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return NULL;
-#line 6097 "PicasaPublishing.c"
+#line 6130 "PicasaPublishing.c"
}
}
-gchar* publishing_picasa_publishing_parameters_get_target_album_feed_url (PublishingPicasaPublishingParameters* self) {
+gchar*
+publishing_picasa_publishing_parameters_get_target_album_feed_url (PublishingPicasaPublishingParameters* self)
+{
gchar* result = NULL;
gchar* entry_url = NULL;
gchar* _tmp0_;
@@ -6136,11 +6171,13 @@ gchar* publishing_picasa_publishing_parameters_get_target_album_feed_url (Publis
_g_free0 (entry_url);
#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return result;
-#line 6124 "PicasaPublishing.c"
+#line 6159 "PicasaPublishing.c"
}
-gchar* publishing_picasa_publishing_parameters_get_user_name (PublishingPicasaPublishingParameters* self) {
+gchar*
+publishing_picasa_publishing_parameters_get_user_name (PublishingPicasaPublishingParameters* self)
+{
gchar* result = NULL;
const gchar* _tmp0_;
gchar* _tmp1_;
@@ -6154,58 +6191,66 @@ gchar* publishing_picasa_publishing_parameters_get_user_name (PublishingPicasaPu
result = _tmp1_;
#line 704 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return result;
-#line 6142 "PicasaPublishing.c"
+#line 6179 "PicasaPublishing.c"
}
-void publishing_picasa_publishing_parameters_set_user_name (PublishingPicasaPublishingParameters* self, const gchar* user_name) {
- const gchar* _tmp0_;
- gchar* _tmp1_;
+void
+publishing_picasa_publishing_parameters_set_user_name (PublishingPicasaPublishingParameters* self,
+ const gchar* user_name)
+{
+ gchar* _tmp0_;
#line 707 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self));
#line 707 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_return_if_fail (user_name != NULL);
#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp0_ = user_name;
-#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp1_ = g_strdup (_tmp0_);
+ _tmp0_ = g_strdup (user_name);
#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_g_free0 (self->priv->user_name);
#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- self->priv->user_name = _tmp1_;
-#line 6161 "PicasaPublishing.c"
+ self->priv->user_name = _tmp0_;
+#line 6198 "PicasaPublishing.c"
}
-static gpointer _publishing_picasa_album_ref0 (gpointer self) {
+static gpointer
+_publishing_picasa_album_ref0 (gpointer self)
+{
#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return self ? publishing_picasa_album_ref (self) : NULL;
-#line 6168 "PicasaPublishing.c"
+#line 6207 "PicasaPublishing.c"
}
-static PublishingPicasaAlbum** _vala_array_dup5 (PublishingPicasaAlbum** self, int length) {
+static PublishingPicasaAlbum**
+_vala_array_dup5 (PublishingPicasaAlbum** self,
+ int length)
+{
PublishingPicasaAlbum** result;
int i;
#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
result = g_new0 (PublishingPicasaAlbum*, length + 1);
#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
for (i = 0; i < length; i++) {
-#line 6179 "PicasaPublishing.c"
+#line 6221 "PicasaPublishing.c"
PublishingPicasaAlbum* _tmp0_;
#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp0_ = _publishing_picasa_album_ref0 (self[i]);
#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
result[i] = _tmp0_;
-#line 6185 "PicasaPublishing.c"
+#line 6227 "PicasaPublishing.c"
}
#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return result;
-#line 6189 "PicasaPublishing.c"
+#line 6231 "PicasaPublishing.c"
}
-PublishingPicasaAlbum** publishing_picasa_publishing_parameters_get_albums (PublishingPicasaPublishingParameters* self, int* result_length1) {
+PublishingPicasaAlbum**
+publishing_picasa_publishing_parameters_get_albums (PublishingPicasaPublishingParameters* self,
+ int* result_length1)
+{
PublishingPicasaAlbum** result = NULL;
PublishingPicasaAlbum** _tmp0_;
gint _tmp0__length1;
@@ -6231,77 +6276,80 @@ PublishingPicasaAlbum** publishing_picasa_publishing_parameters_get_albums (Publ
if (result_length1) {
#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
*result_length1 = _tmp2__length1;
-#line 6219 "PicasaPublishing.c"
+#line 6264 "PicasaPublishing.c"
}
#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
result = _tmp2_;
#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return result;
-#line 6225 "PicasaPublishing.c"
+#line 6270 "PicasaPublishing.c"
}
-static PublishingPicasaAlbum** _vala_array_dup6 (PublishingPicasaAlbum** self, int length) {
+static PublishingPicasaAlbum**
+_vala_array_dup6 (PublishingPicasaAlbum** self,
+ int length)
+{
PublishingPicasaAlbum** result;
int i;
#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
result = g_new0 (PublishingPicasaAlbum*, length + 1);
#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
for (i = 0; i < length; i++) {
-#line 6236 "PicasaPublishing.c"
+#line 6284 "PicasaPublishing.c"
PublishingPicasaAlbum* _tmp0_;
#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp0_ = _publishing_picasa_album_ref0 (self[i]);
#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
result[i] = _tmp0_;
-#line 6242 "PicasaPublishing.c"
+#line 6290 "PicasaPublishing.c"
}
#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return result;
-#line 6246 "PicasaPublishing.c"
+#line 6294 "PicasaPublishing.c"
}
-void publishing_picasa_publishing_parameters_set_albums (PublishingPicasaPublishingParameters* self, PublishingPicasaAlbum** albums, int albums_length1) {
+void
+publishing_picasa_publishing_parameters_set_albums (PublishingPicasaPublishingParameters* self,
+ PublishingPicasaAlbum** albums,
+ int albums_length1)
+{
PublishingPicasaAlbum** _tmp0_;
gint _tmp0__length1;
- PublishingPicasaAlbum** _tmp1_;
- gint _tmp1__length1;
#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self));
#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp0_ = albums;
+ _tmp0_ = (albums != NULL) ? _vala_array_dup6 (albums, albums_length1) : ((gpointer) albums);
#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp0__length1 = albums_length1;
#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup6 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
-#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp1__length1 = _tmp0__length1;
-#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
self->priv->albums = (_vala_array_free (self->priv->albums, self->priv->albums_length1, (GDestroyNotify) publishing_picasa_album_unref), NULL);
#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- self->priv->albums = _tmp1_;
+ self->priv->albums = _tmp0_;
#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- self->priv->albums_length1 = _tmp1__length1;
+ self->priv->albums_length1 = _tmp0__length1;
#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
self->priv->_albums_size_ = self->priv->albums_length1;
-#line 6273 "PicasaPublishing.c"
+#line 6319 "PicasaPublishing.c"
}
-void publishing_picasa_publishing_parameters_set_major_axis_size_pixels (PublishingPicasaPublishingParameters* self, gint pixels) {
- gint _tmp0_;
+void
+publishing_picasa_publishing_parameters_set_major_axis_size_pixels (PublishingPicasaPublishingParameters* self,
+ gint pixels)
+{
#line 719 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self));
#line 720 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp0_ = pixels;
-#line 720 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- self->priv->major_axis_size_pixels = _tmp0_;
-#line 6285 "PicasaPublishing.c"
+ self->priv->major_axis_size_pixels = pixels;
+#line 6331 "PicasaPublishing.c"
}
-gint publishing_picasa_publishing_parameters_get_major_axis_size_pixels (PublishingPicasaPublishingParameters* self) {
+gint
+publishing_picasa_publishing_parameters_get_major_axis_size_pixels (PublishingPicasaPublishingParameters* self)
+{
gint result = 0;
gint _tmp0_;
#line 723 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -6312,23 +6360,25 @@ gint publishing_picasa_publishing_parameters_get_major_axis_size_pixels (Publish
result = _tmp0_;
#line 724 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return result;
-#line 6300 "PicasaPublishing.c"
+#line 6348 "PicasaPublishing.c"
}
-void publishing_picasa_publishing_parameters_set_major_axis_size_selection_id (PublishingPicasaPublishingParameters* self, gint selection_id) {
- gint _tmp0_;
+void
+publishing_picasa_publishing_parameters_set_major_axis_size_selection_id (PublishingPicasaPublishingParameters* self,
+ gint selection_id)
+{
#line 727 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self));
#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp0_ = selection_id;
-#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- self->priv->major_axis_size_selection_id = _tmp0_;
-#line 6312 "PicasaPublishing.c"
+ self->priv->major_axis_size_selection_id = selection_id;
+#line 6360 "PicasaPublishing.c"
}
-gint publishing_picasa_publishing_parameters_get_major_axis_size_selection_id (PublishingPicasaPublishingParameters* self) {
+gint
+publishing_picasa_publishing_parameters_get_major_axis_size_selection_id (PublishingPicasaPublishingParameters* self)
+{
gint result = 0;
gint _tmp0_;
#line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -6339,23 +6389,25 @@ gint publishing_picasa_publishing_parameters_get_major_axis_size_selection_id (P
result = _tmp0_;
#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return result;
-#line 6327 "PicasaPublishing.c"
+#line 6377 "PicasaPublishing.c"
}
-void publishing_picasa_publishing_parameters_set_strip_metadata (PublishingPicasaPublishingParameters* self, gboolean strip_metadata) {
- gboolean _tmp0_;
+void
+publishing_picasa_publishing_parameters_set_strip_metadata (PublishingPicasaPublishingParameters* self,
+ gboolean strip_metadata)
+{
#line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self));
#line 736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp0_ = strip_metadata;
-#line 736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- self->priv->strip_metadata = _tmp0_;
-#line 6339 "PicasaPublishing.c"
+ self->priv->strip_metadata = strip_metadata;
+#line 6389 "PicasaPublishing.c"
}
-gboolean publishing_picasa_publishing_parameters_get_strip_metadata (PublishingPicasaPublishingParameters* self) {
+gboolean
+publishing_picasa_publishing_parameters_get_strip_metadata (PublishingPicasaPublishingParameters* self)
+{
gboolean result = FALSE;
gboolean _tmp0_;
#line 739 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -6366,23 +6418,25 @@ gboolean publishing_picasa_publishing_parameters_get_strip_metadata (PublishingP
result = _tmp0_;
#line 740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return result;
-#line 6354 "PicasaPublishing.c"
+#line 6406 "PicasaPublishing.c"
}
-void publishing_picasa_publishing_parameters_set_media_type (PublishingPicasaPublishingParameters* self, SpitPublishingPublisherMediaType media_type) {
- SpitPublishingPublisherMediaType _tmp0_;
+void
+publishing_picasa_publishing_parameters_set_media_type (PublishingPicasaPublishingParameters* self,
+ SpitPublishingPublisherMediaType media_type)
+{
#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self));
#line 744 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp0_ = media_type;
-#line 744 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- self->priv->media_type = _tmp0_;
-#line 6366 "PicasaPublishing.c"
+ self->priv->media_type = media_type;
+#line 6418 "PicasaPublishing.c"
}
-SpitPublishingPublisherMediaType publishing_picasa_publishing_parameters_get_media_type (PublishingPicasaPublishingParameters* self) {
+SpitPublishingPublisherMediaType
+publishing_picasa_publishing_parameters_get_media_type (PublishingPicasaPublishingParameters* self)
+{
SpitPublishingPublisherMediaType result = 0;
SpitPublishingPublisherMediaType _tmp0_;
#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -6393,108 +6447,133 @@ SpitPublishingPublisherMediaType publishing_picasa_publishing_parameters_get_med
result = _tmp0_;
#line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return result;
-#line 6381 "PicasaPublishing.c"
+#line 6435 "PicasaPublishing.c"
}
-static void publishing_picasa_value_publishing_parameters_init (GValue* value) {
+static void
+publishing_picasa_value_publishing_parameters_init (GValue* value)
+{
#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 6388 "PicasaPublishing.c"
+#line 6444 "PicasaPublishing.c"
}
-static void publishing_picasa_value_publishing_parameters_free_value (GValue* value) {
+static void
+publishing_picasa_value_publishing_parameters_free_value (GValue* value)
+{
#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (value->data[0].v_pointer) {
#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_picasa_publishing_parameters_unref (value->data[0].v_pointer);
-#line 6397 "PicasaPublishing.c"
+#line 6455 "PicasaPublishing.c"
}
}
-static void publishing_picasa_value_publishing_parameters_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+publishing_picasa_value_publishing_parameters_copy_value (const GValue* src_value,
+ GValue* dest_value)
+{
#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (src_value->data[0].v_pointer) {
#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
dest_value->data[0].v_pointer = publishing_picasa_publishing_parameters_ref (src_value->data[0].v_pointer);
-#line 6407 "PicasaPublishing.c"
+#line 6468 "PicasaPublishing.c"
} else {
#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
dest_value->data[0].v_pointer = NULL;
-#line 6411 "PicasaPublishing.c"
+#line 6472 "PicasaPublishing.c"
}
}
-static gpointer publishing_picasa_value_publishing_parameters_peek_pointer (const GValue* value) {
+static gpointer
+publishing_picasa_value_publishing_parameters_peek_pointer (const GValue* value)
+{
#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return value->data[0].v_pointer;
-#line 6419 "PicasaPublishing.c"
+#line 6482 "PicasaPublishing.c"
}
-static gchar* publishing_picasa_value_publishing_parameters_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_picasa_value_publishing_parameters_collect_value (GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (collect_values[0].v_pointer) {
-#line 6426 "PicasaPublishing.c"
+#line 6494 "PicasaPublishing.c"
PublishingPicasaPublishingParameters * object;
object = collect_values[0].v_pointer;
#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (object->parent_instance.g_class == NULL) {
#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 6433 "PicasaPublishing.c"
+#line 6501 "PicasaPublishing.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 6437 "PicasaPublishing.c"
+#line 6505 "PicasaPublishing.c"
}
#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
value->data[0].v_pointer = publishing_picasa_publishing_parameters_ref (object);
-#line 6441 "PicasaPublishing.c"
+#line 6509 "PicasaPublishing.c"
} else {
#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 6445 "PicasaPublishing.c"
+#line 6513 "PicasaPublishing.c"
}
#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return NULL;
-#line 6449 "PicasaPublishing.c"
+#line 6517 "PicasaPublishing.c"
}
-static gchar* publishing_picasa_value_publishing_parameters_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_picasa_value_publishing_parameters_lcopy_value (const GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
PublishingPicasaPublishingParameters ** object_p;
object_p = collect_values[0].v_pointer;
#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (!object_p) {
#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 6460 "PicasaPublishing.c"
+#line 6533 "PicasaPublishing.c"
}
#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (!value->data[0].v_pointer) {
#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
*object_p = NULL;
-#line 6466 "PicasaPublishing.c"
+#line 6539 "PicasaPublishing.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
*object_p = value->data[0].v_pointer;
-#line 6470 "PicasaPublishing.c"
+#line 6543 "PicasaPublishing.c"
} else {
#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
*object_p = publishing_picasa_publishing_parameters_ref (value->data[0].v_pointer);
-#line 6474 "PicasaPublishing.c"
+#line 6547 "PicasaPublishing.c"
}
#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return NULL;
-#line 6478 "PicasaPublishing.c"
+#line 6551 "PicasaPublishing.c"
}
-GParamSpec* publishing_picasa_param_spec_publishing_parameters (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+publishing_picasa_param_spec_publishing_parameters (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags)
+{
PublishingPicasaParamSpecPublishingParameters* spec;
#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_PICASA_TYPE_PUBLISHING_PARAMETERS), NULL);
@@ -6504,20 +6583,25 @@ GParamSpec* publishing_picasa_param_spec_publishing_parameters (const gchar* nam
G_PARAM_SPEC (spec)->value_type = object_type;
#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return G_PARAM_SPEC (spec);
-#line 6492 "PicasaPublishing.c"
+#line 6571 "PicasaPublishing.c"
}
-gpointer publishing_picasa_value_get_publishing_parameters (const GValue* value) {
+gpointer
+publishing_picasa_value_get_publishing_parameters (const GValue* value)
+{
#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PICASA_TYPE_PUBLISHING_PARAMETERS), NULL);
#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return value->data[0].v_pointer;
-#line 6501 "PicasaPublishing.c"
+#line 6582 "PicasaPublishing.c"
}
-void publishing_picasa_value_set_publishing_parameters (GValue* value, gpointer v_object) {
+void
+publishing_picasa_value_set_publishing_parameters (GValue* value,
+ gpointer v_object)
+{
PublishingPicasaPublishingParameters * old;
#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PICASA_TYPE_PUBLISHING_PARAMETERS));
@@ -6533,22 +6617,25 @@ void publishing_picasa_value_set_publishing_parameters (GValue* value, gpointer
value->data[0].v_pointer = v_object;
#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_picasa_publishing_parameters_ref (value->data[0].v_pointer);
-#line 6521 "PicasaPublishing.c"
+#line 6605 "PicasaPublishing.c"
} else {
#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 6525 "PicasaPublishing.c"
+#line 6609 "PicasaPublishing.c"
}
#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (old) {
#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_picasa_publishing_parameters_unref (old);
-#line 6531 "PicasaPublishing.c"
+#line 6615 "PicasaPublishing.c"
}
}
-void publishing_picasa_value_take_publishing_parameters (GValue* value, gpointer v_object) {
+void
+publishing_picasa_value_take_publishing_parameters (GValue* value,
+ gpointer v_object)
+{
PublishingPicasaPublishingParameters * old;
#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PICASA_TYPE_PUBLISHING_PARAMETERS));
@@ -6562,42 +6649,48 @@ void publishing_picasa_value_take_publishing_parameters (GValue* value, gpointer
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
value->data[0].v_pointer = v_object;
-#line 6550 "PicasaPublishing.c"
+#line 6637 "PicasaPublishing.c"
} else {
#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 6554 "PicasaPublishing.c"
+#line 6641 "PicasaPublishing.c"
}
#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (old) {
#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_picasa_publishing_parameters_unref (old);
-#line 6560 "PicasaPublishing.c"
+#line 6647 "PicasaPublishing.c"
}
}
-static void publishing_picasa_publishing_parameters_class_init (PublishingPicasaPublishingParametersClass * klass) {
+static void
+publishing_picasa_publishing_parameters_class_init (PublishingPicasaPublishingParametersClass * klass)
+{
#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_picasa_publishing_parameters_parent_class = g_type_class_peek_parent (klass);
#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
((PublishingPicasaPublishingParametersClass *) klass)->finalize = publishing_picasa_publishing_parameters_finalize;
#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_type_class_add_private (klass, sizeof (PublishingPicasaPublishingParametersPrivate));
-#line 6572 "PicasaPublishing.c"
+#line 6661 "PicasaPublishing.c"
}
-static void publishing_picasa_publishing_parameters_instance_init (PublishingPicasaPublishingParameters * self) {
+static void
+publishing_picasa_publishing_parameters_instance_init (PublishingPicasaPublishingParameters * self)
+{
#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
self->priv = PUBLISHING_PICASA_PUBLISHING_PARAMETERS_GET_PRIVATE (self);
#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
self->ref_count = 1;
-#line 6581 "PicasaPublishing.c"
+#line 6672 "PicasaPublishing.c"
}
-static void publishing_picasa_publishing_parameters_finalize (PublishingPicasaPublishingParameters * obj) {
+static void
+publishing_picasa_publishing_parameters_finalize (PublishingPicasaPublishingParameters * obj)
+{
PublishingPicasaPublishingParameters * self;
#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PICASA_TYPE_PUBLISHING_PARAMETERS, PublishingPicasaPublishingParameters);
@@ -6611,11 +6704,13 @@ static void publishing_picasa_publishing_parameters_finalize (PublishingPicasaPu
_g_free0 (self->priv->user_name);
#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
self->priv->albums = (_vala_array_free (self->priv->albums, self->priv->albums_length1, (GDestroyNotify) publishing_picasa_album_unref), NULL);
-#line 6599 "PicasaPublishing.c"
+#line 6692 "PicasaPublishing.c"
}
-GType publishing_picasa_publishing_parameters_get_type (void) {
+GType
+publishing_picasa_publishing_parameters_get_type (void)
+{
static volatile gsize publishing_picasa_publishing_parameters_type_id__volatile = 0;
if (g_once_init_enter (&publishing_picasa_publishing_parameters_type_id__volatile)) {
static const GTypeValueTable g_define_type_value_table = { publishing_picasa_value_publishing_parameters_init, publishing_picasa_value_publishing_parameters_free_value, publishing_picasa_value_publishing_parameters_copy_value, publishing_picasa_value_publishing_parameters_peek_pointer, "p", publishing_picasa_value_publishing_parameters_collect_value, "p", publishing_picasa_value_publishing_parameters_lcopy_value };
@@ -6629,18 +6724,22 @@ GType publishing_picasa_publishing_parameters_get_type (void) {
}
-gpointer publishing_picasa_publishing_parameters_ref (gpointer instance) {
+gpointer
+publishing_picasa_publishing_parameters_ref (gpointer instance)
+{
PublishingPicasaPublishingParameters * self;
self = instance;
#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_atomic_int_inc (&self->ref_count);
#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return instance;
-#line 6624 "PicasaPublishing.c"
+#line 6721 "PicasaPublishing.c"
}
-void publishing_picasa_publishing_parameters_unref (gpointer instance) {
+void
+publishing_picasa_publishing_parameters_unref (gpointer instance)
+{
PublishingPicasaPublishingParameters * self;
self = instance;
#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -6649,52 +6748,54 @@ void publishing_picasa_publishing_parameters_unref (gpointer instance) {
PUBLISHING_PICASA_PUBLISHING_PARAMETERS_GET_CLASS (self)->finalize (self);
#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 6637 "PicasaPublishing.c"
+#line 6736 "PicasaPublishing.c"
}
}
-PublishingPicasaUploader* publishing_picasa_uploader_construct (GType object_type, PublishingRESTSupportGoogleSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingPicasaPublishingParameters* parameters) {
+PublishingPicasaUploader*
+publishing_picasa_uploader_construct (GType object_type,
+ PublishingRESTSupportGoogleSession* session,
+ SpitPublishingPublishable** publishables,
+ int publishables_length1,
+ PublishingPicasaPublishingParameters* parameters)
+{
PublishingPicasaUploader* self = NULL;
- PublishingRESTSupportGoogleSession* _tmp0_;
- SpitPublishingPublishable** _tmp1_;
- gint _tmp1__length1;
- PublishingPicasaPublishingParameters* _tmp2_;
- PublishingPicasaPublishingParameters* _tmp3_;
+ PublishingPicasaPublishingParameters* _tmp0_;
#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (session), NULL);
#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_return_val_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (parameters), NULL);
#line 757 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp0_ = session;
-#line 757 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp1_ = publishables;
-#line 757 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp1__length1 = publishables_length1;
-#line 757 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- self = (PublishingPicasaUploader*) publishing_rest_support_batch_uploader_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, _tmp1__length1);
-#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp2_ = parameters;
+ self = (PublishingPicasaUploader*) publishing_rest_support_batch_uploader_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), publishables, publishables_length1);
#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp3_ = _publishing_picasa_publishing_parameters_ref0 (_tmp2_);
+ _tmp0_ = _publishing_picasa_publishing_parameters_ref0 (parameters);
#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_publishing_picasa_publishing_parameters_unref0 (self->priv->parameters);
#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- self->priv->parameters = _tmp3_;
+ self->priv->parameters = _tmp0_;
#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return self;
-#line 6671 "PicasaPublishing.c"
+#line 6764 "PicasaPublishing.c"
}
-PublishingPicasaUploader* publishing_picasa_uploader_new (PublishingRESTSupportGoogleSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingPicasaPublishingParameters* parameters) {
+PublishingPicasaUploader*
+publishing_picasa_uploader_new (PublishingRESTSupportGoogleSession* session,
+ SpitPublishingPublishable** publishables,
+ int publishables_length1,
+ PublishingPicasaPublishingParameters* parameters)
+{
#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return publishing_picasa_uploader_construct (PUBLISHING_PICASA_TYPE_UPLOADER, session, publishables, publishables_length1, parameters);
-#line 6678 "PicasaPublishing.c"
+#line 6776 "PicasaPublishing.c"
}
-static PublishingRESTSupportTransaction* publishing_picasa_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base, SpitPublishingPublishable* publishable) {
+static PublishingRESTSupportTransaction*
+publishing_picasa_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base,
+ SpitPublishingPublishable* publishable)
+{
PublishingPicasaUploader * self;
PublishingRESTSupportTransaction* result = NULL;
PublishingRESTSupportSession* _tmp0_;
@@ -6730,11 +6831,13 @@ static PublishingRESTSupportTransaction* publishing_picasa_uploader_real_create_
result = _tmp6_;
#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return result;
-#line 6718 "PicasaPublishing.c"
+#line 6819 "PicasaPublishing.c"
}
-static void publishing_picasa_uploader_class_init (PublishingPicasaUploaderClass * klass) {
+static void
+publishing_picasa_uploader_class_init (PublishingPicasaUploaderClass * klass)
+{
#line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_picasa_uploader_parent_class = g_type_class_peek_parent (klass);
#line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -6743,18 +6846,22 @@ static void publishing_picasa_uploader_class_init (PublishingPicasaUploaderClass
g_type_class_add_private (klass, sizeof (PublishingPicasaUploaderPrivate));
#line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = (PublishingRESTSupportTransaction* (*) (PublishingRESTSupportBatchUploader *, SpitPublishingPublishable*)) publishing_picasa_uploader_real_create_transaction;
-#line 6731 "PicasaPublishing.c"
+#line 6834 "PicasaPublishing.c"
}
-static void publishing_picasa_uploader_instance_init (PublishingPicasaUploader * self) {
+static void
+publishing_picasa_uploader_instance_init (PublishingPicasaUploader * self)
+{
#line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
self->priv = PUBLISHING_PICASA_UPLOADER_GET_PRIVATE (self);
-#line 6738 "PicasaPublishing.c"
+#line 6843 "PicasaPublishing.c"
}
-static void publishing_picasa_uploader_finalize (PublishingRESTSupportBatchUploader * obj) {
+static void
+publishing_picasa_uploader_finalize (PublishingRESTSupportBatchUploader * obj)
+{
PublishingPicasaUploader * self;
#line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PICASA_TYPE_UPLOADER, PublishingPicasaUploader);
@@ -6762,11 +6869,13 @@ static void publishing_picasa_uploader_finalize (PublishingRESTSupportBatchUploa
_publishing_picasa_publishing_parameters_unref0 (self->priv->parameters);
#line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_CLASS (publishing_picasa_uploader_parent_class)->finalize (obj);
-#line 6750 "PicasaPublishing.c"
+#line 6857 "PicasaPublishing.c"
}
-GType publishing_picasa_uploader_get_type (void) {
+GType
+publishing_picasa_uploader_get_type (void)
+{
static volatile gsize publishing_picasa_uploader_type_id__volatile = 0;
if (g_once_init_enter (&publishing_picasa_uploader_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingPicasaUploaderClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_picasa_uploader_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingPicasaUploader), 0, (GInstanceInitFunc) publishing_picasa_uploader_instance_init, NULL };
@@ -6778,7 +6887,11 @@ GType publishing_picasa_uploader_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) {
@@ -6790,13 +6903,19 @@ 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);
}
-static gint _vala_array_length (gpointer array) {
+static gint
+_vala_array_length (gpointer array)
+{
int length;
length = 0;
if (array) {
diff --git a/plugins/shotwell-publishing/PiwigoPublishing.c b/plugins/shotwell-publishing/PiwigoPublishing.c
index ed0eee0..e066269 100644
--- a/plugins/shotwell-publishing/PiwigoPublishing.c
+++ b/plugins/shotwell-publishing/PiwigoPublishing.c
@@ -1,4 +1,4 @@
-/* PiwigoPublishing.c generated by valac 0.36.6, the Vala compiler
+/* PiwigoPublishing.c generated by valac 0.40.4, the Vala compiler
* generated from PiwigoPublishing.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>
@@ -37,6 +38,11 @@
typedef struct _PiwigoService PiwigoService;
typedef struct _PiwigoServiceClass PiwigoServiceClass;
typedef struct _PiwigoServicePrivate PiwigoServicePrivate;
+enum {
+ PIWIGO_SERVICE_0_PROPERTY,
+ PIWIGO_SERVICE_NUM_PROPERTIES
+};
+static GParamSpec* piwigo_service_properties[PIWIGO_SERVICE_NUM_PROPERTIES];
#define _g_free0(var) (var = (g_free (var), NULL))
#define PUBLISHING_PIWIGO_TYPE_PIWIGO_PUBLISHER (publishing_piwigo_piwigo_publisher_get_type ())
@@ -110,6 +116,11 @@ typedef struct _PublishingPiwigoPiwigoPublisherPrivate PublishingPiwigoPiwigoPub
typedef struct _PublishingPiwigoSession PublishingPiwigoSession;
typedef struct _PublishingPiwigoSessionClass PublishingPiwigoSessionClass;
+enum {
+ PUBLISHING_PIWIGO_PIWIGO_PUBLISHER_0_PROPERTY,
+ PUBLISHING_PIWIGO_PIWIGO_PUBLISHER_NUM_PROPERTIES
+};
+static GParamSpec* publishing_piwigo_piwigo_publisher_properties[PUBLISHING_PIWIGO_PIWIGO_PUBLISHER_NUM_PROPERTIES];
#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
#define _publishing_rest_support_session_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rest_support_session_unref (var), NULL)))
#define _publishing_piwigo_publishing_parameters_unref0(var) ((var == NULL) ? NULL : (var = (publishing_piwigo_publishing_parameters_unref (var), NULL)))
@@ -235,25 +246,53 @@ typedef struct _PublishingPiwigoUploaderPrivate PublishingPiwigoUploaderPrivate;
typedef struct _PublishingPiwigoImagesAddTransaction PublishingPiwigoImagesAddTransaction;
typedef struct _PublishingPiwigoImagesAddTransactionClass PublishingPiwigoImagesAddTransactionClass;
typedef struct _PublishingPiwigoSSLErrorPanePrivate PublishingPiwigoSSLErrorPanePrivate;
+enum {
+ PUBLISHING_PIWIGO_SSL_ERROR_PANE_0_PROPERTY,
+ PUBLISHING_PIWIGO_SSL_ERROR_PANE_HOST_PROPERTY,
+ PUBLISHING_PIWIGO_SSL_ERROR_PANE_CERT_PROPERTY,
+ PUBLISHING_PIWIGO_SSL_ERROR_PANE_ERROR_TEXT_PROPERTY,
+ PUBLISHING_PIWIGO_SSL_ERROR_PANE_NUM_PROPERTIES
+};
+static GParamSpec* publishing_piwigo_ssl_error_pane_properties[PUBLISHING_PIWIGO_SSL_ERROR_PANE_NUM_PROPERTIES];
#define _g_byte_array_unref0(var) ((var == NULL) ? NULL : (var = (g_byte_array_unref (var), NULL)))
enum {
PUBLISHING_PIWIGO_SSL_ERROR_PANE_PROCEED_SIGNAL,
- PUBLISHING_PIWIGO_SSL_ERROR_PANE_LAST_SIGNAL
+ PUBLISHING_PIWIGO_SSL_ERROR_PANE_NUM_SIGNALS
};
-static guint publishing_piwigo_ssl_error_pane_signals[PUBLISHING_PIWIGO_SSL_ERROR_PANE_LAST_SIGNAL] = {0};
+static guint publishing_piwigo_ssl_error_pane_signals[PUBLISHING_PIWIGO_SSL_ERROR_PANE_NUM_SIGNALS] = {0};
typedef struct _PublishingPiwigoAuthenticationPanePrivate PublishingPiwigoAuthenticationPanePrivate;
enum {
+ PUBLISHING_PIWIGO_AUTHENTICATION_PANE_0_PROPERTY,
+ PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_PROPERTY,
+ PUBLISHING_PIWIGO_AUTHENTICATION_PANE_PUBLISHER_PROPERTY,
+ PUBLISHING_PIWIGO_AUTHENTICATION_PANE_NUM_PROPERTIES
+};
+static GParamSpec* publishing_piwigo_authentication_pane_properties[PUBLISHING_PIWIGO_AUTHENTICATION_PANE_NUM_PROPERTIES];
+enum {
PUBLISHING_PIWIGO_AUTHENTICATION_PANE_LOGIN_SIGNAL,
- PUBLISHING_PIWIGO_AUTHENTICATION_PANE_LAST_SIGNAL
+ PUBLISHING_PIWIGO_AUTHENTICATION_PANE_NUM_SIGNALS
};
-static guint publishing_piwigo_authentication_pane_signals[PUBLISHING_PIWIGO_AUTHENTICATION_PANE_LAST_SIGNAL] = {0};
+static guint publishing_piwigo_authentication_pane_signals[PUBLISHING_PIWIGO_AUTHENTICATION_PANE_NUM_SIGNALS] = {0};
typedef struct _PublishingPiwigoPublishingOptionsPanePrivate PublishingPiwigoPublishingOptionsPanePrivate;
enum {
+ PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_0_PROPERTY,
+ PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_CATEGORY_PROPERTY,
+ PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_PERMISSION_LEVEL_PROPERTY,
+ PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_PHOTO_SIZE_PROPERTY,
+ PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_TITLE_AS_COMMENT_PROPERTY,
+ PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_NO_UPLOAD_TAGS_PROPERTY,
+ PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_STRIP_METADATA_ENABLED_PROPERTY,
+ PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_EXISTING_CATEGORIES_PROPERTY,
+ PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_DEFAULT_COMMENT_PROPERTY,
+ PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_NUM_PROPERTIES
+};
+static GParamSpec* publishing_piwigo_publishing_options_pane_properties[PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_NUM_PROPERTIES];
+enum {
PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL,
PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL,
- PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL
+ PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_NUM_SIGNALS
};
-static guint publishing_piwigo_publishing_options_pane_signals[PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL] = {0};
+static guint publishing_piwigo_publishing_options_pane_signals[PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_NUM_SIGNALS] = {0};
typedef struct _PublishingPiwigoSessionPrivate PublishingPiwigoSessionPrivate;
typedef struct _PublishingPiwigoTransactionPrivate PublishingPiwigoTransactionPrivate;
typedef struct _PublishingPiwigoSessionLoginTransactionPrivate PublishingPiwigoSessionLoginTransactionPrivate;
@@ -589,21 +628,28 @@ static gpointer publishing_piwigo_categories_add_transaction_parent_class = NULL
static gpointer publishing_piwigo_images_add_transaction_parent_class = NULL;
GType piwigo_service_get_type (void) G_GNUC_CONST;
-enum {
- PIWIGO_SERVICE_DUMMY_PROPERTY
-};
#define PIWIGO_SERVICE_ICON_FILENAME "piwigo.png"
PiwigoService* piwigo_service_new (GFile* resource_directory);
-PiwigoService* piwigo_service_construct (GType object_type, GFile* resource_directory);
-static gint piwigo_service_real_get_pluggable_interface (SpitPluggable* base, gint min_host_interface, gint max_host_interface);
+PiwigoService* piwigo_service_construct (GType object_type,
+ GFile* resource_directory);
+static gint piwigo_service_real_get_pluggable_interface (SpitPluggable* base,
+ gint min_host_interface,
+ gint max_host_interface);
static const gchar* piwigo_service_real_get_id (SpitPluggable* base);
static const gchar* piwigo_service_real_get_pluggable_name (SpitPluggable* base);
-static void piwigo_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info);
-static GdkPixbuf** _vala_array_dup12 (GdkPixbuf** self, int length);
-static void piwigo_service_real_activation (SpitPluggable* base, gboolean enabled);
-static SpitPublishingPublisher* piwigo_service_real_create_publisher (SpitPublishingService* base, SpitPublishingPluginHost* host);
-PublishingPiwigoPiwigoPublisher* publishing_piwigo_piwigo_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host);
-PublishingPiwigoPiwigoPublisher* publishing_piwigo_piwigo_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host);
+static void piwigo_service_real_get_info (SpitPluggable* base,
+ SpitPluggableInfo* info);
+static GdkPixbuf** _vala_array_dup12 (GdkPixbuf** self,
+ int length);
+static void piwigo_service_real_activation (SpitPluggable* base,
+ gboolean enabled);
+static SpitPublishingPublisher* piwigo_service_real_create_publisher (SpitPublishingService* base,
+ SpitPublishingPluginHost* host);
+PublishingPiwigoPiwigoPublisher* publishing_piwigo_piwigo_publisher_new (SpitPublishingService* service,
+ SpitPublishingPluginHost* host);
+PublishingPiwigoPiwigoPublisher* publishing_piwigo_piwigo_publisher_construct (GType object_type,
+ SpitPublishingService* service,
+ SpitPublishingPluginHost* host);
GType publishing_piwigo_piwigo_publisher_get_type (void) G_GNUC_CONST;
static SpitPublishingPublisherMediaType piwigo_service_real_get_supported_media (SpitPublishingService* base);
static void piwigo_service_finalize (GObject * obj);
@@ -612,66 +658,94 @@ static void piwigo_service_finalize (GObject * obj);
#define PUBLISHING_PIWIGO_ORIGINAL_SIZE -1
gpointer publishing_piwigo_category_ref (gpointer instance);
void publishing_piwigo_category_unref (gpointer instance);
-GParamSpec* publishing_piwigo_param_spec_category (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void publishing_piwigo_value_set_category (GValue* value, gpointer v_object);
-void publishing_piwigo_value_take_category (GValue* value, gpointer v_object);
+GParamSpec* publishing_piwigo_param_spec_category (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void publishing_piwigo_value_set_category (GValue* value,
+ gpointer v_object);
+void publishing_piwigo_value_take_category (GValue* value,
+ gpointer v_object);
gpointer publishing_piwigo_value_get_category (const GValue* value);
GType publishing_piwigo_category_get_type (void) G_GNUC_CONST;
-enum {
- PUBLISHING_PIWIGO_CATEGORY_DUMMY_PROPERTY
-};
#define PUBLISHING_PIWIGO_CATEGORY_NO_ID -1
-PublishingPiwigoCategory* publishing_piwigo_category_new (gint id, const gchar* name, const gchar* uppercats, const gchar* comment);
-PublishingPiwigoCategory* publishing_piwigo_category_construct (GType object_type, gint id, const gchar* name, const gchar* uppercats, const gchar* comment);
-PublishingPiwigoCategory* publishing_piwigo_category_new_local (const gchar* name, gint parent_id, const gchar* comment);
-PublishingPiwigoCategory* publishing_piwigo_category_construct_local (GType object_type, const gchar* name, gint parent_id, const gchar* comment);
+PublishingPiwigoCategory* publishing_piwigo_category_new (gint id,
+ const gchar* name,
+ const gchar* uppercats,
+ const gchar* comment);
+PublishingPiwigoCategory* publishing_piwigo_category_construct (GType object_type,
+ gint id,
+ const gchar* name,
+ const gchar* uppercats,
+ const gchar* comment);
+PublishingPiwigoCategory* publishing_piwigo_category_new_local (const gchar* name,
+ gint parent_id,
+ const gchar* comment);
+PublishingPiwigoCategory* publishing_piwigo_category_construct_local (GType object_type,
+ const gchar* name,
+ gint parent_id,
+ const gchar* comment);
gboolean publishing_piwigo_category_is_local (PublishingPiwigoCategory* self);
-gboolean publishing_piwigo_category_equal (PublishingPiwigoCategory* _self_, PublishingPiwigoCategory* other);
+gboolean publishing_piwigo_category_equal (PublishingPiwigoCategory* _self_,
+ PublishingPiwigoCategory* other);
static void publishing_piwigo_category_finalize (PublishingPiwigoCategory * obj);
gpointer publishing_piwigo_permission_level_ref (gpointer instance);
void publishing_piwigo_permission_level_unref (gpointer instance);
-GParamSpec* publishing_piwigo_param_spec_permission_level (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void publishing_piwigo_value_set_permission_level (GValue* value, gpointer v_object);
-void publishing_piwigo_value_take_permission_level (GValue* value, gpointer v_object);
+GParamSpec* publishing_piwigo_param_spec_permission_level (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void publishing_piwigo_value_set_permission_level (GValue* value,
+ gpointer v_object);
+void publishing_piwigo_value_take_permission_level (GValue* value,
+ gpointer v_object);
gpointer publishing_piwigo_value_get_permission_level (const GValue* value);
GType publishing_piwigo_permission_level_get_type (void) G_GNUC_CONST;
-enum {
- PUBLISHING_PIWIGO_PERMISSION_LEVEL_DUMMY_PROPERTY
-};
-PublishingPiwigoPermissionLevel* publishing_piwigo_permission_level_new (gint id, const gchar* name);
-PublishingPiwigoPermissionLevel* publishing_piwigo_permission_level_construct (GType object_type, gint id, const gchar* name);
+PublishingPiwigoPermissionLevel* publishing_piwigo_permission_level_new (gint id,
+ const gchar* name);
+PublishingPiwigoPermissionLevel* publishing_piwigo_permission_level_construct (GType object_type,
+ gint id,
+ const gchar* name);
static void publishing_piwigo_permission_level_finalize (PublishingPiwigoPermissionLevel * obj);
gpointer publishing_piwigo_size_entry_ref (gpointer instance);
void publishing_piwigo_size_entry_unref (gpointer instance);
-GParamSpec* publishing_piwigo_param_spec_size_entry (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void publishing_piwigo_value_set_size_entry (GValue* value, gpointer v_object);
-void publishing_piwigo_value_take_size_entry (GValue* value, gpointer v_object);
+GParamSpec* publishing_piwigo_param_spec_size_entry (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void publishing_piwigo_value_set_size_entry (GValue* value,
+ gpointer v_object);
+void publishing_piwigo_value_take_size_entry (GValue* value,
+ gpointer v_object);
gpointer publishing_piwigo_value_get_size_entry (const GValue* value);
GType publishing_piwigo_size_entry_get_type (void) G_GNUC_CONST;
-enum {
- PUBLISHING_PIWIGO_SIZE_ENTRY_DUMMY_PROPERTY
-};
-PublishingPiwigoSizeEntry* publishing_piwigo_size_entry_new (gint id, const gchar* name);
-PublishingPiwigoSizeEntry* publishing_piwigo_size_entry_construct (GType object_type, gint id, const gchar* name);
+PublishingPiwigoSizeEntry* publishing_piwigo_size_entry_new (gint id,
+ const gchar* name);
+PublishingPiwigoSizeEntry* publishing_piwigo_size_entry_construct (GType object_type,
+ gint id,
+ const gchar* name);
static void publishing_piwigo_size_entry_finalize (PublishingPiwigoSizeEntry * obj);
gpointer publishing_piwigo_publishing_parameters_ref (gpointer instance);
void publishing_piwigo_publishing_parameters_unref (gpointer instance);
-GParamSpec* publishing_piwigo_param_spec_publishing_parameters (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void publishing_piwigo_value_set_publishing_parameters (GValue* value, gpointer v_object);
-void publishing_piwigo_value_take_publishing_parameters (GValue* value, gpointer v_object);
+GParamSpec* publishing_piwigo_param_spec_publishing_parameters (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void publishing_piwigo_value_set_publishing_parameters (GValue* value,
+ gpointer v_object);
+void publishing_piwigo_value_take_publishing_parameters (GValue* value,
+ gpointer v_object);
gpointer publishing_piwigo_value_get_publishing_parameters (const GValue* value);
GType publishing_piwigo_publishing_parameters_get_type (void) G_GNUC_CONST;
-enum {
- PUBLISHING_PIWIGO_PUBLISHING_PARAMETERS_DUMMY_PROPERTY
-};
PublishingPiwigoPublishingParameters* publishing_piwigo_publishing_parameters_new (void);
PublishingPiwigoPublishingParameters* publishing_piwigo_publishing_parameters_construct (GType object_type);
static void publishing_piwigo_publishing_parameters_finalize (PublishingPiwigoPublishingParameters * obj);
GType publishing_piwigo_session_get_type (void) G_GNUC_CONST;
#define PUBLISHING_PIWIGO_PIWIGO_PUBLISHER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_PIWIGO_TYPE_PIWIGO_PUBLISHER, PublishingPiwigoPiwigoPublisherPrivate))
-enum {
- PUBLISHING_PIWIGO_PIWIGO_PUBLISHER_DUMMY_PROPERTY
-};
PublishingPiwigoSession* publishing_piwigo_session_new (void);
PublishingPiwigoSession* publishing_piwigo_session_construct (GType object_type);
static SpitPublishingService* publishing_piwigo_piwigo_publisher_real_get_service (SpitPublishingPublisher* base);
@@ -682,286 +756,492 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_categories (PublishingPi
gchar* publishing_piwigo_piwigo_publisher_get_persistent_url (PublishingPiwigoPiwigoPublisher* self);
gchar* publishing_piwigo_piwigo_publisher_get_persistent_username (PublishingPiwigoPiwigoPublisher* self);
gchar* publishing_piwigo_piwigo_publisher_get_persistent_password (PublishingPiwigoPiwigoPublisher* self);
-static void publishing_piwigo_piwigo_publisher_do_network_login (PublishingPiwigoPiwigoPublisher* self, const gchar* url, const gchar* username, const gchar* password, gboolean remember_password);
+static void publishing_piwigo_piwigo_publisher_do_network_login (PublishingPiwigoPiwigoPublisher* self,
+ const gchar* url,
+ const gchar* username,
+ const gchar* password,
+ gboolean remember_password);
gboolean publishing_piwigo_piwigo_publisher_get_remember_password (PublishingPiwigoPiwigoPublisher* self);
GType publishing_piwigo_authentication_pane_mode_get_type (void) G_GNUC_CONST;
-static void publishing_piwigo_piwigo_publisher_do_show_authentication_pane (PublishingPiwigoPiwigoPublisher* self, PublishingPiwigoAuthenticationPaneMode mode);
+static void publishing_piwigo_piwigo_publisher_do_show_authentication_pane (PublishingPiwigoPiwigoPublisher* self,
+ PublishingPiwigoAuthenticationPaneMode mode);
static void publishing_piwigo_piwigo_publisher_real_stop (SpitPublishingPublisher* base);
-static void publishing_piwigo_piwigo_publisher_set_persistent_url (PublishingPiwigoPiwigoPublisher* self, const gchar* url);
-static void publishing_piwigo_piwigo_publisher_set_persistent_username (PublishingPiwigoPiwigoPublisher* self, const gchar* username);
-static void publishing_piwigo_piwigo_publisher_set_persistent_password (PublishingPiwigoPiwigoPublisher* self, const gchar* password);
-static void publishing_piwigo_piwigo_publisher_set_remember_password (PublishingPiwigoPiwigoPublisher* self, gboolean remember_password);
+static void publishing_piwigo_piwigo_publisher_set_persistent_url (PublishingPiwigoPiwigoPublisher* self,
+ const gchar* url);
+static void publishing_piwigo_piwigo_publisher_set_persistent_username (PublishingPiwigoPiwigoPublisher* self,
+ const gchar* username);
+static void publishing_piwigo_piwigo_publisher_set_persistent_password (PublishingPiwigoPiwigoPublisher* self,
+ const gchar* password);
+static void publishing_piwigo_piwigo_publisher_set_remember_password (PublishingPiwigoPiwigoPublisher* self,
+ gboolean remember_password);
gint publishing_piwigo_piwigo_publisher_get_last_category (PublishingPiwigoPiwigoPublisher* self);
-static void publishing_piwigo_piwigo_publisher_set_last_category (PublishingPiwigoPiwigoPublisher* self, gint last_category);
+static void publishing_piwigo_piwigo_publisher_set_last_category (PublishingPiwigoPiwigoPublisher* self,
+ gint last_category);
gint publishing_piwigo_piwigo_publisher_get_last_permission_level (PublishingPiwigoPiwigoPublisher* self);
-static void publishing_piwigo_piwigo_publisher_set_last_permission_level (PublishingPiwigoPiwigoPublisher* self, gint last_permission_level);
+static void publishing_piwigo_piwigo_publisher_set_last_permission_level (PublishingPiwigoPiwigoPublisher* self,
+ gint last_permission_level);
gint publishing_piwigo_piwigo_publisher_get_last_photo_size (PublishingPiwigoPiwigoPublisher* self);
-static void publishing_piwigo_piwigo_publisher_set_last_photo_size (PublishingPiwigoPiwigoPublisher* self, gint last_photo_size);
+static void publishing_piwigo_piwigo_publisher_set_last_photo_size (PublishingPiwigoPiwigoPublisher* self,
+ gint last_photo_size);
static gboolean publishing_piwigo_piwigo_publisher_get_last_title_as_comment (PublishingPiwigoPiwigoPublisher* self);
-static void publishing_piwigo_piwigo_publisher_set_last_title_as_comment (PublishingPiwigoPiwigoPublisher* self, gboolean title_as_comment);
+static void publishing_piwigo_piwigo_publisher_set_last_title_as_comment (PublishingPiwigoPiwigoPublisher* self,
+ gboolean title_as_comment);
static gboolean publishing_piwigo_piwigo_publisher_get_last_no_upload_tags (PublishingPiwigoPiwigoPublisher* self);
-static void publishing_piwigo_piwigo_publisher_set_last_no_upload_tags (PublishingPiwigoPiwigoPublisher* self, gboolean no_upload_tags);
+static void publishing_piwigo_piwigo_publisher_set_last_no_upload_tags (PublishingPiwigoPiwigoPublisher* self,
+ gboolean no_upload_tags);
static gboolean publishing_piwigo_piwigo_publisher_get_metadata_removal_choice (PublishingPiwigoPiwigoPublisher* self);
-static void publishing_piwigo_piwigo_publisher_set_metadata_removal_choice (PublishingPiwigoPiwigoPublisher* self, gboolean strip_metadata);
+static void publishing_piwigo_piwigo_publisher_set_metadata_removal_choice (PublishingPiwigoPiwigoPublisher* self,
+ gboolean strip_metadata);
GType publishing_piwigo_authentication_pane_get_type (void) G_GNUC_CONST;
-PublishingPiwigoAuthenticationPane* publishing_piwigo_authentication_pane_new (PublishingPiwigoPiwigoPublisher* publisher, PublishingPiwigoAuthenticationPaneMode mode);
-PublishingPiwigoAuthenticationPane* publishing_piwigo_authentication_pane_construct (GType object_type, PublishingPiwigoPiwigoPublisher* publisher, PublishingPiwigoAuthenticationPaneMode mode);
-static void publishing_piwigo_piwigo_publisher_on_authentication_pane_login_clicked (PublishingPiwigoPiwigoPublisher* self, const gchar* url, const gchar* username, const gchar* password, gboolean remember_password);
-static void _publishing_piwigo_piwigo_publisher_on_authentication_pane_login_clicked_publishing_piwigo_authentication_pane_login (PublishingPiwigoAuthenticationPane* _sender, const gchar* url, const gchar* user, const gchar* password, gboolean remember_password, gpointer self);
+PublishingPiwigoAuthenticationPane* publishing_piwigo_authentication_pane_new (PublishingPiwigoPiwigoPublisher* publisher,
+ PublishingPiwigoAuthenticationPaneMode mode);
+PublishingPiwigoAuthenticationPane* publishing_piwigo_authentication_pane_construct (GType object_type,
+ PublishingPiwigoPiwigoPublisher* publisher,
+ PublishingPiwigoAuthenticationPaneMode mode);
+static void publishing_piwigo_piwigo_publisher_on_authentication_pane_login_clicked (PublishingPiwigoPiwigoPublisher* self,
+ const gchar* url,
+ const gchar* username,
+ const gchar* password,
+ gboolean remember_password);
+static void _publishing_piwigo_piwigo_publisher_on_authentication_pane_login_clicked_publishing_piwigo_authentication_pane_login (PublishingPiwigoAuthenticationPane* _sender,
+ const gchar* url,
+ const gchar* user,
+ const gchar* password,
+ gboolean remember_password,
+ gpointer self);
GType publishing_piwigo_transaction_get_type (void) G_GNUC_CONST;
GType publishing_piwigo_session_login_transaction_get_type (void) G_GNUC_CONST;
-static void publishing_piwigo_piwigo_publisher_do_show_ssl_downgrade_pane (PublishingPiwigoPiwigoPublisher* self, PublishingPiwigoSessionLoginTransaction* trans, const gchar* url);
+static void publishing_piwigo_piwigo_publisher_do_show_ssl_downgrade_pane (PublishingPiwigoPiwigoPublisher* self,
+ PublishingPiwigoSessionLoginTransaction* trans,
+ const gchar* url);
GType publishing_piwigo_ssl_error_pane_get_type (void) G_GNUC_CONST;
-PublishingPiwigoSSLErrorPane* publishing_piwigo_ssl_error_pane_new (PublishingPiwigoSessionLoginTransaction* transaction, const gchar* host);
-PublishingPiwigoSSLErrorPane* publishing_piwigo_ssl_error_pane_construct (GType object_type, PublishingPiwigoSessionLoginTransaction* transaction, const gchar* host);
+PublishingPiwigoSSLErrorPane* publishing_piwigo_ssl_error_pane_new (PublishingPiwigoSessionLoginTransaction* transaction,
+ const gchar* host);
+PublishingPiwigoSSLErrorPane* publishing_piwigo_ssl_error_pane_construct (GType object_type,
+ PublishingPiwigoSessionLoginTransaction* transaction,
+ const gchar* host);
static void __lambda7_ (PublishingPiwigoPiwigoPublisher* self);
-static void ___lambda7__publishing_piwigo_ssl_error_pane_proceed (PublishingPiwigoSSLErrorPane* _sender, gpointer self);
+static void ___lambda7__publishing_piwigo_ssl_error_pane_proceed (PublishingPiwigoSSLErrorPane* _sender,
+ gpointer self);
static void _vala_SoupURI_free (SoupURI* self);
gchar* publishing_piwigo_piwigo_publisher_normalise_url (const gchar* url);
-PublishingPiwigoSessionLoginTransaction* publishing_piwigo_session_login_transaction_new (PublishingPiwigoSession* session, const gchar* url, const gchar* username, const gchar* password);
-PublishingPiwigoSessionLoginTransaction* publishing_piwigo_session_login_transaction_construct (GType object_type, PublishingPiwigoSession* session, const gchar* url, const gchar* username, const gchar* password);
-static void publishing_piwigo_piwigo_publisher_on_login_network_error (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err);
-static void _publishing_piwigo_piwigo_publisher_on_login_network_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self);
-static void publishing_piwigo_piwigo_publisher_on_login_network_complete (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* txn);
-static void _publishing_piwigo_piwigo_publisher_on_login_network_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
-static void publishing_piwigo_piwigo_publisher_do_show_error (PublishingPiwigoPiwigoPublisher* self, GError* e);
+PublishingPiwigoSessionLoginTransaction* publishing_piwigo_session_login_transaction_new (PublishingPiwigoSession* session,
+ const gchar* url,
+ const gchar* username,
+ const gchar* password);
+PublishingPiwigoSessionLoginTransaction* publishing_piwigo_session_login_transaction_construct (GType object_type,
+ PublishingPiwigoSession* session,
+ const gchar* url,
+ const gchar* username,
+ const gchar* password);
+static void publishing_piwigo_piwigo_publisher_on_login_network_error (PublishingPiwigoPiwigoPublisher* self,
+ PublishingRESTSupportTransaction* bad_txn,
+ GError* err);
+static void _publishing_piwigo_piwigo_publisher_on_login_network_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+ GError* err,
+ gpointer self);
+static void publishing_piwigo_piwigo_publisher_on_login_network_complete (PublishingPiwigoPiwigoPublisher* self,
+ PublishingRESTSupportTransaction* txn);
+static void _publishing_piwigo_piwigo_publisher_on_login_network_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+ gpointer self);
+static void publishing_piwigo_piwigo_publisher_do_show_error (PublishingPiwigoPiwigoPublisher* self,
+ GError* e);
gchar* publishing_piwigo_transaction_validate_xml (PublishingRESTSupportXmlDocument* doc);
-static gchar* _publishing_piwigo_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response (PublishingRESTSupportXmlDocument* doc, gpointer self);
+static gchar* _publishing_piwigo_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response (PublishingRESTSupportXmlDocument* doc,
+ gpointer self);
gchar* publishing_piwigo_transaction_get_error_code (PublishingRESTSupportXmlDocument* doc);
-static gchar* _publishing_piwigo_transaction_get_error_code_publishing_rest_support_xml_document_check_for_error_response (PublishingRESTSupportXmlDocument* doc, gpointer self);
-static gchar* publishing_piwigo_piwigo_publisher_get_pwg_id_from_transaction (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* txn);
-void publishing_piwigo_session_set_pwg_id (PublishingPiwigoSession* self, const gchar* id);
-static void publishing_piwigo_piwigo_publisher_do_fetch_session_status (PublishingPiwigoPiwigoPublisher* self, const gchar* url, const gchar* pwg_id);
+static gchar* _publishing_piwigo_transaction_get_error_code_publishing_rest_support_xml_document_check_for_error_response (PublishingRESTSupportXmlDocument* doc,
+ gpointer self);
+static gchar* publishing_piwigo_piwigo_publisher_get_pwg_id_from_transaction (PublishingPiwigoPiwigoPublisher* self,
+ PublishingRESTSupportTransaction* txn);
+void publishing_piwigo_session_set_pwg_id (PublishingPiwigoSession* self,
+ const gchar* id);
+static void publishing_piwigo_piwigo_publisher_do_fetch_session_status (PublishingPiwigoPiwigoPublisher* self,
+ const gchar* url,
+ const gchar* pwg_id);
GType publishing_piwigo_session_get_status_transaction_get_type (void) G_GNUC_CONST;
-PublishingPiwigoSessionGetStatusTransaction* publishing_piwigo_session_get_status_transaction_new_unauthenticated (PublishingPiwigoSession* session, const gchar* url, const gchar* pwg_id);
-PublishingPiwigoSessionGetStatusTransaction* publishing_piwigo_session_get_status_transaction_construct_unauthenticated (GType object_type, PublishingPiwigoSession* session, const gchar* url, const gchar* pwg_id);
-static void publishing_piwigo_piwigo_publisher_on_session_get_status_error (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err);
-static void _publishing_piwigo_piwigo_publisher_on_session_get_status_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self);
-static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* txn);
-static void _publishing_piwigo_piwigo_publisher_on_session_get_status_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
+PublishingPiwigoSessionGetStatusTransaction* publishing_piwigo_session_get_status_transaction_new_unauthenticated (PublishingPiwigoSession* session,
+ const gchar* url,
+ const gchar* pwg_id);
+PublishingPiwigoSessionGetStatusTransaction* publishing_piwigo_session_get_status_transaction_construct_unauthenticated (GType object_type,
+ PublishingPiwigoSession* session,
+ const gchar* url,
+ const gchar* pwg_id);
+static void publishing_piwigo_piwigo_publisher_on_session_get_status_error (PublishingPiwigoPiwigoPublisher* self,
+ PublishingRESTSupportTransaction* bad_txn,
+ GError* err);
+static void _publishing_piwigo_piwigo_publisher_on_session_get_status_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+ GError* err,
+ gpointer self);
+static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (PublishingPiwigoPiwigoPublisher* self,
+ PublishingRESTSupportTransaction* txn);
+static void _publishing_piwigo_piwigo_publisher_on_session_get_status_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+ gpointer self);
PublishingPiwigoSessionGetStatusTransaction* publishing_piwigo_session_get_status_transaction_new (PublishingPiwigoSession* session);
-PublishingPiwigoSessionGetStatusTransaction* publishing_piwigo_session_get_status_transaction_construct (GType object_type, PublishingPiwigoSession* session);
+PublishingPiwigoSessionGetStatusTransaction* publishing_piwigo_session_get_status_transaction_construct (GType object_type,
+ PublishingPiwigoSession* session);
gchar* publishing_piwigo_session_get_pwg_id (PublishingPiwigoSession* self);
-void publishing_piwigo_session_authenticate (PublishingPiwigoSession* self, const gchar* url, const gchar* username, const gchar* id);
+void publishing_piwigo_session_authenticate (PublishingPiwigoSession* self,
+ const gchar* url,
+ const gchar* username,
+ const gchar* id);
gchar* publishing_piwigo_session_get_pwg_url (PublishingPiwigoSession* self);
gchar* publishing_piwigo_session_get_username (PublishingPiwigoSession* self);
-static void publishing_piwigo_piwigo_publisher_on_network_error (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err);
+static void publishing_piwigo_piwigo_publisher_on_network_error (PublishingPiwigoPiwigoPublisher* self,
+ PublishingRESTSupportTransaction* bad_txn,
+ GError* err);
GType publishing_piwigo_categories_get_list_transaction_get_type (void) G_GNUC_CONST;
PublishingPiwigoCategoriesGetListTransaction* publishing_piwigo_categories_get_list_transaction_new (PublishingPiwigoSession* session);
-PublishingPiwigoCategoriesGetListTransaction* publishing_piwigo_categories_get_list_transaction_construct (GType object_type, PublishingPiwigoSession* session);
-static void publishing_piwigo_piwigo_publisher_on_category_fetch_error (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err);
-static void _publishing_piwigo_piwigo_publisher_on_category_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self);
-static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* txn);
-static void _publishing_piwigo_piwigo_publisher_on_category_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
-static void _vala_array_add38 (PublishingPiwigoCategory** * array, int* length, int* size, PublishingPiwigoCategory* value);
+PublishingPiwigoCategoriesGetListTransaction* publishing_piwigo_categories_get_list_transaction_construct (GType object_type,
+ PublishingPiwigoSession* session);
+static void publishing_piwigo_piwigo_publisher_on_category_fetch_error (PublishingPiwigoPiwigoPublisher* self,
+ PublishingRESTSupportTransaction* bad_txn,
+ GError* err);
+static void _publishing_piwigo_piwigo_publisher_on_category_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+ GError* err,
+ gpointer self);
+static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (PublishingPiwigoPiwigoPublisher* self,
+ PublishingRESTSupportTransaction* txn);
+static void _publishing_piwigo_piwigo_publisher_on_category_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+ gpointer self);
+static void _vala_array_add38 (PublishingPiwigoCategory** * array,
+ int* length,
+ int* size,
+ PublishingPiwigoCategory* value);
static void publishing_piwigo_piwigo_publisher_do_show_publishing_options_pane (PublishingPiwigoPiwigoPublisher* self);
GType publishing_piwigo_publishing_options_pane_get_type (void) G_GNUC_CONST;
-PublishingPiwigoPublishingOptionsPane* publishing_piwigo_publishing_options_pane_new (PublishingPiwigoPiwigoPublisher* publisher, PublishingPiwigoCategory** categories, int categories_length1, gint last_category, gint last_permission_level, gint last_photo_size, gboolean last_title_as_comment, gboolean last_no_upload_tags, gboolean strip_metadata_enabled);
-PublishingPiwigoPublishingOptionsPane* publishing_piwigo_publishing_options_pane_construct (GType object_type, PublishingPiwigoPiwigoPublisher* publisher, PublishingPiwigoCategory** categories, int categories_length1, gint last_category, gint last_permission_level, gint last_photo_size, gboolean last_title_as_comment, gboolean last_no_upload_tags, gboolean strip_metadata_enabled);
+PublishingPiwigoPublishingOptionsPane* publishing_piwigo_publishing_options_pane_new (PublishingPiwigoPiwigoPublisher* publisher,
+ PublishingPiwigoCategory** categories,
+ int categories_length1,
+ gint last_category,
+ gint last_permission_level,
+ gint last_photo_size,
+ gboolean last_title_as_comment,
+ gboolean last_no_upload_tags,
+ gboolean strip_metadata_enabled);
+PublishingPiwigoPublishingOptionsPane* publishing_piwigo_publishing_options_pane_construct (GType object_type,
+ PublishingPiwigoPiwigoPublisher* publisher,
+ PublishingPiwigoCategory** categories,
+ int categories_length1,
+ gint last_category,
+ gint last_permission_level,
+ gint last_photo_size,
+ gboolean last_title_as_comment,
+ gboolean last_no_upload_tags,
+ gboolean strip_metadata_enabled);
static void publishing_piwigo_piwigo_publisher_on_publishing_options_pane_logout_clicked (PublishingPiwigoPiwigoPublisher* self);
-static void _publishing_piwigo_piwigo_publisher_on_publishing_options_pane_logout_clicked_publishing_piwigo_publishing_options_pane_logout (PublishingPiwigoPublishingOptionsPane* _sender, gpointer self);
-static void publishing_piwigo_piwigo_publisher_on_publishing_options_pane_publish_clicked (PublishingPiwigoPiwigoPublisher* self, PublishingPiwigoPublishingParameters* parameters, gboolean strip_metadata);
-static void _publishing_piwigo_piwigo_publisher_on_publishing_options_pane_publish_clicked_publishing_piwigo_publishing_options_pane_publish (PublishingPiwigoPublishingOptionsPane* _sender, PublishingPiwigoPublishingParameters* parameters, gboolean strip_metadata, gpointer self);
+static void _publishing_piwigo_piwigo_publisher_on_publishing_options_pane_logout_clicked_publishing_piwigo_publishing_options_pane_logout (PublishingPiwigoPublishingOptionsPane* _sender,
+ gpointer self);
+static void publishing_piwigo_piwigo_publisher_on_publishing_options_pane_publish_clicked (PublishingPiwigoPiwigoPublisher* self,
+ PublishingPiwigoPublishingParameters* parameters,
+ gboolean strip_metadata);
+static void _publishing_piwigo_piwigo_publisher_on_publishing_options_pane_publish_clicked_publishing_piwigo_publishing_options_pane_publish (PublishingPiwigoPublishingOptionsPane* _sender,
+ PublishingPiwigoPublishingParameters* parameters,
+ gboolean strip_metadata,
+ gpointer self);
GType publishing_piwigo_session_logout_transaction_get_type (void) G_GNUC_CONST;
PublishingPiwigoSessionLogoutTransaction* publishing_piwigo_session_logout_transaction_new (PublishingPiwigoSession* session);
-PublishingPiwigoSessionLogoutTransaction* publishing_piwigo_session_logout_transaction_construct (GType object_type, PublishingPiwigoSession* session);
-static void publishing_piwigo_piwigo_publisher_on_logout_network_error (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err);
-static void _publishing_piwigo_piwigo_publisher_on_logout_network_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self);
-static void publishing_piwigo_piwigo_publisher_on_logout_network_complete (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* txn);
-static void _publishing_piwigo_piwigo_publisher_on_logout_network_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
+PublishingPiwigoSessionLogoutTransaction* publishing_piwigo_session_logout_transaction_construct (GType object_type,
+ PublishingPiwigoSession* session);
+static void publishing_piwigo_piwigo_publisher_on_logout_network_error (PublishingPiwigoPiwigoPublisher* self,
+ PublishingRESTSupportTransaction* bad_txn,
+ GError* err);
+static void _publishing_piwigo_piwigo_publisher_on_logout_network_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+ GError* err,
+ gpointer self);
+static void publishing_piwigo_piwigo_publisher_on_logout_network_complete (PublishingPiwigoPiwigoPublisher* self,
+ PublishingRESTSupportTransaction* txn);
+static void _publishing_piwigo_piwigo_publisher_on_logout_network_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+ gpointer self);
void publishing_piwigo_session_deauthenticate (PublishingPiwigoSession* self);
-static void publishing_piwigo_piwigo_publisher_do_create_category (PublishingPiwigoPiwigoPublisher* self, PublishingPiwigoCategory* category);
-static void publishing_piwigo_piwigo_publisher_do_upload (PublishingPiwigoPiwigoPublisher* self, gboolean strip_metadata);
+static void publishing_piwigo_piwigo_publisher_do_create_category (PublishingPiwigoPiwigoPublisher* self,
+ PublishingPiwigoCategory* category);
+static void publishing_piwigo_piwigo_publisher_do_upload (PublishingPiwigoPiwigoPublisher* self,
+ gboolean strip_metadata);
GType publishing_piwigo_categories_add_transaction_get_type (void) G_GNUC_CONST;
-PublishingPiwigoCategoriesAddTransaction* publishing_piwigo_categories_add_transaction_new (PublishingPiwigoSession* session, const gchar* category, gint parent_id, const gchar* comment);
-PublishingPiwigoCategoriesAddTransaction* publishing_piwigo_categories_add_transaction_construct (GType object_type, PublishingPiwigoSession* session, const gchar* category, gint parent_id, const gchar* comment);
-static void publishing_piwigo_piwigo_publisher_on_category_add_error (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err);
-static void _publishing_piwigo_piwigo_publisher_on_category_add_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self);
-static void publishing_piwigo_piwigo_publisher_on_category_add_complete (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* txn);
-static void _publishing_piwigo_piwigo_publisher_on_category_add_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
+PublishingPiwigoCategoriesAddTransaction* publishing_piwigo_categories_add_transaction_new (PublishingPiwigoSession* session,
+ const gchar* category,
+ gint parent_id,
+ const gchar* comment);
+PublishingPiwigoCategoriesAddTransaction* publishing_piwigo_categories_add_transaction_construct (GType object_type,
+ PublishingPiwigoSession* session,
+ const gchar* category,
+ gint parent_id,
+ const gchar* comment);
+static void publishing_piwigo_piwigo_publisher_on_category_add_error (PublishingPiwigoPiwigoPublisher* self,
+ PublishingRESTSupportTransaction* bad_txn,
+ GError* err);
+static void _publishing_piwigo_piwigo_publisher_on_category_add_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+ GError* err,
+ gpointer self);
+static void publishing_piwigo_piwigo_publisher_on_category_add_complete (PublishingPiwigoPiwigoPublisher* self,
+ PublishingRESTSupportTransaction* txn);
+static void _publishing_piwigo_piwigo_publisher_on_category_add_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+ gpointer self);
GType publishing_piwigo_uploader_get_type (void) G_GNUC_CONST;
-PublishingPiwigoUploader* publishing_piwigo_uploader_new (PublishingPiwigoSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingPiwigoPublishingParameters* parameters);
-PublishingPiwigoUploader* publishing_piwigo_uploader_construct (GType object_type, PublishingPiwigoSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingPiwigoPublishingParameters* parameters);
-static void publishing_piwigo_piwigo_publisher_on_upload_complete (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportBatchUploader* uploader, gint num_published);
-static void _publishing_piwigo_piwigo_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender, gint num_photos_published, gpointer self);
-static void publishing_piwigo_piwigo_publisher_on_upload_error (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportBatchUploader* uploader, GError* err);
-static void _publishing_piwigo_piwigo_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender, GError* err, gpointer self);
-static void publishing_piwigo_piwigo_publisher_on_upload_status_updated (PublishingPiwigoPiwigoPublisher* self, gint file_number, gdouble completed_fraction);
-static void _publishing_piwigo_piwigo_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self);
+PublishingPiwigoUploader* publishing_piwigo_uploader_new (PublishingPiwigoSession* session,
+ SpitPublishingPublishable** publishables,
+ int publishables_length1,
+ PublishingPiwigoPublishingParameters* parameters);
+PublishingPiwigoUploader* publishing_piwigo_uploader_construct (GType object_type,
+ PublishingPiwigoSession* session,
+ SpitPublishingPublishable** publishables,
+ int publishables_length1,
+ PublishingPiwigoPublishingParameters* parameters);
+static void publishing_piwigo_piwigo_publisher_on_upload_complete (PublishingPiwigoPiwigoPublisher* self,
+ PublishingRESTSupportBatchUploader* uploader,
+ gint num_published);
+static void _publishing_piwigo_piwigo_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender,
+ gint num_photos_published,
+ gpointer self);
+static void publishing_piwigo_piwigo_publisher_on_upload_error (PublishingPiwigoPiwigoPublisher* self,
+ PublishingRESTSupportBatchUploader* uploader,
+ GError* err);
+static void _publishing_piwigo_piwigo_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender,
+ GError* err,
+ gpointer self);
+static void publishing_piwigo_piwigo_publisher_on_upload_status_updated (PublishingPiwigoPiwigoPublisher* self,
+ gint file_number,
+ gdouble completed_fraction);
+static void _publishing_piwigo_piwigo_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number,
+ gdouble fraction_complete,
+ gpointer self);
static void publishing_piwigo_piwigo_publisher_do_show_success_pane (PublishingPiwigoPiwigoPublisher* self);
-static void publishing_piwigo_piwigo_publisher_do_show_error_message (PublishingPiwigoPiwigoPublisher* self, const gchar* message);
+static void publishing_piwigo_piwigo_publisher_do_show_error_message (PublishingPiwigoPiwigoPublisher* self,
+ const gchar* message);
static SoupCookie* _vala_SoupCookie_copy (SoupCookie* self);
static void _vala_SoupCookie_free (SoupCookie* self);
static void __vala_SoupCookie_free0_ (gpointer var);
-static void _g_slist_free___vala_SoupCookie_free0_ (GSList* self);
+static inline void _g_slist_free___vala_SoupCookie_free0_ (GSList* self);
static void publishing_piwigo_piwigo_publisher_finalize (GObject * obj);
#define PUBLISHING_PIWIGO_UPLOADER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_PIWIGO_TYPE_UPLOADER, PublishingPiwigoUploaderPrivate))
-enum {
- PUBLISHING_PIWIGO_UPLOADER_DUMMY_PROPERTY
-};
-static PublishingRESTSupportTransaction* publishing_piwigo_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base, SpitPublishingPublishable* publishable);
-PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_new (PublishingPiwigoSession* session, PublishingPiwigoPublishingParameters* parameters, SpitPublishingPublishable* publishable);
-PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_construct (GType object_type, PublishingPiwigoSession* session, PublishingPiwigoPublishingParameters* parameters, SpitPublishingPublishable* publishable);
+static PublishingRESTSupportTransaction* publishing_piwigo_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base,
+ SpitPublishingPublishable* publishable);
+PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_new (PublishingPiwigoSession* session,
+ PublishingPiwigoPublishingParameters* parameters,
+ SpitPublishingPublishable* publishable);
+PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_construct (GType object_type,
+ PublishingPiwigoSession* session,
+ PublishingPiwigoPublishingParameters* parameters,
+ SpitPublishingPublishable* publishable);
GType publishing_piwigo_images_add_transaction_get_type (void) G_GNUC_CONST;
static void publishing_piwigo_uploader_finalize (PublishingRESTSupportBatchUploader * obj);
#define PUBLISHING_PIWIGO_SSL_ERROR_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_PIWIGO_TYPE_SSL_ERROR_PANE, PublishingPiwigoSSLErrorPanePrivate))
-enum {
- PUBLISHING_PIWIGO_SSL_ERROR_PANE_DUMMY_PROPERTY,
- PUBLISHING_PIWIGO_SSL_ERROR_PANE_HOST_PROPERTY,
- PUBLISHING_PIWIGO_SSL_ERROR_PANE_CERT_PROPERTY,
- PUBLISHING_PIWIGO_SSL_ERROR_PANE_ERROR_TEXT_PROPERTY
-};
static void publishing_piwigo_ssl_error_pane_real_constructed (GObject* base);
gchar* publishing_piwigo_ssl_error_pane_get_host (PublishingPiwigoSSLErrorPane* self);
gchar* publishing_piwigo_ssl_error_pane_get_error_text (PublishingPiwigoSSLErrorPane* self);
static void __lambda5_ (PublishingPiwigoSSLErrorPane* self);
static GTlsCertificate* publishing_piwigo_ssl_error_pane_get_cert (PublishingPiwigoSSLErrorPane* self);
-static void ___lambda5__gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void ___lambda5__gtk_button_clicked (GtkButton* _sender,
+ gpointer self);
static void __lambda6_ (PublishingPiwigoSSLErrorPane* self);
-static void ___lambda6__gtk_button_clicked (GtkButton* _sender, gpointer self);
-static void publishing_piwigo_ssl_error_pane_set_host (PublishingPiwigoSSLErrorPane* self, const gchar* value);
-static void publishing_piwigo_ssl_error_pane_set_cert (PublishingPiwigoSSLErrorPane* self, GTlsCertificate* value);
-static void publishing_piwigo_ssl_error_pane_set_error_text (PublishingPiwigoSSLErrorPane* self, const gchar* value);
+static void ___lambda6__gtk_button_clicked (GtkButton* _sender,
+ gpointer self);
+static void publishing_piwigo_ssl_error_pane_set_host (PublishingPiwigoSSLErrorPane* self,
+ const gchar* value);
+static void publishing_piwigo_ssl_error_pane_set_cert (PublishingPiwigoSSLErrorPane* self,
+ GTlsCertificate* value);
+static void publishing_piwigo_ssl_error_pane_set_error_text (PublishingPiwigoSSLErrorPane* self,
+ const gchar* value);
static void publishing_piwigo_ssl_error_pane_finalize (GObject * obj);
-static void _vala_publishing_piwigo_ssl_error_pane_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
-static void _vala_publishing_piwigo_ssl_error_pane_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec);
+static void _vala_publishing_piwigo_ssl_error_pane_get_property (GObject * object,
+ guint property_id,
+ GValue * value,
+ GParamSpec * pspec);
+static void _vala_publishing_piwigo_ssl_error_pane_set_property (GObject * object,
+ guint property_id,
+ const GValue * value,
+ GParamSpec * pspec);
#define PUBLISHING_PIWIGO_AUTHENTICATION_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_PIWIGO_TYPE_AUTHENTICATION_PANE, PublishingPiwigoAuthenticationPanePrivate))
-enum {
- PUBLISHING_PIWIGO_AUTHENTICATION_PANE_DUMMY_PROPERTY,
- PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_PROPERTY,
- PUBLISHING_PIWIGO_AUTHENTICATION_PANE_PUBLISHER_PROPERTY
-};
static void publishing_piwigo_authentication_pane_real_constructed (GObject* base);
PublishingPiwigoAuthenticationPaneMode publishing_piwigo_authentication_pane_get_mode (PublishingPiwigoAuthenticationPane* self);
PublishingPiwigoPiwigoPublisher* publishing_piwigo_authentication_pane_get_publisher (PublishingPiwigoAuthenticationPane* self);
static void publishing_piwigo_authentication_pane_on_user_changed (PublishingPiwigoAuthenticationPane* self);
-static void _publishing_piwigo_authentication_pane_on_user_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self);
+static void _publishing_piwigo_authentication_pane_on_user_changed_gtk_editable_changed (GtkEditable* _sender,
+ gpointer self);
static void publishing_piwigo_authentication_pane_on_url_changed (PublishingPiwigoAuthenticationPane* self);
-static void _publishing_piwigo_authentication_pane_on_url_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self);
+static void _publishing_piwigo_authentication_pane_on_url_changed_gtk_editable_changed (GtkEditable* _sender,
+ gpointer self);
static void publishing_piwigo_authentication_pane_on_password_changed (PublishingPiwigoAuthenticationPane* self);
-static void _publishing_piwigo_authentication_pane_on_password_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self);
+static void _publishing_piwigo_authentication_pane_on_password_changed_gtk_editable_changed (GtkEditable* _sender,
+ gpointer self);
static void publishing_piwigo_authentication_pane_on_login_button_clicked (PublishingPiwigoAuthenticationPane* self);
-static void _publishing_piwigo_authentication_pane_on_login_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void _publishing_piwigo_authentication_pane_on_login_button_clicked_gtk_button_clicked (GtkButton* _sender,
+ gpointer self);
static void publishing_piwigo_authentication_pane_update_login_button_sensitivity (PublishingPiwigoAuthenticationPane* self);
static void publishing_piwigo_authentication_pane_real_on_pane_installed (ShotwellPluginsCommonBuilderPane* base);
-static void publishing_piwigo_authentication_pane_set_mode (PublishingPiwigoAuthenticationPane* self, PublishingPiwigoAuthenticationPaneMode value);
-static void publishing_piwigo_authentication_pane_set_publisher (PublishingPiwigoAuthenticationPane* self, PublishingPiwigoPiwigoPublisher* value);
-static void g_cclosure_user_marshal_VOID__STRING_STRING_STRING_BOOLEAN (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
+static void publishing_piwigo_authentication_pane_set_mode (PublishingPiwigoAuthenticationPane* self,
+ PublishingPiwigoAuthenticationPaneMode value);
+static void publishing_piwigo_authentication_pane_set_publisher (PublishingPiwigoAuthenticationPane* self,
+ PublishingPiwigoPiwigoPublisher* value);
+static void g_cclosure_user_marshal_VOID__STRING_STRING_STRING_BOOLEAN (GClosure * closure,
+ GValue * return_value,
+ guint n_param_values,
+ const GValue * param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data);
static void publishing_piwigo_authentication_pane_finalize (GObject * obj);
-static void _vala_publishing_piwigo_authentication_pane_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
-static void _vala_publishing_piwigo_authentication_pane_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec);
+static void _vala_publishing_piwigo_authentication_pane_get_property (GObject * object,
+ guint property_id,
+ GValue * value,
+ GParamSpec * pspec);
+static void _vala_publishing_piwigo_authentication_pane_set_property (GObject * object,
+ guint property_id,
+ const GValue * value,
+ GParamSpec * pspec);
#define PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_PIWIGO_TYPE_PUBLISHING_OPTIONS_PANE, PublishingPiwigoPublishingOptionsPanePrivate))
-enum {
- PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_DUMMY_PROPERTY,
- PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_CATEGORY_PROPERTY,
- PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_PERMISSION_LEVEL_PROPERTY,
- PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_PHOTO_SIZE_PROPERTY,
- PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_TITLE_AS_COMMENT_PROPERTY,
- PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_NO_UPLOAD_TAGS_PROPERTY,
- PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_STRIP_METADATA_ENABLED_PROPERTY,
- PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_EXISTING_CATEGORIES_PROPERTY,
- PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_DEFAULT_COMMENT_PROPERTY
-};
-static PublishingPiwigoCategory** _vala_array_dup13 (PublishingPiwigoCategory** self, int length);
-static gboolean _publishing_piwigo_category_equal_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self);
+static PublishingPiwigoCategory** _vala_array_dup13 (PublishingPiwigoCategory** self,
+ int length);
+static gboolean _publishing_piwigo_category_equal_gee_equal_data_func (gconstpointer a,
+ gconstpointer b,
+ gpointer self);
static gchar* publishing_piwigo_publishing_options_pane_get_common_comment_if_possible (PublishingPiwigoPiwigoPublisher* publisher);
static void publishing_piwigo_publishing_options_pane_real_constructed (GObject* base);
static gboolean publishing_piwigo_publishing_options_pane_get_strip_metadata_enabled (PublishingPiwigoPublishingOptionsPane* self);
static gboolean publishing_piwigo_publishing_options_pane_get_last_title_as_comment (PublishingPiwigoPublishingOptionsPane* self);
static gboolean publishing_piwigo_publishing_options_pane_get_last_no_upload_tags (PublishingPiwigoPublishingOptionsPane* self);
static void publishing_piwigo_publishing_options_pane_on_logout_button_clicked (PublishingPiwigoPublishingOptionsPane* self);
-static void _publishing_piwigo_publishing_options_pane_on_logout_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void _publishing_piwigo_publishing_options_pane_on_logout_button_clicked_gtk_button_clicked (GtkButton* _sender,
+ gpointer self);
static void publishing_piwigo_publishing_options_pane_on_publish_button_clicked (PublishingPiwigoPublishingOptionsPane* self);
-static void _publishing_piwigo_publishing_options_pane_on_publish_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void _publishing_piwigo_publishing_options_pane_on_publish_button_clicked_gtk_button_clicked (GtkButton* _sender,
+ gpointer self);
static void publishing_piwigo_publishing_options_pane_on_use_existing_radio_clicked (PublishingPiwigoPublishingOptionsPane* self);
-static void _publishing_piwigo_publishing_options_pane_on_use_existing_radio_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void _publishing_piwigo_publishing_options_pane_on_use_existing_radio_clicked_gtk_button_clicked (GtkButton* _sender,
+ gpointer self);
static void publishing_piwigo_publishing_options_pane_on_create_new_radio_clicked (PublishingPiwigoPublishingOptionsPane* self);
-static void _publishing_piwigo_publishing_options_pane_on_create_new_radio_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void _publishing_piwigo_publishing_options_pane_on_create_new_radio_clicked_gtk_button_clicked (GtkButton* _sender,
+ gpointer self);
static void publishing_piwigo_publishing_options_pane_on_new_category_entry_changed (PublishingPiwigoPublishingOptionsPane* self);
-static void _publishing_piwigo_publishing_options_pane_on_new_category_entry_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self);
+static void _publishing_piwigo_publishing_options_pane_on_new_category_entry_changed_gtk_editable_changed (GtkEditable* _sender,
+ gpointer self);
static void publishing_piwigo_publishing_options_pane_on_existing_combo_changed (PublishingPiwigoPublishingOptionsPane* self);
-static void _publishing_piwigo_publishing_options_pane_on_existing_combo_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
-static PublishingPiwigoPermissionLevel** publishing_piwigo_publishing_options_pane_create_perm_levels (PublishingPiwigoPublishingOptionsPane* self, int* result_length1);
-static PublishingPiwigoSizeEntry** publishing_piwigo_publishing_options_pane_create_sizes (PublishingPiwigoPublishingOptionsPane* self, int* result_length1);
+static void _publishing_piwigo_publishing_options_pane_on_existing_combo_changed_gtk_combo_box_changed (GtkComboBox* _sender,
+ gpointer self);
+static PublishingPiwigoPermissionLevel** publishing_piwigo_publishing_options_pane_create_perm_levels (PublishingPiwigoPublishingOptionsPane* self,
+ int* result_length1);
+static PublishingPiwigoSizeEntry** publishing_piwigo_publishing_options_pane_create_sizes (PublishingPiwigoPublishingOptionsPane* self,
+ int* result_length1);
static const gchar* publishing_piwigo_publishing_options_pane_get_default_comment (PublishingPiwigoPublishingOptionsPane* self);
-static void _vala_array_add39 (PublishingPiwigoPermissionLevel** * array, int* length, int* size, PublishingPiwigoPermissionLevel* value);
-static void _vala_array_add40 (PublishingPiwigoPermissionLevel** * array, int* length, int* size, PublishingPiwigoPermissionLevel* value);
-static void _vala_array_add41 (PublishingPiwigoPermissionLevel** * array, int* length, int* size, PublishingPiwigoPermissionLevel* value);
-static void _vala_array_add42 (PublishingPiwigoPermissionLevel** * array, int* length, int* size, PublishingPiwigoPermissionLevel* value);
-static void _vala_array_add43 (PublishingPiwigoPermissionLevel** * array, int* length, int* size, PublishingPiwigoPermissionLevel* value);
-static void _vala_array_add44 (PublishingPiwigoSizeEntry** * array, int* length, int* size, PublishingPiwigoSizeEntry* value);
-static void _vala_array_add45 (PublishingPiwigoSizeEntry** * array, int* length, int* size, PublishingPiwigoSizeEntry* value);
-static void _vala_array_add46 (PublishingPiwigoSizeEntry** * array, int* length, int* size, PublishingPiwigoSizeEntry* value);
-static void _vala_array_add47 (PublishingPiwigoSizeEntry** * array, int* length, int* size, PublishingPiwigoSizeEntry* value);
-static void _vala_array_add48 (PublishingPiwigoSizeEntry** * array, int* length, int* size, PublishingPiwigoSizeEntry* value);
+static void _vala_array_add39 (PublishingPiwigoPermissionLevel** * array,
+ int* length,
+ int* size,
+ PublishingPiwigoPermissionLevel* value);
+static void _vala_array_add40 (PublishingPiwigoPermissionLevel** * array,
+ int* length,
+ int* size,
+ PublishingPiwigoPermissionLevel* value);
+static void _vala_array_add41 (PublishingPiwigoPermissionLevel** * array,
+ int* length,
+ int* size,
+ PublishingPiwigoPermissionLevel* value);
+static void _vala_array_add42 (PublishingPiwigoPermissionLevel** * array,
+ int* length,
+ int* size,
+ PublishingPiwigoPermissionLevel* value);
+static void _vala_array_add43 (PublishingPiwigoPermissionLevel** * array,
+ int* length,
+ int* size,
+ PublishingPiwigoPermissionLevel* value);
+static void _vala_array_add44 (PublishingPiwigoSizeEntry** * array,
+ int* length,
+ int* size,
+ PublishingPiwigoSizeEntry* value);
+static void _vala_array_add45 (PublishingPiwigoSizeEntry** * array,
+ int* length,
+ int* size,
+ PublishingPiwigoSizeEntry* value);
+static void _vala_array_add46 (PublishingPiwigoSizeEntry** * array,
+ int* length,
+ int* size,
+ PublishingPiwigoSizeEntry* value);
+static void _vala_array_add47 (PublishingPiwigoSizeEntry** * array,
+ int* length,
+ int* size,
+ PublishingPiwigoSizeEntry* value);
+static void _vala_array_add48 (PublishingPiwigoSizeEntry** * array,
+ int* length,
+ int* size,
+ PublishingPiwigoSizeEntry* value);
static GeeList* publishing_piwigo_publishing_options_pane_get_existing_categories (PublishingPiwigoPublishingOptionsPane* self);
static void publishing_piwigo_publishing_options_pane_update_publish_button_sensitivity (PublishingPiwigoPublishingOptionsPane* self);
-static gboolean publishing_piwigo_publishing_options_pane_category_already_exists (PublishingPiwigoPublishingOptionsPane* self, const gchar* category_name);
+static gboolean publishing_piwigo_publishing_options_pane_category_already_exists (PublishingPiwigoPublishingOptionsPane* self,
+ const gchar* category_name);
static void publishing_piwigo_publishing_options_pane_real_on_pane_installed (ShotwellPluginsCommonBuilderPane* base);
static void publishing_piwigo_publishing_options_pane_create_categories_combo (PublishingPiwigoPublishingOptionsPane* self);
static void publishing_piwigo_publishing_options_pane_create_within_categories_combo (PublishingPiwigoPublishingOptionsPane* self);
static void publishing_piwigo_publishing_options_pane_create_permissions_combo (PublishingPiwigoPublishingOptionsPane* self);
static void publishing_piwigo_publishing_options_pane_create_size_combo (PublishingPiwigoPublishingOptionsPane* self);
-static gint publishing_piwigo_publishing_options_pane_find_category_index (PublishingPiwigoPublishingOptionsPane* self, gint category_id);
+static gint publishing_piwigo_publishing_options_pane_find_category_index (PublishingPiwigoPublishingOptionsPane* self,
+ gint category_id);
static gint publishing_piwigo_publishing_options_pane_get_last_category (PublishingPiwigoPublishingOptionsPane* self);
-static gint publishing_piwigo_publishing_options_pane_find_permission_level_index (PublishingPiwigoPublishingOptionsPane* self, gint permission_level_id);
+static gint publishing_piwigo_publishing_options_pane_find_permission_level_index (PublishingPiwigoPublishingOptionsPane* self,
+ gint permission_level_id);
static gint publishing_piwigo_publishing_options_pane_get_last_permission_level (PublishingPiwigoPublishingOptionsPane* self);
-static gint publishing_piwigo_publishing_options_pane_find_size_index (PublishingPiwigoPublishingOptionsPane* self, gint size_id);
+static gint publishing_piwigo_publishing_options_pane_find_size_index (PublishingPiwigoPublishingOptionsPane* self,
+ gint size_id);
static gint publishing_piwigo_publishing_options_pane_get_last_photo_size (PublishingPiwigoPublishingOptionsPane* self);
-static void publishing_piwigo_publishing_options_pane_set_last_category (PublishingPiwigoPublishingOptionsPane* self, gint value);
-static void publishing_piwigo_publishing_options_pane_set_last_permission_level (PublishingPiwigoPublishingOptionsPane* self, gint value);
-static void publishing_piwigo_publishing_options_pane_set_last_photo_size (PublishingPiwigoPublishingOptionsPane* self, gint value);
-static void publishing_piwigo_publishing_options_pane_set_last_title_as_comment (PublishingPiwigoPublishingOptionsPane* self, gboolean value);
-static void publishing_piwigo_publishing_options_pane_set_last_no_upload_tags (PublishingPiwigoPublishingOptionsPane* self, gboolean value);
-static void publishing_piwigo_publishing_options_pane_set_strip_metadata_enabled (PublishingPiwigoPublishingOptionsPane* self, gboolean value);
-static void publishing_piwigo_publishing_options_pane_set_existing_categories (PublishingPiwigoPublishingOptionsPane* self, GeeList* value);
-static void publishing_piwigo_publishing_options_pane_set_default_comment (PublishingPiwigoPublishingOptionsPane* self, const gchar* value);
-static void g_cclosure_user_marshal_VOID__PUBLISHING_PIWIGO_PUBLISHING_PARAMETERS_BOOLEAN (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
+static void publishing_piwigo_publishing_options_pane_set_last_category (PublishingPiwigoPublishingOptionsPane* self,
+ gint value);
+static void publishing_piwigo_publishing_options_pane_set_last_permission_level (PublishingPiwigoPublishingOptionsPane* self,
+ gint value);
+static void publishing_piwigo_publishing_options_pane_set_last_photo_size (PublishingPiwigoPublishingOptionsPane* self,
+ gint value);
+static void publishing_piwigo_publishing_options_pane_set_last_title_as_comment (PublishingPiwigoPublishingOptionsPane* self,
+ gboolean value);
+static void publishing_piwigo_publishing_options_pane_set_last_no_upload_tags (PublishingPiwigoPublishingOptionsPane* self,
+ gboolean value);
+static void publishing_piwigo_publishing_options_pane_set_strip_metadata_enabled (PublishingPiwigoPublishingOptionsPane* self,
+ gboolean value);
+static void publishing_piwigo_publishing_options_pane_set_existing_categories (PublishingPiwigoPublishingOptionsPane* self,
+ GeeList* value);
+static void publishing_piwigo_publishing_options_pane_set_default_comment (PublishingPiwigoPublishingOptionsPane* self,
+ const gchar* value);
+static void g_cclosure_user_marshal_VOID__PUBLISHING_PIWIGO_PUBLISHING_PARAMETERS_BOOLEAN (GClosure * closure,
+ GValue * return_value,
+ guint n_param_values,
+ const GValue * param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data);
static void publishing_piwigo_publishing_options_pane_finalize (GObject * obj);
-static void _vala_publishing_piwigo_publishing_options_pane_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
-static void _vala_publishing_piwigo_publishing_options_pane_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec);
+static void _vala_publishing_piwigo_publishing_options_pane_get_property (GObject * object,
+ guint property_id,
+ GValue * value,
+ GParamSpec * pspec);
+static void _vala_publishing_piwigo_publishing_options_pane_set_property (GObject * object,
+ guint property_id,
+ const GValue * value,
+ GParamSpec * pspec);
#define PUBLISHING_PIWIGO_SESSION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_PIWIGO_TYPE_SESSION, PublishingPiwigoSessionPrivate))
-enum {
- PUBLISHING_PIWIGO_SESSION_DUMMY_PROPERTY
-};
static gboolean publishing_piwigo_session_real_is_authenticated (PublishingRESTSupportSession* base);
static void publishing_piwigo_session_finalize (PublishingRESTSupportSession * obj);
-enum {
- PUBLISHING_PIWIGO_TRANSACTION_DUMMY_PROPERTY
-};
PublishingPiwigoTransaction* publishing_piwigo_transaction_new (PublishingPiwigoSession* session);
-PublishingPiwigoTransaction* publishing_piwigo_transaction_construct (GType object_type, PublishingPiwigoSession* session);
+PublishingPiwigoTransaction* publishing_piwigo_transaction_construct (GType object_type,
+ PublishingPiwigoSession* session);
PublishingPiwigoTransaction* publishing_piwigo_transaction_new_authenticated (PublishingPiwigoSession* session);
-PublishingPiwigoTransaction* publishing_piwigo_transaction_construct_authenticated (GType object_type, PublishingPiwigoSession* session);
-enum {
- PUBLISHING_PIWIGO_SESSION_LOGIN_TRANSACTION_DUMMY_PROPERTY
-};
-PublishingPiwigoSessionLoginTransaction* publishing_piwigo_session_login_transaction_new_from_other (PublishingPiwigoSession* session, PublishingPiwigoTransaction* other);
-PublishingPiwigoSessionLoginTransaction* publishing_piwigo_session_login_transaction_construct_from_other (GType object_type, PublishingPiwigoSession* session, PublishingPiwigoTransaction* other);
-enum {
- PUBLISHING_PIWIGO_SESSION_GET_STATUS_TRANSACTION_DUMMY_PROPERTY
-};
-enum {
- PUBLISHING_PIWIGO_CATEGORIES_GET_LIST_TRANSACTION_DUMMY_PROPERTY
-};
-enum {
- PUBLISHING_PIWIGO_SESSION_LOGOUT_TRANSACTION_DUMMY_PROPERTY
-};
-enum {
- PUBLISHING_PIWIGO_CATEGORIES_ADD_TRANSACTION_DUMMY_PROPERTY
-};
+PublishingPiwigoTransaction* publishing_piwigo_transaction_construct_authenticated (GType object_type,
+ PublishingPiwigoSession* session);
+PublishingPiwigoSessionLoginTransaction* publishing_piwigo_session_login_transaction_new_from_other (PublishingPiwigoSession* session,
+ PublishingPiwigoTransaction* other);
+PublishingPiwigoSessionLoginTransaction* publishing_piwigo_session_login_transaction_construct_from_other (GType object_type,
+ PublishingPiwigoSession* session,
+ PublishingPiwigoTransaction* other);
#define PUBLISHING_PIWIGO_IMAGES_ADD_TRANSACTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_PIWIGO_TYPE_IMAGES_ADD_TRANSACTION, PublishingPiwigoImagesAddTransactionPrivate))
-enum {
- PUBLISHING_PIWIGO_IMAGES_ADD_TRANSACTION_DUMMY_PROPERTY
-};
static void _g_free0_ (gpointer var);
static void publishing_piwigo_images_add_transaction_finalize (PublishingRESTSupportTransaction * 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 gint _vala_array_length (gpointer array);
-PiwigoService* piwigo_service_construct (GType object_type, GFile* resource_directory) {
+PiwigoService*
+piwigo_service_construct (GType object_type,
+ GFile* resource_directory)
+{
PiwigoService * self = NULL;
GdkPixbuf** _tmp0_;
gint _tmp0__length1;
@@ -975,7 +1255,7 @@ PiwigoService* piwigo_service_construct (GType object_type, GFile* resource_dire
_tmp0__length1 = piwigo_service_icon_pixbuf_set_length1;
#line 13 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_tmp0_ == NULL) {
-#line 979 "PiwigoPublishing.c"
+#line 1259 "PiwigoPublishing.c"
gint _tmp1_;
GdkPixbuf** _tmp2_;
#line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -988,44 +1268,43 @@ PiwigoService* piwigo_service_construct (GType object_type, GFile* resource_dire
piwigo_service_icon_pixbuf_set_length1 = _tmp1_;
#line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_piwigo_service_icon_pixbuf_set_size_ = piwigo_service_icon_pixbuf_set_length1;
-#line 992 "PiwigoPublishing.c"
+#line 1272 "PiwigoPublishing.c"
}
#line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return self;
-#line 996 "PiwigoPublishing.c"
+#line 1276 "PiwigoPublishing.c"
}
-PiwigoService* piwigo_service_new (GFile* resource_directory) {
+PiwigoService*
+piwigo_service_new (GFile* resource_directory)
+{
#line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return piwigo_service_construct (TYPE_PIWIGO_SERVICE, resource_directory);
-#line 1003 "PiwigoPublishing.c"
+#line 1285 "PiwigoPublishing.c"
}
-static gint piwigo_service_real_get_pluggable_interface (SpitPluggable* base, gint min_host_interface, gint max_host_interface) {
+static gint
+piwigo_service_real_get_pluggable_interface (SpitPluggable* base,
+ gint min_host_interface,
+ gint max_host_interface)
+{
PiwigoService * self;
gint result = 0;
- gint _tmp0_;
- gint _tmp1_;
- gint _tmp2_;
#line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PIWIGO_SERVICE, PiwigoService);
#line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp0_ = min_host_interface;
-#line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp1_ = max_host_interface;
-#line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp2_ = spit_negotiate_interfaces (_tmp0_, _tmp1_, SPIT_PUBLISHING_CURRENT_INTERFACE);
-#line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- result = _tmp2_;
+ result = spit_negotiate_interfaces (min_host_interface, max_host_interface, SPIT_PUBLISHING_CURRENT_INTERFACE);
#line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 1025 "PiwigoPublishing.c"
+#line 1302 "PiwigoPublishing.c"
}
-static const gchar* piwigo_service_real_get_id (SpitPluggable* base) {
+static const gchar*
+piwigo_service_real_get_id (SpitPluggable* base)
+{
PiwigoService * self;
const gchar* result = NULL;
#line 23 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -1034,11 +1313,13 @@ static const gchar* piwigo_service_real_get_id (SpitPluggable* base) {
result = "org.yorba.shotwell.publishing.piwigo";
#line 24 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 1038 "PiwigoPublishing.c"
+#line 1317 "PiwigoPublishing.c"
}
-static const gchar* piwigo_service_real_get_pluggable_name (SpitPluggable* base) {
+static const gchar*
+piwigo_service_real_get_pluggable_name (SpitPluggable* base)
+{
PiwigoService * self;
const gchar* result = NULL;
#line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -1047,39 +1328,47 @@ static const gchar* piwigo_service_real_get_pluggable_name (SpitPluggable* base)
result = "Piwigo";
#line 28 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 1051 "PiwigoPublishing.c"
+#line 1332 "PiwigoPublishing.c"
}
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return self ? g_object_ref (self) : NULL;
-#line 1058 "PiwigoPublishing.c"
+#line 1341 "PiwigoPublishing.c"
}
-static GdkPixbuf** _vala_array_dup12 (GdkPixbuf** self, int length) {
+static GdkPixbuf**
+_vala_array_dup12 (GdkPixbuf** self,
+ int length)
+{
GdkPixbuf** result;
int i;
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
result = g_new0 (GdkPixbuf*, length + 1);
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
for (i = 0; i < length; i++) {
-#line 1069 "PiwigoPublishing.c"
+#line 1355 "PiwigoPublishing.c"
GdkPixbuf* _tmp0_;
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = _g_object_ref0 (self[i]);
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
result[i] = _tmp0_;
-#line 1075 "PiwigoPublishing.c"
+#line 1361 "PiwigoPublishing.c"
}
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 1079 "PiwigoPublishing.c"
+#line 1365 "PiwigoPublishing.c"
}
-static void piwigo_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info) {
+static void
+piwigo_service_real_get_info (SpitPluggable* base,
+ SpitPluggableInfo* info)
+{
PiwigoService * self;
gchar* _tmp0_;
gchar* _tmp1_;
@@ -1154,40 +1443,45 @@ static void piwigo_service_real_get_info (SpitPluggable* base, SpitPluggableInfo
(*info).icons = _tmp8_;
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
(*info).icons_length1 = _tmp8__length1;
-#line 1158 "PiwigoPublishing.c"
+#line 1447 "PiwigoPublishing.c"
}
-static void piwigo_service_real_activation (SpitPluggable* base, gboolean enabled) {
+static void
+piwigo_service_real_activation (SpitPluggable* base,
+ gboolean enabled)
+{
PiwigoService * self;
#line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PIWIGO_SERVICE, PiwigoService);
-#line 1166 "PiwigoPublishing.c"
+#line 1458 "PiwigoPublishing.c"
}
-static SpitPublishingPublisher* piwigo_service_real_create_publisher (SpitPublishingService* base, SpitPublishingPluginHost* host) {
+static SpitPublishingPublisher*
+piwigo_service_real_create_publisher (SpitPublishingService* base,
+ SpitPublishingPluginHost* host)
+{
PiwigoService * self;
SpitPublishingPublisher* result = NULL;
- SpitPublishingPluginHost* _tmp0_;
- PublishingPiwigoPiwigoPublisher* _tmp1_;
+ PublishingPiwigoPiwigoPublisher* _tmp0_;
#line 46 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PIWIGO_SERVICE, PiwigoService);
#line 46 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL);
#line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp0_ = host;
+ _tmp0_ = publishing_piwigo_piwigo_publisher_new (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_SERVICE, SpitPublishingService), host);
#line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp1_ = publishing_piwigo_piwigo_publisher_new (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_SERVICE, SpitPublishingService), _tmp0_);
-#line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher);
+ result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher);
#line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 1187 "PiwigoPublishing.c"
+#line 1479 "PiwigoPublishing.c"
}
-static SpitPublishingPublisherMediaType piwigo_service_real_get_supported_media (SpitPublishingService* base) {
+static SpitPublishingPublisherMediaType
+piwigo_service_real_get_supported_media (SpitPublishingService* base)
+{
PiwigoService * self;
SpitPublishingPublisherMediaType result = 0;
#line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -1196,20 +1490,24 @@ static SpitPublishingPublisherMediaType piwigo_service_real_get_supported_media
result = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO;
#line 51 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 1200 "PiwigoPublishing.c"
+#line 1494 "PiwigoPublishing.c"
}
-static void piwigo_service_class_init (PiwigoServiceClass * klass) {
+static void
+piwigo_service_class_init (PiwigoServiceClass * klass)
+{
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
piwigo_service_parent_class = g_type_class_peek_parent (klass);
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
G_OBJECT_CLASS (klass)->finalize = piwigo_service_finalize;
-#line 1209 "PiwigoPublishing.c"
+#line 1505 "PiwigoPublishing.c"
}
-static void piwigo_service_spit_pluggable_interface_init (SpitPluggableIface * iface) {
+static void
+piwigo_service_spit_pluggable_interface_init (SpitPluggableIface * iface)
+{
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
piwigo_service_spit_pluggable_parent_iface = g_type_interface_peek_parent (iface);
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -1222,36 +1520,44 @@ static void piwigo_service_spit_pluggable_interface_init (SpitPluggableIface * i
iface->get_info = (void (*) (SpitPluggable *, SpitPluggableInfo*)) piwigo_service_real_get_info;
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
iface->activation = (void (*) (SpitPluggable *, gboolean)) piwigo_service_real_activation;
-#line 1226 "PiwigoPublishing.c"
+#line 1524 "PiwigoPublishing.c"
}
-static void piwigo_service_spit_publishing_service_interface_init (SpitPublishingServiceIface * iface) {
+static void
+piwigo_service_spit_publishing_service_interface_init (SpitPublishingServiceIface * iface)
+{
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
piwigo_service_spit_publishing_service_parent_iface = g_type_interface_peek_parent (iface);
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
iface->create_publisher = (SpitPublishingPublisher* (*) (SpitPublishingService *, SpitPublishingPluginHost*)) piwigo_service_real_create_publisher;
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
iface->get_supported_media = (SpitPublishingPublisherMediaType (*) (SpitPublishingService *)) piwigo_service_real_get_supported_media;
-#line 1237 "PiwigoPublishing.c"
+#line 1537 "PiwigoPublishing.c"
}
-static void piwigo_service_instance_init (PiwigoService * self) {
+static void
+piwigo_service_instance_init (PiwigoService * self)
+{
}
-static void piwigo_service_finalize (GObject * obj) {
+static void
+piwigo_service_finalize (GObject * obj)
+{
PiwigoService * self;
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PIWIGO_SERVICE, PiwigoService);
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
G_OBJECT_CLASS (piwigo_service_parent_class)->finalize (obj);
-#line 1251 "PiwigoPublishing.c"
+#line 1555 "PiwigoPublishing.c"
}
-GType piwigo_service_get_type (void) {
+GType
+piwigo_service_get_type (void)
+{
static volatile gsize piwigo_service_type_id__volatile = 0;
if (g_once_init_enter (&piwigo_service_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PiwigoServiceClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) piwigo_service_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PiwigoService), 0, (GInstanceInitFunc) piwigo_service_instance_init, NULL };
@@ -1267,15 +1573,17 @@ GType piwigo_service_get_type (void) {
}
-PublishingPiwigoCategory* publishing_piwigo_category_construct (GType object_type, gint id, const gchar* name, const gchar* uppercats, const gchar* comment) {
+PublishingPiwigoCategory*
+publishing_piwigo_category_construct (GType object_type,
+ gint id,
+ const gchar* name,
+ const gchar* uppercats,
+ const gchar* comment)
+{
PublishingPiwigoCategory* self = NULL;
- gint _tmp0_;
- const gchar* _tmp1_;
+ gchar* _tmp0_;
+ gchar* _tmp1_;
gchar* _tmp2_;
- const gchar* _tmp3_;
- gchar* _tmp4_;
- const gchar* _tmp5_;
- gchar* _tmp6_;
#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (name != NULL, NULL);
#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -1283,54 +1591,53 @@ PublishingPiwigoCategory* publishing_piwigo_category_construct (GType object_typ
#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self = (PublishingPiwigoCategory*) g_type_create_instance (object_type);
#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp0_ = id;
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->id = _tmp0_;
+ self->id = id;
#line 71 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp1_ = name;
-#line 71 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp2_ = g_strdup (_tmp1_);
+ _tmp0_ = g_strdup (name);
#line 71 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (self->name);
#line 71 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->name = _tmp2_;
-#line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp3_ = uppercats;
+ self->name = _tmp0_;
#line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp4_ = g_strdup (_tmp3_);
+ _tmp1_ = g_strdup (uppercats);
#line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (self->uppercats);
#line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->uppercats = _tmp4_;
-#line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp5_ = comment;
+ self->uppercats = _tmp1_;
#line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp6_ = g_strdup (_tmp5_);
+ _tmp2_ = g_strdup (comment);
#line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (self->comment);
#line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->comment = _tmp6_;
+ self->comment = _tmp2_;
#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return self;
-#line 1316 "PiwigoPublishing.c"
+#line 1616 "PiwigoPublishing.c"
}
-PublishingPiwigoCategory* publishing_piwigo_category_new (gint id, const gchar* name, const gchar* uppercats, const gchar* comment) {
+PublishingPiwigoCategory*
+publishing_piwigo_category_new (gint id,
+ const gchar* name,
+ const gchar* uppercats,
+ const gchar* comment)
+{
#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return publishing_piwigo_category_construct (PUBLISHING_PIWIGO_TYPE_CATEGORY, id, name, uppercats, comment);
-#line 1323 "PiwigoPublishing.c"
+#line 1628 "PiwigoPublishing.c"
}
-PublishingPiwigoCategory* publishing_piwigo_category_construct_local (GType object_type, const gchar* name, gint parent_id, const gchar* comment) {
+PublishingPiwigoCategory*
+publishing_piwigo_category_construct_local (GType object_type,
+ const gchar* name,
+ gint parent_id,
+ const gchar* comment)
+{
PublishingPiwigoCategory* self = NULL;
- const gchar* _tmp0_;
+ gchar* _tmp0_;
gchar* _tmp1_;
- gint _tmp2_;
- gchar* _tmp3_;
- const gchar* _tmp4_;
- gchar* _tmp5_;
+ gchar* _tmp2_;
#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (name != NULL, NULL);
#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -1338,43 +1645,43 @@ PublishingPiwigoCategory* publishing_piwigo_category_construct_local (GType obje
#line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->id = PUBLISHING_PIWIGO_CATEGORY_NO_ID;
#line 78 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp0_ = name;
-#line 78 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp1_ = g_strdup (_tmp0_);
+ _tmp0_ = g_strdup (name);
#line 78 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (self->name);
#line 78 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->name = _tmp1_;
+ self->name = _tmp0_;
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp2_ = parent_id;
-#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp3_ = g_strdup_printf ("%i", _tmp2_);
+ _tmp1_ = g_strdup_printf ("%i", parent_id);
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (self->uppercats);
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->uppercats = _tmp3_;
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp4_ = comment;
+ self->uppercats = _tmp1_;
#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp5_ = g_strdup (_tmp4_);
+ _tmp2_ = g_strdup (comment);
#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (self->comment);
#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->comment = _tmp5_;
+ self->comment = _tmp2_;
#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return self;
-#line 1367 "PiwigoPublishing.c"
+#line 1668 "PiwigoPublishing.c"
}
-PublishingPiwigoCategory* publishing_piwigo_category_new_local (const gchar* name, gint parent_id, const gchar* comment) {
+PublishingPiwigoCategory*
+publishing_piwigo_category_new_local (const gchar* name,
+ gint parent_id,
+ const gchar* comment)
+{
#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return publishing_piwigo_category_construct_local (PUBLISHING_PIWIGO_TYPE_CATEGORY, name, parent_id, comment);
-#line 1374 "PiwigoPublishing.c"
+#line 1679 "PiwigoPublishing.c"
}
-gboolean publishing_piwigo_category_is_local (PublishingPiwigoCategory* self) {
+gboolean
+publishing_piwigo_category_is_local (PublishingPiwigoCategory* self)
+{
gboolean result = FALSE;
gint _tmp0_;
#line 85 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -1385,134 +1692,156 @@ gboolean publishing_piwigo_category_is_local (PublishingPiwigoCategory* self) {
result = _tmp0_ == PUBLISHING_PIWIGO_CATEGORY_NO_ID;
#line 86 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 1389 "PiwigoPublishing.c"
+#line 1696 "PiwigoPublishing.c"
}
-gboolean publishing_piwigo_category_equal (PublishingPiwigoCategory* _self_, PublishingPiwigoCategory* other) {
+gboolean
+publishing_piwigo_category_equal (PublishingPiwigoCategory* _self_,
+ PublishingPiwigoCategory* other)
+{
gboolean result = FALSE;
- PublishingPiwigoCategory* _tmp0_;
+ gint _tmp0_;
gint _tmp1_;
- PublishingPiwigoCategory* _tmp2_;
- gint _tmp3_;
#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (PUBLISHING_PIWIGO_IS_CATEGORY (_self_), FALSE);
#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (PUBLISHING_PIWIGO_IS_CATEGORY (other), FALSE);
#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp0_ = _self_;
+ _tmp0_ = _self_->id;
#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp1_ = _tmp0_->id;
+ _tmp1_ = other->id;
#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp2_ = other;
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp3_ = _tmp2_->id;
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- result = _tmp1_ == _tmp3_;
+ result = _tmp0_ == _tmp1_;
#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 1415 "PiwigoPublishing.c"
+#line 1719 "PiwigoPublishing.c"
}
-static void publishing_piwigo_value_category_init (GValue* value) {
+static void
+publishing_piwigo_value_category_init (GValue* value)
+{
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 1422 "PiwigoPublishing.c"
+#line 1728 "PiwigoPublishing.c"
}
-static void publishing_piwigo_value_category_free_value (GValue* value) {
+static void
+publishing_piwigo_value_category_free_value (GValue* value)
+{
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (value->data[0].v_pointer) {
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_category_unref (value->data[0].v_pointer);
-#line 1431 "PiwigoPublishing.c"
+#line 1739 "PiwigoPublishing.c"
}
}
-static void publishing_piwigo_value_category_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+publishing_piwigo_value_category_copy_value (const GValue* src_value,
+ GValue* dest_value)
+{
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (src_value->data[0].v_pointer) {
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
dest_value->data[0].v_pointer = publishing_piwigo_category_ref (src_value->data[0].v_pointer);
-#line 1441 "PiwigoPublishing.c"
+#line 1752 "PiwigoPublishing.c"
} else {
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
dest_value->data[0].v_pointer = NULL;
-#line 1445 "PiwigoPublishing.c"
+#line 1756 "PiwigoPublishing.c"
}
}
-static gpointer publishing_piwigo_value_category_peek_pointer (const GValue* value) {
+static gpointer
+publishing_piwigo_value_category_peek_pointer (const GValue* value)
+{
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return value->data[0].v_pointer;
-#line 1453 "PiwigoPublishing.c"
+#line 1766 "PiwigoPublishing.c"
}
-static gchar* publishing_piwigo_value_category_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_piwigo_value_category_collect_value (GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (collect_values[0].v_pointer) {
-#line 1460 "PiwigoPublishing.c"
+#line 1778 "PiwigoPublishing.c"
PublishingPiwigoCategory * object;
object = collect_values[0].v_pointer;
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (object->parent_instance.g_class == NULL) {
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1467 "PiwigoPublishing.c"
+#line 1785 "PiwigoPublishing.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1471 "PiwigoPublishing.c"
+#line 1789 "PiwigoPublishing.c"
}
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
value->data[0].v_pointer = publishing_piwigo_category_ref (object);
-#line 1475 "PiwigoPublishing.c"
+#line 1793 "PiwigoPublishing.c"
} else {
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 1479 "PiwigoPublishing.c"
+#line 1797 "PiwigoPublishing.c"
}
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return NULL;
-#line 1483 "PiwigoPublishing.c"
+#line 1801 "PiwigoPublishing.c"
}
-static gchar* publishing_piwigo_value_category_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_piwigo_value_category_lcopy_value (const GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
PublishingPiwigoCategory ** object_p;
object_p = collect_values[0].v_pointer;
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (!object_p) {
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1494 "PiwigoPublishing.c"
+#line 1817 "PiwigoPublishing.c"
}
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (!value->data[0].v_pointer) {
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
*object_p = NULL;
-#line 1500 "PiwigoPublishing.c"
+#line 1823 "PiwigoPublishing.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
*object_p = value->data[0].v_pointer;
-#line 1504 "PiwigoPublishing.c"
+#line 1827 "PiwigoPublishing.c"
} else {
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
*object_p = publishing_piwigo_category_ref (value->data[0].v_pointer);
-#line 1508 "PiwigoPublishing.c"
+#line 1831 "PiwigoPublishing.c"
}
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return NULL;
-#line 1512 "PiwigoPublishing.c"
+#line 1835 "PiwigoPublishing.c"
}
-GParamSpec* publishing_piwigo_param_spec_category (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+publishing_piwigo_param_spec_category (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags)
+{
PublishingPiwigoParamSpecCategory* spec;
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_PIWIGO_TYPE_CATEGORY), NULL);
@@ -1522,20 +1851,25 @@ GParamSpec* publishing_piwigo_param_spec_category (const gchar* name, const gcha
G_PARAM_SPEC (spec)->value_type = object_type;
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return G_PARAM_SPEC (spec);
-#line 1526 "PiwigoPublishing.c"
+#line 1855 "PiwigoPublishing.c"
}
-gpointer publishing_piwigo_value_get_category (const GValue* value) {
+gpointer
+publishing_piwigo_value_get_category (const GValue* value)
+{
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PIWIGO_TYPE_CATEGORY), NULL);
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return value->data[0].v_pointer;
-#line 1535 "PiwigoPublishing.c"
+#line 1866 "PiwigoPublishing.c"
}
-void publishing_piwigo_value_set_category (GValue* value, gpointer v_object) {
+void
+publishing_piwigo_value_set_category (GValue* value,
+ gpointer v_object)
+{
PublishingPiwigoCategory * old;
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PIWIGO_TYPE_CATEGORY));
@@ -1551,22 +1885,25 @@ void publishing_piwigo_value_set_category (GValue* value, gpointer v_object) {
value->data[0].v_pointer = v_object;
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_category_ref (value->data[0].v_pointer);
-#line 1555 "PiwigoPublishing.c"
+#line 1889 "PiwigoPublishing.c"
} else {
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 1559 "PiwigoPublishing.c"
+#line 1893 "PiwigoPublishing.c"
}
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (old) {
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_category_unref (old);
-#line 1565 "PiwigoPublishing.c"
+#line 1899 "PiwigoPublishing.c"
}
}
-void publishing_piwigo_value_take_category (GValue* value, gpointer v_object) {
+void
+publishing_piwigo_value_take_category (GValue* value,
+ gpointer v_object)
+{
PublishingPiwigoCategory * old;
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PIWIGO_TYPE_CATEGORY));
@@ -1580,38 +1917,44 @@ void publishing_piwigo_value_take_category (GValue* value, gpointer v_object) {
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
value->data[0].v_pointer = v_object;
-#line 1584 "PiwigoPublishing.c"
+#line 1921 "PiwigoPublishing.c"
} else {
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 1588 "PiwigoPublishing.c"
+#line 1925 "PiwigoPublishing.c"
}
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (old) {
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_category_unref (old);
-#line 1594 "PiwigoPublishing.c"
+#line 1931 "PiwigoPublishing.c"
}
}
-static void publishing_piwigo_category_class_init (PublishingPiwigoCategoryClass * klass) {
+static void
+publishing_piwigo_category_class_init (PublishingPiwigoCategoryClass * klass)
+{
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_category_parent_class = g_type_class_peek_parent (klass);
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
((PublishingPiwigoCategoryClass *) klass)->finalize = publishing_piwigo_category_finalize;
-#line 1604 "PiwigoPublishing.c"
+#line 1943 "PiwigoPublishing.c"
}
-static void publishing_piwigo_category_instance_init (PublishingPiwigoCategory * self) {
+static void
+publishing_piwigo_category_instance_init (PublishingPiwigoCategory * self)
+{
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->ref_count = 1;
-#line 1611 "PiwigoPublishing.c"
+#line 1952 "PiwigoPublishing.c"
}
-static void publishing_piwigo_category_finalize (PublishingPiwigoCategory * obj) {
+static void
+publishing_piwigo_category_finalize (PublishingPiwigoCategory * obj)
+{
PublishingPiwigoCategory * self;
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PIWIGO_TYPE_CATEGORY, PublishingPiwigoCategory);
@@ -1625,11 +1968,13 @@ static void publishing_piwigo_category_finalize (PublishingPiwigoCategory * obj)
_g_free0 (self->display_name);
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (self->uppercats);
-#line 1629 "PiwigoPublishing.c"
+#line 1972 "PiwigoPublishing.c"
}
-GType publishing_piwigo_category_get_type (void) {
+GType
+publishing_piwigo_category_get_type (void)
+{
static volatile gsize publishing_piwigo_category_type_id__volatile = 0;
if (g_once_init_enter (&publishing_piwigo_category_type_id__volatile)) {
static const GTypeValueTable g_define_type_value_table = { publishing_piwigo_value_category_init, publishing_piwigo_value_category_free_value, publishing_piwigo_value_category_copy_value, publishing_piwigo_value_category_peek_pointer, "p", publishing_piwigo_value_category_collect_value, "p", publishing_piwigo_value_category_lcopy_value };
@@ -1643,18 +1988,22 @@ GType publishing_piwigo_category_get_type (void) {
}
-gpointer publishing_piwigo_category_ref (gpointer instance) {
+gpointer
+publishing_piwigo_category_ref (gpointer instance)
+{
PublishingPiwigoCategory * self;
self = instance;
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_atomic_int_inc (&self->ref_count);
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return instance;
-#line 1654 "PiwigoPublishing.c"
+#line 2001 "PiwigoPublishing.c"
}
-void publishing_piwigo_category_unref (gpointer instance) {
+void
+publishing_piwigo_category_unref (gpointer instance)
+{
PublishingPiwigoCategory * self;
self = instance;
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -1663,143 +2012,169 @@ void publishing_piwigo_category_unref (gpointer instance) {
PUBLISHING_PIWIGO_CATEGORY_GET_CLASS (self)->finalize (self);
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 1667 "PiwigoPublishing.c"
+#line 2016 "PiwigoPublishing.c"
}
}
-PublishingPiwigoPermissionLevel* publishing_piwigo_permission_level_construct (GType object_type, gint id, const gchar* name) {
+PublishingPiwigoPermissionLevel*
+publishing_piwigo_permission_level_construct (GType object_type,
+ gint id,
+ const gchar* name)
+{
PublishingPiwigoPermissionLevel* self = NULL;
- gint _tmp0_;
- const gchar* _tmp1_;
- gchar* _tmp2_;
+ gchar* _tmp0_;
#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (name != NULL, NULL);
#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self = (PublishingPiwigoPermissionLevel*) g_type_create_instance (object_type);
#line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp0_ = id;
-#line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->id = _tmp0_;
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp1_ = name;
+ self->id = id;
#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp2_ = g_strdup (_tmp1_);
+ _tmp0_ = g_strdup (name);
#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (self->name);
#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->name = _tmp2_;
+ self->name = _tmp0_;
#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return self;
-#line 1695 "PiwigoPublishing.c"
+#line 2042 "PiwigoPublishing.c"
}
-PublishingPiwigoPermissionLevel* publishing_piwigo_permission_level_new (gint id, const gchar* name) {
+PublishingPiwigoPermissionLevel*
+publishing_piwigo_permission_level_new (gint id,
+ const gchar* name)
+{
#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return publishing_piwigo_permission_level_construct (PUBLISHING_PIWIGO_TYPE_PERMISSION_LEVEL, id, name);
-#line 1702 "PiwigoPublishing.c"
+#line 2052 "PiwigoPublishing.c"
}
-static void publishing_piwigo_value_permission_level_init (GValue* value) {
+static void
+publishing_piwigo_value_permission_level_init (GValue* value)
+{
#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 1709 "PiwigoPublishing.c"
+#line 2061 "PiwigoPublishing.c"
}
-static void publishing_piwigo_value_permission_level_free_value (GValue* value) {
+static void
+publishing_piwigo_value_permission_level_free_value (GValue* value)
+{
#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (value->data[0].v_pointer) {
#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_permission_level_unref (value->data[0].v_pointer);
-#line 1718 "PiwigoPublishing.c"
+#line 2072 "PiwigoPublishing.c"
}
}
-static void publishing_piwigo_value_permission_level_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+publishing_piwigo_value_permission_level_copy_value (const GValue* src_value,
+ GValue* dest_value)
+{
#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (src_value->data[0].v_pointer) {
#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
dest_value->data[0].v_pointer = publishing_piwigo_permission_level_ref (src_value->data[0].v_pointer);
-#line 1728 "PiwigoPublishing.c"
+#line 2085 "PiwigoPublishing.c"
} else {
#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
dest_value->data[0].v_pointer = NULL;
-#line 1732 "PiwigoPublishing.c"
+#line 2089 "PiwigoPublishing.c"
}
}
-static gpointer publishing_piwigo_value_permission_level_peek_pointer (const GValue* value) {
+static gpointer
+publishing_piwigo_value_permission_level_peek_pointer (const GValue* value)
+{
#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return value->data[0].v_pointer;
-#line 1740 "PiwigoPublishing.c"
+#line 2099 "PiwigoPublishing.c"
}
-static gchar* publishing_piwigo_value_permission_level_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_piwigo_value_permission_level_collect_value (GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (collect_values[0].v_pointer) {
-#line 1747 "PiwigoPublishing.c"
+#line 2111 "PiwigoPublishing.c"
PublishingPiwigoPermissionLevel * object;
object = collect_values[0].v_pointer;
#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (object->parent_instance.g_class == NULL) {
#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1754 "PiwigoPublishing.c"
+#line 2118 "PiwigoPublishing.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1758 "PiwigoPublishing.c"
+#line 2122 "PiwigoPublishing.c"
}
#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
value->data[0].v_pointer = publishing_piwigo_permission_level_ref (object);
-#line 1762 "PiwigoPublishing.c"
+#line 2126 "PiwigoPublishing.c"
} else {
#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 1766 "PiwigoPublishing.c"
+#line 2130 "PiwigoPublishing.c"
}
#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return NULL;
-#line 1770 "PiwigoPublishing.c"
+#line 2134 "PiwigoPublishing.c"
}
-static gchar* publishing_piwigo_value_permission_level_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_piwigo_value_permission_level_lcopy_value (const GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
PublishingPiwigoPermissionLevel ** object_p;
object_p = collect_values[0].v_pointer;
#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (!object_p) {
#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1781 "PiwigoPublishing.c"
+#line 2150 "PiwigoPublishing.c"
}
#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (!value->data[0].v_pointer) {
#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
*object_p = NULL;
-#line 1787 "PiwigoPublishing.c"
+#line 2156 "PiwigoPublishing.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
*object_p = value->data[0].v_pointer;
-#line 1791 "PiwigoPublishing.c"
+#line 2160 "PiwigoPublishing.c"
} else {
#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
*object_p = publishing_piwigo_permission_level_ref (value->data[0].v_pointer);
-#line 1795 "PiwigoPublishing.c"
+#line 2164 "PiwigoPublishing.c"
}
#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return NULL;
-#line 1799 "PiwigoPublishing.c"
+#line 2168 "PiwigoPublishing.c"
}
-GParamSpec* publishing_piwigo_param_spec_permission_level (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+publishing_piwigo_param_spec_permission_level (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags)
+{
PublishingPiwigoParamSpecPermissionLevel* spec;
#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_PIWIGO_TYPE_PERMISSION_LEVEL), NULL);
@@ -1809,20 +2184,25 @@ GParamSpec* publishing_piwigo_param_spec_permission_level (const gchar* name, co
G_PARAM_SPEC (spec)->value_type = object_type;
#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return G_PARAM_SPEC (spec);
-#line 1813 "PiwigoPublishing.c"
+#line 2188 "PiwigoPublishing.c"
}
-gpointer publishing_piwigo_value_get_permission_level (const GValue* value) {
+gpointer
+publishing_piwigo_value_get_permission_level (const GValue* value)
+{
#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PIWIGO_TYPE_PERMISSION_LEVEL), NULL);
#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return value->data[0].v_pointer;
-#line 1822 "PiwigoPublishing.c"
+#line 2199 "PiwigoPublishing.c"
}
-void publishing_piwigo_value_set_permission_level (GValue* value, gpointer v_object) {
+void
+publishing_piwigo_value_set_permission_level (GValue* value,
+ gpointer v_object)
+{
PublishingPiwigoPermissionLevel * old;
#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PIWIGO_TYPE_PERMISSION_LEVEL));
@@ -1838,22 +2218,25 @@ void publishing_piwigo_value_set_permission_level (GValue* value, gpointer v_obj
value->data[0].v_pointer = v_object;
#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_permission_level_ref (value->data[0].v_pointer);
-#line 1842 "PiwigoPublishing.c"
+#line 2222 "PiwigoPublishing.c"
} else {
#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 1846 "PiwigoPublishing.c"
+#line 2226 "PiwigoPublishing.c"
}
#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (old) {
#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_permission_level_unref (old);
-#line 1852 "PiwigoPublishing.c"
+#line 2232 "PiwigoPublishing.c"
}
}
-void publishing_piwigo_value_take_permission_level (GValue* value, gpointer v_object) {
+void
+publishing_piwigo_value_take_permission_level (GValue* value,
+ gpointer v_object)
+{
PublishingPiwigoPermissionLevel * old;
#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PIWIGO_TYPE_PERMISSION_LEVEL));
@@ -1867,38 +2250,44 @@ void publishing_piwigo_value_take_permission_level (GValue* value, gpointer v_ob
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
value->data[0].v_pointer = v_object;
-#line 1871 "PiwigoPublishing.c"
+#line 2254 "PiwigoPublishing.c"
} else {
#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 1875 "PiwigoPublishing.c"
+#line 2258 "PiwigoPublishing.c"
}
#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (old) {
#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_permission_level_unref (old);
-#line 1881 "PiwigoPublishing.c"
+#line 2264 "PiwigoPublishing.c"
}
}
-static void publishing_piwigo_permission_level_class_init (PublishingPiwigoPermissionLevelClass * klass) {
+static void
+publishing_piwigo_permission_level_class_init (PublishingPiwigoPermissionLevelClass * klass)
+{
#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_permission_level_parent_class = g_type_class_peek_parent (klass);
#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
((PublishingPiwigoPermissionLevelClass *) klass)->finalize = publishing_piwigo_permission_level_finalize;
-#line 1891 "PiwigoPublishing.c"
+#line 2276 "PiwigoPublishing.c"
}
-static void publishing_piwigo_permission_level_instance_init (PublishingPiwigoPermissionLevel * self) {
+static void
+publishing_piwigo_permission_level_instance_init (PublishingPiwigoPermissionLevel * self)
+{
#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->ref_count = 1;
-#line 1898 "PiwigoPublishing.c"
+#line 2285 "PiwigoPublishing.c"
}
-static void publishing_piwigo_permission_level_finalize (PublishingPiwigoPermissionLevel * obj) {
+static void
+publishing_piwigo_permission_level_finalize (PublishingPiwigoPermissionLevel * obj)
+{
PublishingPiwigoPermissionLevel * self;
#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PIWIGO_TYPE_PERMISSION_LEVEL, PublishingPiwigoPermissionLevel);
@@ -1906,11 +2295,13 @@ static void publishing_piwigo_permission_level_finalize (PublishingPiwigoPermiss
g_signal_handlers_destroy (self);
#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (self->name);
-#line 1910 "PiwigoPublishing.c"
+#line 2299 "PiwigoPublishing.c"
}
-GType publishing_piwigo_permission_level_get_type (void) {
+GType
+publishing_piwigo_permission_level_get_type (void)
+{
static volatile gsize publishing_piwigo_permission_level_type_id__volatile = 0;
if (g_once_init_enter (&publishing_piwigo_permission_level_type_id__volatile)) {
static const GTypeValueTable g_define_type_value_table = { publishing_piwigo_value_permission_level_init, publishing_piwigo_value_permission_level_free_value, publishing_piwigo_value_permission_level_copy_value, publishing_piwigo_value_permission_level_peek_pointer, "p", publishing_piwigo_value_permission_level_collect_value, "p", publishing_piwigo_value_permission_level_lcopy_value };
@@ -1924,18 +2315,22 @@ GType publishing_piwigo_permission_level_get_type (void) {
}
-gpointer publishing_piwigo_permission_level_ref (gpointer instance) {
+gpointer
+publishing_piwigo_permission_level_ref (gpointer instance)
+{
PublishingPiwigoPermissionLevel * self;
self = instance;
#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_atomic_int_inc (&self->ref_count);
#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return instance;
-#line 1935 "PiwigoPublishing.c"
+#line 2328 "PiwigoPublishing.c"
}
-void publishing_piwigo_permission_level_unref (gpointer instance) {
+void
+publishing_piwigo_permission_level_unref (gpointer instance)
+{
PublishingPiwigoPermissionLevel * self;
self = instance;
#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -1944,143 +2339,169 @@ void publishing_piwigo_permission_level_unref (gpointer instance) {
PUBLISHING_PIWIGO_PERMISSION_LEVEL_GET_CLASS (self)->finalize (self);
#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 1948 "PiwigoPublishing.c"
+#line 2343 "PiwigoPublishing.c"
}
}
-PublishingPiwigoSizeEntry* publishing_piwigo_size_entry_construct (GType object_type, gint id, const gchar* name) {
+PublishingPiwigoSizeEntry*
+publishing_piwigo_size_entry_construct (GType object_type,
+ gint id,
+ const gchar* name)
+{
PublishingPiwigoSizeEntry* self = NULL;
- gint _tmp0_;
- const gchar* _tmp1_;
- gchar* _tmp2_;
+ gchar* _tmp0_;
#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (name != NULL, NULL);
#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self = (PublishingPiwigoSizeEntry*) g_type_create_instance (object_type);
#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp0_ = id;
-#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->id = _tmp0_;
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp1_ = name;
+ self->id = id;
#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp2_ = g_strdup (_tmp1_);
+ _tmp0_ = g_strdup (name);
#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (self->name);
#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->name = _tmp2_;
+ self->name = _tmp0_;
#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return self;
-#line 1976 "PiwigoPublishing.c"
+#line 2369 "PiwigoPublishing.c"
}
-PublishingPiwigoSizeEntry* publishing_piwigo_size_entry_new (gint id, const gchar* name) {
+PublishingPiwigoSizeEntry*
+publishing_piwigo_size_entry_new (gint id,
+ const gchar* name)
+{
#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return publishing_piwigo_size_entry_construct (PUBLISHING_PIWIGO_TYPE_SIZE_ENTRY, id, name);
-#line 1983 "PiwigoPublishing.c"
+#line 2379 "PiwigoPublishing.c"
}
-static void publishing_piwigo_value_size_entry_init (GValue* value) {
+static void
+publishing_piwigo_value_size_entry_init (GValue* value)
+{
#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 1990 "PiwigoPublishing.c"
+#line 2388 "PiwigoPublishing.c"
}
-static void publishing_piwigo_value_size_entry_free_value (GValue* value) {
+static void
+publishing_piwigo_value_size_entry_free_value (GValue* value)
+{
#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (value->data[0].v_pointer) {
#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_size_entry_unref (value->data[0].v_pointer);
-#line 1999 "PiwigoPublishing.c"
+#line 2399 "PiwigoPublishing.c"
}
}
-static void publishing_piwigo_value_size_entry_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+publishing_piwigo_value_size_entry_copy_value (const GValue* src_value,
+ GValue* dest_value)
+{
#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (src_value->data[0].v_pointer) {
#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
dest_value->data[0].v_pointer = publishing_piwigo_size_entry_ref (src_value->data[0].v_pointer);
-#line 2009 "PiwigoPublishing.c"
+#line 2412 "PiwigoPublishing.c"
} else {
#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
dest_value->data[0].v_pointer = NULL;
-#line 2013 "PiwigoPublishing.c"
+#line 2416 "PiwigoPublishing.c"
}
}
-static gpointer publishing_piwigo_value_size_entry_peek_pointer (const GValue* value) {
+static gpointer
+publishing_piwigo_value_size_entry_peek_pointer (const GValue* value)
+{
#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return value->data[0].v_pointer;
-#line 2021 "PiwigoPublishing.c"
+#line 2426 "PiwigoPublishing.c"
}
-static gchar* publishing_piwigo_value_size_entry_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_piwigo_value_size_entry_collect_value (GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (collect_values[0].v_pointer) {
-#line 2028 "PiwigoPublishing.c"
+#line 2438 "PiwigoPublishing.c"
PublishingPiwigoSizeEntry * object;
object = collect_values[0].v_pointer;
#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (object->parent_instance.g_class == NULL) {
#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2035 "PiwigoPublishing.c"
+#line 2445 "PiwigoPublishing.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2039 "PiwigoPublishing.c"
+#line 2449 "PiwigoPublishing.c"
}
#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
value->data[0].v_pointer = publishing_piwigo_size_entry_ref (object);
-#line 2043 "PiwigoPublishing.c"
+#line 2453 "PiwigoPublishing.c"
} else {
#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 2047 "PiwigoPublishing.c"
+#line 2457 "PiwigoPublishing.c"
}
#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return NULL;
-#line 2051 "PiwigoPublishing.c"
+#line 2461 "PiwigoPublishing.c"
}
-static gchar* publishing_piwigo_value_size_entry_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_piwigo_value_size_entry_lcopy_value (const GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
PublishingPiwigoSizeEntry ** object_p;
object_p = collect_values[0].v_pointer;
#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (!object_p) {
#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 2062 "PiwigoPublishing.c"
+#line 2477 "PiwigoPublishing.c"
}
#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (!value->data[0].v_pointer) {
#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
*object_p = NULL;
-#line 2068 "PiwigoPublishing.c"
+#line 2483 "PiwigoPublishing.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
*object_p = value->data[0].v_pointer;
-#line 2072 "PiwigoPublishing.c"
+#line 2487 "PiwigoPublishing.c"
} else {
#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
*object_p = publishing_piwigo_size_entry_ref (value->data[0].v_pointer);
-#line 2076 "PiwigoPublishing.c"
+#line 2491 "PiwigoPublishing.c"
}
#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return NULL;
-#line 2080 "PiwigoPublishing.c"
+#line 2495 "PiwigoPublishing.c"
}
-GParamSpec* publishing_piwigo_param_spec_size_entry (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+publishing_piwigo_param_spec_size_entry (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags)
+{
PublishingPiwigoParamSpecSizeEntry* spec;
#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_PIWIGO_TYPE_SIZE_ENTRY), NULL);
@@ -2090,20 +2511,25 @@ GParamSpec* publishing_piwigo_param_spec_size_entry (const gchar* name, const gc
G_PARAM_SPEC (spec)->value_type = object_type;
#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return G_PARAM_SPEC (spec);
-#line 2094 "PiwigoPublishing.c"
+#line 2515 "PiwigoPublishing.c"
}
-gpointer publishing_piwigo_value_get_size_entry (const GValue* value) {
+gpointer
+publishing_piwigo_value_get_size_entry (const GValue* value)
+{
#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PIWIGO_TYPE_SIZE_ENTRY), NULL);
#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return value->data[0].v_pointer;
-#line 2103 "PiwigoPublishing.c"
+#line 2526 "PiwigoPublishing.c"
}
-void publishing_piwigo_value_set_size_entry (GValue* value, gpointer v_object) {
+void
+publishing_piwigo_value_set_size_entry (GValue* value,
+ gpointer v_object)
+{
PublishingPiwigoSizeEntry * old;
#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PIWIGO_TYPE_SIZE_ENTRY));
@@ -2119,22 +2545,25 @@ void publishing_piwigo_value_set_size_entry (GValue* value, gpointer v_object) {
value->data[0].v_pointer = v_object;
#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_size_entry_ref (value->data[0].v_pointer);
-#line 2123 "PiwigoPublishing.c"
+#line 2549 "PiwigoPublishing.c"
} else {
#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 2127 "PiwigoPublishing.c"
+#line 2553 "PiwigoPublishing.c"
}
#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (old) {
#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_size_entry_unref (old);
-#line 2133 "PiwigoPublishing.c"
+#line 2559 "PiwigoPublishing.c"
}
}
-void publishing_piwigo_value_take_size_entry (GValue* value, gpointer v_object) {
+void
+publishing_piwigo_value_take_size_entry (GValue* value,
+ gpointer v_object)
+{
PublishingPiwigoSizeEntry * old;
#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PIWIGO_TYPE_SIZE_ENTRY));
@@ -2148,38 +2577,44 @@ void publishing_piwigo_value_take_size_entry (GValue* value, gpointer v_object)
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
value->data[0].v_pointer = v_object;
-#line 2152 "PiwigoPublishing.c"
+#line 2581 "PiwigoPublishing.c"
} else {
#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 2156 "PiwigoPublishing.c"
+#line 2585 "PiwigoPublishing.c"
}
#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (old) {
#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_size_entry_unref (old);
-#line 2162 "PiwigoPublishing.c"
+#line 2591 "PiwigoPublishing.c"
}
}
-static void publishing_piwigo_size_entry_class_init (PublishingPiwigoSizeEntryClass * klass) {
+static void
+publishing_piwigo_size_entry_class_init (PublishingPiwigoSizeEntryClass * klass)
+{
#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_size_entry_parent_class = g_type_class_peek_parent (klass);
#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
((PublishingPiwigoSizeEntryClass *) klass)->finalize = publishing_piwigo_size_entry_finalize;
-#line 2172 "PiwigoPublishing.c"
+#line 2603 "PiwigoPublishing.c"
}
-static void publishing_piwigo_size_entry_instance_init (PublishingPiwigoSizeEntry * self) {
+static void
+publishing_piwigo_size_entry_instance_init (PublishingPiwigoSizeEntry * self)
+{
#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->ref_count = 1;
-#line 2179 "PiwigoPublishing.c"
+#line 2612 "PiwigoPublishing.c"
}
-static void publishing_piwigo_size_entry_finalize (PublishingPiwigoSizeEntry * obj) {
+static void
+publishing_piwigo_size_entry_finalize (PublishingPiwigoSizeEntry * obj)
+{
PublishingPiwigoSizeEntry * self;
#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PIWIGO_TYPE_SIZE_ENTRY, PublishingPiwigoSizeEntry);
@@ -2187,11 +2622,13 @@ static void publishing_piwigo_size_entry_finalize (PublishingPiwigoSizeEntry * o
g_signal_handlers_destroy (self);
#line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (self->name);
-#line 2191 "PiwigoPublishing.c"
+#line 2626 "PiwigoPublishing.c"
}
-GType publishing_piwigo_size_entry_get_type (void) {
+GType
+publishing_piwigo_size_entry_get_type (void)
+{
static volatile gsize publishing_piwigo_size_entry_type_id__volatile = 0;
if (g_once_init_enter (&publishing_piwigo_size_entry_type_id__volatile)) {
static const GTypeValueTable g_define_type_value_table = { publishing_piwigo_value_size_entry_init, publishing_piwigo_value_size_entry_free_value, publishing_piwigo_value_size_entry_copy_value, publishing_piwigo_value_size_entry_peek_pointer, "p", publishing_piwigo_value_size_entry_collect_value, "p", publishing_piwigo_value_size_entry_lcopy_value };
@@ -2205,18 +2642,22 @@ GType publishing_piwigo_size_entry_get_type (void) {
}
-gpointer publishing_piwigo_size_entry_ref (gpointer instance) {
+gpointer
+publishing_piwigo_size_entry_ref (gpointer instance)
+{
PublishingPiwigoSizeEntry * self;
self = instance;
#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_atomic_int_inc (&self->ref_count);
#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return instance;
-#line 2216 "PiwigoPublishing.c"
+#line 2655 "PiwigoPublishing.c"
}
-void publishing_piwigo_size_entry_unref (gpointer instance) {
+void
+publishing_piwigo_size_entry_unref (gpointer instance)
+{
PublishingPiwigoSizeEntry * self;
self = instance;
#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -2225,126 +2666,155 @@ void publishing_piwigo_size_entry_unref (gpointer instance) {
PUBLISHING_PIWIGO_SIZE_ENTRY_GET_CLASS (self)->finalize (self);
#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 2229 "PiwigoPublishing.c"
+#line 2670 "PiwigoPublishing.c"
}
}
-PublishingPiwigoPublishingParameters* publishing_piwigo_publishing_parameters_construct (GType object_type) {
+PublishingPiwigoPublishingParameters*
+publishing_piwigo_publishing_parameters_construct (GType object_type)
+{
PublishingPiwigoPublishingParameters* self = NULL;
#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self = (PublishingPiwigoPublishingParameters*) g_type_create_instance (object_type);
#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return self;
-#line 2240 "PiwigoPublishing.c"
+#line 2683 "PiwigoPublishing.c"
}
-PublishingPiwigoPublishingParameters* publishing_piwigo_publishing_parameters_new (void) {
+PublishingPiwigoPublishingParameters*
+publishing_piwigo_publishing_parameters_new (void)
+{
#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return publishing_piwigo_publishing_parameters_construct (PUBLISHING_PIWIGO_TYPE_PUBLISHING_PARAMETERS);
-#line 2247 "PiwigoPublishing.c"
+#line 2692 "PiwigoPublishing.c"
}
-static void publishing_piwigo_value_publishing_parameters_init (GValue* value) {
+static void
+publishing_piwigo_value_publishing_parameters_init (GValue* value)
+{
#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 2254 "PiwigoPublishing.c"
+#line 2701 "PiwigoPublishing.c"
}
-static void publishing_piwigo_value_publishing_parameters_free_value (GValue* value) {
+static void
+publishing_piwigo_value_publishing_parameters_free_value (GValue* value)
+{
#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (value->data[0].v_pointer) {
#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_publishing_parameters_unref (value->data[0].v_pointer);
-#line 2263 "PiwigoPublishing.c"
+#line 2712 "PiwigoPublishing.c"
}
}
-static void publishing_piwigo_value_publishing_parameters_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+publishing_piwigo_value_publishing_parameters_copy_value (const GValue* src_value,
+ GValue* dest_value)
+{
#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (src_value->data[0].v_pointer) {
#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
dest_value->data[0].v_pointer = publishing_piwigo_publishing_parameters_ref (src_value->data[0].v_pointer);
-#line 2273 "PiwigoPublishing.c"
+#line 2725 "PiwigoPublishing.c"
} else {
#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
dest_value->data[0].v_pointer = NULL;
-#line 2277 "PiwigoPublishing.c"
+#line 2729 "PiwigoPublishing.c"
}
}
-static gpointer publishing_piwigo_value_publishing_parameters_peek_pointer (const GValue* value) {
+static gpointer
+publishing_piwigo_value_publishing_parameters_peek_pointer (const GValue* value)
+{
#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return value->data[0].v_pointer;
-#line 2285 "PiwigoPublishing.c"
+#line 2739 "PiwigoPublishing.c"
}
-static gchar* publishing_piwigo_value_publishing_parameters_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_piwigo_value_publishing_parameters_collect_value (GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (collect_values[0].v_pointer) {
-#line 2292 "PiwigoPublishing.c"
+#line 2751 "PiwigoPublishing.c"
PublishingPiwigoPublishingParameters * object;
object = collect_values[0].v_pointer;
#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (object->parent_instance.g_class == NULL) {
#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2299 "PiwigoPublishing.c"
+#line 2758 "PiwigoPublishing.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2303 "PiwigoPublishing.c"
+#line 2762 "PiwigoPublishing.c"
}
#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
value->data[0].v_pointer = publishing_piwigo_publishing_parameters_ref (object);
-#line 2307 "PiwigoPublishing.c"
+#line 2766 "PiwigoPublishing.c"
} else {
#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 2311 "PiwigoPublishing.c"
+#line 2770 "PiwigoPublishing.c"
}
#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return NULL;
-#line 2315 "PiwigoPublishing.c"
+#line 2774 "PiwigoPublishing.c"
}
-static gchar* publishing_piwigo_value_publishing_parameters_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_piwigo_value_publishing_parameters_lcopy_value (const GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
PublishingPiwigoPublishingParameters ** object_p;
object_p = collect_values[0].v_pointer;
#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (!object_p) {
#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 2326 "PiwigoPublishing.c"
+#line 2790 "PiwigoPublishing.c"
}
#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (!value->data[0].v_pointer) {
#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
*object_p = NULL;
-#line 2332 "PiwigoPublishing.c"
+#line 2796 "PiwigoPublishing.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
*object_p = value->data[0].v_pointer;
-#line 2336 "PiwigoPublishing.c"
+#line 2800 "PiwigoPublishing.c"
} else {
#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
*object_p = publishing_piwigo_publishing_parameters_ref (value->data[0].v_pointer);
-#line 2340 "PiwigoPublishing.c"
+#line 2804 "PiwigoPublishing.c"
}
#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return NULL;
-#line 2344 "PiwigoPublishing.c"
+#line 2808 "PiwigoPublishing.c"
}
-GParamSpec* publishing_piwigo_param_spec_publishing_parameters (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+publishing_piwigo_param_spec_publishing_parameters (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags)
+{
PublishingPiwigoParamSpecPublishingParameters* spec;
#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_PIWIGO_TYPE_PUBLISHING_PARAMETERS), NULL);
@@ -2354,20 +2824,25 @@ GParamSpec* publishing_piwigo_param_spec_publishing_parameters (const gchar* nam
G_PARAM_SPEC (spec)->value_type = object_type;
#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return G_PARAM_SPEC (spec);
-#line 2358 "PiwigoPublishing.c"
+#line 2828 "PiwigoPublishing.c"
}
-gpointer publishing_piwigo_value_get_publishing_parameters (const GValue* value) {
+gpointer
+publishing_piwigo_value_get_publishing_parameters (const GValue* value)
+{
#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PIWIGO_TYPE_PUBLISHING_PARAMETERS), NULL);
#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return value->data[0].v_pointer;
-#line 2367 "PiwigoPublishing.c"
+#line 2839 "PiwigoPublishing.c"
}
-void publishing_piwigo_value_set_publishing_parameters (GValue* value, gpointer v_object) {
+void
+publishing_piwigo_value_set_publishing_parameters (GValue* value,
+ gpointer v_object)
+{
PublishingPiwigoPublishingParameters * old;
#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PIWIGO_TYPE_PUBLISHING_PARAMETERS));
@@ -2383,22 +2858,25 @@ void publishing_piwigo_value_set_publishing_parameters (GValue* value, gpointer
value->data[0].v_pointer = v_object;
#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_publishing_parameters_ref (value->data[0].v_pointer);
-#line 2387 "PiwigoPublishing.c"
+#line 2862 "PiwigoPublishing.c"
} else {
#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 2391 "PiwigoPublishing.c"
+#line 2866 "PiwigoPublishing.c"
}
#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (old) {
#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_publishing_parameters_unref (old);
-#line 2397 "PiwigoPublishing.c"
+#line 2872 "PiwigoPublishing.c"
}
}
-void publishing_piwigo_value_take_publishing_parameters (GValue* value, gpointer v_object) {
+void
+publishing_piwigo_value_take_publishing_parameters (GValue* value,
+ gpointer v_object)
+{
PublishingPiwigoPublishingParameters * old;
#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PIWIGO_TYPE_PUBLISHING_PARAMETERS));
@@ -2412,31 +2890,35 @@ void publishing_piwigo_value_take_publishing_parameters (GValue* value, gpointer
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
value->data[0].v_pointer = v_object;
-#line 2416 "PiwigoPublishing.c"
+#line 2894 "PiwigoPublishing.c"
} else {
#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 2420 "PiwigoPublishing.c"
+#line 2898 "PiwigoPublishing.c"
}
#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (old) {
#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_publishing_parameters_unref (old);
-#line 2426 "PiwigoPublishing.c"
+#line 2904 "PiwigoPublishing.c"
}
}
-static void publishing_piwigo_publishing_parameters_class_init (PublishingPiwigoPublishingParametersClass * klass) {
+static void
+publishing_piwigo_publishing_parameters_class_init (PublishingPiwigoPublishingParametersClass * klass)
+{
#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_publishing_parameters_parent_class = g_type_class_peek_parent (klass);
#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
((PublishingPiwigoPublishingParametersClass *) klass)->finalize = publishing_piwigo_publishing_parameters_finalize;
-#line 2436 "PiwigoPublishing.c"
+#line 2916 "PiwigoPublishing.c"
}
-static void publishing_piwigo_publishing_parameters_instance_init (PublishingPiwigoPublishingParameters * self) {
+static void
+publishing_piwigo_publishing_parameters_instance_init (PublishingPiwigoPublishingParameters * self)
+{
#line 115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->category = NULL;
#line 116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -2449,11 +2931,13 @@ static void publishing_piwigo_publishing_parameters_instance_init (PublishingPiw
self->no_upload_tags = FALSE;
#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->ref_count = 1;
-#line 2453 "PiwigoPublishing.c"
+#line 2935 "PiwigoPublishing.c"
}
-static void publishing_piwigo_publishing_parameters_finalize (PublishingPiwigoPublishingParameters * obj) {
+static void
+publishing_piwigo_publishing_parameters_finalize (PublishingPiwigoPublishingParameters * obj)
+{
PublishingPiwigoPublishingParameters * self;
#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PIWIGO_TYPE_PUBLISHING_PARAMETERS, PublishingPiwigoPublishingParameters);
@@ -2465,11 +2949,13 @@ static void publishing_piwigo_publishing_parameters_finalize (PublishingPiwigoPu
_publishing_piwigo_permission_level_unref0 (self->perm_level);
#line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_piwigo_size_entry_unref0 (self->photo_size);
-#line 2469 "PiwigoPublishing.c"
+#line 2953 "PiwigoPublishing.c"
}
-GType publishing_piwigo_publishing_parameters_get_type (void) {
+GType
+publishing_piwigo_publishing_parameters_get_type (void)
+{
static volatile gsize publishing_piwigo_publishing_parameters_type_id__volatile = 0;
if (g_once_init_enter (&publishing_piwigo_publishing_parameters_type_id__volatile)) {
static const GTypeValueTable g_define_type_value_table = { publishing_piwigo_value_publishing_parameters_init, publishing_piwigo_value_publishing_parameters_free_value, publishing_piwigo_value_publishing_parameters_copy_value, publishing_piwigo_value_publishing_parameters_peek_pointer, "p", publishing_piwigo_value_publishing_parameters_collect_value, "p", publishing_piwigo_value_publishing_parameters_lcopy_value };
@@ -2483,18 +2969,22 @@ GType publishing_piwigo_publishing_parameters_get_type (void) {
}
-gpointer publishing_piwigo_publishing_parameters_ref (gpointer instance) {
+gpointer
+publishing_piwigo_publishing_parameters_ref (gpointer instance)
+{
PublishingPiwigoPublishingParameters * self;
self = instance;
#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_atomic_int_inc (&self->ref_count);
#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return instance;
-#line 2494 "PiwigoPublishing.c"
+#line 2982 "PiwigoPublishing.c"
}
-void publishing_piwigo_publishing_parameters_unref (gpointer instance) {
+void
+publishing_piwigo_publishing_parameters_unref (gpointer instance)
+{
PublishingPiwigoPublishingParameters * self;
self = instance;
#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -2503,18 +2993,20 @@ void publishing_piwigo_publishing_parameters_unref (gpointer instance) {
PUBLISHING_PIWIGO_PUBLISHING_PARAMETERS_GET_CLASS (self)->finalize (self);
#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 2507 "PiwigoPublishing.c"
+#line 2997 "PiwigoPublishing.c"
}
}
-PublishingPiwigoPiwigoPublisher* publishing_piwigo_piwigo_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host) {
+PublishingPiwigoPiwigoPublisher*
+publishing_piwigo_piwigo_publisher_construct (GType object_type,
+ SpitPublishingService* service,
+ SpitPublishingPluginHost* host)
+{
PublishingPiwigoPiwigoPublisher * self = NULL;
SpitPublishingService* _tmp0_;
- SpitPublishingService* _tmp1_;
- SpitPublishingPluginHost* _tmp2_;
- SpitPublishingPluginHost* _tmp3_;
- PublishingPiwigoSession* _tmp4_;
+ SpitPublishingPluginHost* _tmp1_;
+ PublishingPiwigoSession* _tmp2_;
#line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (SPIT_PUBLISHING_IS_SERVICE (service), NULL);
#line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -2524,41 +3016,42 @@ PublishingPiwigoPiwigoPublisher* publishing_piwigo_piwigo_publisher_construct (G
#line 137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_debug ("PiwigoPublishing.vala:137: PiwigoPublisher instantiated.");
#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp0_ = service;
-#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp1_ = _g_object_ref0 (_tmp0_);
+ _tmp0_ = _g_object_ref0 (service);
#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_object_unref0 (self->priv->service);
#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->service = _tmp1_;
+ self->priv->service = _tmp0_;
#line 139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp2_ = host;
-#line 139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp3_ = _g_object_ref0 (_tmp2_);
+ _tmp1_ = _g_object_ref0 (host);
#line 139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_object_unref0 (self->priv->host);
#line 139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->host = _tmp3_;
+ self->priv->host = _tmp1_;
#line 140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp4_ = publishing_piwigo_session_new ();
+ _tmp2_ = publishing_piwigo_session_new ();
#line 140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_rest_support_session_unref0 (self->priv->session);
#line 140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->session = _tmp4_;
+ self->priv->session = _tmp2_;
#line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return self;
-#line 2551 "PiwigoPublishing.c"
+#line 3039 "PiwigoPublishing.c"
}
-PublishingPiwigoPiwigoPublisher* publishing_piwigo_piwigo_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host) {
+PublishingPiwigoPiwigoPublisher*
+publishing_piwigo_piwigo_publisher_new (SpitPublishingService* service,
+ SpitPublishingPluginHost* host)
+{
#line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return publishing_piwigo_piwigo_publisher_construct (PUBLISHING_PIWIGO_TYPE_PIWIGO_PUBLISHER, service, host);
-#line 2558 "PiwigoPublishing.c"
+#line 3049 "PiwigoPublishing.c"
}
-static SpitPublishingService* publishing_piwigo_piwigo_publisher_real_get_service (SpitPublishingPublisher* base) {
+static SpitPublishingService*
+publishing_piwigo_piwigo_publisher_real_get_service (SpitPublishingPublisher* base)
+{
PublishingPiwigoPiwigoPublisher * self;
SpitPublishingService* result = NULL;
SpitPublishingService* _tmp0_;
@@ -2573,11 +3066,13 @@ static SpitPublishingService* publishing_piwigo_piwigo_publisher_real_get_servic
result = _tmp1_;
#line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 2577 "PiwigoPublishing.c"
+#line 3070 "PiwigoPublishing.c"
}
-SpitPublishingPluginHost* publishing_piwigo_piwigo_publisher_get_host (PublishingPiwigoPiwigoPublisher* self) {
+SpitPublishingPluginHost*
+publishing_piwigo_piwigo_publisher_get_host (PublishingPiwigoPiwigoPublisher* self)
+{
SpitPublishingPluginHost* result = NULL;
SpitPublishingPluginHost* _tmp0_;
SpitPublishingPluginHost* _tmp1_;
@@ -2591,11 +3086,13 @@ SpitPublishingPluginHost* publishing_piwigo_piwigo_publisher_get_host (Publishin
result = _tmp1_;
#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 2595 "PiwigoPublishing.c"
+#line 3090 "PiwigoPublishing.c"
}
-static gboolean publishing_piwigo_piwigo_publisher_real_is_running (SpitPublishingPublisher* base) {
+static gboolean
+publishing_piwigo_piwigo_publisher_real_is_running (SpitPublishingPublisher* base)
+{
PublishingPiwigoPiwigoPublisher * self;
gboolean result = FALSE;
gboolean _tmp0_;
@@ -2607,117 +3104,110 @@ static gboolean publishing_piwigo_piwigo_publisher_real_is_running (SpitPublishi
result = _tmp0_;
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 2611 "PiwigoPublishing.c"
+#line 3108 "PiwigoPublishing.c"
}
-static void publishing_piwigo_piwigo_publisher_real_start (SpitPublishingPublisher* base) {
+static void
+publishing_piwigo_piwigo_publisher_real_start (SpitPublishingPublisher* base)
+{
PublishingPiwigoPiwigoPublisher * self;
- gboolean _tmp0_;
- PublishingPiwigoSession* _tmp1_;
- gboolean _tmp2_;
+ PublishingPiwigoSession* _tmp0_;
#line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_PIWIGO_PUBLISHER, PublishingPiwigoPiwigoPublisher);
#line 158 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 158 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (_tmp0_) {
+ if (spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
#line 159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return;
-#line 2628 "PiwigoPublishing.c"
+#line 3123 "PiwigoPublishing.c"
}
#line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_debug ("PiwigoPublishing.vala:161: PiwigoPublisher: starting interaction.");
#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->priv->running = TRUE;
#line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp1_ = self->priv->session;
-#line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp2_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
+ _tmp0_ = self->priv->session;
#line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (_tmp2_) {
+ if (publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession))) {
#line 166 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_debug ("PiwigoPublishing.vala:166: PiwigoPublisher: session is authenticated.");
#line 167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_do_fetch_categories (self);
-#line 2644 "PiwigoPublishing.c"
+#line 3137 "PiwigoPublishing.c"
} else {
gchar* persistent_url = NULL;
- gchar* _tmp3_;
+ gchar* _tmp1_;
gchar* persistent_username = NULL;
- gchar* _tmp4_;
+ gchar* _tmp2_;
gchar* persistent_password = NULL;
- gchar* _tmp5_;
- gboolean _tmp6_ = FALSE;
- gboolean _tmp7_ = FALSE;
- const gchar* _tmp8_;
+ gchar* _tmp3_;
+ gboolean _tmp4_ = FALSE;
+ gboolean _tmp5_ = FALSE;
+ const gchar* _tmp6_;
#line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_debug ("PiwigoPublishing.vala:169: PiwigoPublisher: session is not authenticat" \
"ed.");
#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp3_ = publishing_piwigo_piwigo_publisher_get_persistent_url (self);
+ _tmp1_ = publishing_piwigo_piwigo_publisher_get_persistent_url (self);
#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- persistent_url = _tmp3_;
+ persistent_url = _tmp1_;
#line 171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp4_ = publishing_piwigo_piwigo_publisher_get_persistent_username (self);
+ _tmp2_ = publishing_piwigo_piwigo_publisher_get_persistent_username (self);
#line 171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- persistent_username = _tmp4_;
+ persistent_username = _tmp2_;
#line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp5_ = publishing_piwigo_piwigo_publisher_get_persistent_password (self);
+ _tmp3_ = publishing_piwigo_piwigo_publisher_get_persistent_password (self);
#line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- persistent_password = _tmp5_;
+ persistent_password = _tmp3_;
#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp8_ = persistent_url;
+ _tmp6_ = persistent_url;
#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (_tmp8_ != NULL) {
-#line 2673 "PiwigoPublishing.c"
- const gchar* _tmp9_;
+ if (_tmp6_ != NULL) {
+#line 3166 "PiwigoPublishing.c"
+ const gchar* _tmp7_;
#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp9_ = persistent_username;
+ _tmp7_ = persistent_username;
#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp7_ = _tmp9_ != NULL;
-#line 2679 "PiwigoPublishing.c"
+ _tmp5_ = _tmp7_ != NULL;
+#line 3172 "PiwigoPublishing.c"
} else {
#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp7_ = FALSE;
-#line 2683 "PiwigoPublishing.c"
+ _tmp5_ = FALSE;
+#line 3176 "PiwigoPublishing.c"
}
#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (_tmp7_) {
-#line 2687 "PiwigoPublishing.c"
- const gchar* _tmp10_;
+ if (_tmp5_) {
+#line 3180 "PiwigoPublishing.c"
+ const gchar* _tmp8_;
#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp10_ = persistent_password;
+ _tmp8_ = persistent_password;
#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp6_ = _tmp10_ != NULL;
-#line 2693 "PiwigoPublishing.c"
+ _tmp4_ = _tmp8_ != NULL;
+#line 3186 "PiwigoPublishing.c"
} else {
#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp6_ = FALSE;
-#line 2697 "PiwigoPublishing.c"
+ _tmp4_ = FALSE;
+#line 3190 "PiwigoPublishing.c"
}
#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (_tmp6_) {
-#line 2701 "PiwigoPublishing.c"
+ if (_tmp4_) {
+#line 3194 "PiwigoPublishing.c"
+ const gchar* _tmp9_;
+ const gchar* _tmp10_;
const gchar* _tmp11_;
- const gchar* _tmp12_;
- const gchar* _tmp13_;
- gboolean _tmp14_;
-#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp11_ = persistent_url;
#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp12_ = persistent_username;
+ _tmp9_ = persistent_url;
#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp13_ = persistent_password;
+ _tmp10_ = persistent_username;
#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp14_ = publishing_piwigo_piwigo_publisher_get_remember_password (self);
+ _tmp11_ = persistent_password;
#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- publishing_piwigo_piwigo_publisher_do_network_login (self, _tmp11_, _tmp12_, _tmp13_, _tmp14_);
-#line 2716 "PiwigoPublishing.c"
+ publishing_piwigo_piwigo_publisher_do_network_login (self, _tmp9_, _tmp10_, _tmp11_, publishing_piwigo_piwigo_publisher_get_remember_password (self));
+#line 3206 "PiwigoPublishing.c"
} else {
#line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_do_show_authentication_pane (self, PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_INTRO);
-#line 2720 "PiwigoPublishing.c"
+#line 3210 "PiwigoPublishing.c"
}
#line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (persistent_password);
@@ -2725,22 +3215,26 @@ static void publishing_piwigo_piwigo_publisher_real_start (SpitPublishingPublish
_g_free0 (persistent_username);
#line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (persistent_url);
-#line 2728 "PiwigoPublishing.c"
+#line 3218 "PiwigoPublishing.c"
}
}
-static void publishing_piwigo_piwigo_publisher_real_stop (SpitPublishingPublisher* base) {
+static void
+publishing_piwigo_piwigo_publisher_real_stop (SpitPublishingPublisher* base)
+{
PublishingPiwigoPiwigoPublisher * self;
#line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_PIWIGO_PUBLISHER, PublishingPiwigoPiwigoPublisher);
#line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->priv->running = FALSE;
-#line 2739 "PiwigoPublishing.c"
+#line 3231 "PiwigoPublishing.c"
}
-gchar* publishing_piwigo_piwigo_publisher_get_persistent_url (PublishingPiwigoPiwigoPublisher* self) {
+gchar*
+publishing_piwigo_piwigo_publisher_get_persistent_url (PublishingPiwigoPiwigoPublisher* self)
+{
gchar* result = NULL;
SpitPublishingPluginHost* _tmp0_;
gchar* _tmp1_;
@@ -2754,13 +3248,15 @@ gchar* publishing_piwigo_piwigo_publisher_get_persistent_url (PublishingPiwigoPi
result = _tmp1_;
#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 2757 "PiwigoPublishing.c"
+#line 3251 "PiwigoPublishing.c"
}
-static void publishing_piwigo_piwigo_publisher_set_persistent_url (PublishingPiwigoPiwigoPublisher* self, const gchar* url) {
+static void
+publishing_piwigo_piwigo_publisher_set_persistent_url (PublishingPiwigoPiwigoPublisher* self,
+ const gchar* url)
+{
SpitPublishingPluginHost* _tmp0_;
- const gchar* _tmp1_;
#line 191 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
#line 191 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -2768,14 +3264,14 @@ static void publishing_piwigo_piwigo_publisher_set_persistent_url (PublishingPiw
#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = self->priv->host;
#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp1_ = url;
-#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "url", _tmp1_);
-#line 2774 "PiwigoPublishing.c"
+ spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "url", url);
+#line 3268 "PiwigoPublishing.c"
}
-gchar* publishing_piwigo_piwigo_publisher_get_persistent_username (PublishingPiwigoPiwigoPublisher* self) {
+gchar*
+publishing_piwigo_piwigo_publisher_get_persistent_username (PublishingPiwigoPiwigoPublisher* self)
+{
gchar* result = NULL;
SpitPublishingPluginHost* _tmp0_;
gchar* _tmp1_;
@@ -2789,13 +3285,15 @@ gchar* publishing_piwigo_piwigo_publisher_get_persistent_username (PublishingPiw
result = _tmp1_;
#line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 2792 "PiwigoPublishing.c"
+#line 3288 "PiwigoPublishing.c"
}
-static void publishing_piwigo_piwigo_publisher_set_persistent_username (PublishingPiwigoPiwigoPublisher* self, const gchar* username) {
+static void
+publishing_piwigo_piwigo_publisher_set_persistent_username (PublishingPiwigoPiwigoPublisher* self,
+ const gchar* username)
+{
SpitPublishingPluginHost* _tmp0_;
- const gchar* _tmp1_;
#line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
#line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -2803,14 +3301,14 @@ static void publishing_piwigo_piwigo_publisher_set_persistent_username (Publishi
#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = self->priv->host;
#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp1_ = username;
-#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "username", _tmp1_);
-#line 2809 "PiwigoPublishing.c"
+ spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "username", username);
+#line 3305 "PiwigoPublishing.c"
}
-gchar* publishing_piwigo_piwigo_publisher_get_persistent_password (PublishingPiwigoPiwigoPublisher* self) {
+gchar*
+publishing_piwigo_piwigo_publisher_get_persistent_password (PublishingPiwigoPiwigoPublisher* self)
+{
gchar* result = NULL;
SpitPublishingPluginHost* _tmp0_;
gchar* _tmp1_;
@@ -2824,253 +3322,246 @@ gchar* publishing_piwigo_piwigo_publisher_get_persistent_password (PublishingPiw
result = _tmp1_;
#line 204 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 2827 "PiwigoPublishing.c"
+#line 3325 "PiwigoPublishing.c"
}
-static void publishing_piwigo_piwigo_publisher_set_persistent_password (PublishingPiwigoPiwigoPublisher* self, const gchar* password) {
+static void
+publishing_piwigo_piwigo_publisher_set_persistent_password (PublishingPiwigoPiwigoPublisher* self,
+ const gchar* password)
+{
SpitPublishingPluginHost* _tmp0_;
- const gchar* _tmp1_;
#line 207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
#line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = self->priv->host;
#line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp1_ = password;
-#line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "password", _tmp1_);
-#line 2842 "PiwigoPublishing.c"
+ spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "password", password);
+#line 3340 "PiwigoPublishing.c"
}
-gboolean publishing_piwigo_piwigo_publisher_get_remember_password (PublishingPiwigoPiwigoPublisher* self) {
+gboolean
+publishing_piwigo_piwigo_publisher_get_remember_password (PublishingPiwigoPiwigoPublisher* self)
+{
gboolean result = FALSE;
SpitPublishingPluginHost* _tmp0_;
- gboolean _tmp1_;
#line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self), FALSE);
#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = self->priv->host;
#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp1_ = spit_host_interface_get_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "remember-password", FALSE);
-#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- result = _tmp1_;
+ result = spit_host_interface_get_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "remember-password", FALSE);
#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 2860 "PiwigoPublishing.c"
+#line 3357 "PiwigoPublishing.c"
}
-static void publishing_piwigo_piwigo_publisher_set_remember_password (PublishingPiwigoPiwigoPublisher* self, gboolean remember_password) {
+static void
+publishing_piwigo_piwigo_publisher_set_remember_password (PublishingPiwigoPiwigoPublisher* self,
+ gboolean remember_password)
+{
SpitPublishingPluginHost* _tmp0_;
- gboolean _tmp1_;
#line 215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
#line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = self->priv->host;
#line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp1_ = remember_password;
-#line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "remember-password", _tmp1_);
-#line 2875 "PiwigoPublishing.c"
+ spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "remember-password", remember_password);
+#line 3372 "PiwigoPublishing.c"
}
-gint publishing_piwigo_piwigo_publisher_get_last_category (PublishingPiwigoPiwigoPublisher* self) {
+gint
+publishing_piwigo_piwigo_publisher_get_last_category (PublishingPiwigoPiwigoPublisher* self)
+{
gint result = 0;
SpitPublishingPluginHost* _tmp0_;
- gint _tmp1_;
#line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self), 0);
#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = self->priv->host;
#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp1_ = spit_host_interface_get_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-category", -1);
-#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- result = _tmp1_;
+ result = spit_host_interface_get_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-category", -1);
#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 2893 "PiwigoPublishing.c"
+#line 3389 "PiwigoPublishing.c"
}
-static void publishing_piwigo_piwigo_publisher_set_last_category (PublishingPiwigoPiwigoPublisher* self, gint last_category) {
+static void
+publishing_piwigo_piwigo_publisher_set_last_category (PublishingPiwigoPiwigoPublisher* self,
+ gint last_category)
+{
SpitPublishingPluginHost* _tmp0_;
- gint _tmp1_;
#line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
#line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = self->priv->host;
#line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp1_ = last_category;
-#line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-category", _tmp1_);
-#line 2908 "PiwigoPublishing.c"
+ spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-category", last_category);
+#line 3404 "PiwigoPublishing.c"
}
-gint publishing_piwigo_piwigo_publisher_get_last_permission_level (PublishingPiwigoPiwigoPublisher* self) {
+gint
+publishing_piwigo_piwigo_publisher_get_last_permission_level (PublishingPiwigoPiwigoPublisher* self)
+{
gint result = 0;
SpitPublishingPluginHost* _tmp0_;
- gint _tmp1_;
#line 227 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self), 0);
#line 228 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = self->priv->host;
#line 228 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp1_ = spit_host_interface_get_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-permission-level", -1);
-#line 228 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- result = _tmp1_;
+ result = spit_host_interface_get_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-permission-level", -1);
#line 228 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 2926 "PiwigoPublishing.c"
+#line 3421 "PiwigoPublishing.c"
}
-static void publishing_piwigo_piwigo_publisher_set_last_permission_level (PublishingPiwigoPiwigoPublisher* self, gint last_permission_level) {
+static void
+publishing_piwigo_piwigo_publisher_set_last_permission_level (PublishingPiwigoPiwigoPublisher* self,
+ gint last_permission_level)
+{
SpitPublishingPluginHost* _tmp0_;
- gint _tmp1_;
#line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = self->priv->host;
#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp1_ = last_permission_level;
-#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-permission-level", _tmp1_);
-#line 2941 "PiwigoPublishing.c"
+ spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-permission-level", last_permission_level);
+#line 3436 "PiwigoPublishing.c"
}
-gint publishing_piwigo_piwigo_publisher_get_last_photo_size (PublishingPiwigoPiwigoPublisher* self) {
+gint
+publishing_piwigo_piwigo_publisher_get_last_photo_size (PublishingPiwigoPiwigoPublisher* self)
+{
gint result = 0;
SpitPublishingPluginHost* _tmp0_;
- gint _tmp1_;
#line 235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self), 0);
#line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = self->priv->host;
#line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp1_ = spit_host_interface_get_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-photo-size", -1);
-#line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- result = _tmp1_;
+ result = spit_host_interface_get_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-photo-size", -1);
#line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 2959 "PiwigoPublishing.c"
+#line 3453 "PiwigoPublishing.c"
}
-static void publishing_piwigo_piwigo_publisher_set_last_photo_size (PublishingPiwigoPiwigoPublisher* self, gint last_photo_size) {
+static void
+publishing_piwigo_piwigo_publisher_set_last_photo_size (PublishingPiwigoPiwigoPublisher* self,
+ gint last_photo_size)
+{
SpitPublishingPluginHost* _tmp0_;
- gint _tmp1_;
#line 239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
#line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = self->priv->host;
#line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp1_ = last_photo_size;
-#line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-photo-size", _tmp1_);
-#line 2974 "PiwigoPublishing.c"
+ spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-photo-size", last_photo_size);
+#line 3468 "PiwigoPublishing.c"
}
-static gboolean publishing_piwigo_piwigo_publisher_get_last_title_as_comment (PublishingPiwigoPiwigoPublisher* self) {
+static gboolean
+publishing_piwigo_piwigo_publisher_get_last_title_as_comment (PublishingPiwigoPiwigoPublisher* self)
+{
gboolean result = FALSE;
SpitPublishingPluginHost* _tmp0_;
- gboolean _tmp1_;
#line 243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self), FALSE);
#line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = self->priv->host;
#line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp1_ = spit_host_interface_get_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-title-as-comment", FALSE);
-#line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- result = _tmp1_;
+ result = spit_host_interface_get_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-title-as-comment", FALSE);
#line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 2992 "PiwigoPublishing.c"
+#line 3485 "PiwigoPublishing.c"
}
-static void publishing_piwigo_piwigo_publisher_set_last_title_as_comment (PublishingPiwigoPiwigoPublisher* self, gboolean title_as_comment) {
+static void
+publishing_piwigo_piwigo_publisher_set_last_title_as_comment (PublishingPiwigoPiwigoPublisher* self,
+ gboolean title_as_comment)
+{
SpitPublishingPluginHost* _tmp0_;
- gboolean _tmp1_;
#line 247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
#line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = self->priv->host;
#line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp1_ = title_as_comment;
-#line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-title-as-comment", _tmp1_);
-#line 3007 "PiwigoPublishing.c"
+ spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-title-as-comment", title_as_comment);
+#line 3500 "PiwigoPublishing.c"
}
-static gboolean publishing_piwigo_piwigo_publisher_get_last_no_upload_tags (PublishingPiwigoPiwigoPublisher* self) {
+static gboolean
+publishing_piwigo_piwigo_publisher_get_last_no_upload_tags (PublishingPiwigoPiwigoPublisher* self)
+{
gboolean result = FALSE;
SpitPublishingPluginHost* _tmp0_;
- gboolean _tmp1_;
#line 251 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self), FALSE);
#line 252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = self->priv->host;
#line 252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp1_ = spit_host_interface_get_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-no-upload-tags", FALSE);
-#line 252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- result = _tmp1_;
+ result = spit_host_interface_get_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-no-upload-tags", FALSE);
#line 252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 3025 "PiwigoPublishing.c"
+#line 3517 "PiwigoPublishing.c"
}
-static void publishing_piwigo_piwigo_publisher_set_last_no_upload_tags (PublishingPiwigoPiwigoPublisher* self, gboolean no_upload_tags) {
+static void
+publishing_piwigo_piwigo_publisher_set_last_no_upload_tags (PublishingPiwigoPiwigoPublisher* self,
+ gboolean no_upload_tags)
+{
SpitPublishingPluginHost* _tmp0_;
- gboolean _tmp1_;
#line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
#line 256 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = self->priv->host;
#line 256 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp1_ = no_upload_tags;
-#line 256 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-no-upload-tags", _tmp1_);
-#line 3040 "PiwigoPublishing.c"
+ spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-no-upload-tags", no_upload_tags);
+#line 3532 "PiwigoPublishing.c"
}
-static gboolean publishing_piwigo_piwigo_publisher_get_metadata_removal_choice (PublishingPiwigoPiwigoPublisher* self) {
+static gboolean
+publishing_piwigo_piwigo_publisher_get_metadata_removal_choice (PublishingPiwigoPiwigoPublisher* self)
+{
gboolean result = FALSE;
SpitPublishingPluginHost* _tmp0_;
- gboolean _tmp1_;
#line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self), FALSE);
#line 260 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = self->priv->host;
#line 260 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp1_ = spit_host_interface_get_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "strip_metadata", FALSE);
-#line 260 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- result = _tmp1_;
+ result = spit_host_interface_get_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "strip_metadata", FALSE);
#line 260 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 3058 "PiwigoPublishing.c"
+#line 3549 "PiwigoPublishing.c"
}
-static void publishing_piwigo_piwigo_publisher_set_metadata_removal_choice (PublishingPiwigoPiwigoPublisher* self, gboolean strip_metadata) {
+static void
+publishing_piwigo_piwigo_publisher_set_metadata_removal_choice (PublishingPiwigoPiwigoPublisher* self,
+ gboolean strip_metadata)
+{
SpitPublishingPluginHost* _tmp0_;
- gboolean _tmp1_;
#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = self->priv->host;
#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp1_ = strip_metadata;
-#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "strip_metadata", _tmp1_);
-#line 3073 "PiwigoPublishing.c"
+ spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "strip_metadata", strip_metadata);
+#line 3564 "PiwigoPublishing.c"
}
@@ -3085,22 +3576,31 @@ static void publishing_piwigo_piwigo_publisher_set_metadata_removal_choice (Publ
*
* @param mode the mode for the authentication pane
*/
-static void _publishing_piwigo_piwigo_publisher_on_authentication_pane_login_clicked_publishing_piwigo_authentication_pane_login (PublishingPiwigoAuthenticationPane* _sender, const gchar* url, const gchar* user, const gchar* password, gboolean remember_password, gpointer self) {
+static void
+_publishing_piwigo_piwigo_publisher_on_authentication_pane_login_clicked_publishing_piwigo_authentication_pane_login (PublishingPiwigoAuthenticationPane* _sender,
+ const gchar* url,
+ const gchar* user,
+ const gchar* password,
+ gboolean remember_password,
+ gpointer self)
+{
#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_on_authentication_pane_login_clicked ((PublishingPiwigoPiwigoPublisher*) self, url, user, password, remember_password);
-#line 3091 "PiwigoPublishing.c"
+#line 3589 "PiwigoPublishing.c"
}
-static void publishing_piwigo_piwigo_publisher_do_show_authentication_pane (PublishingPiwigoPiwigoPublisher* self, PublishingPiwigoAuthenticationPaneMode mode) {
+static void
+publishing_piwigo_piwigo_publisher_do_show_authentication_pane (PublishingPiwigoPiwigoPublisher* self,
+ PublishingPiwigoAuthenticationPaneMode mode)
+{
SpitPublishingPluginHost* _tmp0_;
PublishingPiwigoAuthenticationPane* authentication_pane = NULL;
- PublishingPiwigoAuthenticationPaneMode _tmp1_;
- PublishingPiwigoAuthenticationPane* _tmp2_;
+ PublishingPiwigoAuthenticationPane* _tmp1_;
+ SpitPublishingPluginHost* _tmp2_;
SpitPublishingPluginHost* _tmp3_;
- SpitPublishingPluginHost* _tmp4_;
+ GtkWidget* _tmp4_;
GtkWidget* _tmp5_;
- GtkWidget* _tmp6_;
#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -3110,34 +3610,34 @@ static void publishing_piwigo_piwigo_publisher_do_show_authentication_pane (Publ
#line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
spit_publishing_plugin_host_set_service_locked (_tmp0_, FALSE);
#line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp1_ = mode;
-#line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp2_ = publishing_piwigo_authentication_pane_new (self, _tmp1_);
+ _tmp1_ = publishing_piwigo_authentication_pane_new (self, mode);
#line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- authentication_pane = _tmp2_;
+ authentication_pane = _tmp1_;
#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_connect_object (authentication_pane, "login", (GCallback) _publishing_piwigo_piwigo_publisher_on_authentication_pane_login_clicked_publishing_piwigo_authentication_pane_login, self, 0);
#line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp3_ = self->priv->host;
+ _tmp2_ = self->priv->host;
#line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- spit_publishing_plugin_host_install_dialog_pane (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (authentication_pane, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CLOSE);
+ spit_publishing_plugin_host_install_dialog_pane (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (authentication_pane, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CLOSE);
#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp4_ = self->priv->host;
+ _tmp3_ = self->priv->host;
#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp5_ = shotwell_plugins_common_builder_pane_get_default_widget (G_TYPE_CHECK_INSTANCE_CAST (authentication_pane, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane));
+ _tmp4_ = shotwell_plugins_common_builder_pane_get_default_widget (G_TYPE_CHECK_INSTANCE_CAST (authentication_pane, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane));
#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp6_ = _tmp5_;
+ _tmp5_ = _tmp4_;
#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- spit_publishing_plugin_host_set_dialog_default_widget (_tmp4_, _tmp6_);
+ spit_publishing_plugin_host_set_dialog_default_widget (_tmp3_, _tmp5_);
#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_object_unref0 (_tmp6_);
+ _g_object_unref0 (_tmp5_);
#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_object_unref0 (authentication_pane);
-#line 3136 "PiwigoPublishing.c"
+#line 3634 "PiwigoPublishing.c"
}
-static void __lambda7_ (PublishingPiwigoPiwigoPublisher* self) {
+static void
+__lambda7_ (PublishingPiwigoPiwigoPublisher* self)
+{
PublishingPiwigoSession* _tmp0_;
PublishingPiwigoSession* _tmp1_;
gchar* persistent_url = NULL;
@@ -3178,39 +3678,38 @@ static void __lambda7_ (PublishingPiwigoPiwigoPublisher* self) {
_tmp7_ = persistent_url;
#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_tmp7_ != NULL) {
-#line 3180 "PiwigoPublishing.c"
+#line 3680 "PiwigoPublishing.c"
const gchar* _tmp8_;
#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp8_ = persistent_username;
#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp6_ = _tmp8_ != NULL;
-#line 3186 "PiwigoPublishing.c"
+#line 3686 "PiwigoPublishing.c"
} else {
#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp6_ = FALSE;
-#line 3190 "PiwigoPublishing.c"
+#line 3690 "PiwigoPublishing.c"
}
#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_tmp6_) {
-#line 3194 "PiwigoPublishing.c"
+#line 3694 "PiwigoPublishing.c"
const gchar* _tmp9_;
#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp9_ = persistent_password;
#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp5_ = _tmp9_ != NULL;
-#line 3200 "PiwigoPublishing.c"
+#line 3700 "PiwigoPublishing.c"
} else {
#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp5_ = FALSE;
-#line 3204 "PiwigoPublishing.c"
+#line 3704 "PiwigoPublishing.c"
}
#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_tmp5_) {
-#line 3208 "PiwigoPublishing.c"
+#line 3708 "PiwigoPublishing.c"
const gchar* _tmp10_;
const gchar* _tmp11_;
const gchar* _tmp12_;
- gboolean _tmp13_;
#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp10_ = persistent_url;
#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -3218,14 +3717,12 @@ static void __lambda7_ (PublishingPiwigoPiwigoPublisher* self) {
#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp12_ = persistent_password;
#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp13_ = publishing_piwigo_piwigo_publisher_get_remember_password (self);
-#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- publishing_piwigo_piwigo_publisher_do_network_login (self, _tmp10_, _tmp11_, _tmp12_, _tmp13_);
-#line 3223 "PiwigoPublishing.c"
+ publishing_piwigo_piwigo_publisher_do_network_login (self, _tmp10_, _tmp11_, _tmp12_, publishing_piwigo_piwigo_publisher_get_remember_password (self));
+#line 3720 "PiwigoPublishing.c"
} else {
#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_do_show_authentication_pane (self, PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_INTRO);
-#line 3227 "PiwigoPublishing.c"
+#line 3724 "PiwigoPublishing.c"
}
#line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (persistent_password);
@@ -3233,37 +3730,44 @@ static void __lambda7_ (PublishingPiwigoPiwigoPublisher* self) {
_g_free0 (persistent_username);
#line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (persistent_url);
-#line 3235 "PiwigoPublishing.c"
+#line 3732 "PiwigoPublishing.c"
}
-static void ___lambda7__publishing_piwigo_ssl_error_pane_proceed (PublishingPiwigoSSLErrorPane* _sender, gpointer self) {
+static void
+___lambda7__publishing_piwigo_ssl_error_pane_proceed (PublishingPiwigoSSLErrorPane* _sender,
+ gpointer self)
+{
#line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
__lambda7_ ((PublishingPiwigoPiwigoPublisher*) self);
-#line 3242 "PiwigoPublishing.c"
+#line 3742 "PiwigoPublishing.c"
}
-static void _vala_SoupURI_free (SoupURI* self) {
+static void
+_vala_SoupURI_free (SoupURI* self)
+{
#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_boxed_free (soup_uri_get_type (), self);
-#line 3249 "PiwigoPublishing.c"
+#line 3751 "PiwigoPublishing.c"
}
-static void publishing_piwigo_piwigo_publisher_do_show_ssl_downgrade_pane (PublishingPiwigoPiwigoPublisher* self, PublishingPiwigoSessionLoginTransaction* trans, const gchar* url) {
+static void
+publishing_piwigo_piwigo_publisher_do_show_ssl_downgrade_pane (PublishingPiwigoPiwigoPublisher* self,
+ PublishingPiwigoSessionLoginTransaction* trans,
+ const gchar* url)
+{
SoupURI* uri = NULL;
- const gchar* _tmp0_;
- SoupURI* _tmp1_;
- SpitPublishingPluginHost* _tmp2_;
+ SoupURI* _tmp0_;
+ SpitPublishingPluginHost* _tmp1_;
PublishingPiwigoSSLErrorPane* ssl_pane = NULL;
- PublishingPiwigoSessionLoginTransaction* _tmp3_;
- const gchar* _tmp4_;
- PublishingPiwigoSSLErrorPane* _tmp5_;
- SpitPublishingPluginHost* _tmp6_;
- SpitPublishingPluginHost* _tmp7_;
- GtkWidget* _tmp8_;
- GtkWidget* _tmp9_;
+ const gchar* _tmp2_;
+ PublishingPiwigoSSLErrorPane* _tmp3_;
+ SpitPublishingPluginHost* _tmp4_;
+ SpitPublishingPluginHost* _tmp5_;
+ GtkWidget* _tmp6_;
+ GtkWidget* _tmp7_;
#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -3271,44 +3775,40 @@ static void publishing_piwigo_piwigo_publisher_do_show_ssl_downgrade_pane (Publi
#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (url != NULL);
#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp0_ = url;
+ _tmp0_ = soup_uri_new (url);
#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp1_ = soup_uri_new (_tmp0_);
-#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- uri = _tmp1_;
+ uri = _tmp0_;
#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp2_ = self->priv->host;
+ _tmp1_ = self->priv->host;
#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- spit_publishing_plugin_host_set_service_locked (_tmp2_, FALSE);
-#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp3_ = trans;
+ spit_publishing_plugin_host_set_service_locked (_tmp1_, FALSE);
#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp4_ = soup_uri_get_host (uri);
+ _tmp2_ = soup_uri_get_host (uri);
#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp5_ = publishing_piwigo_ssl_error_pane_new (_tmp3_, _tmp4_);
+ _tmp3_ = publishing_piwigo_ssl_error_pane_new (trans, _tmp2_);
#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- ssl_pane = _tmp5_;
+ ssl_pane = _tmp3_;
#line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_connect_object (ssl_pane, "proceed", (GCallback) ___lambda7__publishing_piwigo_ssl_error_pane_proceed, self, 0);
#line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp6_ = self->priv->host;
+ _tmp4_ = self->priv->host;
#line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- spit_publishing_plugin_host_install_dialog_pane (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (ssl_pane, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CLOSE);
+ spit_publishing_plugin_host_install_dialog_pane (_tmp4_, G_TYPE_CHECK_INSTANCE_CAST (ssl_pane, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CLOSE);
#line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp7_ = self->priv->host;
+ _tmp5_ = self->priv->host;
#line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp8_ = shotwell_plugins_common_builder_pane_get_default_widget (G_TYPE_CHECK_INSTANCE_CAST (ssl_pane, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane));
+ _tmp6_ = shotwell_plugins_common_builder_pane_get_default_widget (G_TYPE_CHECK_INSTANCE_CAST (ssl_pane, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane));
#line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp9_ = _tmp8_;
+ _tmp7_ = _tmp6_;
#line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- spit_publishing_plugin_host_set_dialog_default_widget (_tmp7_, _tmp9_);
+ spit_publishing_plugin_host_set_dialog_default_widget (_tmp5_, _tmp7_);
#line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_object_unref0 (_tmp9_);
+ _g_object_unref0 (_tmp7_);
#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_object_unref0 (ssl_pane);
#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
__vala_SoupURI_free0 (uri);
-#line 3310 "PiwigoPublishing.c"
+#line 3810 "PiwigoPublishing.c"
}
@@ -3323,12 +3823,14 @@ static void publishing_piwigo_piwigo_publisher_do_show_ssl_downgrade_pane (Publi
* @param username the name of the Piwigo user as entered in the dialog
* @param password the password of the Piwigo as entered in the dialog
*/
-static void publishing_piwigo_piwigo_publisher_on_authentication_pane_login_clicked (PublishingPiwigoPiwigoPublisher* self, const gchar* url, const gchar* username, const gchar* password, gboolean remember_password) {
+static void
+publishing_piwigo_piwigo_publisher_on_authentication_pane_login_clicked (PublishingPiwigoPiwigoPublisher* self,
+ const gchar* url,
+ const gchar* username,
+ const gchar* password,
+ gboolean remember_password)
+{
gboolean _tmp0_;
- const gchar* _tmp1_;
- const gchar* _tmp2_;
- const gchar* _tmp3_;
- gboolean _tmp4_;
#line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
#line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -3345,19 +3847,11 @@ static void publishing_piwigo_piwigo_publisher_on_authentication_pane_login_clic
if (!_tmp0_) {
#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return;
-#line 3347 "PiwigoPublishing.c"
+#line 3849 "PiwigoPublishing.c"
}
#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp1_ = url;
-#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp2_ = username;
-#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp3_ = password;
-#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp4_ = remember_password;
-#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- publishing_piwigo_piwigo_publisher_do_network_login (self, _tmp1_, _tmp2_, _tmp3_, _tmp4_);
-#line 3359 "PiwigoPublishing.c"
+ publishing_piwigo_piwigo_publisher_do_network_login (self, url, username, password, remember_password);
+#line 3853 "PiwigoPublishing.c"
}
@@ -3372,34 +3866,42 @@ static void publishing_piwigo_piwigo_publisher_on_authentication_pane_login_clic
* @param username the name of the Piwigo user used to login
* @param password the password of the Piwigo user used to login
*/
-static void _publishing_piwigo_piwigo_publisher_on_login_network_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
+static void
+_publishing_piwigo_piwigo_publisher_on_login_network_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+ GError* err,
+ gpointer self)
+{
#line 360 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_on_login_network_error ((PublishingPiwigoPiwigoPublisher*) self, _sender, err);
-#line 3377 "PiwigoPublishing.c"
+#line 3875 "PiwigoPublishing.c"
}
-static void _publishing_piwigo_piwigo_publisher_on_login_network_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
+static void
+_publishing_piwigo_piwigo_publisher_on_login_network_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+ gpointer self)
+{
#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_on_login_network_complete ((PublishingPiwigoPiwigoPublisher*) self, _sender);
-#line 3384 "PiwigoPublishing.c"
+#line 3885 "PiwigoPublishing.c"
}
-static void publishing_piwigo_piwigo_publisher_do_network_login (PublishingPiwigoPiwigoPublisher* self, const gchar* url, const gchar* username, const gchar* password, gboolean remember_password) {
+static void
+publishing_piwigo_piwigo_publisher_do_network_login (PublishingPiwigoPiwigoPublisher* self,
+ const gchar* url,
+ const gchar* username,
+ const gchar* password,
+ gboolean remember_password)
+{
SpitPublishingPluginHost* _tmp0_;
SpitPublishingPluginHost* _tmp1_;
- gboolean _tmp2_;
- gboolean _tmp3_;
PublishingPiwigoSessionLoginTransaction* login_trans = NULL;
- PublishingPiwigoSession* _tmp5_;
- const gchar* _tmp6_;
- gchar* _tmp7_;
- gchar* _tmp8_;
- const gchar* _tmp9_;
- const gchar* _tmp10_;
- PublishingPiwigoSessionLoginTransaction* _tmp11_;
- PublishingPiwigoSessionLoginTransaction* _tmp12_;
+ PublishingPiwigoSession* _tmp2_;
+ gchar* _tmp3_;
+ gchar* _tmp4_;
+ PublishingPiwigoSessionLoginTransaction* _tmp5_;
+ PublishingPiwigoSessionLoginTransaction* _tmp6_;
GError * _inner_error_ = NULL;
#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
@@ -3420,50 +3922,36 @@ static void publishing_piwigo_piwigo_publisher_do_network_login (PublishingPiwig
#line 350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
spit_publishing_plugin_host_install_login_wait_pane (_tmp1_);
#line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp2_ = remember_password;
-#line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- publishing_piwigo_piwigo_publisher_set_remember_password (self, _tmp2_);
-#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp3_ = remember_password;
+ publishing_piwigo_piwigo_publisher_set_remember_password (self, remember_password);
#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (_tmp3_) {
-#line 3429 "PiwigoPublishing.c"
- const gchar* _tmp4_;
-#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp4_ = password;
+ if (remember_password) {
#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- publishing_piwigo_piwigo_publisher_set_persistent_password (self, _tmp4_);
-#line 3435 "PiwigoPublishing.c"
+ publishing_piwigo_piwigo_publisher_set_persistent_password (self, password);
+#line 3929 "PiwigoPublishing.c"
} else {
#line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_set_persistent_password (self, NULL);
-#line 3439 "PiwigoPublishing.c"
+#line 3933 "PiwigoPublishing.c"
}
#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp5_ = self->priv->session;
-#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp6_ = url;
-#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp7_ = publishing_piwigo_piwigo_publisher_normalise_url (_tmp6_);
-#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp8_ = _tmp7_;
+ _tmp2_ = self->priv->session;
#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp9_ = username;
+ _tmp3_ = publishing_piwigo_piwigo_publisher_normalise_url (url);
#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp10_ = password;
+ _tmp4_ = _tmp3_;
#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp11_ = publishing_piwigo_session_login_transaction_new (_tmp5_, _tmp8_, _tmp9_, _tmp10_);
+ _tmp5_ = publishing_piwigo_session_login_transaction_new (_tmp2_, _tmp4_, username, password);
#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp12_ = _tmp11_;
+ _tmp6_ = _tmp5_;
#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_free0 (_tmp8_);
+ _g_free0 (_tmp4_);
#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- login_trans = _tmp12_;
+ login_trans = _tmp6_;
#line 360 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (login_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_piwigo_piwigo_publisher_on_login_network_error_publishing_rest_support_transaction_network_error, self, 0);
#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (login_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_piwigo_piwigo_publisher_on_login_network_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 3465 "PiwigoPublishing.c"
+#line 3953 "PiwigoPublishing.c"
{
#line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (login_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
@@ -3471,7 +3959,7 @@ static void publishing_piwigo_piwigo_publisher_do_network_login (PublishingPiwig
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3473 "PiwigoPublishing.c"
+#line 3961 "PiwigoPublishing.c"
goto __catch28_spit_publishing_publishing_error;
}
#line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -3482,44 +3970,40 @@ static void publishing_piwigo_piwigo_publisher_do_network_login (PublishingPiwig
g_clear_error (&_inner_error_);
#line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return;
-#line 3484 "PiwigoPublishing.c"
+#line 3972 "PiwigoPublishing.c"
}
}
goto __finally28;
__catch28_spit_publishing_publishing_error:
{
GError* err = NULL;
- GError* _tmp13_;
+ GError* _tmp7_;
#line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
err = _inner_error_;
#line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_inner_error_ = NULL;
#line 366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp13_ = err;
+ _tmp7_ = err;
#line 366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (g_error_matches (_tmp13_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_SSL_FAILED)) {
-#line 3500 "PiwigoPublishing.c"
- const gchar* _tmp14_;
+ if (g_error_matches (_tmp7_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_SSL_FAILED)) {
#line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_debug ("PiwigoPublishing.vala:367: ERROR: SSL connection problems");
#line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp14_ = url;
-#line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- publishing_piwigo_piwigo_publisher_do_show_ssl_downgrade_pane (self, login_trans, _tmp14_);
-#line 3508 "PiwigoPublishing.c"
+ publishing_piwigo_piwigo_publisher_do_show_ssl_downgrade_pane (self, login_trans, url);
+#line 3992 "PiwigoPublishing.c"
} else {
- GError* _tmp15_;
+ GError* _tmp8_;
#line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_debug ("PiwigoPublishing.vala:370: ERROR: do_network_login");
#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp15_ = err;
+ _tmp8_ = err;
#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp15_);
-#line 3517 "PiwigoPublishing.c"
+ publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp8_);
+#line 4001 "PiwigoPublishing.c"
}
#line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_error_free0 (err);
-#line 3521 "PiwigoPublishing.c"
+#line 4005 "PiwigoPublishing.c"
}
__finally28:
#line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -3532,113 +4016,100 @@ static void publishing_piwigo_piwigo_publisher_do_network_login (PublishingPiwig
g_clear_error (&_inner_error_);
#line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return;
-#line 3534 "PiwigoPublishing.c"
+#line 4018 "PiwigoPublishing.c"
}
#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_rest_support_transaction_unref0 (login_trans);
-#line 3538 "PiwigoPublishing.c"
+#line 4022 "PiwigoPublishing.c"
}
-gchar* publishing_piwigo_piwigo_publisher_normalise_url (const gchar* url) {
+gchar*
+publishing_piwigo_piwigo_publisher_normalise_url (const gchar* url)
+{
gchar* result = NULL;
gchar* norm_url = NULL;
- const gchar* _tmp0_;
- gchar* _tmp1_;
- const gchar* _tmp2_;
- gboolean _tmp3_;
- gboolean _tmp10_ = FALSE;
- const gchar* _tmp11_;
- gboolean _tmp12_;
+ gchar* _tmp0_;
+ const gchar* _tmp1_;
+ gboolean _tmp7_ = FALSE;
+ const gchar* _tmp8_;
#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (url != NULL, NULL);
#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp0_ = url;
+ _tmp0_ = g_strdup (url);
#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp1_ = g_strdup (_tmp0_);
-#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- norm_url = _tmp1_;
-#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp2_ = norm_url;
+ norm_url = _tmp0_;
#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp3_ = g_str_has_suffix (_tmp2_, ".php");
+ _tmp1_ = norm_url;
#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (!_tmp3_) {
-#line 3566 "PiwigoPublishing.c"
- const gchar* _tmp4_;
- gboolean _tmp5_;
- const gchar* _tmp8_;
- gchar* _tmp9_;
-#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp4_ = norm_url;
+ if (!g_str_has_suffix (_tmp1_, ".php")) {
+#line 4045 "PiwigoPublishing.c"
+ const gchar* _tmp2_;
+ const gchar* _tmp5_;
+ gchar* _tmp6_;
#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp5_ = g_str_has_suffix (_tmp4_, "/");
+ _tmp2_ = norm_url;
#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (!_tmp5_) {
-#line 3577 "PiwigoPublishing.c"
- const gchar* _tmp6_;
- gchar* _tmp7_;
+ if (!g_str_has_suffix (_tmp2_, "/")) {
+#line 4053 "PiwigoPublishing.c"
+ const gchar* _tmp3_;
+ gchar* _tmp4_;
#line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp6_ = norm_url;
+ _tmp3_ = norm_url;
#line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp7_ = g_strconcat (_tmp6_, "/", NULL);
+ _tmp4_ = g_strconcat (_tmp3_, "/", NULL);
#line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (norm_url);
#line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- norm_url = _tmp7_;
-#line 3588 "PiwigoPublishing.c"
+ norm_url = _tmp4_;
+#line 4064 "PiwigoPublishing.c"
}
#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp8_ = norm_url;
+ _tmp5_ = norm_url;
#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp9_ = g_strconcat (_tmp8_, PUBLISHING_PIWIGO_PIWIGO_WS, NULL);
+ _tmp6_ = g_strconcat (_tmp5_, PUBLISHING_PIWIGO_PIWIGO_WS, NULL);
#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (norm_url);
#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- norm_url = _tmp9_;
-#line 3598 "PiwigoPublishing.c"
+ norm_url = _tmp6_;
+#line 4074 "PiwigoPublishing.c"
}
#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp11_ = norm_url;
-#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp12_ = g_str_has_prefix (_tmp11_, "http://");
+ _tmp8_ = norm_url;
#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (!_tmp12_) {
-#line 3606 "PiwigoPublishing.c"
- const gchar* _tmp13_;
- gboolean _tmp14_;
-#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp13_ = norm_url;
+ if (!g_str_has_prefix (_tmp8_, "http://")) {
+#line 4080 "PiwigoPublishing.c"
+ const gchar* _tmp9_;
#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp14_ = g_str_has_prefix (_tmp13_, "https://");
+ _tmp9_ = norm_url;
#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp10_ = !_tmp14_;
-#line 3615 "PiwigoPublishing.c"
+ _tmp7_ = !g_str_has_prefix (_tmp9_, "https://");
+#line 4086 "PiwigoPublishing.c"
} else {
#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp10_ = FALSE;
-#line 3619 "PiwigoPublishing.c"
+ _tmp7_ = FALSE;
+#line 4090 "PiwigoPublishing.c"
}
#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (_tmp10_) {
-#line 3623 "PiwigoPublishing.c"
- const gchar* _tmp15_;
- gchar* _tmp16_;
+ if (_tmp7_) {
+#line 4094 "PiwigoPublishing.c"
+ const gchar* _tmp10_;
+ gchar* _tmp11_;
#line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp15_ = norm_url;
+ _tmp10_ = norm_url;
#line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp16_ = g_strconcat ("http://", _tmp15_, NULL);
+ _tmp11_ = g_strconcat ("http://", _tmp10_, NULL);
#line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (norm_url);
#line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- norm_url = _tmp16_;
-#line 3634 "PiwigoPublishing.c"
+ norm_url = _tmp11_;
+#line 4105 "PiwigoPublishing.c"
}
#line 390 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
result = norm_url;
#line 390 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 3640 "PiwigoPublishing.c"
+#line 4111 "PiwigoPublishing.c"
}
@@ -3655,41 +4126,46 @@ gchar* publishing_piwigo_piwigo_publisher_normalise_url (const gchar* url) {
*
* @param txn the received REST transaction
*/
-static gchar* _publishing_piwigo_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response (PublishingRESTSupportXmlDocument* doc, gpointer self) {
+static gchar*
+_publishing_piwigo_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response (PublishingRESTSupportXmlDocument* doc,
+ gpointer self)
+{
gchar* result;
result = publishing_piwigo_transaction_validate_xml (doc);
#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 3662 "PiwigoPublishing.c"
+#line 4136 "PiwigoPublishing.c"
}
-static gchar* _publishing_piwigo_transaction_get_error_code_publishing_rest_support_xml_document_check_for_error_response (PublishingRESTSupportXmlDocument* doc, gpointer self) {
+static gchar*
+_publishing_piwigo_transaction_get_error_code_publishing_rest_support_xml_document_check_for_error_response (PublishingRESTSupportXmlDocument* doc,
+ gpointer self)
+{
gchar* result;
result = publishing_piwigo_transaction_get_error_code (doc);
#line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 3671 "PiwigoPublishing.c"
+#line 4148 "PiwigoPublishing.c"
}
-static void publishing_piwigo_piwigo_publisher_on_login_network_complete (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* txn) {
- PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_piwigo_piwigo_publisher_on_login_network_complete (PublishingPiwigoPiwigoPublisher* self,
+ PublishingRESTSupportTransaction* txn)
+{
+ guint _tmp0_;
guint _tmp1_;
- PublishingRESTSupportTransaction* _tmp2_;
- guint _tmp3_;
gchar* endpoint_url = NULL;
- PublishingRESTSupportTransaction* _tmp19_;
- gchar* _tmp20_;
- const gchar* _tmp21_;
+ gchar* _tmp14_;
+ const gchar* _tmp15_;
gchar* pwg_id = NULL;
- PublishingRESTSupportTransaction* _tmp22_;
- gchar* _tmp23_;
- const gchar* _tmp24_;
- PublishingPiwigoSession* _tmp25_;
- const gchar* _tmp26_;
- const gchar* _tmp27_;
- const gchar* _tmp28_;
+ gchar* _tmp16_;
+ const gchar* _tmp17_;
+ PublishingPiwigoSession* _tmp18_;
+ const gchar* _tmp19_;
+ const gchar* _tmp20_;
+ const gchar* _tmp21_;
GError * _inner_error_ = NULL;
#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
@@ -3698,43 +4174,36 @@ static void publishing_piwigo_piwigo_publisher_on_login_network_complete (Publis
#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_debug ("PiwigoPublishing.vala:407: EVENT: on_login_network_complete");
#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp0_ = txn;
-#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
+ g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_login_network_complete_publishing_rest_support_transaction_completed, self);
+ g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_login_network_complete_publishing_rest_support_transaction_completed, self);
#line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp2_ = txn;
+ g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
#line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_login_network_error_publishing_rest_support_transaction_network_error, self);
-#line 3711 "PiwigoPublishing.c"
+ g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_login_network_error_publishing_rest_support_transaction_network_error, self);
+#line 4183 "PiwigoPublishing.c"
{
- PublishingRESTSupportTransaction* _tmp4_;
- gchar* _tmp5_;
- gchar* _tmp6_;
- PublishingRESTSupportXmlDocument* _tmp7_;
- PublishingRESTSupportXmlDocument* _tmp8_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
+ PublishingRESTSupportXmlDocument* _tmp4_;
+ PublishingRESTSupportXmlDocument* _tmp5_;
#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp4_ = txn;
+ _tmp2_ = publishing_rest_support_transaction_get_response (txn);
#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp5_ = publishing_rest_support_transaction_get_response (_tmp4_);
+ _tmp3_ = _tmp2_;
#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp6_ = _tmp5_;
+ _tmp4_ = publishing_rest_support_xml_document_parse_string (_tmp3_, _publishing_piwigo_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response, NULL, &_inner_error_);
#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp7_ = publishing_rest_support_xml_document_parse_string (_tmp6_, _publishing_piwigo_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response, NULL, &_inner_error_);
+ _tmp5_ = _tmp4_;
#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp8_ = _tmp7_;
+ _publishing_rest_support_xml_document_unref0 (_tmp5_);
#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _publishing_rest_support_xml_document_unref0 (_tmp8_);
-#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_free0 (_tmp6_);
+ _g_free0 (_tmp3_);
#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3736 "PiwigoPublishing.c"
+#line 4205 "PiwigoPublishing.c"
goto __catch29_spit_publishing_publishing_error;
}
#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -3743,7 +4212,7 @@ static void publishing_piwigo_piwigo_publisher_on_login_network_complete (Publis
g_clear_error (&_inner_error_);
#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return;
-#line 3745 "PiwigoPublishing.c"
+#line 4214 "PiwigoPublishing.c"
}
}
goto __finally29;
@@ -3754,32 +4223,29 @@ static void publishing_piwigo_piwigo_publisher_on_login_network_complete (Publis
err = _inner_error_;
#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_inner_error_ = NULL;
-#line 3756 "PiwigoPublishing.c"
+#line 4225 "PiwigoPublishing.c"
{
- PublishingRESTSupportTransaction* _tmp9_;
- gchar* _tmp10_;
- gchar* _tmp11_;
- PublishingRESTSupportXmlDocument* _tmp12_;
- PublishingRESTSupportXmlDocument* _tmp13_;
-#line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp9_ = txn;
+ gchar* _tmp6_;
+ gchar* _tmp7_;
+ PublishingRESTSupportXmlDocument* _tmp8_;
+ PublishingRESTSupportXmlDocument* _tmp9_;
#line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp10_ = publishing_rest_support_transaction_get_response (_tmp9_);
+ _tmp6_ = publishing_rest_support_transaction_get_response (txn);
#line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp11_ = _tmp10_;
+ _tmp7_ = _tmp6_;
#line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp12_ = publishing_rest_support_xml_document_parse_string (_tmp11_, _publishing_piwigo_transaction_get_error_code_publishing_rest_support_xml_document_check_for_error_response, NULL, &_inner_error_);
+ _tmp8_ = publishing_rest_support_xml_document_parse_string (_tmp7_, _publishing_piwigo_transaction_get_error_code_publishing_rest_support_xml_document_check_for_error_response, NULL, &_inner_error_);
#line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp13_ = _tmp12_;
+ _tmp9_ = _tmp8_;
#line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _publishing_rest_support_xml_document_unref0 (_tmp13_);
+ _publishing_rest_support_xml_document_unref0 (_tmp9_);
#line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_free0 (_tmp11_);
+ _g_free0 (_tmp7_);
#line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3781 "PiwigoPublishing.c"
+#line 4247 "PiwigoPublishing.c"
goto __catch30_spit_publishing_publishing_error;
}
#line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -3790,7 +4256,7 @@ static void publishing_piwigo_piwigo_publisher_on_login_network_complete (Publis
g_clear_error (&_inner_error_);
#line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return;
-#line 3792 "PiwigoPublishing.c"
+#line 4258 "PiwigoPublishing.c"
}
}
goto __finally30;
@@ -3798,44 +4264,41 @@ static void publishing_piwigo_piwigo_publisher_on_login_network_complete (Publis
{
GError* code = NULL;
gint code_int = 0;
- GError* _tmp14_;
- const gchar* _tmp15_;
- gint _tmp16_;
- gint _tmp17_;
+ GError* _tmp10_;
+ const gchar* _tmp11_;
+ gint _tmp12_;
#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
code = _inner_error_;
#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_inner_error_ = NULL;
#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp14_ = code;
-#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp15_ = _tmp14_->message;
+ _tmp10_ = code;
#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp16_ = atoi (_tmp15_);
+ _tmp11_ = _tmp10_->message;
#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- code_int = _tmp16_;
+ code_int = atoi (_tmp11_);
#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp17_ = code_int;
+ _tmp12_ = code_int;
#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (_tmp17_ == 999) {
+ if (_tmp12_ == 999) {
#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_debug ("PiwigoPublishing.vala:422: ERROR: on_login_network_complete, code 999");
#line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_do_show_authentication_pane (self, PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_FAILED_RETRY_USER);
-#line 3824 "PiwigoPublishing.c"
+#line 4287 "PiwigoPublishing.c"
} else {
- GError* _tmp18_;
+ GError* _tmp13_;
#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_debug ("PiwigoPublishing.vala:425: ERROR: on_login_network_complete");
#line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp18_ = err;
+ _tmp13_ = err;
#line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp18_);
-#line 3833 "PiwigoPublishing.c"
+ publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp13_);
+#line 4296 "PiwigoPublishing.c"
}
#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_error_free0 (code);
-#line 3837 "PiwigoPublishing.c"
+#line 4300 "PiwigoPublishing.c"
}
__finally30:
#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -3850,13 +4313,13 @@ static void publishing_piwigo_piwigo_publisher_on_login_network_complete (Publis
g_clear_error (&_inner_error_);
#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return;
-#line 3852 "PiwigoPublishing.c"
+#line 4315 "PiwigoPublishing.c"
}
#line 429 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_error_free0 (err);
#line 429 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return;
-#line 3858 "PiwigoPublishing.c"
+#line 4321 "PiwigoPublishing.c"
}
__finally29:
#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -3867,45 +4330,41 @@ static void publishing_piwigo_piwigo_publisher_on_login_network_complete (Publis
g_clear_error (&_inner_error_);
#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return;
-#line 3869 "PiwigoPublishing.c"
+#line 4332 "PiwigoPublishing.c"
}
#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp19_ = txn;
+ _tmp14_ = publishing_rest_support_transaction_get_endpoint_url (txn);
#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp20_ = publishing_rest_support_transaction_get_endpoint_url (_tmp19_);
-#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- endpoint_url = _tmp20_;
+ endpoint_url = _tmp14_;
#line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp21_ = endpoint_url;
+ _tmp15_ = endpoint_url;
#line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_debug ("PiwigoPublishing.vala:433: Setting endpoint URL to %s", _tmp21_);
-#line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp22_ = txn;
+ g_debug ("PiwigoPublishing.vala:433: Setting endpoint URL to %s", _tmp15_);
#line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp23_ = publishing_piwigo_piwigo_publisher_get_pwg_id_from_transaction (self, _tmp22_);
+ _tmp16_ = publishing_piwigo_piwigo_publisher_get_pwg_id_from_transaction (self, txn);
#line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- pwg_id = _tmp23_;
+ pwg_id = _tmp16_;
#line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp24_ = pwg_id;
+ _tmp17_ = pwg_id;
#line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_debug ("PiwigoPublishing.vala:435: Setting session pwg_id to %s", _tmp24_);
+ g_debug ("PiwigoPublishing.vala:435: Setting session pwg_id to %s", _tmp17_);
#line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp25_ = self->priv->session;
+ _tmp18_ = self->priv->session;
#line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp26_ = pwg_id;
+ _tmp19_ = pwg_id;
#line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- publishing_piwigo_session_set_pwg_id (_tmp25_, _tmp26_);
+ publishing_piwigo_session_set_pwg_id (_tmp18_, _tmp19_);
#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp27_ = endpoint_url;
+ _tmp20_ = endpoint_url;
#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp28_ = pwg_id;
+ _tmp21_ = pwg_id;
#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- publishing_piwigo_piwigo_publisher_do_fetch_session_status (self, _tmp27_, _tmp28_);
+ publishing_piwigo_piwigo_publisher_do_fetch_session_status (self, _tmp20_, _tmp21_);
#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (pwg_id);
#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (endpoint_url);
-#line 3907 "PiwigoPublishing.c"
+#line 4366 "PiwigoPublishing.c"
}
@@ -3920,13 +4379,14 @@ static void publishing_piwigo_piwigo_publisher_on_login_network_complete (Publis
* @param bad_txn the received REST transaction
* @param err the received error
*/
-static void publishing_piwigo_piwigo_publisher_on_login_network_error (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) {
- PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_piwigo_piwigo_publisher_on_login_network_error (PublishingPiwigoPiwigoPublisher* self,
+ PublishingRESTSupportTransaction* bad_txn,
+ GError* err)
+{
+ guint _tmp0_;
guint _tmp1_;
- PublishingRESTSupportTransaction* _tmp2_;
- guint _tmp3_;
- PublishingPiwigoSession* _tmp4_;
- gboolean _tmp5_;
+ PublishingPiwigoSession* _tmp2_;
#line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
#line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -3934,30 +4394,24 @@ static void publishing_piwigo_piwigo_publisher_on_login_network_error (Publishin
#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_debug ("PiwigoPublishing.vala:456: EVENT: on_login_network_error");
#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp0_ = bad_txn;
-#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
+ g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_login_network_complete_publishing_rest_support_transaction_completed, self);
+ g_signal_handlers_disconnect_matched (bad_txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_login_network_complete_publishing_rest_support_transaction_completed, self);
#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp2_ = bad_txn;
+ g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_login_network_error_publishing_rest_support_transaction_network_error, self);
-#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp4_ = self->priv->session;
+ g_signal_handlers_disconnect_matched (bad_txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_login_network_error_publishing_rest_support_transaction_network_error, self);
#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp5_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
+ _tmp2_ = self->priv->session;
#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (_tmp5_) {
+ if (publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession))) {
#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return;
-#line 3955 "PiwigoPublishing.c"
+#line 4409 "PiwigoPublishing.c"
}
#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_do_show_authentication_pane (self, PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_FAILED_RETRY_URL);
-#line 3959 "PiwigoPublishing.c"
+#line 4413 "PiwigoPublishing.c"
}
@@ -3971,25 +4425,35 @@ static void publishing_piwigo_piwigo_publisher_on_login_network_error (Publishin
* persisted. In this case, it will log the user in and confirm the
* identity.
*/
-static void _publishing_piwigo_piwigo_publisher_on_session_get_status_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
+static void
+_publishing_piwigo_piwigo_publisher_on_session_get_status_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+ GError* err,
+ gpointer self)
+{
#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_on_session_get_status_error ((PublishingPiwigoPiwigoPublisher*) self, _sender, err);
-#line 3976 "PiwigoPublishing.c"
+#line 4434 "PiwigoPublishing.c"
}
-static void _publishing_piwigo_piwigo_publisher_on_session_get_status_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
+static void
+_publishing_piwigo_piwigo_publisher_on_session_get_status_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+ gpointer self)
+{
#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_on_session_get_status_complete ((PublishingPiwigoPiwigoPublisher*) self, _sender);
-#line 3983 "PiwigoPublishing.c"
+#line 4444 "PiwigoPublishing.c"
}
-static void publishing_piwigo_piwigo_publisher_do_fetch_session_status (PublishingPiwigoPiwigoPublisher* self, const gchar* url, const gchar* pwg_id) {
+static void
+publishing_piwigo_piwigo_publisher_do_fetch_session_status (PublishingPiwigoPiwigoPublisher* self,
+ const gchar* url,
+ const gchar* pwg_id)
+{
SpitPublishingPluginHost* _tmp0_;
SpitPublishingPluginHost* _tmp1_;
PublishingPiwigoSession* _tmp2_;
- gboolean _tmp3_;
GError * _inner_error_ = NULL;
#line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
@@ -4010,47 +4474,39 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_session_status (Publishi
#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp2_ = self->priv->session;
#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp3_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (!_tmp3_) {
-#line 4015 "PiwigoPublishing.c"
+ if (!publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession))) {
+#line 4477 "PiwigoPublishing.c"
PublishingPiwigoSessionGetStatusTransaction* status_txn = NULL;
- PublishingPiwigoSession* _tmp4_;
- const gchar* _tmp5_;
- const gchar* _tmp6_;
- PublishingPiwigoSessionGetStatusTransaction* _tmp7_;
- PublishingPiwigoSessionGetStatusTransaction* _tmp8_;
- PublishingPiwigoSessionGetStatusTransaction* _tmp9_;
-#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp4_ = self->priv->session;
-#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp5_ = url;
+ PublishingPiwigoSession* _tmp3_;
+ PublishingPiwigoSessionGetStatusTransaction* _tmp4_;
+ PublishingPiwigoSessionGetStatusTransaction* _tmp5_;
+ PublishingPiwigoSessionGetStatusTransaction* _tmp6_;
#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp6_ = pwg_id;
+ _tmp3_ = self->priv->session;
#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp7_ = publishing_piwigo_session_get_status_transaction_new_unauthenticated (_tmp4_, _tmp5_, _tmp6_);
+ _tmp4_ = publishing_piwigo_session_get_status_transaction_new_unauthenticated (_tmp3_, url, pwg_id);
#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- status_txn = _tmp7_;
+ status_txn = _tmp4_;
#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp8_ = status_txn;
+ _tmp5_ = status_txn;
#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_piwigo_piwigo_publisher_on_session_get_status_error_publishing_rest_support_transaction_network_error, self, 0);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_piwigo_piwigo_publisher_on_session_get_status_error_publishing_rest_support_transaction_network_error, self, 0);
#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp9_ = status_txn;
+ _tmp6_ = status_txn;
#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_piwigo_piwigo_publisher_on_session_get_status_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 4041 "PiwigoPublishing.c"
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_piwigo_piwigo_publisher_on_session_get_status_complete_publishing_rest_support_transaction_completed, self, 0);
+#line 4497 "PiwigoPublishing.c"
{
- PublishingPiwigoSessionGetStatusTransaction* _tmp10_;
+ PublishingPiwigoSessionGetStatusTransaction* _tmp7_;
#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp10_ = status_txn;
+ _tmp7_ = status_txn;
#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
+ publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4052 "PiwigoPublishing.c"
+#line 4508 "PiwigoPublishing.c"
goto __catch31_spit_publishing_publishing_error;
}
#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -4061,14 +4517,14 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_session_status (Publishi
g_clear_error (&_inner_error_);
#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return;
-#line 4063 "PiwigoPublishing.c"
+#line 4519 "PiwigoPublishing.c"
}
}
goto __finally31;
__catch31_spit_publishing_publishing_error:
{
GError* err = NULL;
- GError* _tmp11_;
+ GError* _tmp8_;
#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
err = _inner_error_;
#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -4077,12 +4533,12 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_session_status (Publishi
g_debug ("PiwigoPublishing.vala:489: ERROR: do_fetch_session_status, not authent" \
"icated");
#line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp11_ = err;
+ _tmp8_ = err;
#line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp11_);
+ publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp8_);
#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_error_free0 (err);
-#line 4083 "PiwigoPublishing.c"
+#line 4539 "PiwigoPublishing.c"
}
__finally31:
#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -4095,43 +4551,43 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_session_status (Publishi
g_clear_error (&_inner_error_);
#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return;
-#line 4096 "PiwigoPublishing.c"
+#line 4552 "PiwigoPublishing.c"
}
#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_rest_support_transaction_unref0 (status_txn);
-#line 4100 "PiwigoPublishing.c"
+#line 4556 "PiwigoPublishing.c"
} else {
PublishingPiwigoSessionGetStatusTransaction* status_txn = NULL;
- PublishingPiwigoSession* _tmp12_;
- PublishingPiwigoSessionGetStatusTransaction* _tmp13_;
- PublishingPiwigoSessionGetStatusTransaction* _tmp14_;
- PublishingPiwigoSessionGetStatusTransaction* _tmp15_;
+ PublishingPiwigoSession* _tmp9_;
+ PublishingPiwigoSessionGetStatusTransaction* _tmp10_;
+ PublishingPiwigoSessionGetStatusTransaction* _tmp11_;
+ PublishingPiwigoSessionGetStatusTransaction* _tmp12_;
#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp12_ = self->priv->session;
+ _tmp9_ = self->priv->session;
#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp13_ = publishing_piwigo_session_get_status_transaction_new (_tmp12_);
+ _tmp10_ = publishing_piwigo_session_get_status_transaction_new (_tmp9_);
#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- status_txn = _tmp13_;
+ status_txn = _tmp10_;
#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp14_ = status_txn;
+ _tmp11_ = status_txn;
#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_piwigo_piwigo_publisher_on_session_get_status_error_publishing_rest_support_transaction_network_error, self, 0);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_piwigo_piwigo_publisher_on_session_get_status_error_publishing_rest_support_transaction_network_error, self, 0);
#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp15_ = status_txn;
+ _tmp12_ = status_txn;
#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_piwigo_piwigo_publisher_on_session_get_status_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 4121 "PiwigoPublishing.c"
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_piwigo_piwigo_publisher_on_session_get_status_complete_publishing_rest_support_transaction_completed, self, 0);
+#line 4577 "PiwigoPublishing.c"
{
- PublishingPiwigoSessionGetStatusTransaction* _tmp16_;
+ PublishingPiwigoSessionGetStatusTransaction* _tmp13_;
#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp16_ = status_txn;
+ _tmp13_ = status_txn;
#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
+ publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4132 "PiwigoPublishing.c"
+#line 4588 "PiwigoPublishing.c"
goto __catch32_spit_publishing_publishing_error;
}
#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -4142,14 +4598,14 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_session_status (Publishi
g_clear_error (&_inner_error_);
#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return;
-#line 4143 "PiwigoPublishing.c"
+#line 4599 "PiwigoPublishing.c"
}
}
goto __finally32;
__catch32_spit_publishing_publishing_error:
{
GError* err = NULL;
- GError* _tmp17_;
+ GError* _tmp14_;
#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
err = _inner_error_;
#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -4158,12 +4614,12 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_session_status (Publishi
g_debug ("PiwigoPublishing.vala:500: ERROR: do_fetch_session_status, authenticat" \
"ed");
#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp17_ = err;
+ _tmp14_ = err;
#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp17_);
+ publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp14_);
#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_error_free0 (err);
-#line 4163 "PiwigoPublishing.c"
+#line 4619 "PiwigoPublishing.c"
}
__finally32:
#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -4176,11 +4632,11 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_session_status (Publishi
g_clear_error (&_inner_error_);
#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return;
-#line 4176 "PiwigoPublishing.c"
+#line 4632 "PiwigoPublishing.c"
}
#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_rest_support_transaction_unref0 (status_txn);
-#line 4180 "PiwigoPublishing.c"
+#line 4636 "PiwigoPublishing.c"
}
}
@@ -4192,13 +4648,13 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_session_status (Publishi
* used. If the session is not fully authenticated yet, this event finalises
* session authentication. It then triggers the fetch categories action.
*/
-static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* txn) {
- PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_piwigo_piwigo_publisher_on_session_get_status_complete (PublishingPiwigoPiwigoPublisher* self,
+ PublishingRESTSupportTransaction* txn)
+{
+ guint _tmp0_;
guint _tmp1_;
- PublishingRESTSupportTransaction* _tmp2_;
- guint _tmp3_;
- PublishingPiwigoSession* _tmp4_;
- gboolean _tmp5_;
+ PublishingPiwigoSession* _tmp2_;
GError * _inner_error_ = NULL;
#line 513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
@@ -4207,78 +4663,66 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P
#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_debug ("PiwigoPublishing.vala:514: EVENT: on_session_get_status_complete");
#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp0_ = txn;
-#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
+ g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_session_get_status_complete_publishing_rest_support_transaction_completed, self);
+ g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_session_get_status_complete_publishing_rest_support_transaction_completed, self);
#line 516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp2_ = txn;
+ g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
#line 516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_session_get_status_error_publishing_rest_support_transaction_network_error, self);
-#line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp4_ = self->priv->session;
+ g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_session_get_status_error_publishing_rest_support_transaction_network_error, self);
#line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp5_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
+ _tmp2_ = self->priv->session;
#line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (!_tmp5_) {
-#line 4224 "PiwigoPublishing.c"
+ if (!publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession))) {
+#line 4674 "PiwigoPublishing.c"
gchar* endpoint_url = NULL;
- PublishingRESTSupportTransaction* _tmp6_;
- gchar* _tmp7_;
+ gchar* _tmp3_;
gchar* pwg_id = NULL;
- PublishingPiwigoSession* _tmp8_;
- gchar* _tmp9_;
- const gchar* _tmp10_;
-#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp6_ = txn;
+ PublishingPiwigoSession* _tmp4_;
+ gchar* _tmp5_;
+ const gchar* _tmp6_;
#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp7_ = publishing_rest_support_transaction_get_endpoint_url (_tmp6_);
+ _tmp3_ = publishing_rest_support_transaction_get_endpoint_url (txn);
#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- endpoint_url = _tmp7_;
+ endpoint_url = _tmp3_;
#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp8_ = self->priv->session;
+ _tmp4_ = self->priv->session;
#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp9_ = publishing_piwigo_session_get_pwg_id (_tmp8_);
+ _tmp5_ = publishing_piwigo_session_get_pwg_id (_tmp4_);
#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- pwg_id = _tmp9_;
+ pwg_id = _tmp5_;
#line 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp10_ = pwg_id;
+ _tmp6_ = pwg_id;
#line 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_debug ("PiwigoPublishing.vala:521: Fetching session status for pwg_id %s", _tmp10_);
-#line 4248 "PiwigoPublishing.c"
+ g_debug ("PiwigoPublishing.vala:521: Fetching session status for pwg_id %s", _tmp6_);
+#line 4695 "PiwigoPublishing.c"
{
PublishingRESTSupportXmlDocument* doc = NULL;
- PublishingRESTSupportTransaction* _tmp11_;
- gchar* _tmp12_;
- gchar* _tmp13_;
- PublishingRESTSupportXmlDocument* _tmp14_;
- PublishingRESTSupportXmlDocument* _tmp15_;
+ gchar* _tmp7_;
+ gchar* _tmp8_;
+ PublishingRESTSupportXmlDocument* _tmp9_;
+ PublishingRESTSupportXmlDocument* _tmp10_;
xmlNode* root = NULL;
- PublishingRESTSupportXmlDocument* _tmp16_;
- xmlNode* _tmp17_;
+ PublishingRESTSupportXmlDocument* _tmp11_;
+ xmlNode* _tmp12_;
xmlNode* username_node = NULL;
#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp11_ = txn;
-#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp12_ = publishing_rest_support_transaction_get_response (_tmp11_);
+ _tmp7_ = publishing_rest_support_transaction_get_response (txn);
#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp13_ = _tmp12_;
+ _tmp8_ = _tmp7_;
#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp14_ = publishing_rest_support_xml_document_parse_string (_tmp13_, _publishing_piwigo_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response, NULL, &_inner_error_);
+ _tmp9_ = publishing_rest_support_xml_document_parse_string (_tmp8_, _publishing_piwigo_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response, NULL, &_inner_error_);
#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp15_ = _tmp14_;
+ _tmp10_ = _tmp9_;
#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_free0 (_tmp13_);
+ _g_free0 (_tmp8_);
#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- doc = _tmp15_;
+ doc = _tmp10_;
#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4278 "PiwigoPublishing.c"
+#line 4722 "PiwigoPublishing.c"
goto __catch33_spit_publishing_publishing_error;
}
#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -4291,47 +4735,47 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P
g_clear_error (&_inner_error_);
#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return;
-#line 4291 "PiwigoPublishing.c"
+#line 4735 "PiwigoPublishing.c"
}
#line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp16_ = doc;
+ _tmp11_ = doc;
#line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp17_ = publishing_rest_support_xml_document_get_root_node (_tmp16_);
+ _tmp12_ = publishing_rest_support_xml_document_get_root_node (_tmp11_);
#line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- root = _tmp17_;
-#line 4299 "PiwigoPublishing.c"
+ root = _tmp12_;
+#line 4743 "PiwigoPublishing.c"
{
- xmlNode* _tmp18_ = NULL;
- PublishingRESTSupportXmlDocument* _tmp19_;
- xmlNode* _tmp20_;
- xmlNode* _tmp21_;
+ xmlNode* _tmp13_ = NULL;
+ PublishingRESTSupportXmlDocument* _tmp14_;
+ xmlNode* _tmp15_;
+ xmlNode* _tmp16_;
gchar* username = NULL;
- xmlNode* _tmp22_;
- gchar* _tmp23_;
- const gchar* _tmp24_;
- PublishingPiwigoSession* _tmp25_;
- const gchar* _tmp26_;
- const gchar* _tmp27_;
- const gchar* _tmp28_;
- PublishingPiwigoSession* _tmp29_;
- gchar* _tmp30_;
- gchar* _tmp31_;
- PublishingPiwigoSession* _tmp32_;
- gchar* _tmp33_;
- gchar* _tmp34_;
+ xmlNode* _tmp17_;
+ gchar* _tmp18_;
+ const gchar* _tmp19_;
+ PublishingPiwigoSession* _tmp20_;
+ const gchar* _tmp21_;
+ const gchar* _tmp22_;
+ const gchar* _tmp23_;
+ PublishingPiwigoSession* _tmp24_;
+ gchar* _tmp25_;
+ gchar* _tmp26_;
+ PublishingPiwigoSession* _tmp27_;
+ gchar* _tmp28_;
+ gchar* _tmp29_;
#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp19_ = doc;
+ _tmp14_ = doc;
#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp20_ = root;
+ _tmp15_ = root;
#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp21_ = publishing_rest_support_xml_document_get_named_child (_tmp19_, _tmp20_, "username", &_inner_error_);
+ _tmp16_ = publishing_rest_support_xml_document_get_named_child (_tmp14_, _tmp15_, "username", &_inner_error_);
#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp18_ = _tmp21_;
+ _tmp13_ = _tmp16_;
#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4331 "PiwigoPublishing.c"
+#line 4775 "PiwigoPublishing.c"
goto __catch34_spit_publishing_publishing_error;
}
#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -4346,61 +4790,61 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P
g_clear_error (&_inner_error_);
#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return;
-#line 4346 "PiwigoPublishing.c"
+#line 4790 "PiwigoPublishing.c"
}
#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- username_node = _tmp18_;
+ username_node = _tmp13_;
#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp22_ = username_node;
+ _tmp17_ = username_node;
#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp23_ = (gchar*) xmlNodeGetContent (_tmp22_);
+ _tmp18_ = (gchar*) xmlNodeGetContent (_tmp17_);
#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- username = _tmp23_;
+ username = _tmp18_;
#line 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp24_ = username;
+ _tmp19_ = username;
#line 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_debug ("PiwigoPublishing.vala:532: Returned username is %s", _tmp24_);
+ g_debug ("PiwigoPublishing.vala:532: Returned username is %s", _tmp19_);
#line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp25_ = self->priv->session;
+ _tmp20_ = self->priv->session;
#line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp26_ = endpoint_url;
+ _tmp21_ = endpoint_url;
#line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp27_ = username;
+ _tmp22_ = username;
#line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp28_ = pwg_id;
+ _tmp23_ = pwg_id;
#line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- publishing_piwigo_session_authenticate (_tmp25_, _tmp26_, _tmp27_, _tmp28_);
+ publishing_piwigo_session_authenticate (_tmp20_, _tmp21_, _tmp22_, _tmp23_);
#line 534 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp29_ = self->priv->session;
+ _tmp24_ = self->priv->session;
#line 534 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp30_ = publishing_piwigo_session_get_pwg_url (_tmp29_);
+ _tmp25_ = publishing_piwigo_session_get_pwg_url (_tmp24_);
#line 534 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp31_ = _tmp30_;
+ _tmp26_ = _tmp25_;
#line 534 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- publishing_piwigo_piwigo_publisher_set_persistent_url (self, _tmp31_);
+ publishing_piwigo_piwigo_publisher_set_persistent_url (self, _tmp26_);
#line 534 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_free0 (_tmp31_);
+ _g_free0 (_tmp26_);
#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp32_ = self->priv->session;
+ _tmp27_ = self->priv->session;
#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp33_ = publishing_piwigo_session_get_username (_tmp32_);
+ _tmp28_ = publishing_piwigo_session_get_username (_tmp27_);
#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp34_ = _tmp33_;
+ _tmp29_ = _tmp28_;
#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- publishing_piwigo_piwigo_publisher_set_persistent_username (self, _tmp34_);
+ publishing_piwigo_piwigo_publisher_set_persistent_username (self, _tmp29_);
#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_free0 (_tmp34_);
+ _g_free0 (_tmp29_);
#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_do_fetch_categories (self);
#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (username);
-#line 4394 "PiwigoPublishing.c"
+#line 4838 "PiwigoPublishing.c"
}
goto __finally34;
__catch34_spit_publishing_publishing_error:
{
GError* err2 = NULL;
- GError* _tmp35_;
+ GError* _tmp30_;
#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
err2 = _inner_error_;
#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -4409,9 +4853,9 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P
g_debug ("PiwigoPublishing.vala:538: ERROR: on_session_get_status_complete, inne" \
"r");
#line 539 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp35_ = err2;
+ _tmp30_ = err2;
#line 539 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp35_);
+ publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp30_);
#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_error_free0 (err2);
#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -4422,7 +4866,7 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P
_g_free0 (endpoint_url);
#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return;
-#line 4421 "PiwigoPublishing.c"
+#line 4865 "PiwigoPublishing.c"
}
__finally34:
#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -4431,7 +4875,7 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P
_publishing_rest_support_xml_document_unref0 (doc);
#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4430 "PiwigoPublishing.c"
+#line 4874 "PiwigoPublishing.c"
goto __catch33_spit_publishing_publishing_error;
}
#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -4446,17 +4890,17 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P
g_clear_error (&_inner_error_);
#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return;
-#line 4445 "PiwigoPublishing.c"
+#line 4889 "PiwigoPublishing.c"
}
#line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_rest_support_xml_document_unref0 (doc);
-#line 4449 "PiwigoPublishing.c"
+#line 4893 "PiwigoPublishing.c"
}
goto __finally33;
__catch33_spit_publishing_publishing_error:
{
GError* err = NULL;
- GError* _tmp36_;
+ GError* _tmp31_;
#line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
err = _inner_error_;
#line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -4465,9 +4909,9 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P
g_debug ("PiwigoPublishing.vala:543: ERROR: on_session_get_status_complete, oute" \
"r");
#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp36_ = err;
+ _tmp31_ = err;
#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp36_);
+ publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp31_);
#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_error_free0 (err);
#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -4476,7 +4920,7 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P
_g_free0 (endpoint_url);
#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return;
-#line 4474 "PiwigoPublishing.c"
+#line 4918 "PiwigoPublishing.c"
}
__finally33:
#line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -4491,17 +4935,17 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P
g_clear_error (&_inner_error_);
#line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return;
-#line 4489 "PiwigoPublishing.c"
+#line 4933 "PiwigoPublishing.c"
}
#line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (pwg_id);
#line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (endpoint_url);
-#line 4495 "PiwigoPublishing.c"
+#line 4939 "PiwigoPublishing.c"
} else {
#line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_do_fetch_categories (self);
-#line 4499 "PiwigoPublishing.c"
+#line 4943 "PiwigoPublishing.c"
}
}
@@ -4509,13 +4953,13 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P
/**
* Event triggered when the get session status fails due to a network error.
*/
-static void publishing_piwigo_piwigo_publisher_on_session_get_status_error (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) {
- PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_piwigo_piwigo_publisher_on_session_get_status_error (PublishingPiwigoPiwigoPublisher* self,
+ PublishingRESTSupportTransaction* bad_txn,
+ GError* err)
+{
+ guint _tmp0_;
guint _tmp1_;
- PublishingRESTSupportTransaction* _tmp2_;
- guint _tmp3_;
- PublishingRESTSupportTransaction* _tmp4_;
- GError* _tmp5_;
#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -4523,24 +4967,16 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_error (Publ
#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_debug ("PiwigoPublishing.vala:562: EVENT: on_session_get_status_error");
#line 563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp0_ = bad_txn;
-#line 563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
+ g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
#line 563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_session_get_status_complete_publishing_rest_support_transaction_completed, self);
-#line 564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp2_ = bad_txn;
+ g_signal_handlers_disconnect_matched (bad_txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_session_get_status_complete_publishing_rest_support_transaction_completed, self);
#line 564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
+ g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
#line 564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_session_get_status_error_publishing_rest_support_transaction_network_error, self);
-#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp4_ = bad_txn;
-#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp5_ = err;
+ g_signal_handlers_disconnect_matched (bad_txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_session_get_status_error_publishing_rest_support_transaction_network_error, self);
#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- publishing_piwigo_piwigo_publisher_on_network_error (self, _tmp4_, _tmp5_);
-#line 4538 "PiwigoPublishing.c"
+ publishing_piwigo_piwigo_publisher_on_network_error (self, bad_txn, err);
+#line 4974 "PiwigoPublishing.c"
}
@@ -4550,21 +4986,30 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_error (Publ
* This action fetches all categories from the Piwigo service in order
* to populate the publishing pane presented to the user.
*/
-static void _publishing_piwigo_piwigo_publisher_on_category_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
+static void
+_publishing_piwigo_piwigo_publisher_on_category_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+ GError* err,
+ gpointer self)
+{
#line 580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_on_category_fetch_error ((PublishingPiwigoPiwigoPublisher*) self, _sender, err);
-#line 4551 "PiwigoPublishing.c"
+#line 4991 "PiwigoPublishing.c"
}
-static void _publishing_piwigo_piwigo_publisher_on_category_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
+static void
+_publishing_piwigo_piwigo_publisher_on_category_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+ gpointer self)
+{
#line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_on_category_fetch_complete ((PublishingPiwigoPiwigoPublisher*) self, _sender);
-#line 4558 "PiwigoPublishing.c"
+#line 5001 "PiwigoPublishing.c"
}
-static void publishing_piwigo_piwigo_publisher_do_fetch_categories (PublishingPiwigoPiwigoPublisher* self) {
+static void
+publishing_piwigo_piwigo_publisher_do_fetch_categories (PublishingPiwigoPiwigoPublisher* self)
+{
SpitPublishingPluginHost* _tmp0_;
SpitPublishingPluginHost* _tmp1_;
PublishingPiwigoCategoriesGetListTransaction* cat_trans = NULL;
@@ -4593,7 +5038,7 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_categories (PublishingPi
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (cat_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_piwigo_piwigo_publisher_on_category_fetch_error_publishing_rest_support_transaction_network_error, self, 0);
#line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (cat_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_piwigo_piwigo_publisher_on_category_fetch_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 4591 "PiwigoPublishing.c"
+#line 5036 "PiwigoPublishing.c"
{
#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (cat_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
@@ -4601,7 +5046,7 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_categories (PublishingPi
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4599 "PiwigoPublishing.c"
+#line 5044 "PiwigoPublishing.c"
goto __catch35_spit_publishing_publishing_error;
}
#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -4612,7 +5057,7 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_categories (PublishingPi
g_clear_error (&_inner_error_);
#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return;
-#line 4610 "PiwigoPublishing.c"
+#line 5055 "PiwigoPublishing.c"
}
}
goto __finally35;
@@ -4632,7 +5077,7 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_categories (PublishingPi
publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp4_);
#line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_error_free0 (err);
-#line 4630 "PiwigoPublishing.c"
+#line 5075 "PiwigoPublishing.c"
}
__finally35:
#line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -4645,11 +5090,11 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_categories (PublishingPi
g_clear_error (&_inner_error_);
#line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return;
-#line 4643 "PiwigoPublishing.c"
+#line 5088 "PiwigoPublishing.c"
}
#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_rest_support_transaction_unref0 (cat_trans);
-#line 4647 "PiwigoPublishing.c"
+#line 5092 "PiwigoPublishing.c"
}
@@ -4660,33 +5105,38 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_categories (PublishingPi
* populates the categories list. It then triggers the display of the
* publishing options pane.
*/
-static void _vala_array_add38 (PublishingPiwigoCategory** * array, int* length, int* size, PublishingPiwigoCategory* value) {
+static void
+_vala_array_add38 (PublishingPiwigoCategory** * array,
+ int* length,
+ int* size,
+ PublishingPiwigoCategory* value)
+{
#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if ((*length) == (*size)) {
#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
*array = g_renew (PublishingPiwigoCategory*, *array, (*size) + 1);
-#line 4665 "PiwigoPublishing.c"
+#line 5115 "PiwigoPublishing.c"
}
#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
(*array)[(*length)++] = value;
#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
(*array)[*length] = NULL;
-#line 4671 "PiwigoPublishing.c"
+#line 5121 "PiwigoPublishing.c"
}
-static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* txn) {
- PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_piwigo_piwigo_publisher_on_category_fetch_complete (PublishingPiwigoPiwigoPublisher* self,
+ PublishingRESTSupportTransaction* txn)
+{
+ guint _tmp0_;
guint _tmp1_;
- PublishingRESTSupportTransaction* _tmp2_;
- guint _tmp3_;
- PublishingRESTSupportTransaction* _tmp4_;
- gchar* _tmp5_;
- gchar* _tmp6_;
- PublishingPiwigoCategory** _tmp7_;
- gint _tmp7__length1;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
+ PublishingPiwigoCategory** _tmp4_;
+ gint _tmp4__length1;
GError * _inner_error_ = NULL;
#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
@@ -4695,33 +5145,27 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi
#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_debug ("PiwigoPublishing.vala:599: EVENT: on_category_fetch_complete");
#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp0_ = txn;
-#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
+ g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_category_fetch_complete_publishing_rest_support_transaction_completed, self);
+ g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_category_fetch_complete_publishing_rest_support_transaction_completed, self);
#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp2_ = txn;
+ g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_category_fetch_error_publishing_rest_support_transaction_network_error, self);
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp4_ = txn;
+ g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_category_fetch_error_publishing_rest_support_transaction_network_error, self);
#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp5_ = publishing_rest_support_transaction_get_response (_tmp4_);
+ _tmp2_ = publishing_rest_support_transaction_get_response (txn);
#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp6_ = _tmp5_;
+ _tmp3_ = _tmp2_;
#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_debug ("PiwigoPublishing.vala:602: PiwigoConnector: list of categories: %s", _tmp6_);
+ g_debug ("PiwigoPublishing.vala:602: PiwigoConnector: list of categories: %s", _tmp3_);
#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_free0 (_tmp6_);
+ _g_free0 (_tmp3_);
#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp7_ = self->priv->categories;
+ _tmp4_ = self->priv->categories;
#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp7__length1 = self->priv->categories_length1;
+ _tmp4__length1 = self->priv->categories_length1;
#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (_tmp7_ != NULL) {
+ if (_tmp4_ != NULL) {
#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->priv->categories = (_vala_array_free (self->priv->categories, self->priv->categories_length1, (GDestroyNotify) publishing_piwigo_category_unref), NULL);
#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -4730,53 +5174,50 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi
self->priv->categories_length1 = 0;
#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->priv->_categories_size_ = self->priv->categories_length1;
-#line 4728 "PiwigoPublishing.c"
+#line 5172 "PiwigoPublishing.c"
}
{
PublishingRESTSupportXmlDocument* doc = NULL;
- PublishingRESTSupportTransaction* _tmp8_;
- gchar* _tmp9_;
- gchar* _tmp10_;
- PublishingRESTSupportXmlDocument* _tmp11_;
- PublishingRESTSupportXmlDocument* _tmp12_;
+ gchar* _tmp5_;
+ gchar* _tmp6_;
+ PublishingRESTSupportXmlDocument* _tmp7_;
+ PublishingRESTSupportXmlDocument* _tmp8_;
xmlNode* root = NULL;
- PublishingRESTSupportXmlDocument* _tmp13_;
- xmlNode* _tmp14_;
+ PublishingRESTSupportXmlDocument* _tmp9_;
+ xmlNode* _tmp10_;
xmlNode* categories_node = NULL;
- xmlNode* _tmp15_;
- xmlNode* _tmp16_;
+ xmlNode* _tmp11_;
+ xmlNode* _tmp12_;
xmlNode* category_node_iter = NULL;
- xmlNode* _tmp17_;
- xmlNode* _tmp18_;
+ xmlNode* _tmp13_;
+ xmlNode* _tmp14_;
xmlNode* name_node = NULL;
xmlNode* uppercats_node = NULL;
gchar* name = NULL;
- gchar* _tmp19_;
+ gchar* _tmp15_;
gchar* id_string = NULL;
- gchar* _tmp20_;
+ gchar* _tmp16_;
gchar* uppercats = NULL;
- gchar* _tmp21_;
+ gchar* _tmp17_;
GeeHashMap* id_map = NULL;
- GeeHashMap* _tmp22_;
+ GeeHashMap* _tmp18_;
#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp8_ = txn;
+ _tmp5_ = publishing_rest_support_transaction_get_response (txn);
#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp9_ = publishing_rest_support_transaction_get_response (_tmp8_);
-#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp10_ = _tmp9_;
+ _tmp6_ = _tmp5_;
#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp11_ = publishing_rest_support_xml_document_parse_string (_tmp10_, _publishing_piwigo_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response, NULL, &_inner_error_);
+ _tmp7_ = publishing_rest_support_xml_document_parse_string (_tmp6_, _publishing_piwigo_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response, NULL, &_inner_error_);
#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp12_ = _tmp11_;
+ _tmp8_ = _tmp7_;
#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_free0 (_tmp10_);
+ _g_free0 (_tmp6_);
#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- doc = _tmp12_;
+ doc = _tmp8_;
#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4774 "PiwigoPublishing.c"
+#line 5215 "PiwigoPublishing.c"
goto __catch36_spit_publishing_publishing_error;
}
#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -4785,108 +5226,107 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi
g_clear_error (&_inner_error_);
#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return;
-#line 4783 "PiwigoPublishing.c"
+#line 5224 "PiwigoPublishing.c"
}
#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp13_ = doc;
+ _tmp9_ = doc;
#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp14_ = publishing_rest_support_xml_document_get_root_node (_tmp13_);
+ _tmp10_ = publishing_rest_support_xml_document_get_root_node (_tmp9_);
#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- root = _tmp14_;
+ root = _tmp10_;
#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp15_ = root;
+ _tmp11_ = root;
#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp16_ = xmlFirstElementChild (_tmp15_);
+ _tmp12_ = xmlFirstElementChild (_tmp11_);
#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- categories_node = _tmp16_;
+ categories_node = _tmp12_;
#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp17_ = categories_node;
+ _tmp13_ = categories_node;
#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp18_ = _tmp17_->children;
+ _tmp14_ = _tmp13_->children;
#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- category_node_iter = _tmp18_;
+ category_node_iter = _tmp14_;
#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp19_ = g_strdup ("");
+ _tmp15_ = g_strdup ("");
#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- name = _tmp19_;
+ name = _tmp15_;
#line 618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp20_ = g_strdup ("");
+ _tmp16_ = g_strdup ("");
#line 618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- id_string = _tmp20_;
+ id_string = _tmp16_;
#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp21_ = g_strdup ("");
+ _tmp17_ = g_strdup ("");
#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- uppercats = _tmp21_;
+ uppercats = _tmp17_;
#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp22_ = 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);
+ _tmp18_ = 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 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- id_map = _tmp22_;
-#line 4819 "PiwigoPublishing.c"
+ id_map = _tmp18_;
+#line 5260 "PiwigoPublishing.c"
{
- gboolean _tmp23_ = FALSE;
+ gboolean _tmp19_ = FALSE;
#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp23_ = TRUE;
+ _tmp19_ = TRUE;
#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
while (TRUE) {
-#line 4826 "PiwigoPublishing.c"
+#line 5267 "PiwigoPublishing.c"
+ xmlNode* _tmp22_;
+ xmlNode* _tmp23_ = NULL;
+ PublishingRESTSupportXmlDocument* _tmp24_;
+ xmlNode* _tmp25_;
xmlNode* _tmp26_;
- xmlNode* _tmp27_ = NULL;
- PublishingRESTSupportXmlDocument* _tmp28_;
- xmlNode* _tmp29_;
- xmlNode* _tmp30_;
+ xmlNode* _tmp27_;
+ gchar* _tmp28_;
+ xmlNode* _tmp29_ = NULL;
+ PublishingRESTSupportXmlDocument* _tmp30_;
xmlNode* _tmp31_;
- gchar* _tmp32_;
- xmlNode* _tmp33_ = NULL;
- PublishingRESTSupportXmlDocument* _tmp34_;
+ xmlNode* _tmp32_;
+ xmlNode* _tmp33_;
+ gchar* _tmp34_;
xmlNode* _tmp35_;
- xmlNode* _tmp36_;
- xmlNode* _tmp37_;
- gchar* _tmp38_;
- xmlNode* _tmp39_;
- gchar* _tmp40_;
- GeeHashMap* _tmp41_;
- const gchar* _tmp42_;
+ gchar* _tmp36_;
+ GeeHashMap* _tmp37_;
+ const gchar* _tmp38_;
+ const gchar* _tmp39_;
+ PublishingPiwigoCategory** _tmp40_;
+ gint _tmp40__length1;
+ PublishingPiwigoCategory** _tmp42_;
+ gint _tmp42__length1;
const gchar* _tmp43_;
- PublishingPiwigoCategory** _tmp44_;
- gint _tmp44__length1;
- PublishingPiwigoCategory** _tmp46_;
- gint _tmp46__length1;
- const gchar* _tmp47_;
- gint _tmp48_;
- const gchar* _tmp49_;
- const gchar* _tmp50_;
- PublishingPiwigoCategory* _tmp51_;
+ const gchar* _tmp44_;
+ const gchar* _tmp45_;
+ PublishingPiwigoCategory* _tmp46_;
#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (!_tmp23_) {
-#line 4856 "PiwigoPublishing.c"
- xmlNode* _tmp24_;
- xmlNode* _tmp25_;
+ if (!_tmp19_) {
+#line 5296 "PiwigoPublishing.c"
+ xmlNode* _tmp20_;
+ xmlNode* _tmp21_;
#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp24_ = category_node_iter;
+ _tmp20_ = category_node_iter;
#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp25_ = _tmp24_->next;
+ _tmp21_ = _tmp20_->next;
#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- category_node_iter = _tmp25_;
-#line 4865 "PiwigoPublishing.c"
+ category_node_iter = _tmp21_;
+#line 5305 "PiwigoPublishing.c"
}
#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp23_ = FALSE;
+ _tmp19_ = FALSE;
#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp26_ = category_node_iter;
+ _tmp22_ = category_node_iter;
#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (!(_tmp26_ != NULL)) {
+ if (!(_tmp22_ != NULL)) {
#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
break;
-#line 4875 "PiwigoPublishing.c"
+#line 5315 "PiwigoPublishing.c"
}
#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp28_ = doc;
+ _tmp24_ = doc;
#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp29_ = category_node_iter;
+ _tmp25_ = category_node_iter;
#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp30_ = publishing_rest_support_xml_document_get_named_child (_tmp28_, _tmp29_, "name", &_inner_error_);
+ _tmp26_ = publishing_rest_support_xml_document_get_named_child (_tmp24_, _tmp25_, "name", &_inner_error_);
#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp27_ = _tmp30_;
+ _tmp23_ = _tmp26_;
#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -4901,7 +5341,7 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi
_publishing_rest_support_xml_document_unref0 (doc);
#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4899 "PiwigoPublishing.c"
+#line 5339 "PiwigoPublishing.c"
goto __catch36_spit_publishing_publishing_error;
}
#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -4920,26 +5360,26 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi
g_clear_error (&_inner_error_);
#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return;
-#line 4918 "PiwigoPublishing.c"
+#line 5358 "PiwigoPublishing.c"
}
#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- name_node = _tmp27_;
+ name_node = _tmp23_;
#line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp31_ = name_node;
+ _tmp27_ = name_node;
#line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp32_ = (gchar*) xmlNodeGetContent (_tmp31_);
+ _tmp28_ = (gchar*) xmlNodeGetContent (_tmp27_);
#line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (name);
#line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- name = _tmp32_;
+ name = _tmp28_;
#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp34_ = doc;
+ _tmp30_ = doc;
#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp35_ = category_node_iter;
+ _tmp31_ = category_node_iter;
#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp36_ = publishing_rest_support_xml_document_get_named_child (_tmp34_, _tmp35_, "uppercats", &_inner_error_);
+ _tmp32_ = publishing_rest_support_xml_document_get_named_child (_tmp30_, _tmp31_, "uppercats", &_inner_error_);
#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp33_ = _tmp36_;
+ _tmp29_ = _tmp32_;
#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -4954,7 +5394,7 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi
_publishing_rest_support_xml_document_unref0 (doc);
#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4952 "PiwigoPublishing.c"
+#line 5392 "PiwigoPublishing.c"
goto __catch36_spit_publishing_publishing_error;
}
#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -4973,258 +5413,256 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi
g_clear_error (&_inner_error_);
#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return;
-#line 4971 "PiwigoPublishing.c"
+#line 5411 "PiwigoPublishing.c"
}
#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- uppercats_node = _tmp33_;
+ uppercats_node = _tmp29_;
#line 626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp37_ = uppercats_node;
+ _tmp33_ = uppercats_node;
#line 626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp38_ = (gchar*) xmlNodeGetContent (_tmp37_);
+ _tmp34_ = (gchar*) xmlNodeGetContent (_tmp33_);
#line 626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (uppercats);
#line 626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- uppercats = (gchar*) _tmp38_;
+ uppercats = (gchar*) _tmp34_;
#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp39_ = category_node_iter;
+ _tmp35_ = category_node_iter;
#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp40_ = (gchar*) xmlGetProp (_tmp39_, (xmlChar*) "id");
+ _tmp36_ = (gchar*) xmlGetProp (_tmp35_, (xmlChar*) "id");
#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (id_string);
#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- id_string = _tmp40_;
+ id_string = _tmp36_;
#line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp41_ = id_map;
+ _tmp37_ = id_map;
#line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp42_ = id_string;
+ _tmp38_ = id_string;
#line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp43_ = name;
+ _tmp39_ = name;
#line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp42_, _tmp43_);
+ gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp38_, _tmp39_);
#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp44_ = self->priv->categories;
+ _tmp40_ = self->priv->categories;
#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp44__length1 = self->priv->categories_length1;
+ _tmp40__length1 = self->priv->categories_length1;
#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (_tmp44_ == NULL) {
-#line 5005 "PiwigoPublishing.c"
- PublishingPiwigoCategory** _tmp45_;
+ if (_tmp40_ == NULL) {
+#line 5445 "PiwigoPublishing.c"
+ PublishingPiwigoCategory** _tmp41_;
#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp45_ = g_new0 (PublishingPiwigoCategory*, 0 + 1);
+ _tmp41_ = g_new0 (PublishingPiwigoCategory*, 0 + 1);
#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->priv->categories = (_vala_array_free (self->priv->categories, self->priv->categories_length1, (GDestroyNotify) publishing_piwigo_category_unref), NULL);
#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->categories = _tmp45_;
+ self->priv->categories = _tmp41_;
#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->priv->categories_length1 = 0;
#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->priv->_categories_size_ = self->priv->categories_length1;
-#line 5017 "PiwigoPublishing.c"
+#line 5457 "PiwigoPublishing.c"
}
#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp46_ = self->priv->categories;
-#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp46__length1 = self->priv->categories_length1;
+ _tmp42_ = self->priv->categories;
#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp47_ = id_string;
+ _tmp42__length1 = self->priv->categories_length1;
#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp48_ = atoi (_tmp47_);
+ _tmp43_ = id_string;
#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp49_ = name;
+ _tmp44_ = name;
#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp50_ = uppercats;
+ _tmp45_ = uppercats;
#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp51_ = publishing_piwigo_category_new (_tmp48_, _tmp49_, _tmp50_, "");
+ _tmp46_ = publishing_piwigo_category_new (atoi (_tmp43_), _tmp44_, _tmp45_, "");
#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _vala_array_add38 (&self->priv->categories, &self->priv->categories_length1, &self->priv->_categories_size_, _tmp51_);
-#line 5035 "PiwigoPublishing.c"
+ _vala_array_add38 (&self->priv->categories, &self->priv->categories_length1, &self->priv->_categories_size_, _tmp46_);
+#line 5473 "PiwigoPublishing.c"
}
}
{
gint i = 0;
#line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
i = 0;
-#line 5042 "PiwigoPublishing.c"
+#line 5480 "PiwigoPublishing.c"
{
- gboolean _tmp52_ = FALSE;
+ gboolean _tmp47_ = FALSE;
#line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp52_ = TRUE;
+ _tmp47_ = TRUE;
#line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
while (TRUE) {
-#line 5049 "PiwigoPublishing.c"
- gint _tmp54_;
- PublishingPiwigoCategory** _tmp55_;
- gint _tmp55__length1;
+#line 5487 "PiwigoPublishing.c"
+ gint _tmp49_;
+ PublishingPiwigoCategory** _tmp50_;
+ gint _tmp50__length1;
gchar** upcatids = NULL;
- PublishingPiwigoCategory** _tmp56_;
- gint _tmp56__length1;
- gint _tmp57_;
- PublishingPiwigoCategory* _tmp58_;
- const gchar* _tmp59_;
- gchar** _tmp60_;
- gchar** _tmp61_;
+ PublishingPiwigoCategory** _tmp51_;
+ gint _tmp51__length1;
+ gint _tmp52_;
+ PublishingPiwigoCategory* _tmp53_;
+ const gchar* _tmp54_;
+ gchar** _tmp55_;
+ gchar** _tmp56_;
gint upcatids_length1;
gint _upcatids_size_;
GString* builder = NULL;
- GString* _tmp62_;
- PublishingPiwigoCategory** _tmp76_;
- gint _tmp76__length1;
- gint _tmp77_;
- PublishingPiwigoCategory* _tmp78_;
- GString* _tmp79_;
- const gchar* _tmp80_;
- gchar* _tmp81_;
+ GString* _tmp57_;
+ PublishingPiwigoCategory** _tmp71_;
+ gint _tmp71__length1;
+ gint _tmp72_;
+ PublishingPiwigoCategory* _tmp73_;
+ GString* _tmp74_;
+ const gchar* _tmp75_;
+ gchar* _tmp76_;
#line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (!_tmp52_) {
-#line 5074 "PiwigoPublishing.c"
- gint _tmp53_;
+ if (!_tmp47_) {
+#line 5512 "PiwigoPublishing.c"
+ gint _tmp48_;
#line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp53_ = i;
+ _tmp48_ = i;
#line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- i = _tmp53_ + 1;
-#line 5080 "PiwigoPublishing.c"
+ i = _tmp48_ + 1;
+#line 5518 "PiwigoPublishing.c"
}
#line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp52_ = FALSE;
+ _tmp47_ = FALSE;
#line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp54_ = i;
+ _tmp49_ = i;
#line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp55_ = self->priv->categories;
+ _tmp50_ = self->priv->categories;
#line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp55__length1 = self->priv->categories_length1;
+ _tmp50__length1 = self->priv->categories_length1;
#line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (!(_tmp54_ < _tmp55__length1)) {
+ if (!(_tmp49_ < _tmp50__length1)) {
#line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
break;
-#line 5094 "PiwigoPublishing.c"
+#line 5532 "PiwigoPublishing.c"
}
#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp56_ = self->priv->categories;
+ _tmp51_ = self->priv->categories;
#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp56__length1 = self->priv->categories_length1;
+ _tmp51__length1 = self->priv->categories_length1;
#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp57_ = i;
+ _tmp52_ = i;
#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp58_ = _tmp56_[_tmp57_];
+ _tmp53_ = _tmp51_[_tmp52_];
#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp59_ = _tmp58_->uppercats;
+ _tmp54_ = _tmp53_->uppercats;
#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp61_ = _tmp60_ = g_strsplit (_tmp59_, ",", 0);
+ _tmp56_ = _tmp55_ = g_strsplit (_tmp54_, ",", 0);
#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- upcatids = _tmp61_;
+ upcatids = _tmp56_;
#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- upcatids_length1 = _vala_array_length (_tmp60_);
+ upcatids_length1 = _vala_array_length (_tmp55_);
#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_upcatids_size_ = upcatids_length1;
#line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp62_ = g_string_new ("");
+ _tmp57_ = g_string_new ("");
#line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- builder = _tmp62_;
-#line 5118 "PiwigoPublishing.c"
+ builder = _tmp57_;
+#line 5556 "PiwigoPublishing.c"
{
gint j = 0;
#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
j = 0;
-#line 5123 "PiwigoPublishing.c"
+#line 5561 "PiwigoPublishing.c"
{
- gboolean _tmp63_ = FALSE;
+ gboolean _tmp58_ = FALSE;
#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp63_ = TRUE;
+ _tmp58_ = TRUE;
#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
while (TRUE) {
-#line 5130 "PiwigoPublishing.c"
- gint _tmp65_;
- gchar** _tmp66_;
- gint _tmp66__length1;
- GString* _tmp67_;
- GString* _tmp68_;
- GeeHashMap* _tmp69_;
- gchar** _tmp70_;
- gint _tmp70__length1;
- gint _tmp71_;
- const gchar* _tmp72_;
- gpointer _tmp73_;
- gchar* _tmp74_;
- GString* _tmp75_;
+#line 5568 "PiwigoPublishing.c"
+ gint _tmp60_;
+ gchar** _tmp61_;
+ gint _tmp61__length1;
+ GString* _tmp62_;
+ GString* _tmp63_;
+ GeeHashMap* _tmp64_;
+ gchar** _tmp65_;
+ gint _tmp65__length1;
+ gint _tmp66_;
+ const gchar* _tmp67_;
+ gpointer _tmp68_;
+ gchar* _tmp69_;
+ GString* _tmp70_;
#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (!_tmp63_) {
-#line 5146 "PiwigoPublishing.c"
- gint _tmp64_;
+ if (!_tmp58_) {
+#line 5584 "PiwigoPublishing.c"
+ gint _tmp59_;
#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp64_ = j;
+ _tmp59_ = j;
#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- j = _tmp64_ + 1;
-#line 5152 "PiwigoPublishing.c"
+ j = _tmp59_ + 1;
+#line 5590 "PiwigoPublishing.c"
}
#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp63_ = FALSE;
+ _tmp58_ = FALSE;
#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp65_ = j;
+ _tmp60_ = j;
#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp66_ = upcatids;
+ _tmp61_ = upcatids;
#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp66__length1 = upcatids_length1;
+ _tmp61__length1 = upcatids_length1;
#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (!(_tmp65_ < _tmp66__length1)) {
+ if (!(_tmp60_ < _tmp61__length1)) {
#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
break;
-#line 5166 "PiwigoPublishing.c"
+#line 5604 "PiwigoPublishing.c"
}
#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp67_ = builder;
+ _tmp62_ = builder;
#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_string_append (_tmp67_, "/ ");
+ g_string_append (_tmp62_, "/ ");
#line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp68_ = builder;
+ _tmp63_ = builder;
#line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp69_ = id_map;
+ _tmp64_ = id_map;
#line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp70_ = upcatids;
+ _tmp65_ = upcatids;
#line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp70__length1 = upcatids_length1;
+ _tmp65__length1 = upcatids_length1;
#line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp71_ = j;
+ _tmp66_ = j;
#line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp72_ = _tmp70_[_tmp71_];
+ _tmp67_ = _tmp65_[_tmp66_];
#line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp73_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp72_);
+ _tmp68_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp67_);
#line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp74_ = (gchar*) _tmp73_;
+ _tmp69_ = (gchar*) _tmp68_;
#line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_string_append (_tmp68_, _tmp74_);
+ g_string_append (_tmp63_, _tmp69_);
#line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_free0 (_tmp74_);
+ _g_free0 (_tmp69_);
#line 643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp75_ = builder;
+ _tmp70_ = builder;
#line 643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_string_append (_tmp75_, " ");
-#line 5196 "PiwigoPublishing.c"
+ g_string_append (_tmp70_, " ");
+#line 5634 "PiwigoPublishing.c"
}
}
}
#line 645 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp76_ = self->priv->categories;
+ _tmp71_ = self->priv->categories;
#line 645 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp76__length1 = self->priv->categories_length1;
+ _tmp71__length1 = self->priv->categories_length1;
#line 645 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp77_ = i;
+ _tmp72_ = i;
#line 645 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp78_ = _tmp76_[_tmp77_];
+ _tmp73_ = _tmp71_[_tmp72_];
#line 645 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp79_ = builder;
+ _tmp74_ = builder;
#line 645 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp80_ = _tmp79_->str;
+ _tmp75_ = _tmp74_->str;
#line 645 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp81_ = g_strdup (_tmp80_);
+ _tmp76_ = g_strdup (_tmp75_);
#line 645 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_free0 (_tmp78_->display_name);
+ _g_free0 (_tmp73_->display_name);
#line 645 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp78_->display_name = _tmp81_;
+ _tmp73_->display_name = _tmp76_;
#line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_string_free0 (builder);
#line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
upcatids = (_vala_array_free (upcatids, upcatids_length1, (GDestroyNotify) g_free), NULL);
-#line 5222 "PiwigoPublishing.c"
+#line 5660 "PiwigoPublishing.c"
}
}
}
@@ -5238,13 +5676,13 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi
_g_free0 (name);
#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_rest_support_xml_document_unref0 (doc);
-#line 5236 "PiwigoPublishing.c"
+#line 5674 "PiwigoPublishing.c"
}
goto __finally36;
__catch36_spit_publishing_publishing_error:
{
GError* err = NULL;
- GError* _tmp82_;
+ GError* _tmp77_;
#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
err = _inner_error_;
#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -5252,14 +5690,14 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi
#line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_debug ("PiwigoPublishing.vala:648: ERROR: on_category_fetch_complete");
#line 649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp82_ = err;
+ _tmp77_ = err;
#line 649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp82_);
+ publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp77_);
#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_error_free0 (err);
#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return;
-#line 5257 "PiwigoPublishing.c"
+#line 5695 "PiwigoPublishing.c"
}
__finally36:
#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -5270,11 +5708,11 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi
g_clear_error (&_inner_error_);
#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return;
-#line 5268 "PiwigoPublishing.c"
+#line 5706 "PiwigoPublishing.c"
}
#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_do_show_publishing_options_pane (self);
-#line 5272 "PiwigoPublishing.c"
+#line 5710 "PiwigoPublishing.c"
}
@@ -5282,13 +5720,13 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi
* Event triggered when the fetch categories transaction fails due to a
* network error.
*/
-static void publishing_piwigo_piwigo_publisher_on_category_fetch_error (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) {
- PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_piwigo_piwigo_publisher_on_category_fetch_error (PublishingPiwigoPiwigoPublisher* self,
+ PublishingRESTSupportTransaction* bad_txn,
+ GError* err)
+{
+ guint _tmp0_;
guint _tmp1_;
- PublishingRESTSupportTransaction* _tmp2_;
- guint _tmp3_;
- PublishingRESTSupportTransaction* _tmp4_;
- GError* _tmp5_;
#line 660 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
#line 660 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -5296,24 +5734,16 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_error (Publishi
#line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_debug ("PiwigoPublishing.vala:664: EVENT: on_category_fetch_error");
#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp0_ = bad_txn;
+ g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_category_fetch_complete_publishing_rest_support_transaction_completed, self);
-#line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp2_ = bad_txn;
+ g_signal_handlers_disconnect_matched (bad_txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_category_fetch_complete_publishing_rest_support_transaction_completed, self);
#line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
+ g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
#line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_category_fetch_error_publishing_rest_support_transaction_network_error, self);
-#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp4_ = bad_txn;
-#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp5_ = err;
+ g_signal_handlers_disconnect_matched (bad_txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_category_fetch_error_publishing_rest_support_transaction_network_error, self);
#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- publishing_piwigo_piwigo_publisher_on_network_error (self, _tmp4_, _tmp5_);
-#line 5311 "PiwigoPublishing.c"
+ publishing_piwigo_piwigo_publisher_on_network_error (self, bad_txn, err);
+#line 5741 "PiwigoPublishing.c"
}
@@ -5322,36 +5752,40 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_error (Publishi
*
* This action method shows the publishing options pane.
*/
-static void _publishing_piwigo_piwigo_publisher_on_publishing_options_pane_logout_clicked_publishing_piwigo_publishing_options_pane_logout (PublishingPiwigoPublishingOptionsPane* _sender, gpointer self) {
+static void
+_publishing_piwigo_piwigo_publisher_on_publishing_options_pane_logout_clicked_publishing_piwigo_publishing_options_pane_logout (PublishingPiwigoPublishingOptionsPane* _sender,
+ gpointer self)
+{
#line 682 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_on_publishing_options_pane_logout_clicked ((PublishingPiwigoPiwigoPublisher*) self);
-#line 5323 "PiwigoPublishing.c"
+#line 5756 "PiwigoPublishing.c"
}
-static void _publishing_piwigo_piwigo_publisher_on_publishing_options_pane_publish_clicked_publishing_piwigo_publishing_options_pane_publish (PublishingPiwigoPublishingOptionsPane* _sender, PublishingPiwigoPublishingParameters* parameters, gboolean strip_metadata, gpointer self) {
+static void
+_publishing_piwigo_piwigo_publisher_on_publishing_options_pane_publish_clicked_publishing_piwigo_publishing_options_pane_publish (PublishingPiwigoPublishingOptionsPane* _sender,
+ PublishingPiwigoPublishingParameters* parameters,
+ gboolean strip_metadata,
+ gpointer self)
+{
#line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_on_publishing_options_pane_publish_clicked ((PublishingPiwigoPiwigoPublisher*) self, parameters, strip_metadata);
-#line 5330 "PiwigoPublishing.c"
+#line 5768 "PiwigoPublishing.c"
}
-static void publishing_piwigo_piwigo_publisher_do_show_publishing_options_pane (PublishingPiwigoPiwigoPublisher* self) {
+static void
+publishing_piwigo_piwigo_publisher_do_show_publishing_options_pane (PublishingPiwigoPiwigoPublisher* self)
+{
SpitPublishingPluginHost* _tmp0_;
PublishingPiwigoPublishingOptionsPane* opts_pane = NULL;
PublishingPiwigoCategory** _tmp1_;
gint _tmp1__length1;
- gint _tmp2_;
- gint _tmp3_;
- gint _tmp4_;
- gboolean _tmp5_;
- gboolean _tmp6_;
- gboolean _tmp7_;
- PublishingPiwigoPublishingOptionsPane* _tmp8_;
- SpitPublishingPluginHost* _tmp9_;
- SpitPublishingPluginHost* _tmp10_;
- GtkWidget* _tmp11_;
- GtkWidget* _tmp12_;
+ PublishingPiwigoPublishingOptionsPane* _tmp2_;
+ SpitPublishingPluginHost* _tmp3_;
+ SpitPublishingPluginHost* _tmp4_;
+ GtkWidget* _tmp5_;
+ GtkWidget* _tmp6_;
#line 675 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -5365,63 +5799,60 @@ static void publishing_piwigo_piwigo_publisher_do_show_publishing_options_pane (
#line 679 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1__length1 = self->priv->categories_length1;
#line 679 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp2_ = publishing_piwigo_piwigo_publisher_get_last_category (self);
-#line 679 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp3_ = publishing_piwigo_piwigo_publisher_get_last_permission_level (self);
+ _tmp2_ = publishing_piwigo_publishing_options_pane_new (self, _tmp1_, _tmp1__length1, publishing_piwigo_piwigo_publisher_get_last_category (self), publishing_piwigo_piwigo_publisher_get_last_permission_level (self), publishing_piwigo_piwigo_publisher_get_last_photo_size (self), publishing_piwigo_piwigo_publisher_get_last_title_as_comment (self), publishing_piwigo_piwigo_publisher_get_last_no_upload_tags (self), publishing_piwigo_piwigo_publisher_get_metadata_removal_choice (self));
#line 679 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp4_ = publishing_piwigo_piwigo_publisher_get_last_photo_size (self);
-#line 679 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp5_ = publishing_piwigo_piwigo_publisher_get_last_title_as_comment (self);
-#line 679 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp6_ = publishing_piwigo_piwigo_publisher_get_last_no_upload_tags (self);
-#line 679 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp7_ = publishing_piwigo_piwigo_publisher_get_metadata_removal_choice (self);
-#line 679 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp8_ = publishing_piwigo_publishing_options_pane_new (self, _tmp1_, _tmp1__length1, _tmp2_, _tmp3_, _tmp4_, _tmp5_, _tmp6_, _tmp7_);
-#line 679 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- opts_pane = _tmp8_;
+ opts_pane = _tmp2_;
#line 682 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_connect_object (opts_pane, "logout", (GCallback) _publishing_piwigo_piwigo_publisher_on_publishing_options_pane_logout_clicked_publishing_piwigo_publishing_options_pane_logout, self, 0);
#line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_connect_object (opts_pane, "publish", (GCallback) _publishing_piwigo_piwigo_publisher_on_publishing_options_pane_publish_clicked_publishing_piwigo_publishing_options_pane_publish, self, 0);
#line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp9_ = self->priv->host;
+ _tmp3_ = self->priv->host;
#line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- spit_publishing_plugin_host_install_dialog_pane (_tmp9_, G_TYPE_CHECK_INSTANCE_CAST (opts_pane, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CLOSE);
+ spit_publishing_plugin_host_install_dialog_pane (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (opts_pane, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CLOSE);
#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp10_ = self->priv->host;
+ _tmp4_ = self->priv->host;
#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp11_ = shotwell_plugins_common_builder_pane_get_default_widget (G_TYPE_CHECK_INSTANCE_CAST (opts_pane, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane));
+ _tmp5_ = shotwell_plugins_common_builder_pane_get_default_widget (G_TYPE_CHECK_INSTANCE_CAST (opts_pane, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane));
#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp12_ = _tmp11_;
+ _tmp6_ = _tmp5_;
#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- spit_publishing_plugin_host_set_dialog_default_widget (_tmp10_, _tmp12_);
+ spit_publishing_plugin_host_set_dialog_default_widget (_tmp4_, _tmp6_);
#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_object_unref0 (_tmp12_);
+ _g_object_unref0 (_tmp6_);
#line 675 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_object_unref0 (opts_pane);
-#line 5398 "PiwigoPublishing.c"
+#line 5820 "PiwigoPublishing.c"
}
/**
* Event triggered when the user clicks logout in the publishing options pane.
*/
-static void _publishing_piwigo_piwigo_publisher_on_logout_network_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
+static void
+_publishing_piwigo_piwigo_publisher_on_logout_network_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+ GError* err,
+ gpointer self)
+{
#line 694 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_on_logout_network_error ((PublishingPiwigoPiwigoPublisher*) self, _sender, err);
-#line 5408 "PiwigoPublishing.c"
+#line 5834 "PiwigoPublishing.c"
}
-static void _publishing_piwigo_piwigo_publisher_on_logout_network_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
+static void
+_publishing_piwigo_piwigo_publisher_on_logout_network_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+ gpointer self)
+{
#line 695 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_on_logout_network_complete ((PublishingPiwigoPiwigoPublisher*) self, _sender);
-#line 5415 "PiwigoPublishing.c"
+#line 5844 "PiwigoPublishing.c"
}
-static void publishing_piwigo_piwigo_publisher_on_publishing_options_pane_logout_clicked (PublishingPiwigoPiwigoPublisher* self) {
+static void
+publishing_piwigo_piwigo_publisher_on_publishing_options_pane_logout_clicked (PublishingPiwigoPiwigoPublisher* self)
+{
PublishingPiwigoSessionLogoutTransaction* logout_trans = NULL;
PublishingPiwigoSession* _tmp0_;
PublishingPiwigoSessionLogoutTransaction* _tmp1_;
@@ -5441,7 +5872,7 @@ static void publishing_piwigo_piwigo_publisher_on_publishing_options_pane_logout
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (logout_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_piwigo_piwigo_publisher_on_logout_network_error_publishing_rest_support_transaction_network_error, self, 0);
#line 695 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (logout_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_piwigo_piwigo_publisher_on_logout_network_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 5438 "PiwigoPublishing.c"
+#line 5869 "PiwigoPublishing.c"
{
#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (logout_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
@@ -5449,7 +5880,7 @@ static void publishing_piwigo_piwigo_publisher_on_publishing_options_pane_logout
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 5446 "PiwigoPublishing.c"
+#line 5877 "PiwigoPublishing.c"
goto __catch37_spit_publishing_publishing_error;
}
#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -5460,7 +5891,7 @@ static void publishing_piwigo_piwigo_publisher_on_publishing_options_pane_logout
g_clear_error (&_inner_error_);
#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return;
-#line 5457 "PiwigoPublishing.c"
+#line 5888 "PiwigoPublishing.c"
}
}
goto __finally37;
@@ -5481,7 +5912,7 @@ static void publishing_piwigo_piwigo_publisher_on_publishing_options_pane_logout
publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp2_);
#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_error_free0 (err);
-#line 5477 "PiwigoPublishing.c"
+#line 5908 "PiwigoPublishing.c"
}
__finally37:
#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -5494,11 +5925,11 @@ static void publishing_piwigo_piwigo_publisher_on_publishing_options_pane_logout
g_clear_error (&_inner_error_);
#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return;
-#line 5490 "PiwigoPublishing.c"
+#line 5921 "PiwigoPublishing.c"
}
#line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_rest_support_transaction_unref0 (logout_trans);
-#line 5494 "PiwigoPublishing.c"
+#line 5925 "PiwigoPublishing.c"
}
@@ -5508,12 +5939,13 @@ static void publishing_piwigo_piwigo_publisher_on_publishing_options_pane_logout
* This event de-authenticates the session and shows the authentication
* pane again.
*/
-static void publishing_piwigo_piwigo_publisher_on_logout_network_complete (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* txn) {
- PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_piwigo_piwigo_publisher_on_logout_network_complete (PublishingPiwigoPiwigoPublisher* self,
+ PublishingRESTSupportTransaction* txn)
+{
+ guint _tmp0_;
guint _tmp1_;
- PublishingRESTSupportTransaction* _tmp2_;
- guint _tmp3_;
- PublishingPiwigoSession* _tmp4_;
+ PublishingPiwigoSession* _tmp2_;
#line 711 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
#line 711 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -5521,37 +5953,33 @@ static void publishing_piwigo_piwigo_publisher_on_logout_network_complete (Publi
#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_debug ("PiwigoPublishing.vala:712: EVENT: on_logout_network_complete");
#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp0_ = txn;
-#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
+ g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_logout_network_complete_publishing_rest_support_transaction_completed, self);
+ g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_logout_network_complete_publishing_rest_support_transaction_completed, self);
#line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp2_ = txn;
+ g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
#line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_logout_network_error_publishing_rest_support_transaction_network_error, self);
+ g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_logout_network_error_publishing_rest_support_transaction_network_error, self);
#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp4_ = self->priv->session;
+ _tmp2_ = self->priv->session;
#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- publishing_piwigo_session_deauthenticate (_tmp4_);
+ publishing_piwigo_session_deauthenticate (_tmp2_);
#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_do_show_authentication_pane (self, PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_INTRO);
-#line 5534 "PiwigoPublishing.c"
+#line 5962 "PiwigoPublishing.c"
}
/**
* Event triggered when the logout action fails due to a network error.
*/
-static void publishing_piwigo_piwigo_publisher_on_logout_network_error (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) {
- PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_piwigo_piwigo_publisher_on_logout_network_error (PublishingPiwigoPiwigoPublisher* self,
+ PublishingRESTSupportTransaction* bad_txn,
+ GError* err)
+{
+ guint _tmp0_;
guint _tmp1_;
- PublishingRESTSupportTransaction* _tmp2_;
- guint _tmp3_;
- PublishingRESTSupportTransaction* _tmp4_;
- GError* _tmp5_;
#line 724 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
#line 724 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -5559,24 +5987,16 @@ static void publishing_piwigo_piwigo_publisher_on_logout_network_error (Publishi
#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_debug ("PiwigoPublishing.vala:728: EVENT: on_logout_network_error");
#line 729 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp0_ = bad_txn;
-#line 729 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
+ g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
#line 729 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_logout_network_complete_publishing_rest_support_transaction_completed, self);
+ g_signal_handlers_disconnect_matched (bad_txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_logout_network_complete_publishing_rest_support_transaction_completed, self);
#line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp2_ = bad_txn;
+ g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
#line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_logout_network_error_publishing_rest_support_transaction_network_error, self);
-#line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp4_ = bad_txn;
+ g_signal_handlers_disconnect_matched (bad_txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_logout_network_error_publishing_rest_support_transaction_network_error, self);
#line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp5_ = err;
-#line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- publishing_piwigo_piwigo_publisher_on_network_error (self, _tmp4_, _tmp5_);
-#line 5572 "PiwigoPublishing.c"
+ publishing_piwigo_piwigo_publisher_on_network_error (self, bad_txn, err);
+#line 5992 "PiwigoPublishing.c"
}
@@ -5590,20 +6010,22 @@ static void publishing_piwigo_piwigo_publisher_on_logout_network_error (Publishi
*
* @param parameters the publishing parameters
*/
-static gpointer _publishing_piwigo_publishing_parameters_ref0 (gpointer self) {
+static gpointer
+_publishing_piwigo_publishing_parameters_ref0 (gpointer self)
+{
#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return self ? publishing_piwigo_publishing_parameters_ref (self) : NULL;
-#line 5589 "PiwigoPublishing.c"
+#line 6011 "PiwigoPublishing.c"
}
-static void publishing_piwigo_piwigo_publisher_on_publishing_options_pane_publish_clicked (PublishingPiwigoPiwigoPublisher* self, PublishingPiwigoPublishingParameters* parameters, gboolean strip_metadata) {
+static void
+publishing_piwigo_piwigo_publisher_on_publishing_options_pane_publish_clicked (PublishingPiwigoPiwigoPublisher* self,
+ PublishingPiwigoPublishingParameters* parameters,
+ gboolean strip_metadata)
+{
PublishingPiwigoPublishingParameters* _tmp0_;
- PublishingPiwigoPublishingParameters* _tmp1_;
- gboolean _tmp2_;
- PublishingPiwigoPublishingParameters* _tmp3_;
- PublishingPiwigoCategory* _tmp4_;
- gboolean _tmp5_;
+ PublishingPiwigoCategory* _tmp1_;
#line 744 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
#line 744 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -5612,42 +6034,31 @@ static void publishing_piwigo_piwigo_publisher_on_publishing_options_pane_publis
g_debug ("PiwigoPublishing.vala:746: EVENT: on_publishing_options_pane_publish_c" \
"licked");
#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp0_ = parameters;
-#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp1_ = _publishing_piwigo_publishing_parameters_ref0 (_tmp0_);
+ _tmp0_ = _publishing_piwigo_publishing_parameters_ref0 (parameters);
#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_piwigo_publishing_parameters_unref0 (self->priv->parameters);
#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->parameters = _tmp1_;
-#line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp2_ = strip_metadata;
+ self->priv->parameters = _tmp0_;
#line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->strip_metadata = _tmp2_;
+ self->priv->strip_metadata = strip_metadata;
#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp3_ = parameters;
+ _tmp1_ = parameters->category;
#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp4_ = _tmp3_->category;
-#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp5_ = publishing_piwigo_category_is_local (_tmp4_);
-#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (_tmp5_) {
-#line 5626 "PiwigoPublishing.c"
- PublishingPiwigoPublishingParameters* _tmp6_;
- PublishingPiwigoCategory* _tmp7_;
-#line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp6_ = parameters;
+ if (publishing_piwigo_category_is_local (_tmp1_)) {
+#line 6040 "PiwigoPublishing.c"
+ PublishingPiwigoCategory* _tmp2_;
#line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp7_ = _tmp6_->category;
+ _tmp2_ = parameters->category;
#line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- publishing_piwigo_piwigo_publisher_do_create_category (self, _tmp7_);
-#line 5635 "PiwigoPublishing.c"
+ publishing_piwigo_piwigo_publisher_do_create_category (self, _tmp2_);
+#line 6046 "PiwigoPublishing.c"
} else {
- gboolean _tmp8_;
+ gboolean _tmp3_;
#line 753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp8_ = self->priv->strip_metadata;
+ _tmp3_ = self->priv->strip_metadata;
#line 753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- publishing_piwigo_piwigo_publisher_do_upload (self, _tmp8_);
-#line 5642 "PiwigoPublishing.c"
+ publishing_piwigo_piwigo_publisher_do_upload (self, _tmp3_);
+#line 6053 "PiwigoPublishing.c"
}
}
@@ -5663,143 +6074,131 @@ static void publishing_piwigo_piwigo_publisher_on_publishing_options_pane_publis
*
* @param category the new category to create on the server
*/
-static gchar* string_strip (const gchar* self) {
+static gchar*
+string_strip (const gchar* self)
+{
gchar* result = NULL;
gchar* _result_ = NULL;
gchar* _tmp0_;
const gchar* _tmp1_;
-#line 1234 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1248 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1249 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp0_ = g_strdup (self);
-#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1249 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_result_ = _tmp0_;
-#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1250 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp1_ = _result_;
-#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1250 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_strstrip (_tmp1_);
-#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1251 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
result = _result_;
-#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1251 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 5677 "PiwigoPublishing.c"
+#line 6090 "PiwigoPublishing.c"
}
-static void _publishing_piwigo_piwigo_publisher_on_category_add_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
+static void
+_publishing_piwigo_piwigo_publisher_on_category_add_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+ GError* err,
+ gpointer self)
+{
#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_on_category_add_error ((PublishingPiwigoPiwigoPublisher*) self, _sender, err);
-#line 5684 "PiwigoPublishing.c"
+#line 6101 "PiwigoPublishing.c"
}
-static void _publishing_piwigo_piwigo_publisher_on_category_add_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
+static void
+_publishing_piwigo_piwigo_publisher_on_category_add_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+ gpointer self)
+{
#line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_on_category_add_complete ((PublishingPiwigoPiwigoPublisher*) self, _sender);
-#line 5691 "PiwigoPublishing.c"
+#line 6111 "PiwigoPublishing.c"
}
-static void publishing_piwigo_piwigo_publisher_do_create_category (PublishingPiwigoPiwigoPublisher* self, PublishingPiwigoCategory* category) {
- PublishingPiwigoCategory* _tmp0_;
- const gchar* _tmp1_;
+static void
+publishing_piwigo_piwigo_publisher_do_create_category (PublishingPiwigoPiwigoPublisher* self,
+ PublishingPiwigoCategory* category)
+{
+ const gchar* _tmp0_;
+ gchar* _tmp1_;
gchar* _tmp2_;
- gchar* _tmp3_;
- PublishingPiwigoCategory* _tmp4_;
- gboolean _tmp5_;
- SpitPublishingPluginHost* _tmp6_;
- SpitPublishingPluginHost* _tmp7_;
- PublishingPiwigoCategory* _tmp8_;
+ SpitPublishingPluginHost* _tmp3_;
+ SpitPublishingPluginHost* _tmp4_;
+ const gchar* _tmp5_;
+ gchar* _tmp6_;
+ gchar* _tmp7_;
+ PublishingPiwigoCategoriesAddTransaction* creation_trans = NULL;
+ PublishingPiwigoSession* _tmp8_;
const gchar* _tmp9_;
gchar* _tmp10_;
gchar* _tmp11_;
- PublishingPiwigoCategoriesAddTransaction* creation_trans = NULL;
- PublishingPiwigoSession* _tmp12_;
- PublishingPiwigoCategory* _tmp13_;
- const gchar* _tmp14_;
- gchar* _tmp15_;
- gchar* _tmp16_;
- PublishingPiwigoCategory* _tmp17_;
- const gchar* _tmp18_;
- gint _tmp19_;
- PublishingPiwigoCategory* _tmp20_;
- const gchar* _tmp21_;
- PublishingPiwigoCategoriesAddTransaction* _tmp22_;
- PublishingPiwigoCategoriesAddTransaction* _tmp23_;
+ const gchar* _tmp12_;
+ const gchar* _tmp13_;
+ PublishingPiwigoCategoriesAddTransaction* _tmp14_;
+ PublishingPiwigoCategoriesAddTransaction* _tmp15_;
GError * _inner_error_ = NULL;
#line 768 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
#line 768 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_CATEGORY (category));
#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp0_ = category;
+ _tmp0_ = category->name;
#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp1_ = _tmp0_->name;
+ _tmp1_ = g_strdup_printf ("ACTION: creating a new category: %s", _tmp0_);
#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp2_ = g_strdup_printf ("ACTION: creating a new category: %s", _tmp1_);
-#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp3_ = _tmp2_;
+ _tmp2_ = _tmp1_;
#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_debug ("PiwigoPublishing.vala:769: %s", _tmp3_);
+ g_debug ("PiwigoPublishing.vala:769: %s", _tmp2_);
#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_free0 (_tmp3_);
-#line 770 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp4_ = category;
-#line 770 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp5_ = publishing_piwigo_category_is_local (_tmp4_);
+ _g_free0 (_tmp2_);
#line 770 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _vala_assert (_tmp5_, "category.is_local()");
+ _vala_assert (publishing_piwigo_category_is_local (category), "category.is_local()");
#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp6_ = self->priv->host;
+ _tmp3_ = self->priv->host;
#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- spit_publishing_plugin_host_set_service_locked (_tmp6_, TRUE);
-#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp7_ = self->priv->host;
+ spit_publishing_plugin_host_set_service_locked (_tmp3_, TRUE);
#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp8_ = category;
+ _tmp4_ = self->priv->host;
#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp9_ = _tmp8_->name;
+ _tmp5_ = category->name;
#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp10_ = g_strdup_printf (_ ("Creating album %s…"), _tmp9_);
+ _tmp6_ = g_strdup_printf (_ ("Creating album %s…"), _tmp5_);
#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp11_ = _tmp10_;
+ _tmp7_ = _tmp6_;
#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- spit_publishing_plugin_host_install_static_message_pane (_tmp7_, _tmp11_, SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
+ spit_publishing_plugin_host_install_static_message_pane (_tmp4_, _tmp7_, SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_free0 (_tmp11_);
-#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp12_ = self->priv->session;
-#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp13_ = category;
-#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp14_ = _tmp13_->name;
-#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp15_ = string_strip (_tmp14_);
+ _g_free0 (_tmp7_);
#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp16_ = _tmp15_;
+ _tmp8_ = self->priv->session;
#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp17_ = category;
+ _tmp9_ = category->name;
#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp18_ = _tmp17_->uppercats;
+ _tmp10_ = string_strip (_tmp9_);
#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp19_ = atoi (_tmp18_);
+ _tmp11_ = _tmp10_;
#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp20_ = category;
+ _tmp12_ = category->uppercats;
#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp21_ = _tmp20_->comment;
+ _tmp13_ = category->comment;
#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp22_ = publishing_piwigo_categories_add_transaction_new (_tmp12_, _tmp16_, _tmp19_, _tmp21_);
+ _tmp14_ = publishing_piwigo_categories_add_transaction_new (_tmp8_, _tmp11_, atoi (_tmp12_), _tmp13_);
#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp23_ = _tmp22_;
+ _tmp15_ = _tmp14_;
#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_free0 (_tmp16_);
+ _g_free0 (_tmp11_);
#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- creation_trans = _tmp23_;
+ creation_trans = _tmp15_;
#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (creation_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_piwigo_piwigo_publisher_on_category_add_error_publishing_rest_support_transaction_network_error, self, 0);
#line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (creation_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_piwigo_piwigo_publisher_on_category_add_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 5794 "PiwigoPublishing.c"
+#line 6193 "PiwigoPublishing.c"
{
#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (creation_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
@@ -5807,7 +6206,7 @@ static void publishing_piwigo_piwigo_publisher_do_create_category (PublishingPiw
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 5802 "PiwigoPublishing.c"
+#line 6201 "PiwigoPublishing.c"
goto __catch38_spit_publishing_publishing_error;
}
#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -5818,14 +6217,14 @@ static void publishing_piwigo_piwigo_publisher_do_create_category (PublishingPiw
g_clear_error (&_inner_error_);
#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return;
-#line 5813 "PiwigoPublishing.c"
+#line 6212 "PiwigoPublishing.c"
}
}
goto __finally38;
__catch38_spit_publishing_publishing_error:
{
GError* err = NULL;
- GError* _tmp24_;
+ GError* _tmp16_;
#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
err = _inner_error_;
#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -5833,12 +6232,12 @@ static void publishing_piwigo_piwigo_publisher_do_create_category (PublishingPiw
#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_debug ("PiwigoPublishing.vala:783: ERROR: do_create_category");
#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp24_ = err;
+ _tmp16_ = err;
#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp24_);
+ publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp16_);
#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_error_free0 (err);
-#line 5833 "PiwigoPublishing.c"
+#line 6232 "PiwigoPublishing.c"
}
__finally38:
#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -5851,11 +6250,11 @@ static void publishing_piwigo_piwigo_publisher_do_create_category (PublishingPiw
g_clear_error (&_inner_error_);
#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return;
-#line 5846 "PiwigoPublishing.c"
+#line 6245 "PiwigoPublishing.c"
}
#line 768 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_rest_support_transaction_unref0 (creation_trans);
-#line 5850 "PiwigoPublishing.c"
+#line 6249 "PiwigoPublishing.c"
}
@@ -5866,11 +6265,12 @@ static void publishing_piwigo_piwigo_publisher_do_create_category (PublishingPiw
* transaction and assigns that ID to the category currently held in
* the publishing parameters. It then calls the upload action.
*/
-static void publishing_piwigo_piwigo_publisher_on_category_add_complete (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* txn) {
- PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_piwigo_piwigo_publisher_on_category_add_complete (PublishingPiwigoPiwigoPublisher* self,
+ PublishingRESTSupportTransaction* txn)
+{
+ guint _tmp0_;
guint _tmp1_;
- PublishingRESTSupportTransaction* _tmp2_;
- guint _tmp3_;
GError * _inner_error_ = NULL;
#line 795 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
@@ -5879,62 +6279,54 @@ static void publishing_piwigo_piwigo_publisher_on_category_add_complete (Publish
#line 796 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_debug ("PiwigoPublishing.vala:796: EVENT: on_category_add_complete");
#line 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp0_ = txn;
-#line 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
+ g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
#line 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_category_add_complete_publishing_rest_support_transaction_completed, self);
+ g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_category_add_complete_publishing_rest_support_transaction_completed, self);
#line 798 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp2_ = txn;
+ g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
#line 798 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 798 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_category_add_error_publishing_rest_support_transaction_network_error, self);
-#line 5885 "PiwigoPublishing.c"
+ g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_category_add_error_publishing_rest_support_transaction_network_error, self);
+#line 6281 "PiwigoPublishing.c"
{
PublishingRESTSupportXmlDocument* doc = NULL;
- PublishingRESTSupportTransaction* _tmp4_;
- gchar* _tmp5_;
- gchar* _tmp6_;
- PublishingRESTSupportXmlDocument* _tmp7_;
- PublishingRESTSupportXmlDocument* _tmp8_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
+ PublishingRESTSupportXmlDocument* _tmp4_;
+ PublishingRESTSupportXmlDocument* _tmp5_;
xmlNode* rsp = NULL;
+ PublishingRESTSupportXmlDocument* _tmp6_;
+ xmlNode* _tmp7_;
+ xmlNode* id_node = NULL;
+ xmlNode* _tmp8_ = NULL;
PublishingRESTSupportXmlDocument* _tmp9_;
xmlNode* _tmp10_;
- xmlNode* id_node = NULL;
- xmlNode* _tmp11_ = NULL;
- PublishingRESTSupportXmlDocument* _tmp12_;
- xmlNode* _tmp13_;
- xmlNode* _tmp14_;
+ xmlNode* _tmp11_;
gchar* id_string = NULL;
- xmlNode* _tmp15_;
- gchar* _tmp16_;
+ xmlNode* _tmp12_;
+ gchar* _tmp13_;
gint id = 0;
- const gchar* _tmp17_;
- gint _tmp18_;
- PublishingPiwigoPublishingParameters* _tmp19_;
- PublishingPiwigoCategory* _tmp20_;
- gint _tmp21_;
- gboolean _tmp22_;
+ const gchar* _tmp14_;
+ PublishingPiwigoPublishingParameters* _tmp15_;
+ PublishingPiwigoCategory* _tmp16_;
+ gint _tmp17_;
+ gboolean _tmp18_;
#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp4_ = txn;
+ _tmp2_ = publishing_rest_support_transaction_get_response (txn);
#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp5_ = publishing_rest_support_transaction_get_response (_tmp4_);
-#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp6_ = _tmp5_;
+ _tmp3_ = _tmp2_;
#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp7_ = publishing_rest_support_xml_document_parse_string (_tmp6_, _publishing_piwigo_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response, NULL, &_inner_error_);
+ _tmp4_ = publishing_rest_support_xml_document_parse_string (_tmp3_, _publishing_piwigo_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response, NULL, &_inner_error_);
#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp8_ = _tmp7_;
+ _tmp5_ = _tmp4_;
#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_free0 (_tmp6_);
+ _g_free0 (_tmp3_);
#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- doc = _tmp8_;
+ doc = _tmp5_;
#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 5929 "PiwigoPublishing.c"
+#line 6321 "PiwigoPublishing.c"
goto __catch39_spit_publishing_publishing_error;
}
#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -5943,29 +6335,29 @@ static void publishing_piwigo_piwigo_publisher_on_category_add_complete (Publish
g_clear_error (&_inner_error_);
#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return;
-#line 5938 "PiwigoPublishing.c"
+#line 6330 "PiwigoPublishing.c"
}
#line 805 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp9_ = doc;
+ _tmp6_ = doc;
#line 805 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp10_ = publishing_rest_support_xml_document_get_root_node (_tmp9_);
+ _tmp7_ = publishing_rest_support_xml_document_get_root_node (_tmp6_);
#line 805 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- rsp = _tmp10_;
+ rsp = _tmp7_;
#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp12_ = doc;
+ _tmp9_ = doc;
#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp13_ = rsp;
+ _tmp10_ = rsp;
#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp14_ = publishing_rest_support_xml_document_get_named_child (_tmp12_, _tmp13_, "id", &_inner_error_);
+ _tmp11_ = publishing_rest_support_xml_document_get_named_child (_tmp9_, _tmp10_, "id", &_inner_error_);
#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp11_ = _tmp14_;
+ _tmp8_ = _tmp11_;
#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_rest_support_xml_document_unref0 (doc);
#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 5960 "PiwigoPublishing.c"
+#line 6352 "PiwigoPublishing.c"
goto __catch39_spit_publishing_publishing_error;
}
#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -5976,45 +6368,43 @@ static void publishing_piwigo_piwigo_publisher_on_category_add_complete (Publish
g_clear_error (&_inner_error_);
#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return;
-#line 5971 "PiwigoPublishing.c"
+#line 6363 "PiwigoPublishing.c"
}
#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- id_node = _tmp11_;
+ id_node = _tmp8_;
#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp15_ = id_node;
+ _tmp12_ = id_node;
#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp16_ = (gchar*) xmlNodeGetContent (_tmp15_);
+ _tmp13_ = (gchar*) xmlNodeGetContent (_tmp12_);
#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- id_string = _tmp16_;
+ id_string = _tmp13_;
#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp17_ = id_string;
+ _tmp14_ = id_string;
#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp18_ = atoi (_tmp17_);
-#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- id = _tmp18_;
+ id = atoi (_tmp14_);
#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp19_ = self->priv->parameters;
+ _tmp15_ = self->priv->parameters;
#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp20_ = _tmp19_->category;
+ _tmp16_ = _tmp15_->category;
#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp21_ = id;
+ _tmp17_ = id;
#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp20_->id = _tmp21_;
+ _tmp16_->id = _tmp17_;
#line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp22_ = self->priv->strip_metadata;
+ _tmp18_ = self->priv->strip_metadata;
#line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- publishing_piwigo_piwigo_publisher_do_upload (self, _tmp22_);
+ publishing_piwigo_piwigo_publisher_do_upload (self, _tmp18_);
#line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (id_string);
#line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_rest_support_xml_document_unref0 (doc);
-#line 6003 "PiwigoPublishing.c"
+#line 6393 "PiwigoPublishing.c"
}
goto __finally39;
__catch39_spit_publishing_publishing_error:
{
GError* err = NULL;
- GError* _tmp23_;
+ GError* _tmp19_;
#line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
err = _inner_error_;
#line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -6022,12 +6412,12 @@ static void publishing_piwigo_piwigo_publisher_on_category_add_complete (Publish
#line 813 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_debug ("PiwigoPublishing.vala:813: ERROR: on_category_add_complete");
#line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp23_ = err;
+ _tmp19_ = err;
#line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp23_);
+ publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp19_);
#line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_error_free0 (err);
-#line 6022 "PiwigoPublishing.c"
+#line 6412 "PiwigoPublishing.c"
}
__finally39:
#line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -6038,7 +6428,7 @@ static void publishing_piwigo_piwigo_publisher_on_category_add_complete (Publish
g_clear_error (&_inner_error_);
#line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return;
-#line 6033 "PiwigoPublishing.c"
+#line 6423 "PiwigoPublishing.c"
}
}
@@ -6046,13 +6436,13 @@ static void publishing_piwigo_piwigo_publisher_on_category_add_complete (Publish
/**
* Event triggered when the add category action fails due to a network error.
*/
-static void publishing_piwigo_piwigo_publisher_on_category_add_error (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) {
- PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_piwigo_piwigo_publisher_on_category_add_error (PublishingPiwigoPiwigoPublisher* self,
+ PublishingRESTSupportTransaction* bad_txn,
+ GError* err)
+{
+ guint _tmp0_;
guint _tmp1_;
- PublishingRESTSupportTransaction* _tmp2_;
- guint _tmp3_;
- PublishingRESTSupportTransaction* _tmp4_;
- GError* _tmp5_;
#line 821 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
#line 821 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -6060,150 +6450,151 @@ static void publishing_piwigo_piwigo_publisher_on_category_add_error (Publishing
#line 825 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_debug ("PiwigoPublishing.vala:825: EVENT: on_category_add_error");
#line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp0_ = bad_txn;
-#line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
+ g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
#line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_category_add_complete_publishing_rest_support_transaction_completed, self);
+ g_signal_handlers_disconnect_matched (bad_txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_category_add_complete_publishing_rest_support_transaction_completed, self);
#line 827 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp2_ = bad_txn;
+ g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
#line 827 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 827 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_category_add_error_publishing_rest_support_transaction_network_error, self);
-#line 828 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp4_ = bad_txn;
+ g_signal_handlers_disconnect_matched (bad_txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_category_add_error_publishing_rest_support_transaction_network_error, self);
#line 828 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp5_ = err;
-#line 828 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- publishing_piwigo_piwigo_publisher_on_network_error (self, _tmp4_, _tmp5_);
-#line 6072 "PiwigoPublishing.c"
+ publishing_piwigo_piwigo_publisher_on_network_error (self, bad_txn, err);
+#line 6454 "PiwigoPublishing.c"
}
/**
* Upload action: the big one, the one we've been waiting for!
*/
-static void _publishing_piwigo_piwigo_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender, gint num_photos_published, gpointer self) {
+static void
+_publishing_piwigo_piwigo_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender,
+ gint num_photos_published,
+ gpointer self)
+{
#line 851 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_on_upload_complete ((PublishingPiwigoPiwigoPublisher*) self, _sender, num_photos_published);
-#line 6082 "PiwigoPublishing.c"
+#line 6468 "PiwigoPublishing.c"
}
-static void _publishing_piwigo_piwigo_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender, GError* err, gpointer self) {
+static void
+_publishing_piwigo_piwigo_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender,
+ GError* err,
+ gpointer self)
+{
#line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_on_upload_error ((PublishingPiwigoPiwigoPublisher*) self, _sender, err);
-#line 6089 "PiwigoPublishing.c"
+#line 6479 "PiwigoPublishing.c"
}
-static void _publishing_piwigo_piwigo_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self) {
+static void
+_publishing_piwigo_piwigo_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number,
+ gdouble fraction_complete,
+ gpointer self)
+{
#line 853 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_on_upload_status_updated ((PublishingPiwigoPiwigoPublisher*) self, file_number, fraction_complete);
-#line 6096 "PiwigoPublishing.c"
+#line 6490 "PiwigoPublishing.c"
}
-static void publishing_piwigo_piwigo_publisher_do_upload (PublishingPiwigoPiwigoPublisher* self, gboolean strip_metadata) {
- gboolean _tmp0_;
- SpitPublishingPluginHost* _tmp1_;
- PublishingPiwigoPublishingParameters* _tmp2_;
- PublishingPiwigoCategory* _tmp3_;
- gint _tmp4_;
- PublishingPiwigoPublishingParameters* _tmp5_;
- PublishingPiwigoPermissionLevel* _tmp6_;
- gint _tmp7_;
- PublishingPiwigoPublishingParameters* _tmp8_;
- PublishingPiwigoSizeEntry* _tmp9_;
- gint _tmp10_;
- PublishingPiwigoPublishingParameters* _tmp11_;
- gboolean _tmp12_;
- PublishingPiwigoPublishingParameters* _tmp13_;
- gboolean _tmp14_;
- gboolean _tmp15_;
- SpitPublishingPluginHost* _tmp16_;
- PublishingPiwigoPublishingParameters* _tmp17_;
- PublishingPiwigoSizeEntry* _tmp18_;
- gint _tmp19_;
- gboolean _tmp20_;
- void* _tmp21_;
- GDestroyNotify _tmp22_;
- SpitPublishingProgressCallback _tmp23_;
+static void
+publishing_piwigo_piwigo_publisher_do_upload (PublishingPiwigoPiwigoPublisher* self,
+ gboolean strip_metadata)
+{
+ SpitPublishingPluginHost* _tmp0_;
+ PublishingPiwigoPublishingParameters* _tmp1_;
+ PublishingPiwigoCategory* _tmp2_;
+ gint _tmp3_;
+ PublishingPiwigoPublishingParameters* _tmp4_;
+ PublishingPiwigoPermissionLevel* _tmp5_;
+ gint _tmp6_;
+ PublishingPiwigoPublishingParameters* _tmp7_;
+ PublishingPiwigoSizeEntry* _tmp8_;
+ gint _tmp9_;
+ PublishingPiwigoPublishingParameters* _tmp10_;
+ gboolean _tmp11_;
+ PublishingPiwigoPublishingParameters* _tmp12_;
+ gboolean _tmp13_;
+ SpitPublishingPluginHost* _tmp14_;
+ PublishingPiwigoPublishingParameters* _tmp15_;
+ PublishingPiwigoSizeEntry* _tmp16_;
+ gint _tmp17_;
+ gboolean _tmp18_;
+ void* _tmp19_;
+ GDestroyNotify _tmp20_;
+ SpitPublishingProgressCallback _tmp21_;
SpitPublishingPublishable** publishables = NULL;
- SpitPublishingPluginHost* _tmp24_;
- gint _tmp25_;
- SpitPublishingPublishable** _tmp26_;
+ SpitPublishingPluginHost* _tmp22_;
+ gint _tmp23_;
+ SpitPublishingPublishable** _tmp24_;
gint publishables_length1;
gint _publishables_size_;
PublishingPiwigoUploader* uploader = NULL;
- PublishingPiwigoSession* _tmp27_;
- PublishingPiwigoPublishingParameters* _tmp28_;
- PublishingPiwigoUploader* _tmp29_;
+ PublishingPiwigoSession* _tmp25_;
+ PublishingPiwigoPublishingParameters* _tmp26_;
+ PublishingPiwigoUploader* _tmp27_;
#line 834 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
#line 835 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp0_ = strip_metadata;
-#line 835 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->strip_metadata = _tmp0_;
+ self->priv->strip_metadata = strip_metadata;
#line 836 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_debug ("PiwigoPublishing.vala:836: ACTION: uploading pictures");
#line 838 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp1_ = self->priv->host;
+ _tmp0_ = self->priv->host;
#line 838 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- spit_publishing_plugin_host_set_service_locked (_tmp1_, TRUE);
+ spit_publishing_plugin_host_set_service_locked (_tmp0_, TRUE);
#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp2_ = self->priv->parameters;
+ _tmp1_ = self->priv->parameters;
#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp3_ = _tmp2_->category;
+ _tmp2_ = _tmp1_->category;
#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp4_ = _tmp3_->id;
+ _tmp3_ = _tmp2_->id;
#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- publishing_piwigo_piwigo_publisher_set_last_category (self, _tmp4_);
+ publishing_piwigo_piwigo_publisher_set_last_category (self, _tmp3_);
#line 841 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp5_ = self->priv->parameters;
+ _tmp4_ = self->priv->parameters;
#line 841 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp6_ = _tmp5_->perm_level;
+ _tmp5_ = _tmp4_->perm_level;
#line 841 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp7_ = _tmp6_->id;
+ _tmp6_ = _tmp5_->id;
#line 841 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- publishing_piwigo_piwigo_publisher_set_last_permission_level (self, _tmp7_);
+ publishing_piwigo_piwigo_publisher_set_last_permission_level (self, _tmp6_);
#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp8_ = self->priv->parameters;
+ _tmp7_ = self->priv->parameters;
#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp9_ = _tmp8_->photo_size;
+ _tmp8_ = _tmp7_->photo_size;
#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp10_ = _tmp9_->id;
+ _tmp9_ = _tmp8_->id;
#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- publishing_piwigo_piwigo_publisher_set_last_photo_size (self, _tmp10_);
+ publishing_piwigo_piwigo_publisher_set_last_photo_size (self, _tmp9_);
#line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp11_ = self->priv->parameters;
+ _tmp10_ = self->priv->parameters;
#line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp12_ = _tmp11_->title_as_comment;
+ _tmp11_ = _tmp10_->title_as_comment;
#line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- publishing_piwigo_piwigo_publisher_set_last_title_as_comment (self, _tmp12_);
+ publishing_piwigo_piwigo_publisher_set_last_title_as_comment (self, _tmp11_);
#line 844 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp13_ = self->priv->parameters;
+ _tmp12_ = self->priv->parameters;
#line 844 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp14_ = _tmp13_->no_upload_tags;
+ _tmp13_ = _tmp12_->no_upload_tags;
#line 844 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- publishing_piwigo_piwigo_publisher_set_last_no_upload_tags (self, _tmp14_);
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp15_ = strip_metadata;
+ publishing_piwigo_piwigo_publisher_set_last_no_upload_tags (self, _tmp13_);
#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- publishing_piwigo_piwigo_publisher_set_metadata_removal_choice (self, _tmp15_);
+ publishing_piwigo_piwigo_publisher_set_metadata_removal_choice (self, strip_metadata);
#line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp16_ = self->priv->host;
+ _tmp14_ = self->priv->host;
#line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp17_ = self->priv->parameters;
+ _tmp15_ = self->priv->parameters;
#line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp18_ = _tmp17_->photo_size;
+ _tmp16_ = _tmp15_->photo_size;
#line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp19_ = _tmp18_->id;
+ _tmp17_ = _tmp16_->id;
#line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp20_ = self->priv->strip_metadata;
+ _tmp18_ = self->priv->strip_metadata;
#line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp23_ = spit_publishing_plugin_host_serialize_publishables (_tmp16_, _tmp19_, _tmp20_, &_tmp21_, &_tmp22_);
+ _tmp21_ = spit_publishing_plugin_host_serialize_publishables (_tmp14_, _tmp17_, _tmp18_, &_tmp19_, &_tmp20_);
#line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
(self->priv->progress_reporter_target_destroy_notify == NULL) ? NULL : (self->priv->progress_reporter_target_destroy_notify (self->priv->progress_reporter_target), NULL);
#line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -6213,29 +6604,29 @@ static void publishing_piwigo_piwigo_publisher_do_upload (PublishingPiwigoPiwigo
#line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->priv->progress_reporter_target_destroy_notify = NULL;
#line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->progress_reporter = _tmp23_;
+ self->priv->progress_reporter = _tmp21_;
#line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->progress_reporter_target = _tmp21_;
+ self->priv->progress_reporter_target = _tmp19_;
#line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->progress_reporter_target_destroy_notify = _tmp22_;
+ self->priv->progress_reporter_target_destroy_notify = _tmp20_;
#line 848 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp24_ = self->priv->host;
+ _tmp22_ = self->priv->host;
#line 848 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp26_ = spit_publishing_plugin_host_get_publishables (_tmp24_, &_tmp25_);
+ _tmp24_ = spit_publishing_plugin_host_get_publishables (_tmp22_, &_tmp23_);
#line 848 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- publishables = _tmp26_;
+ publishables = _tmp24_;
#line 848 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- publishables_length1 = _tmp25_;
+ publishables_length1 = _tmp23_;
#line 848 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishables_size_ = publishables_length1;
#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp27_ = self->priv->session;
+ _tmp25_ = self->priv->session;
#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp28_ = self->priv->parameters;
+ _tmp26_ = self->priv->parameters;
#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp29_ = publishing_piwigo_uploader_new (_tmp27_, publishables, publishables_length1, _tmp28_);
+ _tmp27_ = publishing_piwigo_uploader_new (_tmp25_, publishables, publishables_length1, _tmp26_);
#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- uploader = _tmp29_;
+ uploader = _tmp27_;
#line 851 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (uploader, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), "upload-complete", (GCallback) _publishing_piwigo_piwigo_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self, 0);
#line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -6246,7 +6637,7 @@ static void publishing_piwigo_piwigo_publisher_do_upload (PublishingPiwigoPiwigo
_publishing_rest_support_batch_uploader_unref0 (uploader);
#line 834 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishables = (_vala_array_free (publishables, publishables_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 6241 "PiwigoPublishing.c"
+#line 6632 "PiwigoPublishing.c"
}
@@ -6254,11 +6645,13 @@ static void publishing_piwigo_piwigo_publisher_do_upload (PublishingPiwigoPiwigo
* Event triggered when the batch uploader reports that at least one of the
* network transactions encapsulating uploads has completed successfully
*/
-static void publishing_piwigo_piwigo_publisher_on_upload_complete (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportBatchUploader* uploader, gint num_published) {
- PublishingRESTSupportBatchUploader* _tmp0_;
+static void
+publishing_piwigo_piwigo_publisher_on_upload_complete (PublishingPiwigoPiwigoPublisher* self,
+ PublishingRESTSupportBatchUploader* uploader,
+ gint num_published)
+{
+ guint _tmp0_;
guint _tmp1_;
- PublishingRESTSupportBatchUploader* _tmp2_;
- guint _tmp3_;
#line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
#line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -6266,20 +6659,16 @@ static void publishing_piwigo_piwigo_publisher_on_upload_complete (PublishingPiw
#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_debug ("PiwigoPublishing.vala:861: EVENT: on_upload_complete");
#line 862 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp0_ = uploader;
+ g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp0_, NULL, FALSE);
#line 862 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp1_, NULL, FALSE);
-#line 862 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self);
-#line 863 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp2_ = uploader;
+ g_signal_handlers_disconnect_matched (uploader, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self);
#line 863 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp3_, NULL, FALSE);
+ g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp1_, NULL, FALSE);
#line 863 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self);
+ g_signal_handlers_disconnect_matched (uploader, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self);
#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_do_show_success_pane (self);
-#line 6274 "PiwigoPublishing.c"
+#line 6663 "PiwigoPublishing.c"
}
@@ -6287,12 +6676,13 @@ static void publishing_piwigo_piwigo_publisher_on_upload_complete (PublishingPiw
* Event triggered when the batch uploader reports that at least one of the
* network transactions encapsulating uploads has caused a network error
*/
-static void publishing_piwigo_piwigo_publisher_on_upload_error (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportBatchUploader* uploader, GError* err) {
- PublishingRESTSupportBatchUploader* _tmp0_;
+static void
+publishing_piwigo_piwigo_publisher_on_upload_error (PublishingPiwigoPiwigoPublisher* self,
+ PublishingRESTSupportBatchUploader* uploader,
+ GError* err)
+{
+ guint _tmp0_;
guint _tmp1_;
- PublishingRESTSupportBatchUploader* _tmp2_;
- guint _tmp3_;
- GError* _tmp4_;
#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -6300,76 +6690,64 @@ static void publishing_piwigo_piwigo_publisher_on_upload_error (PublishingPiwigo
#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_debug ("PiwigoPublishing.vala:878: EVENT: on_upload_error");
#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp0_ = uploader;
-#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp1_, NULL, FALSE);
+ g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp0_, NULL, FALSE);
#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self);
+ g_signal_handlers_disconnect_matched (uploader, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self);
#line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp2_ = uploader;
+ g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp1_, NULL, FALSE);
#line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp3_, NULL, FALSE);
-#line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self);
-#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp4_ = err;
+ g_signal_handlers_disconnect_matched (uploader, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self);
#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp4_);
-#line 6310 "PiwigoPublishing.c"
+ publishing_piwigo_piwigo_publisher_do_show_error (self, err);
+#line 6694 "PiwigoPublishing.c"
}
/**
* Event triggered when upload progresses and the status needs to be updated.
*/
-static void publishing_piwigo_piwigo_publisher_on_upload_status_updated (PublishingPiwigoPiwigoPublisher* self, gint file_number, gdouble completed_fraction) {
- gboolean _tmp0_;
- gdouble _tmp1_;
- SpitPublishingProgressCallback _tmp2_;
- void* _tmp2__target;
- SpitPublishingProgressCallback _tmp3_;
- void* _tmp3__target;
- gint _tmp4_;
- gdouble _tmp5_;
+static void
+publishing_piwigo_piwigo_publisher_on_upload_status_updated (PublishingPiwigoPiwigoPublisher* self,
+ gint file_number,
+ gdouble completed_fraction)
+{
+ SpitPublishingProgressCallback _tmp0_;
+ void* _tmp0__target;
+ SpitPublishingProgressCallback _tmp1_;
+ void* _tmp1__target;
#line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (!_tmp0_) {
+ if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return;
-#line 6334 "PiwigoPublishing.c"
+#line 6716 "PiwigoPublishing.c"
}
#line 892 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp1_ = completed_fraction;
-#line 892 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_debug ("PiwigoPublishing.vala:892: EVENT: uploader reports upload %.2f percent" \
-" complete.", 100.0 * _tmp1_);
+" complete.", 100.0 * completed_fraction);
#line 894 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp2_ = self->priv->progress_reporter;
+ _tmp0_ = self->priv->progress_reporter;
#line 894 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp2__target = self->priv->progress_reporter_target;
+ _tmp0__target = self->priv->progress_reporter_target;
#line 894 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _vala_assert (_tmp2_ != NULL, "progress_reporter != null");
-#line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp3_ = self->priv->progress_reporter;
-#line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp3__target = self->priv->progress_reporter_target;
+ _vala_assert (_tmp0_ != NULL, "progress_reporter != null");
#line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp4_ = file_number;
+ _tmp1_ = self->priv->progress_reporter;
#line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp5_ = completed_fraction;
+ _tmp1__target = self->priv->progress_reporter_target;
#line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp3_ (_tmp4_, _tmp5_, _tmp3__target);
-#line 6356 "PiwigoPublishing.c"
+ _tmp1_ (file_number, completed_fraction, _tmp1__target);
+#line 6732 "PiwigoPublishing.c"
}
/**
* Action to display the success pane in the publishing dialog.
*/
-static void publishing_piwigo_piwigo_publisher_do_show_success_pane (PublishingPiwigoPiwigoPublisher* self) {
+static void
+publishing_piwigo_piwigo_publisher_do_show_success_pane (PublishingPiwigoPiwigoPublisher* self)
+{
SpitPublishingPluginHost* _tmp0_;
SpitPublishingPluginHost* _tmp1_;
#line 902 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -6384,15 +6762,18 @@ static void publishing_piwigo_piwigo_publisher_do_show_success_pane (PublishingP
_tmp1_ = self->priv->host;
#line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
spit_publishing_plugin_host_install_success_pane (_tmp1_);
-#line 6378 "PiwigoPublishing.c"
+#line 6756 "PiwigoPublishing.c"
}
/**
* Helper event to handle network errors.
*/
-static void publishing_piwigo_piwigo_publisher_on_network_error (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) {
- GError* _tmp0_;
+static void
+publishing_piwigo_piwigo_publisher_on_network_error (PublishingPiwigoPiwigoPublisher* self,
+ PublishingRESTSupportTransaction* bad_txn,
+ GError* err)
+{
#line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
#line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -6400,25 +6781,24 @@ static void publishing_piwigo_piwigo_publisher_on_network_error (PublishingPiwig
#line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_debug ("PiwigoPublishing.vala:916: EVENT: on_network_error");
#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp0_ = err;
-#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp0_);
-#line 6397 "PiwigoPublishing.c"
+ publishing_piwigo_piwigo_publisher_do_show_error (self, err);
+#line 6776 "PiwigoPublishing.c"
}
/**
* Action to display an error to the user.
*/
-static void publishing_piwigo_piwigo_publisher_do_show_error (PublishingPiwigoPiwigoPublisher* self, GError* e) {
+static void
+publishing_piwigo_piwigo_publisher_do_show_error (PublishingPiwigoPiwigoPublisher* self,
+ GError* e)
+{
gchar* error_type = NULL;
gchar* _tmp0_;
- GError* _tmp1_;
- const gchar* _tmp16_;
- GError* _tmp17_;
- const gchar* _tmp18_;
- gchar* _tmp19_;
- gchar* _tmp20_;
+ const gchar* _tmp8_;
+ const gchar* _tmp9_;
+ gchar* _tmp10_;
+ gchar* _tmp11_;
#line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
#line 924 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -6428,121 +6808,98 @@ static void publishing_piwigo_piwigo_publisher_do_show_error (PublishingPiwigoPi
#line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
error_type = _tmp0_;
#line 926 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp1_ = e;
-#line 926 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (g_error_matches (_tmp1_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_NO_ANSWER)) {
+ if (g_error_matches (e, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_NO_ANSWER)) {
#line 927 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_do_show_authentication_pane (self, PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_FAILED_RETRY_URL);
#line 928 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (error_type);
#line 928 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return;
-#line 6431 "PiwigoPublishing.c"
+#line 6809 "PiwigoPublishing.c"
} else {
- GError* _tmp2_;
-#line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp2_ = e;
#line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (g_error_matches (_tmp2_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_COMMUNICATION_FAILED)) {
-#line 6438 "PiwigoPublishing.c"
- gchar* _tmp3_;
+ if (g_error_matches (e, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_COMMUNICATION_FAILED)) {
+#line 6813 "PiwigoPublishing.c"
+ gchar* _tmp1_;
#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp3_ = g_strdup ("COMMUNICATION_FAILED");
+ _tmp1_ = g_strdup ("COMMUNICATION_FAILED");
#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (error_type);
#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- error_type = _tmp3_;
-#line 6446 "PiwigoPublishing.c"
+ error_type = _tmp1_;
+#line 6821 "PiwigoPublishing.c"
} else {
- GError* _tmp4_;
#line 931 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp4_ = e;
-#line 931 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (g_error_matches (_tmp4_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_PROTOCOL_ERROR)) {
-#line 6453 "PiwigoPublishing.c"
- gchar* _tmp5_;
+ if (g_error_matches (e, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_PROTOCOL_ERROR)) {
+#line 6825 "PiwigoPublishing.c"
+ gchar* _tmp2_;
#line 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp5_ = g_strdup ("PROTOCOL_ERROR");
+ _tmp2_ = g_strdup ("PROTOCOL_ERROR");
#line 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (error_type);
#line 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- error_type = _tmp5_;
-#line 6461 "PiwigoPublishing.c"
+ error_type = _tmp2_;
+#line 6833 "PiwigoPublishing.c"
} else {
- GError* _tmp6_;
-#line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp6_ = e;
#line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (g_error_matches (_tmp6_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_SERVICE_ERROR)) {
-#line 6468 "PiwigoPublishing.c"
- gchar* _tmp7_;
+ if (g_error_matches (e, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_SERVICE_ERROR)) {
+#line 6837 "PiwigoPublishing.c"
+ gchar* _tmp3_;
#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp7_ = g_strdup ("SERVICE_ERROR");
+ _tmp3_ = g_strdup ("SERVICE_ERROR");
#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (error_type);
#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- error_type = _tmp7_;
-#line 6476 "PiwigoPublishing.c"
+ error_type = _tmp3_;
+#line 6845 "PiwigoPublishing.c"
} else {
- GError* _tmp8_;
-#line 935 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp8_ = e;
#line 935 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (g_error_matches (_tmp8_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE)) {
-#line 6483 "PiwigoPublishing.c"
- gchar* _tmp9_;
+ if (g_error_matches (e, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE)) {
+#line 6849 "PiwigoPublishing.c"
+ gchar* _tmp4_;
#line 936 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp9_ = g_strdup ("MALFORMED_RESPONSE");
+ _tmp4_ = g_strdup ("MALFORMED_RESPONSE");
#line 936 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (error_type);
#line 936 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- error_type = _tmp9_;
-#line 6491 "PiwigoPublishing.c"
+ error_type = _tmp4_;
+#line 6857 "PiwigoPublishing.c"
} else {
- GError* _tmp10_;
#line 937 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp10_ = e;
-#line 937 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (g_error_matches (_tmp10_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR)) {
-#line 6498 "PiwigoPublishing.c"
- gchar* _tmp11_;
+ if (g_error_matches (e, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR)) {
+#line 6861 "PiwigoPublishing.c"
+ gchar* _tmp5_;
#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp11_ = g_strdup ("LOCAL_FILE_ERROR");
+ _tmp5_ = g_strdup ("LOCAL_FILE_ERROR");
#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (error_type);
#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- error_type = _tmp11_;
-#line 6506 "PiwigoPublishing.c"
+ error_type = _tmp5_;
+#line 6869 "PiwigoPublishing.c"
} else {
- GError* _tmp12_;
-#line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp12_ = e;
#line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (g_error_matches (_tmp12_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_EXPIRED_SESSION)) {
-#line 6513 "PiwigoPublishing.c"
- gchar* _tmp13_;
+ if (g_error_matches (e, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_EXPIRED_SESSION)) {
+#line 6873 "PiwigoPublishing.c"
+ gchar* _tmp6_;
#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp13_ = g_strdup ("EXPIRED_SESSION");
+ _tmp6_ = g_strdup ("EXPIRED_SESSION");
#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (error_type);
#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- error_type = _tmp13_;
-#line 6521 "PiwigoPublishing.c"
+ error_type = _tmp6_;
+#line 6881 "PiwigoPublishing.c"
} else {
- GError* _tmp14_;
-#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp14_ = e;
#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (g_error_matches (_tmp14_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_SSL_FAILED)) {
-#line 6528 "PiwigoPublishing.c"
- gchar* _tmp15_;
+ if (g_error_matches (e, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_SSL_FAILED)) {
+#line 6885 "PiwigoPublishing.c"
+ gchar* _tmp7_;
#line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp15_ = g_strdup ("SECURE_CONNECTION_FAILED");
+ _tmp7_ = g_strdup ("SECURE_CONNECTION_FAILED");
#line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (error_type);
#line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- error_type = _tmp15_;
-#line 6536 "PiwigoPublishing.c"
+ error_type = _tmp7_;
+#line 6893 "PiwigoPublishing.c"
}
}
}
@@ -6552,33 +6909,33 @@ static void publishing_piwigo_piwigo_publisher_do_show_error (PublishingPiwigoPi
}
}
#line 945 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp16_ = error_type;
+ _tmp8_ = error_type;
#line 945 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp17_ = e;
+ _tmp9_ = e->message;
#line 945 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp18_ = _tmp17_->message;
+ _tmp10_ = g_strdup_printf ("Unhandled error: type=%s; message='%s'", _tmp8_, _tmp9_);
#line 945 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp19_ = g_strdup_printf ("Unhandled error: type=%s; message='%s'", _tmp16_, _tmp18_);
-#line 945 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp20_ = _tmp19_;
+ _tmp11_ = _tmp10_;
#line 945 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_debug ("PiwigoPublishing.vala:945: %s", _tmp20_);
+ g_debug ("PiwigoPublishing.vala:945: %s", _tmp11_);
#line 945 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_free0 (_tmp20_);
+ _g_free0 (_tmp11_);
#line 946 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_do_show_error_message (self, _ ("An error message occurred when publishing to Piwigo. Please try again."));
#line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (error_type);
-#line 6563 "PiwigoPublishing.c"
+#line 6918 "PiwigoPublishing.c"
}
/**
* Action to display an error message to the user.
*/
-static void publishing_piwigo_piwigo_publisher_do_show_error_message (PublishingPiwigoPiwigoPublisher* self, const gchar* message) {
+static void
+publishing_piwigo_piwigo_publisher_do_show_error_message (PublishingPiwigoPiwigoPublisher* self,
+ const gchar* message)
+{
SpitPublishingPluginHost* _tmp0_;
- const gchar* _tmp1_;
#line 952 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
#line 952 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -6588,10 +6945,8 @@ static void publishing_piwigo_piwigo_publisher_do_show_error_message (Publishing
#line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = self->priv->host;
#line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp1_ = message;
-#line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- spit_publishing_plugin_host_install_static_message_pane (_tmp0_, _tmp1_, SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CLOSE);
-#line 6585 "PiwigoPublishing.c"
+ spit_publishing_plugin_host_install_static_message_pane (_tmp0_, message, SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CLOSE);
+#line 6940 "PiwigoPublishing.c"
}
@@ -6604,51 +6959,61 @@ static void publishing_piwigo_piwigo_publisher_do_show_error_message (Publishing
* @param txn the received transaction
* @return the value of pwg_id if present or null if not found
*/
-static SoupCookie* _vala_SoupCookie_copy (SoupCookie* self) {
+static SoupCookie*
+_vala_SoupCookie_copy (SoupCookie* self)
+{
#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return g_boxed_copy (soup_cookie_get_type (), self);
-#line 6601 "PiwigoPublishing.c"
+#line 6958 "PiwigoPublishing.c"
}
-static gpointer __vala_SoupCookie_copy0 (gpointer self) {
+static gpointer
+__vala_SoupCookie_copy0 (gpointer self)
+{
#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return self ? _vala_SoupCookie_copy (self) : NULL;
-#line 6608 "PiwigoPublishing.c"
+#line 6967 "PiwigoPublishing.c"
}
-static void _vala_SoupCookie_free (SoupCookie* self) {
+static void
+_vala_SoupCookie_free (SoupCookie* self)
+{
#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_boxed_free (soup_cookie_get_type (), self);
-#line 6615 "PiwigoPublishing.c"
+#line 6976 "PiwigoPublishing.c"
}
-static void __vala_SoupCookie_free0_ (gpointer var) {
+static void
+__vala_SoupCookie_free0_ (gpointer var)
+{
#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
(var == NULL) ? NULL : (var = (_vala_SoupCookie_free (var), NULL));
-#line 6622 "PiwigoPublishing.c"
+#line 6985 "PiwigoPublishing.c"
}
-static void _g_slist_free___vala_SoupCookie_free0_ (GSList* self) {
-#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_slist_foreach (self, (GFunc) __vala_SoupCookie_free0_, NULL);
+static inline void
+_g_slist_free___vala_SoupCookie_free0_ (GSList* self)
+{
#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_slist_free (self);
-#line 6631 "PiwigoPublishing.c"
+ g_slist_free_full (self, (GDestroyNotify) __vala_SoupCookie_free0_);
+#line 6994 "PiwigoPublishing.c"
}
-static gchar* publishing_piwigo_piwigo_publisher_get_pwg_id_from_transaction (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* txn) {
+static gchar*
+publishing_piwigo_piwigo_publisher_get_pwg_id_from_transaction (PublishingPiwigoPiwigoPublisher* self,
+ PublishingRESTSupportTransaction* txn)
+{
gchar* result = NULL;
gchar* pwg_id = NULL;
- PublishingRESTSupportTransaction* _tmp0_;
+ SoupMessage* _tmp0_;
SoupMessage* _tmp1_;
- SoupMessage* _tmp2_;
+ GSList* _tmp2_;
GSList* _tmp3_;
- GSList* _tmp4_;
#line 969 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self), NULL);
#line 969 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -6656,92 +7021,94 @@ static gchar* publishing_piwigo_piwigo_publisher_get_pwg_id_from_transaction (Pu
#line 970 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
pwg_id = NULL;
#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp0_ = txn;
+ _tmp0_ = publishing_rest_support_transaction_get_message (txn);
#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp1_ = publishing_rest_support_transaction_get_message (_tmp0_);
-#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp2_ = _tmp1_;
+ _tmp1_ = _tmp0_;
#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp3_ = soup_cookies_from_response (_tmp2_);
+ _tmp2_ = soup_cookies_from_response (_tmp1_);
#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp4_ = _tmp3_;
+ _tmp3_ = _tmp2_;
#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_object_unref0 (_tmp2_);
-#line 6661 "PiwigoPublishing.c"
+ _g_object_unref0 (_tmp1_);
+#line 7024 "PiwigoPublishing.c"
{
GSList* cookie_collection = NULL;
GSList* cookie_it = NULL;
#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- cookie_collection = _tmp4_;
+ cookie_collection = _tmp3_;
#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
for (cookie_it = cookie_collection; cookie_it != NULL; cookie_it = cookie_it->next) {
-#line 6669 "PiwigoPublishing.c"
- SoupCookie* _tmp5_;
+#line 7032 "PiwigoPublishing.c"
+ SoupCookie* _tmp4_;
SoupCookie* cookie = NULL;
#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp5_ = __vala_SoupCookie_copy0 ((SoupCookie*) cookie_it->data);
+ _tmp4_ = __vala_SoupCookie_copy0 ((SoupCookie*) cookie_it->data);
#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- cookie = _tmp5_;
-#line 6676 "PiwigoPublishing.c"
+ cookie = _tmp4_;
+#line 7039 "PiwigoPublishing.c"
{
- SoupCookie* _tmp6_;
- const gchar* _tmp7_;
+ SoupCookie* _tmp5_;
+ const gchar* _tmp6_;
#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp6_ = cookie;
+ _tmp5_ = cookie;
#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp7_ = soup_cookie_get_name (_tmp6_);
+ _tmp6_ = soup_cookie_get_name (_tmp5_);
#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (g_strcmp0 (_tmp7_, "pwg_id") == 0) {
-#line 6686 "PiwigoPublishing.c"
- SoupCookie* _tmp8_;
- const gchar* _tmp9_;
- gchar* _tmp10_;
- const gchar* _tmp11_;
+ if (g_strcmp0 (_tmp6_, "pwg_id") == 0) {
+#line 7049 "PiwigoPublishing.c"
+ SoupCookie* _tmp7_;
+ const gchar* _tmp8_;
+ gchar* _tmp9_;
+ const gchar* _tmp10_;
#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp8_ = cookie;
+ _tmp7_ = cookie;
#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp9_ = soup_cookie_get_value (_tmp8_);
+ _tmp8_ = soup_cookie_get_value (_tmp7_);
#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp10_ = g_strdup (_tmp9_);
+ _tmp9_ = g_strdup (_tmp8_);
#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (pwg_id);
#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- pwg_id = _tmp10_;
+ pwg_id = _tmp9_;
#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp11_ = pwg_id;
+ _tmp10_ = pwg_id;
#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_debug ("PiwigoPublishing.vala:977: Found pwg_id %s", _tmp11_);
-#line 6705 "PiwigoPublishing.c"
+ g_debug ("PiwigoPublishing.vala:977: Found pwg_id %s", _tmp10_);
+#line 7068 "PiwigoPublishing.c"
}
#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
__vala_SoupCookie_free0 (cookie);
-#line 6709 "PiwigoPublishing.c"
+#line 7072 "PiwigoPublishing.c"
}
}
#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
__g_slist_free___vala_SoupCookie_free0_0 (cookie_collection);
-#line 6714 "PiwigoPublishing.c"
+#line 7077 "PiwigoPublishing.c"
}
#line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
result = pwg_id;
#line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 6720 "PiwigoPublishing.c"
+#line 7083 "PiwigoPublishing.c"
}
-static void publishing_piwigo_piwigo_publisher_class_init (PublishingPiwigoPiwigoPublisherClass * klass) {
+static void
+publishing_piwigo_piwigo_publisher_class_init (PublishingPiwigoPiwigoPublisherClass * klass)
+{
#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_parent_class = g_type_class_peek_parent (klass);
#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_type_class_add_private (klass, sizeof (PublishingPiwigoPiwigoPublisherPrivate));
#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
G_OBJECT_CLASS (klass)->finalize = publishing_piwigo_piwigo_publisher_finalize;
-#line 6731 "PiwigoPublishing.c"
+#line 7096 "PiwigoPublishing.c"
}
-static void publishing_piwigo_piwigo_publisher_spit_publishing_publisher_interface_init (SpitPublishingPublisherIface * iface) {
+static void
+publishing_piwigo_piwigo_publisher_spit_publishing_publisher_interface_init (SpitPublishingPublisherIface * iface)
+{
#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_spit_publishing_publisher_parent_iface = g_type_interface_peek_parent (iface);
#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -6752,11 +7119,13 @@ static void publishing_piwigo_piwigo_publisher_spit_publishing_publisher_interfa
iface->start = (void (*) (SpitPublishingPublisher *)) publishing_piwigo_piwigo_publisher_real_start;
#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
iface->stop = (void (*) (SpitPublishingPublisher *)) publishing_piwigo_piwigo_publisher_real_stop;
-#line 6746 "PiwigoPublishing.c"
+#line 7113 "PiwigoPublishing.c"
}
-static void publishing_piwigo_piwigo_publisher_instance_init (PublishingPiwigoPiwigoPublisher * self) {
+static void
+publishing_piwigo_piwigo_publisher_instance_init (PublishingPiwigoPiwigoPublisher * self)
+{
#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->priv = PUBLISHING_PIWIGO_PIWIGO_PUBLISHER_GET_PRIVATE (self);
#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -6777,11 +7146,13 @@ static void publishing_piwigo_piwigo_publisher_instance_init (PublishingPiwigoPi
self->priv->progress_reporter_target = self;
#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->priv->progress_reporter_target_destroy_notify = NULL;
-#line 6771 "PiwigoPublishing.c"
+#line 7140 "PiwigoPublishing.c"
}
-static void publishing_piwigo_piwigo_publisher_finalize (GObject * obj) {
+static void
+publishing_piwigo_piwigo_publisher_finalize (GObject * obj)
+{
PublishingPiwigoPiwigoPublisher * self;
#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PIWIGO_TYPE_PIWIGO_PUBLISHER, PublishingPiwigoPiwigoPublisher);
@@ -6805,11 +7176,13 @@ static void publishing_piwigo_piwigo_publisher_finalize (GObject * obj) {
self->priv->progress_reporter_target_destroy_notify = NULL;
#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
G_OBJECT_CLASS (publishing_piwigo_piwigo_publisher_parent_class)->finalize (obj);
-#line 6799 "PiwigoPublishing.c"
+#line 7170 "PiwigoPublishing.c"
}
-GType publishing_piwigo_piwigo_publisher_get_type (void) {
+GType
+publishing_piwigo_piwigo_publisher_get_type (void)
+{
static volatile gsize publishing_piwigo_piwigo_publisher_type_id__volatile = 0;
if (g_once_init_enter (&publishing_piwigo_piwigo_publisher_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingPiwigoPiwigoPublisherClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_piwigo_piwigo_publisher_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingPiwigoPiwigoPublisher), 0, (GInstanceInitFunc) publishing_piwigo_piwigo_publisher_instance_init, NULL };
@@ -6823,55 +7196,56 @@ GType publishing_piwigo_piwigo_publisher_get_type (void) {
}
-PublishingPiwigoUploader* publishing_piwigo_uploader_construct (GType object_type, PublishingPiwigoSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingPiwigoPublishingParameters* parameters) {
+PublishingPiwigoUploader*
+publishing_piwigo_uploader_construct (GType object_type,
+ PublishingPiwigoSession* session,
+ SpitPublishingPublishable** publishables,
+ int publishables_length1,
+ PublishingPiwigoPublishingParameters* parameters)
+{
PublishingPiwigoUploader* self = NULL;
- PublishingPiwigoSession* _tmp0_;
- SpitPublishingPublishable** _tmp1_;
- gint _tmp1__length1;
- PublishingPiwigoPublishingParameters* _tmp2_;
- PublishingPiwigoPublishingParameters* _tmp3_;
+ PublishingPiwigoPublishingParameters* _tmp0_;
#line 990 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL);
#line 990 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_PARAMETERS (parameters), NULL);
#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp0_ = session;
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp1_ = publishables;
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp1__length1 = publishables_length1;
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self = (PublishingPiwigoUploader*) publishing_rest_support_batch_uploader_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, _tmp1__length1);
-#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp2_ = parameters;
+ self = (PublishingPiwigoUploader*) publishing_rest_support_batch_uploader_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), publishables, publishables_length1);
#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp3_ = _publishing_piwigo_publishing_parameters_ref0 (_tmp2_);
+ _tmp0_ = _publishing_piwigo_publishing_parameters_ref0 (parameters);
#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_piwigo_publishing_parameters_unref0 (self->priv->parameters);
#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->parameters = _tmp3_;
+ self->priv->parameters = _tmp0_;
#line 990 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return self;
-#line 6846 "PiwigoPublishing.c"
+#line 7213 "PiwigoPublishing.c"
}
-PublishingPiwigoUploader* publishing_piwigo_uploader_new (PublishingPiwigoSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingPiwigoPublishingParameters* parameters) {
+PublishingPiwigoUploader*
+publishing_piwigo_uploader_new (PublishingPiwigoSession* session,
+ SpitPublishingPublishable** publishables,
+ int publishables_length1,
+ PublishingPiwigoPublishingParameters* parameters)
+{
#line 990 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return publishing_piwigo_uploader_construct (PUBLISHING_PIWIGO_TYPE_UPLOADER, session, publishables, publishables_length1, parameters);
-#line 6853 "PiwigoPublishing.c"
+#line 7225 "PiwigoPublishing.c"
}
-static PublishingRESTSupportTransaction* publishing_piwigo_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base, SpitPublishingPublishable* publishable) {
+static PublishingRESTSupportTransaction*
+publishing_piwigo_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base,
+ SpitPublishingPublishable* publishable)
+{
PublishingPiwigoUploader * self;
PublishingRESTSupportTransaction* result = NULL;
PublishingRESTSupportSession* _tmp0_;
PublishingPiwigoSession* _tmp1_;
PublishingPiwigoPublishingParameters* _tmp2_;
- SpitPublishingPublishable* _tmp3_;
- PublishingPiwigoImagesAddTransaction* _tmp4_;
- PublishingRESTSupportTransaction* _tmp5_;
+ PublishingPiwigoImagesAddTransaction* _tmp3_;
+ PublishingRESTSupportTransaction* _tmp4_;
#line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_UPLOADER, PublishingPiwigoUploader);
#line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -6883,22 +7257,22 @@ static PublishingRESTSupportTransaction* publishing_piwigo_uploader_real_create_
#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp2_ = self->priv->parameters;
#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp3_ = publishable;
-#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp4_ = publishing_piwigo_images_add_transaction_new (_tmp1_, _tmp2_, _tmp3_);
+ _tmp3_ = publishing_piwigo_images_add_transaction_new (_tmp1_, _tmp2_, publishable);
#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction);
+ _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction);
#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_rest_support_session_unref0 (_tmp1_);
#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- result = _tmp5_;
+ result = _tmp4_;
#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 6888 "PiwigoPublishing.c"
+#line 7260 "PiwigoPublishing.c"
}
-static void publishing_piwigo_uploader_class_init (PublishingPiwigoUploaderClass * klass) {
+static void
+publishing_piwigo_uploader_class_init (PublishingPiwigoUploaderClass * klass)
+{
#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_uploader_parent_class = g_type_class_peek_parent (klass);
#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -6907,18 +7281,22 @@ static void publishing_piwigo_uploader_class_init (PublishingPiwigoUploaderClass
g_type_class_add_private (klass, sizeof (PublishingPiwigoUploaderPrivate));
#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = (PublishingRESTSupportTransaction* (*) (PublishingRESTSupportBatchUploader *, SpitPublishingPublishable*)) publishing_piwigo_uploader_real_create_transaction;
-#line 6901 "PiwigoPublishing.c"
+#line 7275 "PiwigoPublishing.c"
}
-static void publishing_piwigo_uploader_instance_init (PublishingPiwigoUploader * self) {
+static void
+publishing_piwigo_uploader_instance_init (PublishingPiwigoUploader * self)
+{
#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->priv = PUBLISHING_PIWIGO_UPLOADER_GET_PRIVATE (self);
-#line 6908 "PiwigoPublishing.c"
+#line 7284 "PiwigoPublishing.c"
}
-static void publishing_piwigo_uploader_finalize (PublishingRESTSupportBatchUploader * obj) {
+static void
+publishing_piwigo_uploader_finalize (PublishingRESTSupportBatchUploader * obj)
+{
PublishingPiwigoUploader * self;
#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PIWIGO_TYPE_UPLOADER, PublishingPiwigoUploader);
@@ -6926,11 +7304,13 @@ static void publishing_piwigo_uploader_finalize (PublishingRESTSupportBatchUploa
_publishing_piwigo_publishing_parameters_unref0 (self->priv->parameters);
#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_CLASS (publishing_piwigo_uploader_parent_class)->finalize (obj);
-#line 6920 "PiwigoPublishing.c"
+#line 7298 "PiwigoPublishing.c"
}
-GType publishing_piwigo_uploader_get_type (void) {
+GType
+publishing_piwigo_uploader_get_type (void)
+{
static volatile gsize publishing_piwigo_uploader_type_id__volatile = 0;
if (g_once_init_enter (&publishing_piwigo_uploader_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingPiwigoUploaderClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_piwigo_uploader_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingPiwigoUploader), 0, (GInstanceInitFunc) publishing_piwigo_uploader_instance_init, NULL };
@@ -6942,50 +7322,53 @@ GType publishing_piwigo_uploader_get_type (void) {
}
-PublishingPiwigoSSLErrorPane* publishing_piwigo_ssl_error_pane_construct (GType object_type, PublishingPiwigoSessionLoginTransaction* transaction, const gchar* host) {
+PublishingPiwigoSSLErrorPane*
+publishing_piwigo_ssl_error_pane_construct (GType object_type,
+ PublishingPiwigoSessionLoginTransaction* transaction,
+ const gchar* host)
+{
PublishingPiwigoSSLErrorPane * self = NULL;
GTlsCertificate* cert = NULL;
gchar* text = NULL;
- PublishingPiwigoSessionLoginTransaction* _tmp0_;
- GTlsCertificate* _tmp1_ = NULL;
- gchar* _tmp2_;
- const gchar* _tmp3_;
+ GTlsCertificate* _tmp0_ = NULL;
+ gchar* _tmp1_;
#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION_LOGIN_TRANSACTION (transaction), NULL);
#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (host != NULL, NULL);
#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp0_ = transaction;
-#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp2_ = publishing_rest_support_transaction_detailed_error_from_tls_flags (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_tmp1_);
+ _tmp1_ = publishing_rest_support_transaction_detailed_error_from_tls_flags (G_TYPE_CHECK_INSTANCE_CAST (transaction, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_tmp0_);
#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_object_unref0 (cert);
#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- cert = _tmp1_;
+ cert = _tmp0_;
#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- text = _tmp2_;
-#line 1017 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp3_ = host;
+ text = _tmp1_;
#line 1017 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self = (PublishingPiwigoSSLErrorPane*) g_object_new (object_type, "resource-path", PLUGIN_RESOURCE_PATH "/piwigo_ssl_failure_pane.ui", "default-id", "default", "cert", cert, "error-text", text, "host", _tmp3_, NULL);
+ self = (PublishingPiwigoSSLErrorPane*) g_object_new (object_type, "resource-path", PLUGIN_RESOURCE_PATH "/piwigo_ssl_failure_pane.ui", "default-id", "default", "cert", cert, "error-text", text, "host", host, NULL);
#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (text);
#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_object_unref0 (cert);
#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return self;
-#line 6968 "PiwigoPublishing.c"
+#line 7346 "PiwigoPublishing.c"
}
-PublishingPiwigoSSLErrorPane* publishing_piwigo_ssl_error_pane_new (PublishingPiwigoSessionLoginTransaction* transaction, const gchar* host) {
+PublishingPiwigoSSLErrorPane*
+publishing_piwigo_ssl_error_pane_new (PublishingPiwigoSessionLoginTransaction* transaction,
+ const gchar* host)
+{
#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return publishing_piwigo_ssl_error_pane_construct (PUBLISHING_PIWIGO_TYPE_SSL_ERROR_PANE, transaction, host);
-#line 6975 "PiwigoPublishing.c"
+#line 7356 "PiwigoPublishing.c"
}
-static void __lambda5_ (PublishingPiwigoSSLErrorPane* self) {
+static void
+__lambda5_ (PublishingPiwigoSSLErrorPane* self)
+{
GcrSimpleCertificate* simple_cert = NULL;
GTlsCertificate* _tmp0_;
GByteArray* _tmp1_;
@@ -7053,13 +7436,13 @@ static void __lambda5_ (PublishingPiwigoSSLErrorPane* self) {
_tmp10_ = use_header;
#line 1043 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_tmp10_) {
-#line 7047 "PiwigoPublishing.c"
+#line 7430 "PiwigoPublishing.c"
GtkDialogFlags _tmp11_;
#line 1044 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp11_ = flags;
#line 1044 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
flags = _tmp11_ | GTK_DIALOG_USE_HEADER_BAR;
-#line 7053 "PiwigoPublishing.c"
+#line 7436 "PiwigoPublishing.c"
}
#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp12_ = publishing_piwigo_ssl_error_pane_get_host (self);
@@ -7086,7 +7469,7 @@ static void __lambda5_ (PublishingPiwigoSSLErrorPane* self) {
#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
dialog = _tmp19_;
#line 1052 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp20_ = (GtkBox*) gtk_dialog_get_content_area (dialog);
+ _tmp20_ = gtk_dialog_get_content_area (dialog);
#line 1052 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp21_ = widget;
#line 1052 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -7107,32 +7490,42 @@ static void __lambda5_ (PublishingPiwigoSSLErrorPane* self) {
_g_object_unref0 (widget);
#line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_object_unref0 (simple_cert);
-#line 7101 "PiwigoPublishing.c"
+#line 7484 "PiwigoPublishing.c"
}
-static void ___lambda5__gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+___lambda5__gtk_button_clicked (GtkButton* _sender,
+ gpointer self)
+{
#line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
__lambda5_ ((PublishingPiwigoSSLErrorPane*) self);
-#line 7108 "PiwigoPublishing.c"
+#line 7494 "PiwigoPublishing.c"
}
-static void __lambda6_ (PublishingPiwigoSSLErrorPane* self) {
+static void
+__lambda6_ (PublishingPiwigoSSLErrorPane* self)
+{
#line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_emit (self, publishing_piwigo_ssl_error_pane_signals[PUBLISHING_PIWIGO_SSL_ERROR_PANE_PROCEED_SIGNAL], 0);
-#line 7115 "PiwigoPublishing.c"
+#line 7503 "PiwigoPublishing.c"
}
-static void ___lambda6__gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+___lambda6__gtk_button_clicked (GtkButton* _sender,
+ gpointer self)
+{
#line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
__lambda6_ ((PublishingPiwigoSSLErrorPane*) self);
-#line 7122 "PiwigoPublishing.c"
+#line 7513 "PiwigoPublishing.c"
}
-static void publishing_piwigo_ssl_error_pane_real_constructed (GObject* base) {
+static void
+publishing_piwigo_ssl_error_pane_real_constructed (GObject* base)
+{
PublishingPiwigoSSLErrorPane * self;
GtkLabel* label = NULL;
GtkBuilder* _tmp0_;
@@ -7273,11 +7666,13 @@ static void publishing_piwigo_ssl_error_pane_real_constructed (GObject* base) {
_g_object_unref0 (info);
#line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_object_unref0 (label);
-#line 7265 "PiwigoPublishing.c"
+#line 7658 "PiwigoPublishing.c"
}
-gchar* publishing_piwigo_ssl_error_pane_get_host (PublishingPiwigoSSLErrorPane* self) {
+gchar*
+publishing_piwigo_ssl_error_pane_get_host (PublishingPiwigoSSLErrorPane* self)
+{
gchar* result;
const gchar* _tmp0_;
gchar* _tmp1_;
@@ -7291,34 +7686,36 @@ gchar* publishing_piwigo_ssl_error_pane_get_host (PublishingPiwigoSSLErrorPane*
result = _tmp1_;
#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 7283 "PiwigoPublishing.c"
+#line 7678 "PiwigoPublishing.c"
}
-static void publishing_piwigo_ssl_error_pane_set_host (PublishingPiwigoSSLErrorPane* self, const gchar* value) {
+static void
+publishing_piwigo_ssl_error_pane_set_host (PublishingPiwigoSSLErrorPane* self,
+ const gchar* value)
+{
#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_SSL_ERROR_PANE (self));
#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (g_strcmp0 (value, publishing_piwigo_ssl_error_pane_get_host (self)) != 0) {
-#line 7292 "PiwigoPublishing.c"
- const gchar* _tmp0_;
- gchar* _tmp1_;
-#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp0_ = value;
+#line 7690 "PiwigoPublishing.c"
+ gchar* _tmp0_;
#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp1_ = g_strdup (_tmp0_);
+ _tmp0_ = g_strdup (value);
#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (self->priv->_host);
#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->_host = _tmp1_;
+ self->priv->_host = _tmp0_;
#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_object_notify ((GObject *) self, "host");
-#line 7305 "PiwigoPublishing.c"
+ g_object_notify_by_pspec ((GObject *) self, publishing_piwigo_ssl_error_pane_properties[PUBLISHING_PIWIGO_SSL_ERROR_PANE_HOST_PROPERTY]);
+#line 7700 "PiwigoPublishing.c"
}
}
-static GTlsCertificate* publishing_piwigo_ssl_error_pane_get_cert (PublishingPiwigoSSLErrorPane* self) {
+static GTlsCertificate*
+publishing_piwigo_ssl_error_pane_get_cert (PublishingPiwigoSSLErrorPane* self)
+{
GTlsCertificate* result;
GTlsCertificate* _tmp0_;
#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -7329,34 +7726,36 @@ static GTlsCertificate* publishing_piwigo_ssl_error_pane_get_cert (PublishingPiw
result = _tmp0_;
#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 7321 "PiwigoPublishing.c"
+#line 7718 "PiwigoPublishing.c"
}
-static void publishing_piwigo_ssl_error_pane_set_cert (PublishingPiwigoSSLErrorPane* self, GTlsCertificate* value) {
+static void
+publishing_piwigo_ssl_error_pane_set_cert (PublishingPiwigoSSLErrorPane* self,
+ GTlsCertificate* value)
+{
#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_SSL_ERROR_PANE (self));
#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (publishing_piwigo_ssl_error_pane_get_cert (self) != value) {
-#line 7330 "PiwigoPublishing.c"
+#line 7730 "PiwigoPublishing.c"
GTlsCertificate* _tmp0_;
- GTlsCertificate* _tmp1_;
#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp0_ = value;
-#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp1_ = _g_object_ref0 (_tmp0_);
+ _tmp0_ = _g_object_ref0 (value);
#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_object_unref0 (self->priv->_cert);
#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->_cert = _tmp1_;
+ self->priv->_cert = _tmp0_;
#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_object_notify ((GObject *) self, "cert");
-#line 7343 "PiwigoPublishing.c"
+ g_object_notify_by_pspec ((GObject *) self, publishing_piwigo_ssl_error_pane_properties[PUBLISHING_PIWIGO_SSL_ERROR_PANE_CERT_PROPERTY]);
+#line 7740 "PiwigoPublishing.c"
}
}
-gchar* publishing_piwigo_ssl_error_pane_get_error_text (PublishingPiwigoSSLErrorPane* self) {
+gchar*
+publishing_piwigo_ssl_error_pane_get_error_text (PublishingPiwigoSSLErrorPane* self)
+{
gchar* result;
const gchar* _tmp0_;
gchar* _tmp1_;
@@ -7370,34 +7769,36 @@ gchar* publishing_piwigo_ssl_error_pane_get_error_text (PublishingPiwigoSSLError
result = _tmp1_;
#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 7362 "PiwigoPublishing.c"
+#line 7761 "PiwigoPublishing.c"
}
-static void publishing_piwigo_ssl_error_pane_set_error_text (PublishingPiwigoSSLErrorPane* self, const gchar* value) {
+static void
+publishing_piwigo_ssl_error_pane_set_error_text (PublishingPiwigoSSLErrorPane* self,
+ const gchar* value)
+{
#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_SSL_ERROR_PANE (self));
#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (g_strcmp0 (value, publishing_piwigo_ssl_error_pane_get_error_text (self)) != 0) {
-#line 7371 "PiwigoPublishing.c"
- const gchar* _tmp0_;
- gchar* _tmp1_;
+#line 7773 "PiwigoPublishing.c"
+ gchar* _tmp0_;
#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp0_ = value;
-#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp1_ = g_strdup (_tmp0_);
+ _tmp0_ = g_strdup (value);
#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (self->priv->_error_text);
#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->_error_text = _tmp1_;
+ self->priv->_error_text = _tmp0_;
#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_object_notify ((GObject *) self, "error-text");
-#line 7384 "PiwigoPublishing.c"
+ g_object_notify_by_pspec ((GObject *) self, publishing_piwigo_ssl_error_pane_properties[PUBLISHING_PIWIGO_SSL_ERROR_PANE_ERROR_TEXT_PROPERTY]);
+#line 7783 "PiwigoPublishing.c"
}
}
-static void publishing_piwigo_ssl_error_pane_class_init (PublishingPiwigoSSLErrorPaneClass * klass) {
+static void
+publishing_piwigo_ssl_error_pane_class_init (PublishingPiwigoSSLErrorPaneClass * klass)
+{
#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_ssl_error_pane_parent_class = g_type_class_peek_parent (klass);
#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -7411,25 +7812,29 @@ static void publishing_piwigo_ssl_error_pane_class_init (PublishingPiwigoSSLErro
#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
G_OBJECT_CLASS (klass)->finalize = publishing_piwigo_ssl_error_pane_finalize;
#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_SSL_ERROR_PANE_HOST_PROPERTY, g_param_spec_string ("host", "host", "host", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+ g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_SSL_ERROR_PANE_HOST_PROPERTY, publishing_piwigo_ssl_error_pane_properties[PUBLISHING_PIWIGO_SSL_ERROR_PANE_HOST_PROPERTY] = g_param_spec_string ("host", "host", "host", NULL, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_SSL_ERROR_PANE_CERT_PROPERTY, g_param_spec_object ("cert", "cert", "cert", g_tls_certificate_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+ g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_SSL_ERROR_PANE_CERT_PROPERTY, publishing_piwigo_ssl_error_pane_properties[PUBLISHING_PIWIGO_SSL_ERROR_PANE_CERT_PROPERTY] = g_param_spec_object ("cert", "cert", "cert", g_tls_certificate_get_type (), G_PARAM_STATIC_STRINGS | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_SSL_ERROR_PANE_ERROR_TEXT_PROPERTY, g_param_spec_string ("error-text", "error-text", "error-text", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+ g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_SSL_ERROR_PANE_ERROR_TEXT_PROPERTY, publishing_piwigo_ssl_error_pane_properties[PUBLISHING_PIWIGO_SSL_ERROR_PANE_ERROR_TEXT_PROPERTY] = g_param_spec_string ("error-text", "error-text", "error-text", NULL, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_ssl_error_pane_signals[PUBLISHING_PIWIGO_SSL_ERROR_PANE_PROCEED_SIGNAL] = g_signal_new ("proceed", PUBLISHING_PIWIGO_TYPE_SSL_ERROR_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 7410 "PiwigoPublishing.c"
+#line 7811 "PiwigoPublishing.c"
}
-static void publishing_piwigo_ssl_error_pane_instance_init (PublishingPiwigoSSLErrorPane * self) {
+static void
+publishing_piwigo_ssl_error_pane_instance_init (PublishingPiwigoSSLErrorPane * self)
+{
#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->priv = PUBLISHING_PIWIGO_SSL_ERROR_PANE_GET_PRIVATE (self);
-#line 7417 "PiwigoPublishing.c"
+#line 7820 "PiwigoPublishing.c"
}
-static void publishing_piwigo_ssl_error_pane_finalize (GObject * obj) {
+static void
+publishing_piwigo_ssl_error_pane_finalize (GObject * obj)
+{
PublishingPiwigoSSLErrorPane * self;
#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PIWIGO_TYPE_SSL_ERROR_PANE, PublishingPiwigoSSLErrorPane);
@@ -7441,11 +7846,13 @@ static void publishing_piwigo_ssl_error_pane_finalize (GObject * obj) {
_g_free0 (self->priv->_error_text);
#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
G_OBJECT_CLASS (publishing_piwigo_ssl_error_pane_parent_class)->finalize (obj);
-#line 7433 "PiwigoPublishing.c"
+#line 7838 "PiwigoPublishing.c"
}
-GType publishing_piwigo_ssl_error_pane_get_type (void) {
+GType
+publishing_piwigo_ssl_error_pane_get_type (void)
+{
static volatile gsize publishing_piwigo_ssl_error_pane_type_id__volatile = 0;
if (g_once_init_enter (&publishing_piwigo_ssl_error_pane_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingPiwigoSSLErrorPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_piwigo_ssl_error_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingPiwigoSSLErrorPane), 0, (GInstanceInitFunc) publishing_piwigo_ssl_error_pane_instance_init, NULL };
@@ -7457,7 +7864,12 @@ GType publishing_piwigo_ssl_error_pane_get_type (void) {
}
-static void _vala_publishing_piwigo_ssl_error_pane_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) {
+static void
+_vala_publishing_piwigo_ssl_error_pane_get_property (GObject * object,
+ guint property_id,
+ GValue * value,
+ GParamSpec * pspec)
+{
PublishingPiwigoSSLErrorPane * self;
self = G_TYPE_CHECK_INSTANCE_CAST (object, PUBLISHING_PIWIGO_TYPE_SSL_ERROR_PANE, PublishingPiwigoSSLErrorPane);
#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -7480,18 +7892,23 @@ static void _vala_publishing_piwigo_ssl_error_pane_get_property (GObject * objec
g_value_take_string (value, publishing_piwigo_ssl_error_pane_get_error_text (self));
#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
break;
-#line 7472 "PiwigoPublishing.c"
+#line 7884 "PiwigoPublishing.c"
default:
#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
break;
-#line 7478 "PiwigoPublishing.c"
+#line 7890 "PiwigoPublishing.c"
}
}
-static void _vala_publishing_piwigo_ssl_error_pane_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) {
+static void
+_vala_publishing_piwigo_ssl_error_pane_set_property (GObject * object,
+ guint property_id,
+ const GValue * value,
+ GParamSpec * pspec)
+{
PublishingPiwigoSSLErrorPane * self;
self = G_TYPE_CHECK_INSTANCE_CAST (object, PUBLISHING_PIWIGO_TYPE_SSL_ERROR_PANE, PublishingPiwigoSSLErrorPane);
#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -7514,18 +7931,20 @@ static void _vala_publishing_piwigo_ssl_error_pane_set_property (GObject * objec
publishing_piwigo_ssl_error_pane_set_error_text (self, g_value_get_string (value));
#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
break;
-#line 7506 "PiwigoPublishing.c"
+#line 7923 "PiwigoPublishing.c"
default:
#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
break;
-#line 7512 "PiwigoPublishing.c"
+#line 7929 "PiwigoPublishing.c"
}
}
-GType publishing_piwigo_authentication_pane_mode_get_type (void) {
+GType
+publishing_piwigo_authentication_pane_mode_get_type (void)
+{
static volatile gsize publishing_piwigo_authentication_pane_mode_type_id__volatile = 0;
if (g_once_init_enter (&publishing_piwigo_authentication_pane_mode_type_id__volatile)) {
static const GEnumValue values[] = {{PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_INTRO, "PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_INTRO", "intro"}, {PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_FAILED_RETRY_URL, "PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_FAILED_RETRY_URL", "failed-retry-url"}, {PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_FAILED_RETRY_USER, "PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_FAILED_RETRY_USER", "failed-retry-user"}, {0, NULL, NULL}};
@@ -7537,60 +7956,75 @@ GType publishing_piwigo_authentication_pane_mode_get_type (void) {
}
-PublishingPiwigoAuthenticationPane* publishing_piwigo_authentication_pane_construct (GType object_type, PublishingPiwigoPiwigoPublisher* publisher, PublishingPiwigoAuthenticationPaneMode mode) {
+PublishingPiwigoAuthenticationPane*
+publishing_piwigo_authentication_pane_construct (GType object_type,
+ PublishingPiwigoPiwigoPublisher* publisher,
+ PublishingPiwigoAuthenticationPaneMode mode)
+{
PublishingPiwigoAuthenticationPane * self = NULL;
- PublishingPiwigoAuthenticationPaneMode _tmp0_;
- PublishingPiwigoPiwigoPublisher* _tmp1_;
#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (publisher), NULL);
#line 1092 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp0_ = mode;
-#line 1092 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp1_ = publisher;
-#line 1092 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self = (PublishingPiwigoAuthenticationPane*) g_object_new (object_type, "resource-path", PLUGIN_RESOURCE_PATH "/piwigo_authentication_pane.ui", "connect-signals", TRUE, "default-id", "login_button", "mode", _tmp0_, "publisher", _tmp1_, NULL);
+ self = (PublishingPiwigoAuthenticationPane*) g_object_new (object_type, "resource-path", PLUGIN_RESOURCE_PATH "/piwigo_authentication_pane.ui", "connect-signals", TRUE, "default-id", "login_button", "mode", mode, "publisher", publisher, NULL);
#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return self;
-#line 7543 "PiwigoPublishing.c"
+#line 7960 "PiwigoPublishing.c"
}
-PublishingPiwigoAuthenticationPane* publishing_piwigo_authentication_pane_new (PublishingPiwigoPiwigoPublisher* publisher, PublishingPiwigoAuthenticationPaneMode mode) {
+PublishingPiwigoAuthenticationPane*
+publishing_piwigo_authentication_pane_new (PublishingPiwigoPiwigoPublisher* publisher,
+ PublishingPiwigoAuthenticationPaneMode mode)
+{
#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return publishing_piwigo_authentication_pane_construct (PUBLISHING_PIWIGO_TYPE_AUTHENTICATION_PANE, publisher, mode);
-#line 7550 "PiwigoPublishing.c"
+#line 7970 "PiwigoPublishing.c"
}
-static void _publishing_piwigo_authentication_pane_on_user_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
+static void
+_publishing_piwigo_authentication_pane_on_user_changed_gtk_editable_changed (GtkEditable* _sender,
+ gpointer self)
+{
#line 1142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_authentication_pane_on_user_changed ((PublishingPiwigoAuthenticationPane*) self);
-#line 7557 "PiwigoPublishing.c"
+#line 7980 "PiwigoPublishing.c"
}
-static void _publishing_piwigo_authentication_pane_on_url_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
+static void
+_publishing_piwigo_authentication_pane_on_url_changed_gtk_editable_changed (GtkEditable* _sender,
+ gpointer self)
+{
#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_authentication_pane_on_url_changed ((PublishingPiwigoAuthenticationPane*) self);
-#line 7564 "PiwigoPublishing.c"
+#line 7990 "PiwigoPublishing.c"
}
-static void _publishing_piwigo_authentication_pane_on_password_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
+static void
+_publishing_piwigo_authentication_pane_on_password_changed_gtk_editable_changed (GtkEditable* _sender,
+ gpointer self)
+{
#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_authentication_pane_on_password_changed ((PublishingPiwigoAuthenticationPane*) self);
-#line 7571 "PiwigoPublishing.c"
+#line 8000 "PiwigoPublishing.c"
}
-static void _publishing_piwigo_authentication_pane_on_login_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+_publishing_piwigo_authentication_pane_on_login_button_clicked_gtk_button_clicked (GtkButton* _sender,
+ gpointer self)
+{
#line 1145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_authentication_pane_on_login_button_clicked ((PublishingPiwigoAuthenticationPane*) self);
-#line 7578 "PiwigoPublishing.c"
+#line 8010 "PiwigoPublishing.c"
}
-static void publishing_piwigo_authentication_pane_real_constructed (GObject* base) {
+static void
+publishing_piwigo_authentication_pane_real_constructed (GObject* base)
+{
PublishingPiwigoAuthenticationPane * self;
GtkBuilder* builder = NULL;
GtkBuilder* _tmp0_;
@@ -7625,18 +8059,17 @@ static void publishing_piwigo_authentication_pane_real_constructed (GObject* bas
GtkSwitch* _tmp41_;
GtkSwitch* _tmp42_;
PublishingPiwigoPiwigoPublisher* _tmp43_;
- gboolean _tmp44_;
- GtkBuilder* _tmp45_;
- GObject* _tmp46_;
- GtkButton* _tmp47_;
+ GtkBuilder* _tmp44_;
+ GObject* _tmp45_;
+ GtkButton* _tmp46_;
+ GtkEntry* _tmp47_;
GtkEntry* _tmp48_;
GtkEntry* _tmp49_;
- GtkEntry* _tmp50_;
- GtkButton* _tmp51_;
- PublishingPiwigoPiwigoPublisher* _tmp52_;
+ GtkButton* _tmp50_;
+ PublishingPiwigoPiwigoPublisher* _tmp51_;
+ SpitPublishingPluginHost* _tmp52_;
SpitPublishingPluginHost* _tmp53_;
- SpitPublishingPluginHost* _tmp54_;
- GtkButton* _tmp55_;
+ GtkButton* _tmp54_;
#line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_AUTHENTICATION_PANE, PublishingPiwigoAuthenticationPane);
#line 1101 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -7659,7 +8092,7 @@ static void publishing_piwigo_authentication_pane_real_constructed (GObject* bas
switch (_tmp4_) {
#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
case PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_INTRO:
-#line 7651 "PiwigoPublishing.c"
+#line 8084 "PiwigoPublishing.c"
{
GtkLabel* _tmp5_;
const gchar* _tmp6_;
@@ -7671,11 +8104,11 @@ static void publishing_piwigo_authentication_pane_real_constructed (GObject* bas
gtk_label_set_text (_tmp5_, _tmp6_);
#line 1108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
break;
-#line 7663 "PiwigoPublishing.c"
+#line 8096 "PiwigoPublishing.c"
}
#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
case PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_FAILED_RETRY_URL:
-#line 7667 "PiwigoPublishing.c"
+#line 8100 "PiwigoPublishing.c"
{
GtkLabel* _tmp7_;
const gchar* _tmp8_;
@@ -7695,11 +8128,11 @@ static void publishing_piwigo_authentication_pane_real_constructed (GObject* bas
_g_free0 (_tmp10_);
#line 1113 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
break;
-#line 7687 "PiwigoPublishing.c"
+#line 8120 "PiwigoPublishing.c"
}
#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
case PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_FAILED_RETRY_USER:
-#line 7691 "PiwigoPublishing.c"
+#line 8124 "PiwigoPublishing.c"
{
GtkLabel* _tmp11_;
const gchar* _tmp12_;
@@ -7719,12 +8152,12 @@ static void publishing_piwigo_authentication_pane_real_constructed (GObject* bas
_g_free0 (_tmp14_);
#line 1118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
break;
-#line 7711 "PiwigoPublishing.c"
+#line 8144 "PiwigoPublishing.c"
}
default:
#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
break;
-#line 7716 "PiwigoPublishing.c"
+#line 8149 "PiwigoPublishing.c"
}
#line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp15_ = builder;
@@ -7746,7 +8179,7 @@ static void publishing_piwigo_authentication_pane_real_constructed (GObject* bas
_tmp20_ = persistent_url;
#line 1123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_tmp20_ != NULL) {
-#line 7738 "PiwigoPublishing.c"
+#line 8171 "PiwigoPublishing.c"
GtkEntry* _tmp21_;
const gchar* _tmp22_;
#line 1124 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -7755,7 +8188,7 @@ static void publishing_piwigo_authentication_pane_real_constructed (GObject* bas
_tmp22_ = persistent_url;
#line 1124 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
gtk_entry_set_text (_tmp21_, _tmp22_);
-#line 7747 "PiwigoPublishing.c"
+#line 8180 "PiwigoPublishing.c"
}
#line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp23_ = builder;
@@ -7777,7 +8210,7 @@ static void publishing_piwigo_authentication_pane_real_constructed (GObject* bas
_tmp28_ = persistent_username;
#line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_tmp28_ != NULL) {
-#line 7769 "PiwigoPublishing.c"
+#line 8202 "PiwigoPublishing.c"
GtkEntry* _tmp29_;
const gchar* _tmp30_;
#line 1129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -7786,7 +8219,7 @@ static void publishing_piwigo_authentication_pane_real_constructed (GObject* bas
_tmp30_ = persistent_username;
#line 1129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
gtk_entry_set_text (_tmp29_, _tmp30_);
-#line 7778 "PiwigoPublishing.c"
+#line 8211 "PiwigoPublishing.c"
}
#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp31_ = builder;
@@ -7808,7 +8241,7 @@ static void publishing_piwigo_authentication_pane_real_constructed (GObject* bas
_tmp36_ = persistent_password;
#line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_tmp36_ != NULL) {
-#line 7800 "PiwigoPublishing.c"
+#line 8233 "PiwigoPublishing.c"
GtkEntry* _tmp37_;
const gchar* _tmp38_;
#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -7817,7 +8250,7 @@ static void publishing_piwigo_authentication_pane_real_constructed (GObject* bas
_tmp38_ = persistent_password;
#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
gtk_entry_set_text (_tmp37_, _tmp38_);
-#line 7809 "PiwigoPublishing.c"
+#line 8242 "PiwigoPublishing.c"
}
#line 1136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp39_ = builder;
@@ -7834,47 +8267,45 @@ static void publishing_piwigo_authentication_pane_real_constructed (GObject* bas
#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp43_ = self->priv->_publisher;
#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp44_ = publishing_piwigo_piwigo_publisher_get_remember_password (_tmp43_);
-#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- gtk_switch_set_active (_tmp42_, _tmp44_);
+ gtk_switch_set_active (_tmp42_, publishing_piwigo_piwigo_publisher_get_remember_password (_tmp43_));
#line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp45_ = builder;
+ _tmp44_ = builder;
#line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp46_ = gtk_builder_get_object (_tmp45_, "login_button");
+ _tmp45_ = gtk_builder_get_object (_tmp44_, "login_button");
#line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp47_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp46_, gtk_button_get_type ()) ? ((GtkButton*) _tmp46_) : NULL);
+ _tmp46_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp45_, gtk_button_get_type ()) ? ((GtkButton*) _tmp45_) : NULL);
#line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_object_unref0 (self->priv->login_button);
#line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->login_button = _tmp47_;
+ self->priv->login_button = _tmp46_;
#line 1142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp48_ = self->priv->username_entry;
+ _tmp47_ = self->priv->username_entry;
#line 1142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_piwigo_authentication_pane_on_user_changed_gtk_editable_changed, self, 0);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, gtk_editable_get_type (), GtkEditable), "changed", (GCallback) _publishing_piwigo_authentication_pane_on_user_changed_gtk_editable_changed, self, 0);
#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp49_ = self->priv->url_entry;
+ _tmp48_ = self->priv->url_entry;
#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_piwigo_authentication_pane_on_url_changed_gtk_editable_changed, self, 0);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_editable_get_type (), GtkEditable), "changed", (GCallback) _publishing_piwigo_authentication_pane_on_url_changed_gtk_editable_changed, self, 0);
#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp50_ = self->priv->password_entry;
+ _tmp49_ = self->priv->password_entry;
#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_piwigo_authentication_pane_on_password_changed_gtk_editable_changed, self, 0);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_editable_get_type (), GtkEditable), "changed", (GCallback) _publishing_piwigo_authentication_pane_on_password_changed_gtk_editable_changed, self, 0);
#line 1145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp51_ = self->priv->login_button;
+ _tmp50_ = self->priv->login_button;
#line 1145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_signal_connect_object (_tmp51_, "clicked", (GCallback) _publishing_piwigo_authentication_pane_on_login_button_clicked_gtk_button_clicked, self, 0);
+ g_signal_connect_object (_tmp50_, "clicked", (GCallback) _publishing_piwigo_authentication_pane_on_login_button_clicked_gtk_button_clicked, self, 0);
#line 1147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp52_ = self->priv->_publisher;
+ _tmp51_ = self->priv->_publisher;
#line 1147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp53_ = publishing_piwigo_piwigo_publisher_get_host (_tmp52_);
+ _tmp52_ = publishing_piwigo_piwigo_publisher_get_host (_tmp51_);
#line 1147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp54_ = _tmp53_;
+ _tmp53_ = _tmp52_;
#line 1147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp55_ = self->priv->login_button;
+ _tmp54_ = self->priv->login_button;
#line 1147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- spit_publishing_plugin_host_set_dialog_default_widget (_tmp54_, G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, gtk_widget_get_type (), GtkWidget));
+ spit_publishing_plugin_host_set_dialog_default_widget (_tmp53_, G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, gtk_widget_get_type (), GtkWidget));
#line 1147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_object_unref0 (_tmp54_);
+ _g_object_unref0 (_tmp53_);
#line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (persistent_password);
#line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -7885,11 +8316,13 @@ static void publishing_piwigo_authentication_pane_real_constructed (GObject* bas
_g_object_unref0 (message_label);
#line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_object_unref0 (builder);
-#line 7877 "PiwigoPublishing.c"
+#line 8308 "PiwigoPublishing.c"
}
-static void publishing_piwigo_authentication_pane_on_login_button_clicked (PublishingPiwigoAuthenticationPane* self) {
+static void
+publishing_piwigo_authentication_pane_on_login_button_clicked (PublishingPiwigoAuthenticationPane* self)
+{
GtkEntry* _tmp0_;
const gchar* _tmp1_;
GtkEntry* _tmp2_;
@@ -7897,7 +8330,6 @@ static void publishing_piwigo_authentication_pane_on_login_button_clicked (Publi
GtkEntry* _tmp4_;
const gchar* _tmp5_;
GtkSwitch* _tmp6_;
- gboolean _tmp7_;
#line 1150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_AUTHENTICATION_PANE (self));
#line 1151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -7915,41 +8347,47 @@ static void publishing_piwigo_authentication_pane_on_login_button_clicked (Publi
#line 1151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp6_ = self->priv->remember_password_checkbutton;
#line 1151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp7_ = gtk_switch_get_active (_tmp6_);
-#line 1151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_signal_emit (self, publishing_piwigo_authentication_pane_signals[PUBLISHING_PIWIGO_AUTHENTICATION_PANE_LOGIN_SIGNAL], 0, _tmp1_, _tmp3_, _tmp5_, _tmp7_);
-#line 7910 "PiwigoPublishing.c"
+ g_signal_emit (self, publishing_piwigo_authentication_pane_signals[PUBLISHING_PIWIGO_AUTHENTICATION_PANE_LOGIN_SIGNAL], 0, _tmp1_, _tmp3_, _tmp5_, gtk_switch_get_active (_tmp6_));
+#line 8340 "PiwigoPublishing.c"
}
-static void publishing_piwigo_authentication_pane_on_url_changed (PublishingPiwigoAuthenticationPane* self) {
+static void
+publishing_piwigo_authentication_pane_on_url_changed (PublishingPiwigoAuthenticationPane* self)
+{
#line 1155 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_AUTHENTICATION_PANE (self));
#line 1156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_authentication_pane_update_login_button_sensitivity (self);
-#line 7919 "PiwigoPublishing.c"
+#line 8351 "PiwigoPublishing.c"
}
-static void publishing_piwigo_authentication_pane_on_user_changed (PublishingPiwigoAuthenticationPane* self) {
+static void
+publishing_piwigo_authentication_pane_on_user_changed (PublishingPiwigoAuthenticationPane* self)
+{
#line 1159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_AUTHENTICATION_PANE (self));
#line 1160 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_authentication_pane_update_login_button_sensitivity (self);
-#line 7928 "PiwigoPublishing.c"
+#line 8362 "PiwigoPublishing.c"
}
-static void publishing_piwigo_authentication_pane_on_password_changed (PublishingPiwigoAuthenticationPane* self) {
+static void
+publishing_piwigo_authentication_pane_on_password_changed (PublishingPiwigoAuthenticationPane* self)
+{
#line 1163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_AUTHENTICATION_PANE (self));
#line 1164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_authentication_pane_update_login_button_sensitivity (self);
-#line 7937 "PiwigoPublishing.c"
+#line 8373 "PiwigoPublishing.c"
}
-static void publishing_piwigo_authentication_pane_update_login_button_sensitivity (PublishingPiwigoAuthenticationPane* self) {
+static void
+publishing_piwigo_authentication_pane_update_login_button_sensitivity (PublishingPiwigoAuthenticationPane* self)
+{
gboolean _tmp0_ = FALSE;
gboolean _tmp1_ = FALSE;
GtkEntry* _tmp2_;
@@ -7966,7 +8404,7 @@ static void publishing_piwigo_authentication_pane_update_login_button_sensitivit
_tmp4_ = _tmp3_;
#line 1168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_tmp4_ != ((guint) 0)) {
-#line 7958 "PiwigoPublishing.c"
+#line 8396 "PiwigoPublishing.c"
GtkEntry* _tmp5_;
guint _tmp6_;
guint _tmp7_;
@@ -7978,15 +8416,15 @@ static void publishing_piwigo_authentication_pane_update_login_button_sensitivit
_tmp7_ = _tmp6_;
#line 1169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = _tmp7_ != ((guint) 0);
-#line 7970 "PiwigoPublishing.c"
+#line 8408 "PiwigoPublishing.c"
} else {
#line 1168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = FALSE;
-#line 7974 "PiwigoPublishing.c"
+#line 8412 "PiwigoPublishing.c"
}
#line 1168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_tmp1_) {
-#line 7978 "PiwigoPublishing.c"
+#line 8416 "PiwigoPublishing.c"
GtkEntry* _tmp8_;
guint _tmp9_;
guint _tmp10_;
@@ -7998,21 +8436,23 @@ static void publishing_piwigo_authentication_pane_update_login_button_sensitivit
_tmp10_ = _tmp9_;
#line 1170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = _tmp10_ != ((guint) 0);
-#line 7990 "PiwigoPublishing.c"
+#line 8428 "PiwigoPublishing.c"
} else {
#line 1168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = FALSE;
-#line 7994 "PiwigoPublishing.c"
+#line 8432 "PiwigoPublishing.c"
}
#line 1168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp11_ = self->priv->login_button;
#line 1168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget), _tmp0_);
-#line 8000 "PiwigoPublishing.c"
+#line 8438 "PiwigoPublishing.c"
}
-static void publishing_piwigo_authentication_pane_real_on_pane_installed (ShotwellPluginsCommonBuilderPane* base) {
+static void
+publishing_piwigo_authentication_pane_real_on_pane_installed (ShotwellPluginsCommonBuilderPane* base)
+{
PublishingPiwigoAuthenticationPane * self;
GtkEntry* _tmp0_;
GtkEntry* _tmp1_;
@@ -8035,11 +8475,13 @@ static void publishing_piwigo_authentication_pane_real_on_pane_installed (Shotwe
gtk_widget_set_can_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), TRUE);
#line 1179 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_authentication_pane_update_login_button_sensitivity (self);
-#line 8027 "PiwigoPublishing.c"
+#line 8467 "PiwigoPublishing.c"
}
-PublishingPiwigoAuthenticationPaneMode publishing_piwigo_authentication_pane_get_mode (PublishingPiwigoAuthenticationPane* self) {
+PublishingPiwigoAuthenticationPaneMode
+publishing_piwigo_authentication_pane_get_mode (PublishingPiwigoAuthenticationPane* self)
+{
PublishingPiwigoAuthenticationPaneMode result;
PublishingPiwigoAuthenticationPaneMode _tmp0_;
#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -8050,29 +8492,30 @@ PublishingPiwigoAuthenticationPaneMode publishing_piwigo_authentication_pane_get
result = _tmp0_;
#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 8042 "PiwigoPublishing.c"
+#line 8484 "PiwigoPublishing.c"
}
-static void publishing_piwigo_authentication_pane_set_mode (PublishingPiwigoAuthenticationPane* self, PublishingPiwigoAuthenticationPaneMode value) {
+static void
+publishing_piwigo_authentication_pane_set_mode (PublishingPiwigoAuthenticationPane* self,
+ PublishingPiwigoAuthenticationPaneMode value)
+{
#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_AUTHENTICATION_PANE (self));
#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (publishing_piwigo_authentication_pane_get_mode (self) != value) {
-#line 8051 "PiwigoPublishing.c"
- PublishingPiwigoAuthenticationPaneMode _tmp0_;
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp0_ = value;
#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->_mode = _tmp0_;
+ self->priv->_mode = value;
#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_object_notify ((GObject *) self, "mode");
-#line 8059 "PiwigoPublishing.c"
+ g_object_notify_by_pspec ((GObject *) self, publishing_piwigo_authentication_pane_properties[PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_PROPERTY]);
+#line 8500 "PiwigoPublishing.c"
}
}
-PublishingPiwigoPiwigoPublisher* publishing_piwigo_authentication_pane_get_publisher (PublishingPiwigoAuthenticationPane* self) {
+PublishingPiwigoPiwigoPublisher*
+publishing_piwigo_authentication_pane_get_publisher (PublishingPiwigoAuthenticationPane* self)
+{
PublishingPiwigoPiwigoPublisher* result;
PublishingPiwigoPiwigoPublisher* _tmp0_;
#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -8083,29 +8526,35 @@ PublishingPiwigoPiwigoPublisher* publishing_piwigo_authentication_pane_get_publi
result = _tmp0_;
#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 8075 "PiwigoPublishing.c"
+#line 8518 "PiwigoPublishing.c"
}
-static void publishing_piwigo_authentication_pane_set_publisher (PublishingPiwigoAuthenticationPane* self, PublishingPiwigoPiwigoPublisher* value) {
+static void
+publishing_piwigo_authentication_pane_set_publisher (PublishingPiwigoAuthenticationPane* self,
+ PublishingPiwigoPiwigoPublisher* value)
+{
#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_AUTHENTICATION_PANE (self));
#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (publishing_piwigo_authentication_pane_get_publisher (self) != value) {
-#line 8084 "PiwigoPublishing.c"
- PublishingPiwigoPiwigoPublisher* _tmp0_;
-#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp0_ = value;
#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->_publisher = _tmp0_;
+ self->priv->_publisher = value;
#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_object_notify ((GObject *) self, "publisher");
-#line 8092 "PiwigoPublishing.c"
+ g_object_notify_by_pspec ((GObject *) self, publishing_piwigo_authentication_pane_properties[PUBLISHING_PIWIGO_AUTHENTICATION_PANE_PUBLISHER_PROPERTY]);
+#line 8534 "PiwigoPublishing.c"
}
}
-static void g_cclosure_user_marshal_VOID__STRING_STRING_STRING_BOOLEAN (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) {
+static void
+g_cclosure_user_marshal_VOID__STRING_STRING_STRING_BOOLEAN (GClosure * closure,
+ GValue * return_value,
+ guint n_param_values,
+ const GValue * param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data)
+{
typedef void (*GMarshalFunc_VOID__STRING_STRING_STRING_BOOLEAN) (gpointer data1, const char* arg_1, const char* arg_2, const char* arg_3, gboolean arg_4, gpointer data2);
register GMarshalFunc_VOID__STRING_STRING_STRING_BOOLEAN callback;
register GCClosure * cc;
@@ -8120,23 +8569,25 @@ static void g_cclosure_user_marshal_VOID__STRING_STRING_STRING_BOOLEAN (GClosure
data1 = closure->data;
#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
data2 = param_values->data[0].v_pointer;
-#line 8112 "PiwigoPublishing.c"
+#line 8561 "PiwigoPublishing.c"
} else {
#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
data1 = param_values->data[0].v_pointer;
#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
data2 = closure->data;
-#line 8118 "PiwigoPublishing.c"
+#line 8567 "PiwigoPublishing.c"
}
#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
callback = (GMarshalFunc_VOID__STRING_STRING_STRING_BOOLEAN) (marshal_data ? marshal_data : cc->callback);
#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
callback (data1, g_value_get_string (param_values + 1), g_value_get_string (param_values + 2), g_value_get_string (param_values + 3), g_value_get_boolean (param_values + 4), data2);
-#line 8124 "PiwigoPublishing.c"
+#line 8573 "PiwigoPublishing.c"
}
-static void publishing_piwigo_authentication_pane_class_init (PublishingPiwigoAuthenticationPaneClass * klass) {
+static void
+publishing_piwigo_authentication_pane_class_init (PublishingPiwigoAuthenticationPaneClass * klass)
+{
gchar* _tmp0_;
gchar* _tmp1_;
gchar* _tmp2_;
@@ -8155,9 +8606,9 @@ static void publishing_piwigo_authentication_pane_class_init (PublishingPiwigoAu
#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
G_OBJECT_CLASS (klass)->finalize = publishing_piwigo_authentication_pane_finalize;
#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_PROPERTY, g_param_spec_enum ("mode", "mode", "mode", PUBLISHING_PIWIGO_AUTHENTICATION_PANE_TYPE_MODE, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+ g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_PROPERTY, publishing_piwigo_authentication_pane_properties[PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_PROPERTY] = g_param_spec_enum ("mode", "mode", "mode", PUBLISHING_PIWIGO_AUTHENTICATION_PANE_TYPE_MODE, 0, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_AUTHENTICATION_PANE_PUBLISHER_PROPERTY, g_param_spec_object ("publisher", "publisher", "publisher", PUBLISHING_PIWIGO_TYPE_PIWIGO_PUBLISHER, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+ g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_AUTHENTICATION_PANE_PUBLISHER_PROPERTY, publishing_piwigo_authentication_pane_properties[PUBLISHING_PIWIGO_AUTHENTICATION_PANE_PUBLISHER_PROPERTY] = g_param_spec_object ("publisher", "publisher", "publisher", PUBLISHING_PIWIGO_TYPE_PIWIGO_PUBLISHER, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_authentication_pane_signals[PUBLISHING_PIWIGO_AUTHENTICATION_PANE_LOGIN_SIGNAL] = g_signal_new ("login", PUBLISHING_PIWIGO_TYPE_AUTHENTICATION_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__STRING_STRING_STRING_BOOLEAN, G_TYPE_NONE, 4, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN);
#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -8174,18 +8625,22 @@ static void publishing_piwigo_authentication_pane_class_init (PublishingPiwigoAu
_tmp2_ = g_strdup (_ ("Username and/or password invalid. Please try again"));
#line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_authentication_pane_FAILED_RETRY_USER_MESSAGE = _tmp2_;
-#line 8164 "PiwigoPublishing.c"
+#line 8615 "PiwigoPublishing.c"
}
-static void publishing_piwigo_authentication_pane_instance_init (PublishingPiwigoAuthenticationPane * self) {
+static void
+publishing_piwigo_authentication_pane_instance_init (PublishingPiwigoAuthenticationPane * self)
+{
#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->priv = PUBLISHING_PIWIGO_AUTHENTICATION_PANE_GET_PRIVATE (self);
-#line 8171 "PiwigoPublishing.c"
+#line 8624 "PiwigoPublishing.c"
}
-static void publishing_piwigo_authentication_pane_finalize (GObject * obj) {
+static void
+publishing_piwigo_authentication_pane_finalize (GObject * obj)
+{
PublishingPiwigoAuthenticationPane * self;
#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PIWIGO_TYPE_AUTHENTICATION_PANE, PublishingPiwigoAuthenticationPane);
@@ -8201,7 +8656,7 @@ static void publishing_piwigo_authentication_pane_finalize (GObject * obj) {
_g_object_unref0 (self->priv->login_button);
#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
G_OBJECT_CLASS (publishing_piwigo_authentication_pane_parent_class)->finalize (obj);
-#line 8191 "PiwigoPublishing.c"
+#line 8646 "PiwigoPublishing.c"
}
@@ -8209,7 +8664,9 @@ static void publishing_piwigo_authentication_pane_finalize (GObject * obj) {
* The authentication pane used when asking service URL, user name and password
* from the user.
*/
-GType publishing_piwigo_authentication_pane_get_type (void) {
+GType
+publishing_piwigo_authentication_pane_get_type (void)
+{
static volatile gsize publishing_piwigo_authentication_pane_type_id__volatile = 0;
if (g_once_init_enter (&publishing_piwigo_authentication_pane_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingPiwigoAuthenticationPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_piwigo_authentication_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingPiwigoAuthenticationPane), 0, (GInstanceInitFunc) publishing_piwigo_authentication_pane_instance_init, NULL };
@@ -8221,7 +8678,12 @@ GType publishing_piwigo_authentication_pane_get_type (void) {
}
-static void _vala_publishing_piwigo_authentication_pane_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) {
+static void
+_vala_publishing_piwigo_authentication_pane_get_property (GObject * object,
+ guint property_id,
+ GValue * value,
+ GParamSpec * pspec)
+{
PublishingPiwigoAuthenticationPane * self;
self = G_TYPE_CHECK_INSTANCE_CAST (object, PUBLISHING_PIWIGO_TYPE_AUTHENTICATION_PANE, PublishingPiwigoAuthenticationPane);
#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -8238,18 +8700,23 @@ static void _vala_publishing_piwigo_authentication_pane_get_property (GObject *
g_value_set_object (value, publishing_piwigo_authentication_pane_get_publisher (self));
#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
break;
-#line 8228 "PiwigoPublishing.c"
+#line 8690 "PiwigoPublishing.c"
default:
#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
break;
-#line 8234 "PiwigoPublishing.c"
+#line 8696 "PiwigoPublishing.c"
}
}
-static void _vala_publishing_piwigo_authentication_pane_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) {
+static void
+_vala_publishing_piwigo_authentication_pane_set_property (GObject * object,
+ guint property_id,
+ const GValue * value,
+ GParamSpec * pspec)
+{
PublishingPiwigoAuthenticationPane * self;
self = G_TYPE_CHECK_INSTANCE_CAST (object, PUBLISHING_PIWIGO_TYPE_AUTHENTICATION_PANE, PublishingPiwigoAuthenticationPane);
#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -8266,165 +8733,188 @@ static void _vala_publishing_piwigo_authentication_pane_set_property (GObject *
publishing_piwigo_authentication_pane_set_publisher (self, g_value_get_object (value));
#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
break;
-#line 8256 "PiwigoPublishing.c"
+#line 8723 "PiwigoPublishing.c"
default:
#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
break;
-#line 8262 "PiwigoPublishing.c"
+#line 8729 "PiwigoPublishing.c"
}
}
-static gpointer _publishing_piwigo_category_ref0 (gpointer self) {
+static gpointer
+_publishing_piwigo_category_ref0 (gpointer self)
+{
#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return self ? publishing_piwigo_category_ref (self) : NULL;
-#line 8270 "PiwigoPublishing.c"
+#line 8739 "PiwigoPublishing.c"
}
-static PublishingPiwigoCategory** _vala_array_dup13 (PublishingPiwigoCategory** self, int length) {
+static PublishingPiwigoCategory**
+_vala_array_dup13 (PublishingPiwigoCategory** self,
+ int length)
+{
PublishingPiwigoCategory** result;
int i;
#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
result = g_new0 (PublishingPiwigoCategory*, length + 1);
#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
for (i = 0; i < length; i++) {
-#line 8281 "PiwigoPublishing.c"
+#line 8753 "PiwigoPublishing.c"
PublishingPiwigoCategory* _tmp0_;
#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = _publishing_piwigo_category_ref0 (self[i]);
#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
result[i] = _tmp0_;
-#line 8287 "PiwigoPublishing.c"
+#line 8759 "PiwigoPublishing.c"
}
#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 8291 "PiwigoPublishing.c"
+#line 8763 "PiwigoPublishing.c"
}
-static gboolean _publishing_piwigo_category_equal_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self) {
+static gboolean
+_publishing_piwigo_category_equal_gee_equal_data_func (gconstpointer a,
+ gconstpointer b,
+ gpointer self)
+{
gboolean result;
result = publishing_piwigo_category_equal ((PublishingPiwigoCategory*) a, (PublishingPiwigoCategory*) b);
#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 8300 "PiwigoPublishing.c"
-}
-
-
-PublishingPiwigoPublishingOptionsPane* publishing_piwigo_publishing_options_pane_construct (GType object_type, PublishingPiwigoPiwigoPublisher* publisher, PublishingPiwigoCategory** categories, int categories_length1, gint last_category, gint last_permission_level, gint last_photo_size, gboolean last_title_as_comment, gboolean last_no_upload_tags, gboolean strip_metadata_enabled) {
+#line 8776 "PiwigoPublishing.c"
+}
+
+
+PublishingPiwigoPublishingOptionsPane*
+publishing_piwigo_publishing_options_pane_construct (GType object_type,
+ PublishingPiwigoPiwigoPublisher* publisher,
+ PublishingPiwigoCategory** categories,
+ int categories_length1,
+ gint last_category,
+ gint last_permission_level,
+ gint last_photo_size,
+ gboolean last_title_as_comment,
+ gboolean last_no_upload_tags,
+ gboolean strip_metadata_enabled)
+{
PublishingPiwigoPublishingOptionsPane * self = NULL;
- gint _tmp0_;
- gint _tmp1_;
- gint _tmp2_;
- gboolean _tmp3_;
- gboolean _tmp4_;
- gboolean _tmp5_;
- PublishingPiwigoCategory** _tmp6_;
- gint _tmp6__length1;
- PublishingPiwigoCategory** _tmp7_;
- gint _tmp7__length1;
- GeeArrayList* _tmp8_;
- GeeArrayList* _tmp9_;
- PublishingPiwigoPiwigoPublisher* _tmp10_;
- gchar* _tmp11_;
- gchar* _tmp12_;
+ PublishingPiwigoCategory** _tmp0_;
+ gint _tmp0__length1;
+ GeeArrayList* _tmp1_;
+ GeeArrayList* _tmp2_;
+ gchar* _tmp3_;
+ gchar* _tmp4_;
#line 1221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (publisher), NULL);
#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp0_ = last_category;
-#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp1_ = last_permission_level;
-#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp2_ = last_photo_size;
-#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp3_ = last_title_as_comment;
-#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp4_ = last_no_upload_tags;
-#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp5_ = strip_metadata_enabled;
-#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp6_ = categories;
+ _tmp0_ = (categories != NULL) ? _vala_array_dup13 (categories, categories_length1) : ((gpointer) categories);
#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp6__length1 = categories_length1;
+ _tmp0__length1 = categories_length1;
#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp7_ = (_tmp6_ != NULL) ? _vala_array_dup13 (_tmp6_, _tmp6__length1) : ((gpointer) _tmp6_);
+ _tmp1_ = gee_array_list_new_wrap (PUBLISHING_PIWIGO_TYPE_CATEGORY, (GBoxedCopyFunc) publishing_piwigo_category_ref, (GDestroyNotify) publishing_piwigo_category_unref, _tmp0_, _tmp0__length1, _publishing_piwigo_category_equal_gee_equal_data_func, NULL, NULL);
#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp7__length1 = _tmp6__length1;
-#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp8_ = gee_array_list_new_wrap (PUBLISHING_PIWIGO_TYPE_CATEGORY, (GBoxedCopyFunc) publishing_piwigo_category_ref, (GDestroyNotify) publishing_piwigo_category_unref, _tmp7_, _tmp7__length1, _publishing_piwigo_category_equal_gee_equal_data_func, NULL, NULL);
-#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp9_ = _tmp8_;
-#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp10_ = publisher;
+ _tmp2_ = _tmp1_;
#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp11_ = publishing_piwigo_publishing_options_pane_get_common_comment_if_possible (_tmp10_);
+ _tmp3_ = publishing_piwigo_publishing_options_pane_get_common_comment_if_possible (publisher);
#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp12_ = _tmp11_;
+ _tmp4_ = _tmp3_;
#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self = (PublishingPiwigoPublishingOptionsPane*) g_object_new (object_type, "resource-path", PLUGIN_RESOURCE_PATH "/piwigo_publishing_options_pane.ui", "connect-signals", TRUE, "default-id", "publish_button", "last-category", _tmp0_, "last-permission-level", _tmp1_, "last-photo-size", _tmp2_, "last-title-as-comment", _tmp3_, "last-no-upload-tags", _tmp4_, "strip-metadata-enabled", _tmp5_, "existing-categories", _tmp9_, "default-comment", _tmp12_, NULL);
+ self = (PublishingPiwigoPublishingOptionsPane*) g_object_new (object_type, "resource-path", PLUGIN_RESOURCE_PATH "/piwigo_publishing_options_pane.ui", "connect-signals", TRUE, "default-id", "publish_button", "last-category", last_category, "last-permission-level", last_permission_level, "last-photo-size", last_photo_size, "last-title-as-comment", last_title_as_comment, "last-no-upload-tags", last_no_upload_tags, "strip-metadata-enabled", strip_metadata_enabled, "existing-categories", _tmp2_, "default-comment", _tmp4_, NULL);
#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_free0 (_tmp12_);
+ _g_free0 (_tmp4_);
#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_object_unref0 (_tmp9_);
+ _g_object_unref0 (_tmp2_);
#line 1221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return self;
-#line 8361 "PiwigoPublishing.c"
+#line 8821 "PiwigoPublishing.c"
}
-PublishingPiwigoPublishingOptionsPane* publishing_piwigo_publishing_options_pane_new (PublishingPiwigoPiwigoPublisher* publisher, PublishingPiwigoCategory** categories, int categories_length1, gint last_category, gint last_permission_level, gint last_photo_size, gboolean last_title_as_comment, gboolean last_no_upload_tags, gboolean strip_metadata_enabled) {
+PublishingPiwigoPublishingOptionsPane*
+publishing_piwigo_publishing_options_pane_new (PublishingPiwigoPiwigoPublisher* publisher,
+ PublishingPiwigoCategory** categories,
+ int categories_length1,
+ gint last_category,
+ gint last_permission_level,
+ gint last_photo_size,
+ gboolean last_title_as_comment,
+ gboolean last_no_upload_tags,
+ gboolean strip_metadata_enabled)
+{
#line 1221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return publishing_piwigo_publishing_options_pane_construct (PUBLISHING_PIWIGO_TYPE_PUBLISHING_OPTIONS_PANE, publisher, categories, categories_length1, last_category, last_permission_level, last_photo_size, last_title_as_comment, last_no_upload_tags, strip_metadata_enabled);
-#line 8368 "PiwigoPublishing.c"
+#line 8838 "PiwigoPublishing.c"
}
-static void _publishing_piwigo_publishing_options_pane_on_logout_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+_publishing_piwigo_publishing_options_pane_on_logout_button_clicked_gtk_button_clicked (GtkButton* _sender,
+ gpointer self)
+{
#line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_publishing_options_pane_on_logout_button_clicked ((PublishingPiwigoPublishingOptionsPane*) self);
-#line 8375 "PiwigoPublishing.c"
+#line 8848 "PiwigoPublishing.c"
}
-static void _publishing_piwigo_publishing_options_pane_on_publish_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+_publishing_piwigo_publishing_options_pane_on_publish_button_clicked_gtk_button_clicked (GtkButton* _sender,
+ gpointer self)
+{
#line 1275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_publishing_options_pane_on_publish_button_clicked ((PublishingPiwigoPublishingOptionsPane*) self);
-#line 8382 "PiwigoPublishing.c"
+#line 8858 "PiwigoPublishing.c"
}
-static void _publishing_piwigo_publishing_options_pane_on_use_existing_radio_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+_publishing_piwigo_publishing_options_pane_on_use_existing_radio_clicked_gtk_button_clicked (GtkButton* _sender,
+ gpointer self)
+{
#line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_publishing_options_pane_on_use_existing_radio_clicked ((PublishingPiwigoPublishingOptionsPane*) self);
-#line 8389 "PiwigoPublishing.c"
+#line 8868 "PiwigoPublishing.c"
}
-static void _publishing_piwigo_publishing_options_pane_on_create_new_radio_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+_publishing_piwigo_publishing_options_pane_on_create_new_radio_clicked_gtk_button_clicked (GtkButton* _sender,
+ gpointer self)
+{
#line 1278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_publishing_options_pane_on_create_new_radio_clicked ((PublishingPiwigoPublishingOptionsPane*) self);
-#line 8396 "PiwigoPublishing.c"
+#line 8878 "PiwigoPublishing.c"
}
-static void _publishing_piwigo_publishing_options_pane_on_new_category_entry_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
+static void
+_publishing_piwigo_publishing_options_pane_on_new_category_entry_changed_gtk_editable_changed (GtkEditable* _sender,
+ gpointer self)
+{
#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_publishing_options_pane_on_new_category_entry_changed ((PublishingPiwigoPublishingOptionsPane*) self);
-#line 8403 "PiwigoPublishing.c"
+#line 8888 "PiwigoPublishing.c"
}
-static void _publishing_piwigo_publishing_options_pane_on_existing_combo_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
+static void
+_publishing_piwigo_publishing_options_pane_on_existing_combo_changed_gtk_combo_box_changed (GtkComboBox* _sender,
+ gpointer self)
+{
#line 1280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_publishing_options_pane_on_existing_combo_changed ((PublishingPiwigoPublishingOptionsPane*) self);
-#line 8410 "PiwigoPublishing.c"
+#line 8898 "PiwigoPublishing.c"
}
-static void publishing_piwigo_publishing_options_pane_real_constructed (GObject* base) {
+static void
+publishing_piwigo_publishing_options_pane_real_constructed (GObject* base)
+{
PublishingPiwigoPublishingOptionsPane * self;
GtkBuilder* builder = NULL;
GtkBuilder* _tmp0_;
@@ -8656,7 +9146,7 @@ static void publishing_piwigo_publishing_options_pane_real_constructed (GObject*
#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp44_ = self->priv->new_category_entry;
#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_piwigo_publishing_options_pane_on_new_category_entry_changed_gtk_editable_changed, self, 0);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_editable_get_type (), GtkEditable), "changed", (GCallback) _publishing_piwigo_publishing_options_pane_on_new_category_entry_changed_gtk_editable_changed, self, 0);
#line 1280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp45_ = self->priv->within_existing_combo;
#line 1280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -8693,96 +9183,124 @@ static void publishing_piwigo_publishing_options_pane_real_constructed (GObject*
gtk_text_buffer_set_text (_tmp52_, _tmp53_, -1);
#line 1244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_object_unref0 (builder);
-#line 8683 "PiwigoPublishing.c"
+#line 9173 "PiwigoPublishing.c"
}
-static void _vala_array_add39 (PublishingPiwigoPermissionLevel** * array, int* length, int* size, PublishingPiwigoPermissionLevel* value) {
+static void
+_vala_array_add39 (PublishingPiwigoPermissionLevel** * array,
+ int* length,
+ int* size,
+ PublishingPiwigoPermissionLevel* value)
+{
#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if ((*length) == (*size)) {
#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
*array = g_renew (PublishingPiwigoPermissionLevel*, *array, (*size) + 1);
-#line 8694 "PiwigoPublishing.c"
+#line 9189 "PiwigoPublishing.c"
}
#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
(*array)[(*length)++] = value;
#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
(*array)[*length] = NULL;
-#line 8700 "PiwigoPublishing.c"
+#line 9195 "PiwigoPublishing.c"
}
-static void _vala_array_add40 (PublishingPiwigoPermissionLevel** * array, int* length, int* size, PublishingPiwigoPermissionLevel* value) {
+static void
+_vala_array_add40 (PublishingPiwigoPermissionLevel** * array,
+ int* length,
+ int* size,
+ PublishingPiwigoPermissionLevel* value)
+{
#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if ((*length) == (*size)) {
#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
*array = g_renew (PublishingPiwigoPermissionLevel*, *array, (*size) + 1);
-#line 8711 "PiwigoPublishing.c"
+#line 9211 "PiwigoPublishing.c"
}
#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
(*array)[(*length)++] = value;
#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
(*array)[*length] = NULL;
-#line 8717 "PiwigoPublishing.c"
+#line 9217 "PiwigoPublishing.c"
}
-static void _vala_array_add41 (PublishingPiwigoPermissionLevel** * array, int* length, int* size, PublishingPiwigoPermissionLevel* value) {
+static void
+_vala_array_add41 (PublishingPiwigoPermissionLevel** * array,
+ int* length,
+ int* size,
+ PublishingPiwigoPermissionLevel* value)
+{
#line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if ((*length) == (*size)) {
#line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
*array = g_renew (PublishingPiwigoPermissionLevel*, *array, (*size) + 1);
-#line 8728 "PiwigoPublishing.c"
+#line 9233 "PiwigoPublishing.c"
}
#line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
(*array)[(*length)++] = value;
#line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
(*array)[*length] = NULL;
-#line 8734 "PiwigoPublishing.c"
+#line 9239 "PiwigoPublishing.c"
}
-static void _vala_array_add42 (PublishingPiwigoPermissionLevel** * array, int* length, int* size, PublishingPiwigoPermissionLevel* value) {
+static void
+_vala_array_add42 (PublishingPiwigoPermissionLevel** * array,
+ int* length,
+ int* size,
+ PublishingPiwigoPermissionLevel* value)
+{
#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if ((*length) == (*size)) {
#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
*array = g_renew (PublishingPiwigoPermissionLevel*, *array, (*size) + 1);
-#line 8745 "PiwigoPublishing.c"
+#line 9255 "PiwigoPublishing.c"
}
#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
(*array)[(*length)++] = value;
#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
(*array)[*length] = NULL;
-#line 8751 "PiwigoPublishing.c"
+#line 9261 "PiwigoPublishing.c"
}
-static void _vala_array_add43 (PublishingPiwigoPermissionLevel** * array, int* length, int* size, PublishingPiwigoPermissionLevel* value) {
+static void
+_vala_array_add43 (PublishingPiwigoPermissionLevel** * array,
+ int* length,
+ int* size,
+ PublishingPiwigoPermissionLevel* value)
+{
#line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if ((*length) == (*size)) {
#line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
*array = g_renew (PublishingPiwigoPermissionLevel*, *array, (*size) + 1);
-#line 8762 "PiwigoPublishing.c"
+#line 9277 "PiwigoPublishing.c"
}
#line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
(*array)[(*length)++] = value;
#line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
(*array)[*length] = NULL;
-#line 8768 "PiwigoPublishing.c"
+#line 9283 "PiwigoPublishing.c"
}
-static PublishingPiwigoPermissionLevel** publishing_piwigo_publishing_options_pane_create_perm_levels (PublishingPiwigoPublishingOptionsPane* self, int* result_length1) {
+static PublishingPiwigoPermissionLevel**
+publishing_piwigo_publishing_options_pane_create_perm_levels (PublishingPiwigoPublishingOptionsPane* self,
+ int* result_length1)
+{
PublishingPiwigoPermissionLevel** result = NULL;
PublishingPiwigoPermissionLevel** _result_ = NULL;
PublishingPiwigoPermissionLevel** _tmp0_;
@@ -8863,102 +9381,130 @@ static PublishingPiwigoPermissionLevel** publishing_piwigo_publishing_options_pa
if (result_length1) {
#line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
*result_length1 = _tmp11__length1;
-#line 8853 "PiwigoPublishing.c"
+#line 9371 "PiwigoPublishing.c"
}
#line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
result = _tmp11_;
#line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 8859 "PiwigoPublishing.c"
+#line 9377 "PiwigoPublishing.c"
}
-static void _vala_array_add44 (PublishingPiwigoSizeEntry** * array, int* length, int* size, PublishingPiwigoSizeEntry* value) {
+static void
+_vala_array_add44 (PublishingPiwigoSizeEntry** * array,
+ int* length,
+ int* size,
+ PublishingPiwigoSizeEntry* value)
+{
#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if ((*length) == (*size)) {
#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
*array = g_renew (PublishingPiwigoSizeEntry*, *array, (*size) + 1);
-#line 8870 "PiwigoPublishing.c"
+#line 9393 "PiwigoPublishing.c"
}
#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
(*array)[(*length)++] = value;
#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
(*array)[*length] = NULL;
-#line 8876 "PiwigoPublishing.c"
+#line 9399 "PiwigoPublishing.c"
}
-static void _vala_array_add45 (PublishingPiwigoSizeEntry** * array, int* length, int* size, PublishingPiwigoSizeEntry* value) {
+static void
+_vala_array_add45 (PublishingPiwigoSizeEntry** * array,
+ int* length,
+ int* size,
+ PublishingPiwigoSizeEntry* value)
+{
#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if ((*length) == (*size)) {
#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
*array = g_renew (PublishingPiwigoSizeEntry*, *array, (*size) + 1);
-#line 8887 "PiwigoPublishing.c"
+#line 9415 "PiwigoPublishing.c"
}
#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
(*array)[(*length)++] = value;
#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
(*array)[*length] = NULL;
-#line 8893 "PiwigoPublishing.c"
+#line 9421 "PiwigoPublishing.c"
}
-static void _vala_array_add46 (PublishingPiwigoSizeEntry** * array, int* length, int* size, PublishingPiwigoSizeEntry* value) {
+static void
+_vala_array_add46 (PublishingPiwigoSizeEntry** * array,
+ int* length,
+ int* size,
+ PublishingPiwigoSizeEntry* value)
+{
#line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if ((*length) == (*size)) {
#line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
*array = g_renew (PublishingPiwigoSizeEntry*, *array, (*size) + 1);
-#line 8904 "PiwigoPublishing.c"
+#line 9437 "PiwigoPublishing.c"
}
#line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
(*array)[(*length)++] = value;
#line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
(*array)[*length] = NULL;
-#line 8910 "PiwigoPublishing.c"
+#line 9443 "PiwigoPublishing.c"
}
-static void _vala_array_add47 (PublishingPiwigoSizeEntry** * array, int* length, int* size, PublishingPiwigoSizeEntry* value) {
+static void
+_vala_array_add47 (PublishingPiwigoSizeEntry** * array,
+ int* length,
+ int* size,
+ PublishingPiwigoSizeEntry* value)
+{
#line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if ((*length) == (*size)) {
#line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
*array = g_renew (PublishingPiwigoSizeEntry*, *array, (*size) + 1);
-#line 8921 "PiwigoPublishing.c"
+#line 9459 "PiwigoPublishing.c"
}
#line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
(*array)[(*length)++] = value;
#line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
(*array)[*length] = NULL;
-#line 8927 "PiwigoPublishing.c"
+#line 9465 "PiwigoPublishing.c"
}
-static void _vala_array_add48 (PublishingPiwigoSizeEntry** * array, int* length, int* size, PublishingPiwigoSizeEntry* value) {
+static void
+_vala_array_add48 (PublishingPiwigoSizeEntry** * array,
+ int* length,
+ int* size,
+ PublishingPiwigoSizeEntry* value)
+{
#line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if ((*length) == (*size)) {
#line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
*array = g_renew (PublishingPiwigoSizeEntry*, *array, (*size) + 1);
-#line 8938 "PiwigoPublishing.c"
+#line 9481 "PiwigoPublishing.c"
}
#line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
(*array)[(*length)++] = value;
#line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
(*array)[*length] = NULL;
-#line 8944 "PiwigoPublishing.c"
+#line 9487 "PiwigoPublishing.c"
}
-static PublishingPiwigoSizeEntry** publishing_piwigo_publishing_options_pane_create_sizes (PublishingPiwigoPublishingOptionsPane* self, int* result_length1) {
+static PublishingPiwigoSizeEntry**
+publishing_piwigo_publishing_options_pane_create_sizes (PublishingPiwigoPublishingOptionsPane* self,
+ int* result_length1)
+{
PublishingPiwigoSizeEntry** result = NULL;
PublishingPiwigoSizeEntry** _result_ = NULL;
PublishingPiwigoSizeEntry** _tmp0_;
@@ -9039,67 +9585,69 @@ static PublishingPiwigoSizeEntry** publishing_piwigo_publishing_options_pane_cre
if (result_length1) {
#line 1308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
*result_length1 = _tmp11__length1;
-#line 9029 "PiwigoPublishing.c"
+#line 9575 "PiwigoPublishing.c"
}
#line 1308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
result = _tmp11_;
#line 1308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 9035 "PiwigoPublishing.c"
+#line 9581 "PiwigoPublishing.c"
}
-static void publishing_piwigo_publishing_options_pane_on_logout_button_clicked (PublishingPiwigoPublishingOptionsPane* self) {
+static void
+publishing_piwigo_publishing_options_pane_on_logout_button_clicked (PublishingPiwigoPublishingOptionsPane* self)
+{
#line 1311 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
#line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_emit (self, publishing_piwigo_publishing_options_pane_signals[PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL], 0);
-#line 9044 "PiwigoPublishing.c"
+#line 9592 "PiwigoPublishing.c"
}
-static gpointer _publishing_piwigo_permission_level_ref0 (gpointer self) {
+static gpointer
+_publishing_piwigo_permission_level_ref0 (gpointer self)
+{
#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return self ? publishing_piwigo_permission_level_ref (self) : NULL;
-#line 9051 "PiwigoPublishing.c"
+#line 9601 "PiwigoPublishing.c"
}
-static gpointer _publishing_piwigo_size_entry_ref0 (gpointer self) {
+static gpointer
+_publishing_piwigo_size_entry_ref0 (gpointer self)
+{
#line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return self ? publishing_piwigo_size_entry_ref (self) : NULL;
-#line 9058 "PiwigoPublishing.c"
+#line 9610 "PiwigoPublishing.c"
}
-static void publishing_piwigo_publishing_options_pane_on_publish_button_clicked (PublishingPiwigoPublishingOptionsPane* self) {
+static void
+publishing_piwigo_publishing_options_pane_on_publish_button_clicked (PublishingPiwigoPublishingOptionsPane* self)
+{
PublishingPiwigoPublishingParameters* params = NULL;
PublishingPiwigoPublishingParameters* _tmp0_;
PublishingPiwigoPublishingParameters* _tmp1_;
PublishingPiwigoPermissionLevel** _tmp2_;
gint _tmp2__length1;
GtkComboBoxText* _tmp3_;
- gint _tmp4_;
+ PublishingPiwigoPermissionLevel* _tmp4_;
PublishingPiwigoPermissionLevel* _tmp5_;
- PublishingPiwigoPermissionLevel* _tmp6_;
- PublishingPiwigoPublishingParameters* _tmp7_;
- PublishingPiwigoSizeEntry** _tmp8_;
- gint _tmp8__length1;
- GtkComboBoxText* _tmp9_;
- gint _tmp10_;
- PublishingPiwigoSizeEntry* _tmp11_;
- PublishingPiwigoSizeEntry* _tmp12_;
+ PublishingPiwigoPublishingParameters* _tmp6_;
+ PublishingPiwigoSizeEntry** _tmp7_;
+ gint _tmp7__length1;
+ GtkComboBoxText* _tmp8_;
+ PublishingPiwigoSizeEntry* _tmp9_;
+ PublishingPiwigoSizeEntry* _tmp10_;
+ PublishingPiwigoPublishingParameters* _tmp11_;
+ GtkCheckButton* _tmp12_;
PublishingPiwigoPublishingParameters* _tmp13_;
GtkCheckButton* _tmp14_;
- gboolean _tmp15_;
- PublishingPiwigoPublishingParameters* _tmp16_;
- GtkCheckButton* _tmp17_;
- gboolean _tmp18_;
- GtkRadioButton* _tmp19_;
- gboolean _tmp20_;
- PublishingPiwigoPublishingParameters* _tmp53_;
- GtkCheckButton* _tmp54_;
- gboolean _tmp55_;
+ GtkRadioButton* _tmp15_;
+ PublishingPiwigoPublishingParameters* _tmp46_;
+ GtkCheckButton* _tmp47_;
#line 1315 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -9115,204 +9663,188 @@ static void publishing_piwigo_publishing_options_pane_on_publish_button_clicked
#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp3_ = self->priv->perms_combo;
#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp4_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_combo_box_get_type (), GtkComboBox));
-#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp5_ = _tmp2_[_tmp4_];
+ _tmp4_ = _tmp2_[gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_combo_box_get_type (), GtkComboBox))];
#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp6_ = _publishing_piwigo_permission_level_ref0 (_tmp5_);
+ _tmp5_ = _publishing_piwigo_permission_level_ref0 (_tmp4_);
#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_piwigo_permission_level_unref0 (_tmp1_->perm_level);
#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp1_->perm_level = _tmp6_;
+ _tmp1_->perm_level = _tmp5_;
#line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp7_ = params;
+ _tmp6_ = params;
#line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp8_ = self->priv->photo_sizes;
+ _tmp7_ = self->priv->photo_sizes;
#line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp8__length1 = self->priv->photo_sizes_length1;
+ _tmp7__length1 = self->priv->photo_sizes_length1;
#line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp9_ = self->priv->size_combo;
+ _tmp8_ = self->priv->size_combo;
#line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp10_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_combo_box_get_type (), GtkComboBox));
+ _tmp9_ = _tmp7_[gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_combo_box_get_type (), GtkComboBox))];
#line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp11_ = _tmp8_[_tmp10_];
+ _tmp10_ = _publishing_piwigo_size_entry_ref0 (_tmp9_);
#line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp12_ = _publishing_piwigo_size_entry_ref0 (_tmp11_);
+ _publishing_piwigo_size_entry_unref0 (_tmp6_->photo_size);
#line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _publishing_piwigo_size_entry_unref0 (_tmp7_->photo_size);
-#line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp7_->photo_size = _tmp12_;
+ _tmp6_->photo_size = _tmp10_;
#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp13_ = params;
+ _tmp11_ = params;
#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp14_ = self->priv->title_as_comment_check;
+ _tmp12_ = self->priv->title_as_comment_check;
#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp15_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp13_->title_as_comment = _tmp15_;
-#line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp16_ = params;
+ _tmp11_->title_as_comment = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_toggle_button_get_type (), GtkToggleButton));
#line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp17_ = self->priv->no_upload_tags_check;
+ _tmp13_ = params;
#line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp18_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_toggle_button_get_type (), GtkToggleButton));
+ _tmp14_ = self->priv->no_upload_tags_check;
#line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp16_->no_upload_tags = _tmp18_;
+ _tmp13_->no_upload_tags = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_toggle_button_get_type (), GtkToggleButton));
#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp19_ = self->priv->create_new_radio;
+ _tmp15_ = self->priv->create_new_radio;
#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp20_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (_tmp20_) {
-#line 9154 "PiwigoPublishing.c"
+ if (gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_toggle_button_get_type (), GtkToggleButton))) {
+#line 9692 "PiwigoPublishing.c"
gchar* uploadcomment = NULL;
- GtkTextView* _tmp21_;
- GtkTextBuffer* _tmp22_;
- GtkTextBuffer* _tmp23_;
- gchar* _tmp24_;
- gchar* _tmp25_;
- gchar* _tmp26_;
- gchar* _tmp27_;
- gchar* _tmp28_;
+ GtkTextView* _tmp16_;
+ GtkTextBuffer* _tmp17_;
+ GtkTextBuffer* _tmp18_;
+ gchar* _tmp19_;
+ gchar* _tmp20_;
+ gchar* _tmp21_;
+ gchar* _tmp22_;
+ gchar* _tmp23_;
gint a = 0;
- GtkComboBoxText* _tmp29_;
- gint _tmp30_;
- gint _tmp31_;
+ GtkComboBoxText* _tmp24_;
+ gint _tmp25_;
#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp21_ = self->priv->album_comment;
+ _tmp16_ = self->priv->album_comment;
#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp22_ = gtk_text_view_get_buffer (_tmp21_);
+ _tmp17_ = gtk_text_view_get_buffer (_tmp16_);
#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp23_ = _tmp22_;
+ _tmp18_ = _tmp17_;
#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_object_get (_tmp23_, "text", &_tmp24_, NULL);
+ g_object_get (_tmp18_, "text", &_tmp19_, NULL);
#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp25_ = _tmp24_;
+ _tmp20_ = _tmp19_;
#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp26_ = _tmp25_;
+ _tmp21_ = _tmp20_;
#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp27_ = string_strip (_tmp26_);
+ _tmp22_ = string_strip (_tmp21_);
#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp28_ = _tmp27_;
+ _tmp23_ = _tmp22_;
#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_free0 (_tmp26_);
+ _g_free0 (_tmp21_);
#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- uploadcomment = _tmp28_;
+ uploadcomment = _tmp23_;
#line 1323 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp29_ = self->priv->within_existing_combo;
+ _tmp24_ = self->priv->within_existing_combo;
#line 1323 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp30_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_combo_box_get_type (), GtkComboBox));
-#line 1323 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- a = _tmp30_;
+ a = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_combo_box_get_type (), GtkComboBox));
#line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp31_ = a;
+ _tmp25_ = a;
#line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (_tmp31_ == 0) {
-#line 9198 "PiwigoPublishing.c"
- PublishingPiwigoPublishingParameters* _tmp32_;
- GtkEntry* _tmp33_;
- const gchar* _tmp34_;
- const gchar* _tmp35_;
- PublishingPiwigoCategory* _tmp36_;
+ if (_tmp25_ == 0) {
+#line 9733 "PiwigoPublishing.c"
+ PublishingPiwigoPublishingParameters* _tmp26_;
+ GtkEntry* _tmp27_;
+ const gchar* _tmp28_;
+ const gchar* _tmp29_;
+ PublishingPiwigoCategory* _tmp30_;
#line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp32_ = params;
+ _tmp26_ = params;
#line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp33_ = self->priv->new_category_entry;
+ _tmp27_ = self->priv->new_category_entry;
#line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp34_ = gtk_entry_get_text (_tmp33_);
+ _tmp28_ = gtk_entry_get_text (_tmp27_);
#line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp35_ = uploadcomment;
+ _tmp29_ = uploadcomment;
#line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp36_ = publishing_piwigo_category_new_local (_tmp34_, 0, _tmp35_);
+ _tmp30_ = publishing_piwigo_category_new_local (_tmp28_, 0, _tmp29_);
#line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _publishing_piwigo_category_unref0 (_tmp32_->category);
+ _publishing_piwigo_category_unref0 (_tmp26_->category);
#line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp32_->category = _tmp36_;
-#line 9218 "PiwigoPublishing.c"
+ _tmp26_->category = _tmp30_;
+#line 9753 "PiwigoPublishing.c"
} else {
- gint _tmp37_;
- PublishingPiwigoPublishingParameters* _tmp38_;
- GtkEntry* _tmp39_;
+ gint _tmp31_;
+ PublishingPiwigoPublishingParameters* _tmp32_;
+ GtkEntry* _tmp33_;
+ const gchar* _tmp34_;
+ GeeList* _tmp35_;
+ gint _tmp36_;
+ gpointer _tmp37_;
+ PublishingPiwigoCategory* _tmp38_;
+ gint _tmp39_;
const gchar* _tmp40_;
- GeeList* _tmp41_;
- gint _tmp42_;
- gpointer _tmp43_;
- PublishingPiwigoCategory* _tmp44_;
- gint _tmp45_;
- const gchar* _tmp46_;
- PublishingPiwigoCategory* _tmp47_;
+ PublishingPiwigoCategory* _tmp41_;
#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp37_ = a;
+ _tmp31_ = a;
#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- a = _tmp37_ - 1;
+ a = _tmp31_ - 1;
#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp38_ = params;
+ _tmp32_ = params;
#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp39_ = self->priv->new_category_entry;
+ _tmp33_ = self->priv->new_category_entry;
#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp40_ = gtk_entry_get_text (_tmp39_);
+ _tmp34_ = gtk_entry_get_text (_tmp33_);
#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp41_ = self->priv->_existing_categories;
+ _tmp35_ = self->priv->_existing_categories;
#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp42_ = a;
+ _tmp36_ = a;
#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp43_ = gee_list_get (_tmp41_, _tmp42_);
+ _tmp37_ = gee_list_get (_tmp35_, _tmp36_);
#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp44_ = (PublishingPiwigoCategory*) _tmp43_;
+ _tmp38_ = (PublishingPiwigoCategory*) _tmp37_;
#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp45_ = _tmp44_->id;
+ _tmp39_ = _tmp38_->id;
#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp46_ = uploadcomment;
+ _tmp40_ = uploadcomment;
#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp47_ = publishing_piwigo_category_new_local (_tmp40_, _tmp45_, _tmp46_);
+ _tmp41_ = publishing_piwigo_category_new_local (_tmp34_, _tmp39_, _tmp40_);
#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _publishing_piwigo_category_unref0 (_tmp38_->category);
+ _publishing_piwigo_category_unref0 (_tmp32_->category);
#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp38_->category = _tmp47_;
+ _tmp32_->category = _tmp41_;
#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _publishing_piwigo_category_unref0 (_tmp44_);
-#line 9261 "PiwigoPublishing.c"
+ _publishing_piwigo_category_unref0 (_tmp38_);
+#line 9796 "PiwigoPublishing.c"
}
#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (uploadcomment);
-#line 9265 "PiwigoPublishing.c"
+#line 9800 "PiwigoPublishing.c"
} else {
- PublishingPiwigoPublishingParameters* _tmp48_;
- GeeList* _tmp49_;
- GtkComboBoxText* _tmp50_;
- gint _tmp51_;
- gpointer _tmp52_;
+ PublishingPiwigoPublishingParameters* _tmp42_;
+ GeeList* _tmp43_;
+ GtkComboBoxText* _tmp44_;
+ gpointer _tmp45_;
#line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp48_ = params;
+ _tmp42_ = params;
#line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp49_ = self->priv->_existing_categories;
+ _tmp43_ = self->priv->_existing_categories;
#line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp50_ = self->priv->existing_categories_combo;
+ _tmp44_ = self->priv->existing_categories_combo;
#line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp51_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_combo_box_get_type (), GtkComboBox));
+ _tmp45_ = gee_list_get (_tmp43_, gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_combo_box_get_type (), GtkComboBox)));
#line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp52_ = gee_list_get (_tmp49_, _tmp51_);
+ _publishing_piwigo_category_unref0 (_tmp42_->category);
#line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _publishing_piwigo_category_unref0 (_tmp48_->category);
-#line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp48_->category = (PublishingPiwigoCategory*) _tmp52_;
-#line 9286 "PiwigoPublishing.c"
+ _tmp42_->category = (PublishingPiwigoCategory*) _tmp45_;
+#line 9818 "PiwigoPublishing.c"
}
#line 1336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp53_ = params;
+ _tmp46_ = params;
#line 1336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp54_ = self->priv->strip_metadata_check;
+ _tmp47_ = self->priv->strip_metadata_check;
#line 1336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp55_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_signal_emit (self, publishing_piwigo_publishing_options_pane_signals[PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0, _tmp53_, _tmp55_);
+ g_signal_emit (self, publishing_piwigo_publishing_options_pane_signals[PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0, _tmp46_, gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, gtk_toggle_button_get_type (), GtkToggleButton)));
#line 1315 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_piwigo_publishing_parameters_unref0 (params);
-#line 9298 "PiwigoPublishing.c"
+#line 9828 "PiwigoPublishing.c"
}
-static void publishing_piwigo_publishing_options_pane_on_use_existing_radio_clicked (PublishingPiwigoPublishingOptionsPane* self) {
+static void
+publishing_piwigo_publishing_options_pane_on_use_existing_radio_clicked (PublishingPiwigoPublishingOptionsPane* self)
+{
GtkComboBoxText* _tmp0_;
GtkEntry* _tmp1_;
GtkLabel* _tmp2_;
@@ -9352,11 +9884,13 @@ static void publishing_piwigo_publishing_options_pane_on_use_existing_radio_clic
gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), FALSE);
#line 1348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_publishing_options_pane_update_publish_button_sensitivity (self);
-#line 9342 "PiwigoPublishing.c"
+#line 9874 "PiwigoPublishing.c"
}
-static void publishing_piwigo_publishing_options_pane_on_create_new_radio_clicked (PublishingPiwigoPublishingOptionsPane* self) {
+static void
+publishing_piwigo_publishing_options_pane_on_create_new_radio_clicked (PublishingPiwigoPublishingOptionsPane* self)
+{
GtkEntry* _tmp0_;
GtkLabel* _tmp1_;
GtkComboBoxText* _tmp2_;
@@ -9396,42 +9930,46 @@ static void publishing_piwigo_publishing_options_pane_on_create_new_radio_clicke
gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget));
#line 1359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_publishing_options_pane_update_publish_button_sensitivity (self);
-#line 9386 "PiwigoPublishing.c"
+#line 9920 "PiwigoPublishing.c"
}
-static void publishing_piwigo_publishing_options_pane_on_new_category_entry_changed (PublishingPiwigoPublishingOptionsPane* self) {
+static void
+publishing_piwigo_publishing_options_pane_on_new_category_entry_changed (PublishingPiwigoPublishingOptionsPane* self)
+{
#line 1362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
#line 1363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_publishing_options_pane_update_publish_button_sensitivity (self);
-#line 9395 "PiwigoPublishing.c"
+#line 9931 "PiwigoPublishing.c"
}
-static void publishing_piwigo_publishing_options_pane_on_existing_combo_changed (PublishingPiwigoPublishingOptionsPane* self) {
+static void
+publishing_piwigo_publishing_options_pane_on_existing_combo_changed (PublishingPiwigoPublishingOptionsPane* self)
+{
#line 1366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_publishing_options_pane_update_publish_button_sensitivity (self);
-#line 9404 "PiwigoPublishing.c"
+#line 9942 "PiwigoPublishing.c"
}
-static void publishing_piwigo_publishing_options_pane_update_publish_button_sensitivity (PublishingPiwigoPublishingOptionsPane* self) {
+static void
+publishing_piwigo_publishing_options_pane_update_publish_button_sensitivity (PublishingPiwigoPublishingOptionsPane* self)
+{
gchar* category_name = NULL;
GtkEntry* _tmp0_;
const gchar* _tmp1_;
gchar* _tmp2_;
gint a = 0;
GtkComboBoxText* _tmp3_;
- gint _tmp4_;
gchar* search_name = NULL;
- gint _tmp5_;
- gboolean _tmp18_ = FALSE;
- GtkRadioButton* _tmp19_;
- gboolean _tmp20_;
- GtkButton* _tmp25_;
+ gint _tmp4_;
+ gboolean _tmp17_ = FALSE;
+ GtkRadioButton* _tmp18_;
+ GtkButton* _tmp22_;
#line 1370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -9445,116 +9983,111 @@ static void publishing_piwigo_publishing_options_pane_update_publish_button_sens
#line 1372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp3_ = self->priv->within_existing_combo;
#line 1372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp4_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_combo_box_get_type (), GtkComboBox));
-#line 1372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- a = _tmp4_;
+ a = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_combo_box_get_type (), GtkComboBox));
#line 1374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp5_ = a;
+ _tmp4_ = a;
#line 1374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (_tmp5_ <= 0) {
-#line 9442 "PiwigoPublishing.c"
- const gchar* _tmp6_;
- gchar* _tmp7_;
+ if (_tmp4_ <= 0) {
+#line 9978 "PiwigoPublishing.c"
+ const gchar* _tmp5_;
+ gchar* _tmp6_;
#line 1375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp6_ = category_name;
+ _tmp5_ = category_name;
#line 1375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp7_ = g_strconcat ("/ ", _tmp6_, NULL);
+ _tmp6_ = g_strconcat ("/ ", _tmp5_, NULL);
#line 1375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (search_name);
#line 1375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- search_name = _tmp7_;
-#line 9453 "PiwigoPublishing.c"
+ search_name = _tmp6_;
+#line 9989 "PiwigoPublishing.c"
} else {
- gint _tmp8_;
- GeeList* _tmp9_;
- gint _tmp10_;
- gpointer _tmp11_;
- PublishingPiwigoCategory* _tmp12_;
- const gchar* _tmp13_;
+ gint _tmp7_;
+ GeeList* _tmp8_;
+ gint _tmp9_;
+ gpointer _tmp10_;
+ PublishingPiwigoCategory* _tmp11_;
+ const gchar* _tmp12_;
+ gchar* _tmp13_;
gchar* _tmp14_;
- gchar* _tmp15_;
- const gchar* _tmp16_;
- gchar* _tmp17_;
+ const gchar* _tmp15_;
+ gchar* _tmp16_;
#line 1377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp8_ = a;
+ _tmp7_ = a;
#line 1377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- a = _tmp8_ - 1;
+ a = _tmp7_ - 1;
#line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp9_ = self->priv->_existing_categories;
+ _tmp8_ = self->priv->_existing_categories;
#line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp10_ = a;
+ _tmp9_ = a;
#line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp11_ = gee_list_get (_tmp9_, _tmp10_);
+ _tmp10_ = gee_list_get (_tmp8_, _tmp9_);
#line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp12_ = (PublishingPiwigoCategory*) _tmp11_;
+ _tmp11_ = (PublishingPiwigoCategory*) _tmp10_;
#line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp13_ = _tmp12_->display_name;
+ _tmp12_ = _tmp11_->display_name;
#line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp14_ = g_strconcat (_tmp13_, "/ ", NULL);
+ _tmp13_ = g_strconcat (_tmp12_, "/ ", NULL);
#line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp15_ = _tmp14_;
+ _tmp14_ = _tmp13_;
#line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp16_ = category_name;
+ _tmp15_ = category_name;
#line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp17_ = g_strconcat (_tmp15_, _tmp16_, NULL);
+ _tmp16_ = g_strconcat (_tmp14_, _tmp15_, NULL);
#line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (search_name);
#line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- search_name = _tmp17_;
+ search_name = _tmp16_;
#line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_free0 (_tmp15_);
+ _g_free0 (_tmp14_);
#line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _publishing_piwigo_category_unref0 (_tmp12_);
-#line 9495 "PiwigoPublishing.c"
+ _publishing_piwigo_category_unref0 (_tmp11_);
+#line 10031 "PiwigoPublishing.c"
}
#line 1382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp19_ = self->priv->create_new_radio;
-#line 1382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp20_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_toggle_button_get_type (), GtkToggleButton));
+ _tmp18_ = self->priv->create_new_radio;
#line 1382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (_tmp20_) {
-#line 9503 "PiwigoPublishing.c"
- gboolean _tmp21_ = FALSE;
- const gchar* _tmp22_;
+ if (gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_toggle_button_get_type (), GtkToggleButton))) {
+#line 10037 "PiwigoPublishing.c"
+ gboolean _tmp19_ = FALSE;
+ const gchar* _tmp20_;
#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp22_ = category_name;
+ _tmp20_ = category_name;
#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (g_strcmp0 (_tmp22_, "") == 0) {
+ if (g_strcmp0 (_tmp20_, "") == 0) {
#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp21_ = TRUE;
-#line 9512 "PiwigoPublishing.c"
+ _tmp19_ = TRUE;
+#line 10046 "PiwigoPublishing.c"
} else {
- const gchar* _tmp23_;
- gboolean _tmp24_;
-#line 1385 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp23_ = search_name;
+ const gchar* _tmp21_;
#line 1385 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp24_ = publishing_piwigo_publishing_options_pane_category_already_exists (self, _tmp23_);
+ _tmp21_ = search_name;
#line 1385 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp21_ = _tmp24_;
-#line 9522 "PiwigoPublishing.c"
+ _tmp19_ = publishing_piwigo_publishing_options_pane_category_already_exists (self, _tmp21_);
+#line 10053 "PiwigoPublishing.c"
}
#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp18_ = _tmp21_;
-#line 9526 "PiwigoPublishing.c"
+ _tmp17_ = _tmp19_;
+#line 10057 "PiwigoPublishing.c"
} else {
#line 1382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp18_ = FALSE;
-#line 9530 "PiwigoPublishing.c"
+ _tmp17_ = FALSE;
+#line 10061 "PiwigoPublishing.c"
}
#line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp25_ = self->priv->publish_button;
+ _tmp22_ = self->priv->publish_button;
#line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget), !_tmp18_);
+ gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_widget_get_type (), GtkWidget), !_tmp17_);
#line 1370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (search_name);
#line 1370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (category_name);
-#line 9540 "PiwigoPublishing.c"
+#line 10071 "PiwigoPublishing.c"
}
-static void publishing_piwigo_publishing_options_pane_real_on_pane_installed (ShotwellPluginsCommonBuilderPane* base) {
+static void
+publishing_piwigo_publishing_options_pane_real_on_pane_installed (ShotwellPluginsCommonBuilderPane* base)
+{
PublishingPiwigoPublishingOptionsPane * self;
GtkButton* _tmp0_;
#line 1391 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -9575,190 +10108,190 @@ static void publishing_piwigo_publishing_options_pane_real_on_pane_installed (Sh
gtk_widget_set_can_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), TRUE);
#line 1400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_publishing_options_pane_update_publish_button_sensitivity (self);
-#line 9565 "PiwigoPublishing.c"
+#line 10098 "PiwigoPublishing.c"
}
-static gchar* publishing_piwigo_publishing_options_pane_get_common_comment_if_possible (PublishingPiwigoPiwigoPublisher* publisher) {
+static gchar*
+publishing_piwigo_publishing_options_pane_get_common_comment_if_possible (PublishingPiwigoPiwigoPublisher* publisher)
+{
gchar* result = NULL;
SpitPublishingPublishable** publishables = NULL;
- PublishingPiwigoPiwigoPublisher* _tmp0_;
+ SpitPublishingPluginHost* _tmp0_;
SpitPublishingPluginHost* _tmp1_;
- SpitPublishingPluginHost* _tmp2_;
- gint _tmp3_;
+ gint _tmp2_;
+ SpitPublishingPublishable** _tmp3_;
SpitPublishingPublishable** _tmp4_;
- SpitPublishingPublishable** _tmp5_;
- gint _tmp5__length1;
+ gint _tmp4__length1;
gint publishables_length1;
gint _publishables_size_;
gchar* common = NULL;
- gchar* _tmp6_;
+ gchar* _tmp5_;
gboolean isfirst = FALSE;
- SpitPublishingPublishable** _tmp7_;
- gint _tmp7__length1;
- const gchar* _tmp19_;
+ SpitPublishingPublishable** _tmp6_;
+ gint _tmp6__length1;
+ const gchar* _tmp18_;
#line 1403 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (publisher), NULL);
#line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp0_ = publisher;
+ _tmp0_ = publishing_piwigo_piwigo_publisher_get_host (publisher);
#line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp1_ = publishing_piwigo_piwigo_publisher_get_host (_tmp0_);
-#line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp2_ = _tmp1_;
+ _tmp1_ = _tmp0_;
#line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp4_ = spit_publishing_plugin_host_get_publishables (_tmp2_, &_tmp3_);
+ _tmp3_ = spit_publishing_plugin_host_get_publishables (_tmp1_, &_tmp2_);
#line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp5_ = _tmp4_;
+ _tmp4_ = _tmp3_;
#line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp5__length1 = _tmp3_;
+ _tmp4__length1 = _tmp2_;
#line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_object_unref0 (_tmp2_);
+ _g_object_unref0 (_tmp1_);
#line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- publishables = _tmp5_;
+ publishables = _tmp4_;
#line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- publishables_length1 = _tmp5__length1;
+ publishables_length1 = _tmp4__length1;
#line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishables_size_ = publishables_length1;
#line 1407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp6_ = g_strdup ("");
+ _tmp5_ = g_strdup ("");
#line 1407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- common = _tmp6_;
+ common = _tmp5_;
#line 1408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
isfirst = TRUE;
#line 1409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp7_ = publishables;
+ _tmp6_ = publishables;
#line 1409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp7__length1 = publishables_length1;
+ _tmp6__length1 = publishables_length1;
#line 1409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (_tmp7_ != NULL) {
-#line 9621 "PiwigoPublishing.c"
- SpitPublishingPublishable** _tmp8_;
- gint _tmp8__length1;
+ if (_tmp6_ != NULL) {
+#line 10153 "PiwigoPublishing.c"
+ SpitPublishingPublishable** _tmp7_;
+ gint _tmp7__length1;
#line 1410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp8_ = publishables;
+ _tmp7_ = publishables;
#line 1410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp8__length1 = publishables_length1;
-#line 9628 "PiwigoPublishing.c"
+ _tmp7__length1 = publishables_length1;
+#line 10160 "PiwigoPublishing.c"
{
SpitPublishingPublishable** pub_collection = NULL;
gint pub_collection_length1 = 0;
gint _pub_collection_size_ = 0;
gint pub_it = 0;
#line 1410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- pub_collection = _tmp8_;
+ pub_collection = _tmp7_;
#line 1410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- pub_collection_length1 = _tmp8__length1;
+ pub_collection_length1 = _tmp7__length1;
#line 1410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- for (pub_it = 0; pub_it < _tmp8__length1; pub_it = pub_it + 1) {
-#line 9640 "PiwigoPublishing.c"
- SpitPublishingPublishable* _tmp9_;
+ for (pub_it = 0; pub_it < _tmp7__length1; pub_it = pub_it + 1) {
+#line 10172 "PiwigoPublishing.c"
+ SpitPublishingPublishable* _tmp8_;
SpitPublishingPublishable* pub = NULL;
#line 1410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp9_ = _g_object_ref0 (pub_collection[pub_it]);
+ _tmp8_ = _g_object_ref0 (pub_collection[pub_it]);
#line 1410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- pub = _tmp9_;
-#line 9647 "PiwigoPublishing.c"
+ pub = _tmp8_;
+#line 10179 "PiwigoPublishing.c"
{
gchar* cur = NULL;
- SpitPublishingPublishable* _tmp10_;
- gchar* _tmp11_;
- const gchar* _tmp12_;
- gboolean _tmp13_;
+ SpitPublishingPublishable* _tmp9_;
+ gchar* _tmp10_;
+ const gchar* _tmp11_;
+ gboolean _tmp12_;
#line 1411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp10_ = pub;
+ _tmp9_ = pub;
#line 1411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp11_ = spit_publishing_publishable_get_param_string (_tmp10_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_EVENTCOMMENT);
+ _tmp10_ = spit_publishing_publishable_get_param_string (_tmp9_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_EVENTCOMMENT);
#line 1411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- cur = _tmp11_;
+ cur = _tmp10_;
#line 1413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp12_ = cur;
+ _tmp11_ = cur;
#line 1413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (_tmp12_ == NULL) {
+ if (_tmp11_ == NULL) {
#line 1414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (cur);
#line 1414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_object_unref0 (pub);
#line 1414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
continue;
-#line 9670 "PiwigoPublishing.c"
+#line 10202 "PiwigoPublishing.c"
}
#line 1417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp13_ = isfirst;
+ _tmp12_ = isfirst;
#line 1417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (_tmp13_) {
-#line 9676 "PiwigoPublishing.c"
- const gchar* _tmp14_;
- gchar* _tmp15_;
+ if (_tmp12_) {
+#line 10208 "PiwigoPublishing.c"
+ const gchar* _tmp13_;
+ gchar* _tmp14_;
#line 1418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp14_ = cur;
+ _tmp13_ = cur;
#line 1418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp15_ = g_strdup (_tmp14_);
+ _tmp14_ = g_strdup (_tmp13_);
#line 1418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (common);
#line 1418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- common = _tmp15_;
+ common = _tmp14_;
#line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
isfirst = FALSE;
-#line 9689 "PiwigoPublishing.c"
+#line 10221 "PiwigoPublishing.c"
} else {
+ const gchar* _tmp15_;
const gchar* _tmp16_;
- const gchar* _tmp17_;
#line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp16_ = cur;
+ _tmp15_ = cur;
#line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp17_ = common;
+ _tmp16_ = common;
#line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (g_strcmp0 (_tmp16_, _tmp17_) != 0) {
-#line 9699 "PiwigoPublishing.c"
- gchar* _tmp18_;
+ if (g_strcmp0 (_tmp15_, _tmp16_) != 0) {
+#line 10231 "PiwigoPublishing.c"
+ gchar* _tmp17_;
#line 1422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp18_ = g_strdup ("");
+ _tmp17_ = g_strdup ("");
#line 1422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (common);
#line 1422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- common = _tmp18_;
+ common = _tmp17_;
#line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (cur);
#line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_object_unref0 (pub);
#line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
break;
-#line 9713 "PiwigoPublishing.c"
+#line 10245 "PiwigoPublishing.c"
}
}
#line 1410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (cur);
#line 1410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_object_unref0 (pub);
-#line 9720 "PiwigoPublishing.c"
+#line 10252 "PiwigoPublishing.c"
}
}
}
}
#line 1428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp19_ = common;
+ _tmp18_ = common;
#line 1428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_debug ("PiwigoPublishing.vala:1428: PiwigoConnector: found common event commen" \
-"t %s\n", _tmp19_);
+"t %s\n", _tmp18_);
#line 1429 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
result = common;
#line 1429 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishables = (_vala_array_free (publishables, publishables_length1, (GDestroyNotify) g_object_unref), NULL);
#line 1429 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 9735 "PiwigoPublishing.c"
+#line 10267 "PiwigoPublishing.c"
}
-static void publishing_piwigo_publishing_options_pane_create_categories_combo (PublishingPiwigoPublishingOptionsPane* self) {
+static void
+publishing_piwigo_publishing_options_pane_create_categories_combo (PublishingPiwigoPublishingOptionsPane* self)
+{
GeeList* _tmp14_;
gboolean _tmp15_;
gboolean _tmp16_;
- const gchar* _tmp30_;
- gboolean _tmp31_;
+ const gchar* _tmp29_;
#line 1432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 9747 "PiwigoPublishing.c"
+#line 10280 "PiwigoPublishing.c"
{
GeeList* _cat_list = NULL;
GeeList* _tmp0_;
@@ -9786,7 +10319,7 @@ static void publishing_piwigo_publishing_options_pane_create_categories_combo (P
_cat_index = -1;
#line 1433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
while (TRUE) {
-#line 9775 "PiwigoPublishing.c"
+#line 10308 "PiwigoPublishing.c"
gint _tmp5_;
gint _tmp6_;
gint _tmp7_;
@@ -9809,7 +10342,7 @@ static void publishing_piwigo_publishing_options_pane_create_categories_combo (P
if (!(_tmp6_ < _tmp7_)) {
#line 1433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
break;
-#line 9798 "PiwigoPublishing.c"
+#line 10331 "PiwigoPublishing.c"
}
#line 1433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp8_ = _cat_list;
@@ -9829,11 +10362,11 @@ static void publishing_piwigo_publishing_options_pane_create_categories_combo (P
gtk_combo_box_text_append_text (_tmp11_, _tmp13_);
#line 1433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_piwigo_category_unref0 (cat);
-#line 9818 "PiwigoPublishing.c"
+#line 10351 "PiwigoPublishing.c"
}
#line 1433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_object_unref0 (_cat_list);
-#line 9822 "PiwigoPublishing.c"
+#line 10355 "PiwigoPublishing.c"
}
#line 1436 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp14_ = self->priv->_existing_categories;
@@ -9843,7 +10376,7 @@ static void publishing_piwigo_publishing_options_pane_create_categories_combo (P
_tmp16_ = _tmp15_;
#line 1436 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_tmp16_) {
-#line 9832 "PiwigoPublishing.c"
+#line 10365 "PiwigoPublishing.c"
GtkComboBoxText* _tmp17_;
GtkRadioButton* _tmp18_;
GtkRadioButton* _tmp19_;
@@ -9874,63 +10407,60 @@ static void publishing_piwigo_publishing_options_pane_create_categories_combo (P
_tmp22_ = self->priv->new_category_entry;
#line 1443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_widget_get_type (), GtkWidget));
-#line 9863 "PiwigoPublishing.c"
+#line 10396 "PiwigoPublishing.c"
} else {
gint last_category_index = 0;
gint _tmp23_;
- gint _tmp24_;
- GtkComboBoxText* _tmp25_;
- gint _tmp26_;
- GtkEntry* _tmp27_;
- GtkTextView* _tmp28_;
- GtkLabel* _tmp29_;
+ GtkComboBoxText* _tmp24_;
+ gint _tmp25_;
+ GtkEntry* _tmp26_;
+ GtkTextView* _tmp27_;
+ GtkLabel* _tmp28_;
#line 1445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp23_ = self->priv->_last_category;
#line 1445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp24_ = publishing_piwigo_publishing_options_pane_find_category_index (self, _tmp23_);
-#line 1445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- last_category_index = _tmp24_;
+ last_category_index = publishing_piwigo_publishing_options_pane_find_category_index (self, _tmp23_);
#line 1446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp25_ = self->priv->existing_categories_combo;
+ _tmp24_ = self->priv->existing_categories_combo;
#line 1446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp26_ = last_category_index;
+ _tmp25_ = last_category_index;
#line 1446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_combo_box_get_type (), GtkComboBox), _tmp26_);
+ gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_combo_box_get_type (), GtkComboBox), _tmp25_);
#line 1447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp27_ = self->priv->new_category_entry;
+ _tmp26_ = self->priv->new_category_entry;
#line 1447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_widget_get_type (), GtkWidget), FALSE);
+ gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_widget_get_type (), GtkWidget), FALSE);
#line 1448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp28_ = self->priv->album_comment;
+ _tmp27_ = self->priv->album_comment;
#line 1448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget), FALSE);
+ gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_widget_get_type (), GtkWidget), FALSE);
#line 1449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp29_ = self->priv->album_comment_label;
+ _tmp28_ = self->priv->album_comment_label;
#line 1449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 9897 "PiwigoPublishing.c"
+ gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 10427 "PiwigoPublishing.c"
}
#line 1451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp30_ = publishing_piwigo_publishing_options_pane_DEFAULT_CATEGORY_NAME;
+ _tmp29_ = publishing_piwigo_publishing_options_pane_DEFAULT_CATEGORY_NAME;
#line 1451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp31_ = publishing_piwigo_publishing_options_pane_category_already_exists (self, _tmp30_);
-#line 1451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (!_tmp31_) {
-#line 9905 "PiwigoPublishing.c"
- GtkEntry* _tmp32_;
- const gchar* _tmp33_;
+ if (!publishing_piwigo_publishing_options_pane_category_already_exists (self, _tmp29_)) {
+#line 10433 "PiwigoPublishing.c"
+ GtkEntry* _tmp30_;
+ const gchar* _tmp31_;
#line 1452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp32_ = self->priv->new_category_entry;
+ _tmp30_ = self->priv->new_category_entry;
#line 1452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp33_ = publishing_piwigo_publishing_options_pane_DEFAULT_CATEGORY_NAME;
+ _tmp31_ = publishing_piwigo_publishing_options_pane_DEFAULT_CATEGORY_NAME;
#line 1452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- gtk_entry_set_text (_tmp32_, _tmp33_);
-#line 9914 "PiwigoPublishing.c"
+ gtk_entry_set_text (_tmp30_, _tmp31_);
+#line 10442 "PiwigoPublishing.c"
}
}
-static void publishing_piwigo_publishing_options_pane_create_within_categories_combo (PublishingPiwigoPublishingOptionsPane* self) {
+static void
+publishing_piwigo_publishing_options_pane_create_within_categories_combo (PublishingPiwigoPublishingOptionsPane* self)
+{
GtkComboBoxText* _tmp0_;
GtkLabel* _tmp15_;
GtkComboBoxText* _tmp16_;
@@ -9941,7 +10471,7 @@ static void publishing_piwigo_publishing_options_pane_create_within_categories_c
_tmp0_ = self->priv->within_existing_combo;
#line 1457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
gtk_combo_box_text_append_text (_tmp0_, "/ ");
-#line 9930 "PiwigoPublishing.c"
+#line 10460 "PiwigoPublishing.c"
{
GeeList* _cat_list = NULL;
GeeList* _tmp1_;
@@ -9969,7 +10499,7 @@ static void publishing_piwigo_publishing_options_pane_create_within_categories_c
_cat_index = -1;
#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
while (TRUE) {
-#line 9958 "PiwigoPublishing.c"
+#line 10488 "PiwigoPublishing.c"
gint _tmp6_;
gint _tmp7_;
gint _tmp8_;
@@ -9992,7 +10522,7 @@ static void publishing_piwigo_publishing_options_pane_create_within_categories_c
if (!(_tmp7_ < _tmp8_)) {
#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
break;
-#line 9981 "PiwigoPublishing.c"
+#line 10511 "PiwigoPublishing.c"
}
#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp9_ = _cat_list;
@@ -10012,11 +10542,11 @@ static void publishing_piwigo_publishing_options_pane_create_within_categories_c
gtk_combo_box_text_append_text (_tmp12_, _tmp14_);
#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_piwigo_category_unref0 (cat);
-#line 10001 "PiwigoPublishing.c"
+#line 10531 "PiwigoPublishing.c"
}
#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_object_unref0 (_cat_list);
-#line 10005 "PiwigoPublishing.c"
+#line 10535 "PiwigoPublishing.c"
}
#line 1462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp15_ = self->priv->within_existing_label;
@@ -10030,24 +10560,25 @@ static void publishing_piwigo_publishing_options_pane_create_within_categories_c
_tmp17_ = self->priv->within_existing_combo;
#line 1464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 10019 "PiwigoPublishing.c"
+#line 10549 "PiwigoPublishing.c"
}
-static void publishing_piwigo_publishing_options_pane_create_permissions_combo (PublishingPiwigoPublishingOptionsPane* self) {
+static void
+publishing_piwigo_publishing_options_pane_create_permissions_combo (PublishingPiwigoPublishingOptionsPane* self)
+{
PublishingPiwigoPermissionLevel** _tmp0_;
gint _tmp0__length1;
gint last_permission_level_index = 0;
gint _tmp5_;
gint _tmp6_;
- gint _tmp7_;
#line 1467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
#line 1468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = self->priv->perm_levels;
#line 1468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0__length1 = self->priv->perm_levels_length1;
-#line 10036 "PiwigoPublishing.c"
+#line 10567 "PiwigoPublishing.c"
{
PublishingPiwigoPermissionLevel** perm_collection = NULL;
gint perm_collection_length1 = 0;
@@ -10059,14 +10590,14 @@ static void publishing_piwigo_publishing_options_pane_create_permissions_combo (
perm_collection_length1 = _tmp0__length1;
#line 1468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
for (perm_it = 0; perm_it < _tmp0__length1; perm_it = perm_it + 1) {
-#line 10048 "PiwigoPublishing.c"
+#line 10579 "PiwigoPublishing.c"
PublishingPiwigoPermissionLevel* _tmp1_;
PublishingPiwigoPermissionLevel* perm = NULL;
#line 1468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = _publishing_piwigo_permission_level_ref0 (perm_collection[perm_it]);
#line 1468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
perm = _tmp1_;
-#line 10055 "PiwigoPublishing.c"
+#line 10586 "PiwigoPublishing.c"
{
GtkComboBoxText* _tmp2_;
PublishingPiwigoPermissionLevel* _tmp3_;
@@ -10081,55 +10612,54 @@ static void publishing_piwigo_publishing_options_pane_create_permissions_combo (
gtk_combo_box_text_append_text (_tmp2_, _tmp4_);
#line 1468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_piwigo_permission_level_unref0 (perm);
-#line 10070 "PiwigoPublishing.c"
+#line 10601 "PiwigoPublishing.c"
}
}
}
#line 1471 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp5_ = self->priv->_last_permission_level;
#line 1471 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp6_ = publishing_piwigo_publishing_options_pane_find_permission_level_index (self, _tmp5_);
-#line 1471 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- last_permission_level_index = _tmp6_;
+ last_permission_level_index = publishing_piwigo_publishing_options_pane_find_permission_level_index (self, _tmp5_);
#line 1472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp7_ = last_permission_level_index;
+ _tmp6_ = last_permission_level_index;
#line 1472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (_tmp7_ < 0) {
-#line 10084 "PiwigoPublishing.c"
- GtkComboBoxText* _tmp8_;
+ if (_tmp6_ < 0) {
+#line 10613 "PiwigoPublishing.c"
+ GtkComboBoxText* _tmp7_;
#line 1473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp8_ = self->priv->perms_combo;
+ _tmp7_ = self->priv->perms_combo;
#line 1473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_combo_box_get_type (), GtkComboBox), 0);
-#line 10090 "PiwigoPublishing.c"
+ gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_combo_box_get_type (), GtkComboBox), 0);
+#line 10619 "PiwigoPublishing.c"
} else {
- GtkComboBoxText* _tmp9_;
- gint _tmp10_;
+ GtkComboBoxText* _tmp8_;
+ gint _tmp9_;
#line 1475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp9_ = self->priv->perms_combo;
+ _tmp8_ = self->priv->perms_combo;
#line 1475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp10_ = last_permission_level_index;
+ _tmp9_ = last_permission_level_index;
#line 1475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_combo_box_get_type (), GtkComboBox), _tmp10_);
-#line 10100 "PiwigoPublishing.c"
+ gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_combo_box_get_type (), GtkComboBox), _tmp9_);
+#line 10629 "PiwigoPublishing.c"
}
}
-static void publishing_piwigo_publishing_options_pane_create_size_combo (PublishingPiwigoPublishingOptionsPane* self) {
+static void
+publishing_piwigo_publishing_options_pane_create_size_combo (PublishingPiwigoPublishingOptionsPane* self)
+{
PublishingPiwigoSizeEntry** _tmp0_;
gint _tmp0__length1;
gint last_size_index = 0;
gint _tmp5_;
gint _tmp6_;
- gint _tmp7_;
#line 1479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
#line 1480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = self->priv->photo_sizes;
#line 1480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0__length1 = self->priv->photo_sizes_length1;
-#line 10118 "PiwigoPublishing.c"
+#line 10648 "PiwigoPublishing.c"
{
PublishingPiwigoSizeEntry** size_collection = NULL;
gint size_collection_length1 = 0;
@@ -10141,14 +10671,14 @@ static void publishing_piwigo_publishing_options_pane_create_size_combo (Publish
size_collection_length1 = _tmp0__length1;
#line 1480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
for (size_it = 0; size_it < _tmp0__length1; size_it = size_it + 1) {
-#line 10130 "PiwigoPublishing.c"
+#line 10660 "PiwigoPublishing.c"
PublishingPiwigoSizeEntry* _tmp1_;
PublishingPiwigoSizeEntry* size = NULL;
#line 1480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = _publishing_piwigo_size_entry_ref0 (size_collection[size_it]);
#line 1480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
size = _tmp1_;
-#line 10137 "PiwigoPublishing.c"
+#line 10667 "PiwigoPublishing.c"
{
GtkComboBoxText* _tmp2_;
PublishingPiwigoSizeEntry* _tmp3_;
@@ -10163,64 +10693,62 @@ static void publishing_piwigo_publishing_options_pane_create_size_combo (Publish
gtk_combo_box_text_append_text (_tmp2_, _tmp4_);
#line 1480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_piwigo_size_entry_unref0 (size);
-#line 10152 "PiwigoPublishing.c"
+#line 10682 "PiwigoPublishing.c"
}
}
}
#line 1483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp5_ = self->priv->_last_photo_size;
#line 1483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp6_ = publishing_piwigo_publishing_options_pane_find_size_index (self, _tmp5_);
-#line 1483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- last_size_index = _tmp6_;
+ last_size_index = publishing_piwigo_publishing_options_pane_find_size_index (self, _tmp5_);
#line 1484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp7_ = last_size_index;
+ _tmp6_ = last_size_index;
#line 1484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (_tmp7_ < 0) {
-#line 10166 "PiwigoPublishing.c"
- GtkComboBoxText* _tmp8_;
- gint _tmp9_;
-#line 1485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp8_ = self->priv->size_combo;
+ if (_tmp6_ < 0) {
+#line 10694 "PiwigoPublishing.c"
+ GtkComboBoxText* _tmp7_;
#line 1485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp9_ = publishing_piwigo_publishing_options_pane_find_size_index (self, PUBLISHING_PIWIGO_ORIGINAL_SIZE);
+ _tmp7_ = self->priv->size_combo;
#line 1485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_combo_box_get_type (), GtkComboBox), _tmp9_);
-#line 10175 "PiwigoPublishing.c"
+ gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_combo_box_get_type (), GtkComboBox), publishing_piwigo_publishing_options_pane_find_size_index (self, PUBLISHING_PIWIGO_ORIGINAL_SIZE));
+#line 10700 "PiwigoPublishing.c"
} else {
- GtkComboBoxText* _tmp10_;
- gint _tmp11_;
+ GtkComboBoxText* _tmp8_;
+ gint _tmp9_;
#line 1487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp10_ = self->priv->size_combo;
+ _tmp8_ = self->priv->size_combo;
#line 1487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp11_ = last_size_index;
+ _tmp9_ = last_size_index;
#line 1487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_combo_box_get_type (), GtkComboBox), _tmp11_);
-#line 10185 "PiwigoPublishing.c"
+ gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_combo_box_get_type (), GtkComboBox), _tmp9_);
+#line 10710 "PiwigoPublishing.c"
}
}
-static gint publishing_piwigo_publishing_options_pane_find_category_index (PublishingPiwigoPublishingOptionsPane* self, gint category_id) {
+static gint
+publishing_piwigo_publishing_options_pane_find_category_index (PublishingPiwigoPublishingOptionsPane* self,
+ gint category_id)
+{
gint result = 0;
gint _result_ = 0;
#line 1491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), 0);
#line 1492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_result_ = 0;
-#line 10197 "PiwigoPublishing.c"
+#line 10725 "PiwigoPublishing.c"
{
gint i = 0;
#line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
i = 0;
-#line 10202 "PiwigoPublishing.c"
+#line 10730 "PiwigoPublishing.c"
{
gboolean _tmp0_ = FALSE;
#line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = TRUE;
#line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
while (TRUE) {
-#line 10209 "PiwigoPublishing.c"
+#line 10737 "PiwigoPublishing.c"
gint _tmp2_;
GeeList* _tmp3_;
gint _tmp4_;
@@ -10230,17 +10758,16 @@ static gint publishing_piwigo_publishing_options_pane_find_category_index (Publi
gpointer _tmp8_;
PublishingPiwigoCategory* _tmp9_;
gint _tmp10_;
- gint _tmp11_;
- gboolean _tmp12_;
+ gboolean _tmp11_;
#line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (!_tmp0_) {
-#line 10223 "PiwigoPublishing.c"
+#line 10750 "PiwigoPublishing.c"
gint _tmp1_;
#line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = i;
#line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
i = _tmp1_ + 1;
-#line 10229 "PiwigoPublishing.c"
+#line 10756 "PiwigoPublishing.c"
}
#line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = FALSE;
@@ -10256,7 +10783,7 @@ static gint publishing_piwigo_publishing_options_pane_find_category_index (Publi
if (!(_tmp2_ < _tmp5_)) {
#line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
break;
-#line 10245 "PiwigoPublishing.c"
+#line 10772 "PiwigoPublishing.c"
}
#line 1494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp6_ = self->priv->_existing_categories;
@@ -10269,22 +10796,20 @@ static gint publishing_piwigo_publishing_options_pane_find_category_index (Publi
#line 1494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp10_ = _tmp9_->id;
#line 1494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp11_ = category_id;
-#line 1494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp12_ = _tmp10_ == _tmp11_;
+ _tmp11_ = _tmp10_ == category_id;
#line 1494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_piwigo_category_unref0 (_tmp9_);
#line 1494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (_tmp12_) {
-#line 10265 "PiwigoPublishing.c"
- gint _tmp13_;
+ if (_tmp11_) {
+#line 10790 "PiwigoPublishing.c"
+ gint _tmp12_;
#line 1495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp13_ = i;
+ _tmp12_ = i;
#line 1495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _result_ = _tmp13_;
+ _result_ = _tmp12_;
#line 1496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
break;
-#line 10273 "PiwigoPublishing.c"
+#line 10798 "PiwigoPublishing.c"
}
}
}
@@ -10293,30 +10818,33 @@ static gint publishing_piwigo_publishing_options_pane_find_category_index (Publi
result = _result_;
#line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 10282 "PiwigoPublishing.c"
+#line 10807 "PiwigoPublishing.c"
}
-static gint publishing_piwigo_publishing_options_pane_find_permission_level_index (PublishingPiwigoPublishingOptionsPane* self, gint permission_level_id) {
+static gint
+publishing_piwigo_publishing_options_pane_find_permission_level_index (PublishingPiwigoPublishingOptionsPane* self,
+ gint permission_level_id)
+{
gint result = 0;
gint _result_ = 0;
#line 1502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), 0);
#line 1503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_result_ = -1;
-#line 10293 "PiwigoPublishing.c"
+#line 10821 "PiwigoPublishing.c"
{
gint i = 0;
#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
i = 0;
-#line 10298 "PiwigoPublishing.c"
+#line 10826 "PiwigoPublishing.c"
{
gboolean _tmp0_ = FALSE;
#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = TRUE;
#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
while (TRUE) {
-#line 10305 "PiwigoPublishing.c"
+#line 10833 "PiwigoPublishing.c"
gint _tmp2_;
PublishingPiwigoPermissionLevel** _tmp3_;
gint _tmp3__length1;
@@ -10325,16 +10853,15 @@ static gint publishing_piwigo_publishing_options_pane_find_permission_level_inde
gint _tmp5_;
PublishingPiwigoPermissionLevel* _tmp6_;
gint _tmp7_;
- gint _tmp8_;
#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (!_tmp0_) {
-#line 10317 "PiwigoPublishing.c"
+#line 10844 "PiwigoPublishing.c"
gint _tmp1_;
#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = i;
#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
i = _tmp1_ + 1;
-#line 10323 "PiwigoPublishing.c"
+#line 10850 "PiwigoPublishing.c"
}
#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = FALSE;
@@ -10348,7 +10875,7 @@ static gint publishing_piwigo_publishing_options_pane_find_permission_level_inde
if (!(_tmp2_ < _tmp3__length1)) {
#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
break;
-#line 10337 "PiwigoPublishing.c"
+#line 10864 "PiwigoPublishing.c"
}
#line 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp4_ = self->priv->perm_levels;
@@ -10361,18 +10888,16 @@ static gint publishing_piwigo_publishing_options_pane_find_permission_level_inde
#line 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp7_ = _tmp6_->id;
#line 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp8_ = permission_level_id;
-#line 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (_tmp7_ == _tmp8_) {
-#line 10353 "PiwigoPublishing.c"
- gint _tmp9_;
+ if (_tmp7_ == permission_level_id) {
+#line 10878 "PiwigoPublishing.c"
+ gint _tmp8_;
#line 1506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp9_ = i;
+ _tmp8_ = i;
#line 1506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _result_ = _tmp9_;
+ _result_ = _tmp8_;
#line 1507 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
break;
-#line 10361 "PiwigoPublishing.c"
+#line 10886 "PiwigoPublishing.c"
}
}
}
@@ -10381,30 +10906,33 @@ static gint publishing_piwigo_publishing_options_pane_find_permission_level_inde
result = _result_;
#line 1510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 10370 "PiwigoPublishing.c"
+#line 10895 "PiwigoPublishing.c"
}
-static gint publishing_piwigo_publishing_options_pane_find_size_index (PublishingPiwigoPublishingOptionsPane* self, gint size_id) {
+static gint
+publishing_piwigo_publishing_options_pane_find_size_index (PublishingPiwigoPublishingOptionsPane* self,
+ gint size_id)
+{
gint result = 0;
gint _result_ = 0;
#line 1513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), 0);
#line 1514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_result_ = -1;
-#line 10381 "PiwigoPublishing.c"
+#line 10909 "PiwigoPublishing.c"
{
gint i = 0;
#line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
i = 0;
-#line 10386 "PiwigoPublishing.c"
+#line 10914 "PiwigoPublishing.c"
{
gboolean _tmp0_ = FALSE;
#line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = TRUE;
#line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
while (TRUE) {
-#line 10393 "PiwigoPublishing.c"
+#line 10921 "PiwigoPublishing.c"
gint _tmp2_;
PublishingPiwigoSizeEntry** _tmp3_;
gint _tmp3__length1;
@@ -10413,16 +10941,15 @@ static gint publishing_piwigo_publishing_options_pane_find_size_index (Publishin
gint _tmp5_;
PublishingPiwigoSizeEntry* _tmp6_;
gint _tmp7_;
- gint _tmp8_;
#line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (!_tmp0_) {
-#line 10405 "PiwigoPublishing.c"
+#line 10932 "PiwigoPublishing.c"
gint _tmp1_;
#line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = i;
#line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
i = _tmp1_ + 1;
-#line 10411 "PiwigoPublishing.c"
+#line 10938 "PiwigoPublishing.c"
}
#line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = FALSE;
@@ -10436,7 +10963,7 @@ static gint publishing_piwigo_publishing_options_pane_find_size_index (Publishin
if (!(_tmp2_ < _tmp3__length1)) {
#line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
break;
-#line 10425 "PiwigoPublishing.c"
+#line 10952 "PiwigoPublishing.c"
}
#line 1516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp4_ = self->priv->photo_sizes;
@@ -10449,18 +10976,16 @@ static gint publishing_piwigo_publishing_options_pane_find_size_index (Publishin
#line 1516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp7_ = _tmp6_->id;
#line 1516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp8_ = size_id;
-#line 1516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (_tmp7_ == _tmp8_) {
-#line 10441 "PiwigoPublishing.c"
- gint _tmp9_;
+ if (_tmp7_ == size_id) {
+#line 10966 "PiwigoPublishing.c"
+ gint _tmp8_;
#line 1517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp9_ = i;
+ _tmp8_ = i;
#line 1517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _result_ = _tmp9_;
+ _result_ = _tmp8_;
#line 1518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
break;
-#line 10449 "PiwigoPublishing.c"
+#line 10974 "PiwigoPublishing.c"
}
}
}
@@ -10469,11 +10994,14 @@ static gint publishing_piwigo_publishing_options_pane_find_size_index (Publishin
result = _result_;
#line 1521 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 10458 "PiwigoPublishing.c"
+#line 10983 "PiwigoPublishing.c"
}
-static gboolean publishing_piwigo_publishing_options_pane_category_already_exists (PublishingPiwigoPublishingOptionsPane* self, const gchar* category_name) {
+static gboolean
+publishing_piwigo_publishing_options_pane_category_already_exists (PublishingPiwigoPublishingOptionsPane* self,
+ const gchar* category_name)
+{
gboolean result = FALSE;
gboolean _result_ = FALSE;
#line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -10482,7 +11010,7 @@ static gboolean publishing_piwigo_publishing_options_pane_category_already_exist
g_return_val_if_fail (category_name != NULL, FALSE);
#line 1525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_result_ = FALSE;
-#line 10471 "PiwigoPublishing.c"
+#line 10999 "PiwigoPublishing.c"
{
GeeList* _category_list = NULL;
GeeList* _tmp0_;
@@ -10510,7 +11038,7 @@ static gboolean publishing_piwigo_publishing_options_pane_category_already_exist
_category_index = -1;
#line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
while (TRUE) {
-#line 10499 "PiwigoPublishing.c"
+#line 11027 "PiwigoPublishing.c"
gint _tmp5_;
gint _tmp6_;
gint _tmp7_;
@@ -10522,8 +11050,7 @@ static gboolean publishing_piwigo_publishing_options_pane_category_already_exist
const gchar* _tmp12_;
gchar* _tmp13_;
gchar* _tmp14_;
- const gchar* _tmp15_;
- gboolean _tmp16_;
+ gboolean _tmp15_;
#line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp5_ = _category_index;
#line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -10536,7 +11063,7 @@ static gboolean publishing_piwigo_publishing_options_pane_category_already_exist
if (!(_tmp6_ < _tmp7_)) {
#line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
break;
-#line 10525 "PiwigoPublishing.c"
+#line 11052 "PiwigoPublishing.c"
}
#line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp8_ = _category_list;
@@ -10555,38 +11082,38 @@ static gboolean publishing_piwigo_publishing_options_pane_category_already_exist
#line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp14_ = _tmp13_;
#line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp15_ = category_name;
-#line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp16_ = g_strcmp0 (_tmp14_, _tmp15_) == 0;
+ _tmp15_ = g_strcmp0 (_tmp14_, category_name) == 0;
#line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (_tmp14_);
#line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (_tmp16_) {
+ if (_tmp15_) {
#line 1528 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_result_ = TRUE;
#line 1529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_piwigo_category_unref0 (category);
#line 1529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
break;
-#line 10557 "PiwigoPublishing.c"
+#line 11082 "PiwigoPublishing.c"
}
#line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_piwigo_category_unref0 (category);
-#line 10561 "PiwigoPublishing.c"
+#line 11086 "PiwigoPublishing.c"
}
#line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_object_unref0 (_category_list);
-#line 10565 "PiwigoPublishing.c"
+#line 11090 "PiwigoPublishing.c"
}
#line 1532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
result = _result_;
#line 1532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 10571 "PiwigoPublishing.c"
+#line 11096 "PiwigoPublishing.c"
}
-static gint publishing_piwigo_publishing_options_pane_get_last_category (PublishingPiwigoPublishingOptionsPane* self) {
+static gint
+publishing_piwigo_publishing_options_pane_get_last_category (PublishingPiwigoPublishingOptionsPane* self)
+{
gint result;
gint _tmp0_;
#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -10597,29 +11124,30 @@ static gint publishing_piwigo_publishing_options_pane_get_last_category (Publish
result = _tmp0_;
#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 10586 "PiwigoPublishing.c"
+#line 11113 "PiwigoPublishing.c"
}
-static void publishing_piwigo_publishing_options_pane_set_last_category (PublishingPiwigoPublishingOptionsPane* self, gint value) {
+static void
+publishing_piwigo_publishing_options_pane_set_last_category (PublishingPiwigoPublishingOptionsPane* self,
+ gint value)
+{
#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (publishing_piwigo_publishing_options_pane_get_last_category (self) != value) {
-#line 10595 "PiwigoPublishing.c"
- gint _tmp0_;
-#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp0_ = value;
#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->_last_category = _tmp0_;
+ self->priv->_last_category = value;
#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_object_notify ((GObject *) self, "last-category");
-#line 10603 "PiwigoPublishing.c"
+ g_object_notify_by_pspec ((GObject *) self, publishing_piwigo_publishing_options_pane_properties[PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_CATEGORY_PROPERTY]);
+#line 11129 "PiwigoPublishing.c"
}
}
-static gint publishing_piwigo_publishing_options_pane_get_last_permission_level (PublishingPiwigoPublishingOptionsPane* self) {
+static gint
+publishing_piwigo_publishing_options_pane_get_last_permission_level (PublishingPiwigoPublishingOptionsPane* self)
+{
gint result;
gint _tmp0_;
#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -10630,29 +11158,30 @@ static gint publishing_piwigo_publishing_options_pane_get_last_permission_level
result = _tmp0_;
#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 10619 "PiwigoPublishing.c"
+#line 11147 "PiwigoPublishing.c"
}
-static void publishing_piwigo_publishing_options_pane_set_last_permission_level (PublishingPiwigoPublishingOptionsPane* self, gint value) {
+static void
+publishing_piwigo_publishing_options_pane_set_last_permission_level (PublishingPiwigoPublishingOptionsPane* self,
+ gint value)
+{
#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (publishing_piwigo_publishing_options_pane_get_last_permission_level (self) != value) {
-#line 10628 "PiwigoPublishing.c"
- gint _tmp0_;
-#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp0_ = value;
#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->_last_permission_level = _tmp0_;
+ self->priv->_last_permission_level = value;
#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_object_notify ((GObject *) self, "last-permission-level");
-#line 10636 "PiwigoPublishing.c"
+ g_object_notify_by_pspec ((GObject *) self, publishing_piwigo_publishing_options_pane_properties[PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_PERMISSION_LEVEL_PROPERTY]);
+#line 11163 "PiwigoPublishing.c"
}
}
-static gint publishing_piwigo_publishing_options_pane_get_last_photo_size (PublishingPiwigoPublishingOptionsPane* self) {
+static gint
+publishing_piwigo_publishing_options_pane_get_last_photo_size (PublishingPiwigoPublishingOptionsPane* self)
+{
gint result;
gint _tmp0_;
#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -10663,29 +11192,30 @@ static gint publishing_piwigo_publishing_options_pane_get_last_photo_size (Publi
result = _tmp0_;
#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 10652 "PiwigoPublishing.c"
+#line 11181 "PiwigoPublishing.c"
}
-static void publishing_piwigo_publishing_options_pane_set_last_photo_size (PublishingPiwigoPublishingOptionsPane* self, gint value) {
+static void
+publishing_piwigo_publishing_options_pane_set_last_photo_size (PublishingPiwigoPublishingOptionsPane* self,
+ gint value)
+{
#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (publishing_piwigo_publishing_options_pane_get_last_photo_size (self) != value) {
-#line 10661 "PiwigoPublishing.c"
- gint _tmp0_;
#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp0_ = value;
+ self->priv->_last_photo_size = value;
#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->_last_photo_size = _tmp0_;
-#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_object_notify ((GObject *) self, "last-photo-size");
-#line 10669 "PiwigoPublishing.c"
+ g_object_notify_by_pspec ((GObject *) self, publishing_piwigo_publishing_options_pane_properties[PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_PHOTO_SIZE_PROPERTY]);
+#line 11197 "PiwigoPublishing.c"
}
}
-static gboolean publishing_piwigo_publishing_options_pane_get_last_title_as_comment (PublishingPiwigoPublishingOptionsPane* self) {
+static gboolean
+publishing_piwigo_publishing_options_pane_get_last_title_as_comment (PublishingPiwigoPublishingOptionsPane* self)
+{
gboolean result;
gboolean _tmp0_;
#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -10696,29 +11226,30 @@ static gboolean publishing_piwigo_publishing_options_pane_get_last_title_as_comm
result = _tmp0_;
#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 10685 "PiwigoPublishing.c"
+#line 11215 "PiwigoPublishing.c"
}
-static void publishing_piwigo_publishing_options_pane_set_last_title_as_comment (PublishingPiwigoPublishingOptionsPane* self, gboolean value) {
+static void
+publishing_piwigo_publishing_options_pane_set_last_title_as_comment (PublishingPiwigoPublishingOptionsPane* self,
+ gboolean value)
+{
#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (publishing_piwigo_publishing_options_pane_get_last_title_as_comment (self) != value) {
-#line 10694 "PiwigoPublishing.c"
- gboolean _tmp0_;
#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp0_ = value;
+ self->priv->_last_title_as_comment = value;
#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->_last_title_as_comment = _tmp0_;
-#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_object_notify ((GObject *) self, "last-title-as-comment");
-#line 10702 "PiwigoPublishing.c"
+ g_object_notify_by_pspec ((GObject *) self, publishing_piwigo_publishing_options_pane_properties[PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_TITLE_AS_COMMENT_PROPERTY]);
+#line 11231 "PiwigoPublishing.c"
}
}
-static gboolean publishing_piwigo_publishing_options_pane_get_last_no_upload_tags (PublishingPiwigoPublishingOptionsPane* self) {
+static gboolean
+publishing_piwigo_publishing_options_pane_get_last_no_upload_tags (PublishingPiwigoPublishingOptionsPane* self)
+{
gboolean result;
gboolean _tmp0_;
#line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -10729,29 +11260,30 @@ static gboolean publishing_piwigo_publishing_options_pane_get_last_no_upload_tag
result = _tmp0_;
#line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 10718 "PiwigoPublishing.c"
+#line 11249 "PiwigoPublishing.c"
}
-static void publishing_piwigo_publishing_options_pane_set_last_no_upload_tags (PublishingPiwigoPublishingOptionsPane* self, gboolean value) {
+static void
+publishing_piwigo_publishing_options_pane_set_last_no_upload_tags (PublishingPiwigoPublishingOptionsPane* self,
+ gboolean value)
+{
#line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
#line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (publishing_piwigo_publishing_options_pane_get_last_no_upload_tags (self) != value) {
-#line 10727 "PiwigoPublishing.c"
- gboolean _tmp0_;
-#line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp0_ = value;
#line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->_last_no_upload_tags = _tmp0_;
+ self->priv->_last_no_upload_tags = value;
#line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_object_notify ((GObject *) self, "last-no-upload-tags");
-#line 10735 "PiwigoPublishing.c"
+ g_object_notify_by_pspec ((GObject *) self, publishing_piwigo_publishing_options_pane_properties[PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_NO_UPLOAD_TAGS_PROPERTY]);
+#line 11265 "PiwigoPublishing.c"
}
}
-static gboolean publishing_piwigo_publishing_options_pane_get_strip_metadata_enabled (PublishingPiwigoPublishingOptionsPane* self) {
+static gboolean
+publishing_piwigo_publishing_options_pane_get_strip_metadata_enabled (PublishingPiwigoPublishingOptionsPane* self)
+{
gboolean result;
gboolean _tmp0_;
#line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -10762,29 +11294,30 @@ static gboolean publishing_piwigo_publishing_options_pane_get_strip_metadata_ena
result = _tmp0_;
#line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 10751 "PiwigoPublishing.c"
+#line 11283 "PiwigoPublishing.c"
}
-static void publishing_piwigo_publishing_options_pane_set_strip_metadata_enabled (PublishingPiwigoPublishingOptionsPane* self, gboolean value) {
+static void
+publishing_piwigo_publishing_options_pane_set_strip_metadata_enabled (PublishingPiwigoPublishingOptionsPane* self,
+ gboolean value)
+{
#line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
#line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (publishing_piwigo_publishing_options_pane_get_strip_metadata_enabled (self) != value) {
-#line 10760 "PiwigoPublishing.c"
- gboolean _tmp0_;
#line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp0_ = value;
+ self->priv->_strip_metadata_enabled = value;
#line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->_strip_metadata_enabled = _tmp0_;
-#line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_object_notify ((GObject *) self, "strip-metadata-enabled");
-#line 10768 "PiwigoPublishing.c"
+ g_object_notify_by_pspec ((GObject *) self, publishing_piwigo_publishing_options_pane_properties[PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_STRIP_METADATA_ENABLED_PROPERTY]);
+#line 11299 "PiwigoPublishing.c"
}
}
-static GeeList* publishing_piwigo_publishing_options_pane_get_existing_categories (PublishingPiwigoPublishingOptionsPane* self) {
+static GeeList*
+publishing_piwigo_publishing_options_pane_get_existing_categories (PublishingPiwigoPublishingOptionsPane* self)
+{
GeeList* result;
GeeList* _tmp0_;
#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -10795,34 +11328,36 @@ static GeeList* publishing_piwigo_publishing_options_pane_get_existing_categorie
result = _tmp0_;
#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 10784 "PiwigoPublishing.c"
+#line 11317 "PiwigoPublishing.c"
}
-static void publishing_piwigo_publishing_options_pane_set_existing_categories (PublishingPiwigoPublishingOptionsPane* self, GeeList* value) {
+static void
+publishing_piwigo_publishing_options_pane_set_existing_categories (PublishingPiwigoPublishingOptionsPane* self,
+ GeeList* value)
+{
#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (publishing_piwigo_publishing_options_pane_get_existing_categories (self) != value) {
-#line 10793 "PiwigoPublishing.c"
+#line 11329 "PiwigoPublishing.c"
GeeList* _tmp0_;
- GeeList* _tmp1_;
#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp0_ = value;
-#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp1_ = _g_object_ref0 (_tmp0_);
+ _tmp0_ = _g_object_ref0 (value);
#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_object_unref0 (self->priv->_existing_categories);
#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->_existing_categories = _tmp1_;
+ self->priv->_existing_categories = _tmp0_;
#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_object_notify ((GObject *) self, "existing-categories");
-#line 10806 "PiwigoPublishing.c"
+ g_object_notify_by_pspec ((GObject *) self, publishing_piwigo_publishing_options_pane_properties[PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_EXISTING_CATEGORIES_PROPERTY]);
+#line 11339 "PiwigoPublishing.c"
}
}
-static const gchar* publishing_piwigo_publishing_options_pane_get_default_comment (PublishingPiwigoPublishingOptionsPane* self) {
+static const gchar*
+publishing_piwigo_publishing_options_pane_get_default_comment (PublishingPiwigoPublishingOptionsPane* self)
+{
const gchar* result;
const gchar* _tmp0_;
#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -10833,34 +11368,41 @@ static const gchar* publishing_piwigo_publishing_options_pane_get_default_commen
result = _tmp0_;
#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 10822 "PiwigoPublishing.c"
+#line 11357 "PiwigoPublishing.c"
}
-static void publishing_piwigo_publishing_options_pane_set_default_comment (PublishingPiwigoPublishingOptionsPane* self, const gchar* value) {
+static void
+publishing_piwigo_publishing_options_pane_set_default_comment (PublishingPiwigoPublishingOptionsPane* self,
+ const gchar* value)
+{
#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (g_strcmp0 (value, publishing_piwigo_publishing_options_pane_get_default_comment (self)) != 0) {
-#line 10831 "PiwigoPublishing.c"
- const gchar* _tmp0_;
- gchar* _tmp1_;
-#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp0_ = value;
+#line 11369 "PiwigoPublishing.c"
+ gchar* _tmp0_;
#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp1_ = g_strdup (_tmp0_);
+ _tmp0_ = g_strdup (value);
#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (self->priv->_default_comment);
#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->_default_comment = _tmp1_;
+ self->priv->_default_comment = _tmp0_;
#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_object_notify ((GObject *) self, "default-comment");
-#line 10844 "PiwigoPublishing.c"
+ g_object_notify_by_pspec ((GObject *) self, publishing_piwigo_publishing_options_pane_properties[PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_DEFAULT_COMMENT_PROPERTY]);
+#line 11379 "PiwigoPublishing.c"
}
}
-static void g_cclosure_user_marshal_VOID__PUBLISHING_PIWIGO_PUBLISHING_PARAMETERS_BOOLEAN (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) {
+static void
+g_cclosure_user_marshal_VOID__PUBLISHING_PIWIGO_PUBLISHING_PARAMETERS_BOOLEAN (GClosure * closure,
+ GValue * return_value,
+ guint n_param_values,
+ const GValue * param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data)
+{
typedef void (*GMarshalFunc_VOID__PUBLISHING_PIWIGO_PUBLISHING_PARAMETERS_BOOLEAN) (gpointer data1, gpointer arg_1, gboolean arg_2, gpointer data2);
register GMarshalFunc_VOID__PUBLISHING_PIWIGO_PUBLISHING_PARAMETERS_BOOLEAN callback;
register GCClosure * cc;
@@ -10875,23 +11417,25 @@ static void g_cclosure_user_marshal_VOID__PUBLISHING_PIWIGO_PUBLISHING_PARAMETER
data1 = closure->data;
#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
data2 = param_values->data[0].v_pointer;
-#line 10864 "PiwigoPublishing.c"
+#line 11406 "PiwigoPublishing.c"
} else {
#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
data1 = param_values->data[0].v_pointer;
#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
data2 = closure->data;
-#line 10870 "PiwigoPublishing.c"
+#line 11412 "PiwigoPublishing.c"
}
#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
callback = (GMarshalFunc_VOID__PUBLISHING_PIWIGO_PUBLISHING_PARAMETERS_BOOLEAN) (marshal_data ? marshal_data : cc->callback);
#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
callback (data1, publishing_piwigo_value_get_publishing_parameters (param_values + 1), g_value_get_boolean (param_values + 2), data2);
-#line 10876 "PiwigoPublishing.c"
+#line 11418 "PiwigoPublishing.c"
}
-static void publishing_piwigo_publishing_options_pane_class_init (PublishingPiwigoPublishingOptionsPaneClass * klass) {
+static void
+publishing_piwigo_publishing_options_pane_class_init (PublishingPiwigoPublishingOptionsPaneClass * klass)
+{
gchar* _tmp0_;
#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_publishing_options_pane_parent_class = g_type_class_peek_parent (klass);
@@ -10908,21 +11452,21 @@ static void publishing_piwigo_publishing_options_pane_class_init (PublishingPiwi
#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
G_OBJECT_CLASS (klass)->finalize = publishing_piwigo_publishing_options_pane_finalize;
#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_CATEGORY_PROPERTY, g_param_spec_int ("last-category", "last-category", "last-category", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+ g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_CATEGORY_PROPERTY, publishing_piwigo_publishing_options_pane_properties[PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_CATEGORY_PROPERTY] = g_param_spec_int ("last-category", "last-category", "last-category", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_STRINGS | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_PERMISSION_LEVEL_PROPERTY, g_param_spec_int ("last-permission-level", "last-permission-level", "last-permission-level", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+ g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_PERMISSION_LEVEL_PROPERTY, publishing_piwigo_publishing_options_pane_properties[PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_PERMISSION_LEVEL_PROPERTY] = g_param_spec_int ("last-permission-level", "last-permission-level", "last-permission-level", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_STRINGS | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_PHOTO_SIZE_PROPERTY, g_param_spec_int ("last-photo-size", "last-photo-size", "last-photo-size", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+ g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_PHOTO_SIZE_PROPERTY, publishing_piwigo_publishing_options_pane_properties[PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_PHOTO_SIZE_PROPERTY] = g_param_spec_int ("last-photo-size", "last-photo-size", "last-photo-size", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_STRINGS | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_TITLE_AS_COMMENT_PROPERTY, g_param_spec_boolean ("last-title-as-comment", "last-title-as-comment", "last-title-as-comment", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+ g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_TITLE_AS_COMMENT_PROPERTY, publishing_piwigo_publishing_options_pane_properties[PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_TITLE_AS_COMMENT_PROPERTY] = g_param_spec_boolean ("last-title-as-comment", "last-title-as-comment", "last-title-as-comment", FALSE, G_PARAM_STATIC_STRINGS | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_NO_UPLOAD_TAGS_PROPERTY, g_param_spec_boolean ("last-no-upload-tags", "last-no-upload-tags", "last-no-upload-tags", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+ g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_NO_UPLOAD_TAGS_PROPERTY, publishing_piwigo_publishing_options_pane_properties[PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_NO_UPLOAD_TAGS_PROPERTY] = g_param_spec_boolean ("last-no-upload-tags", "last-no-upload-tags", "last-no-upload-tags", FALSE, G_PARAM_STATIC_STRINGS | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_STRIP_METADATA_ENABLED_PROPERTY, g_param_spec_boolean ("strip-metadata-enabled", "strip-metadata-enabled", "strip-metadata-enabled", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+ g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_STRIP_METADATA_ENABLED_PROPERTY, publishing_piwigo_publishing_options_pane_properties[PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_STRIP_METADATA_ENABLED_PROPERTY] = g_param_spec_boolean ("strip-metadata-enabled", "strip-metadata-enabled", "strip-metadata-enabled", FALSE, G_PARAM_STATIC_STRINGS | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_EXISTING_CATEGORIES_PROPERTY, g_param_spec_object ("existing-categories", "existing-categories", "existing-categories", GEE_TYPE_LIST, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+ g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_EXISTING_CATEGORIES_PROPERTY, publishing_piwigo_publishing_options_pane_properties[PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_EXISTING_CATEGORIES_PROPERTY] = g_param_spec_object ("existing-categories", "existing-categories", "existing-categories", GEE_TYPE_LIST, G_PARAM_STATIC_STRINGS | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_DEFAULT_COMMENT_PROPERTY, g_param_spec_string ("default-comment", "default-comment", "default-comment", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+ g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_DEFAULT_COMMENT_PROPERTY, publishing_piwigo_publishing_options_pane_properties[PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_DEFAULT_COMMENT_PROPERTY] = g_param_spec_string ("default-comment", "default-comment", "default-comment", NULL, G_PARAM_STATIC_STRINGS | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_publishing_options_pane_signals[PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL] = g_signal_new ("publish", PUBLISHING_PIWIGO_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__PUBLISHING_PIWIGO_PUBLISHING_PARAMETERS_BOOLEAN, G_TYPE_NONE, 2, PUBLISHING_PIWIGO_TYPE_PUBLISHING_PARAMETERS, G_TYPE_BOOLEAN);
#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -10931,11 +11475,13 @@ static void publishing_piwigo_publishing_options_pane_class_init (PublishingPiwi
_tmp0_ = g_strdup (_ ("Shotwell Connect"));
#line 1188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_publishing_options_pane_DEFAULT_CATEGORY_NAME = _tmp0_;
-#line 10920 "PiwigoPublishing.c"
+#line 11464 "PiwigoPublishing.c"
}
-static void publishing_piwigo_publishing_options_pane_instance_init (PublishingPiwigoPublishingOptionsPane * self) {
+static void
+publishing_piwigo_publishing_options_pane_instance_init (PublishingPiwigoPublishingOptionsPane * self)
+{
#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->priv = PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_GET_PRIVATE (self);
#line 1198 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -10944,11 +11490,13 @@ static void publishing_piwigo_publishing_options_pane_instance_init (PublishingP
self->priv->title_as_comment_check = NULL;
#line 1200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->priv->no_upload_tags_check = NULL;
-#line 10933 "PiwigoPublishing.c"
+#line 11479 "PiwigoPublishing.c"
}
-static void publishing_piwigo_publishing_options_pane_finalize (GObject * obj) {
+static void
+publishing_piwigo_publishing_options_pane_finalize (GObject * obj)
+{
PublishingPiwigoPublishingOptionsPane * self;
#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PIWIGO_TYPE_PUBLISHING_OPTIONS_PANE, PublishingPiwigoPublishingOptionsPane);
@@ -10992,14 +11540,16 @@ static void publishing_piwigo_publishing_options_pane_finalize (GObject * obj) {
_g_free0 (self->priv->_default_comment);
#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
G_OBJECT_CLASS (publishing_piwigo_publishing_options_pane_parent_class)->finalize (obj);
-#line 10981 "PiwigoPublishing.c"
+#line 11529 "PiwigoPublishing.c"
}
/**
* The publishing options pane.
*/
-GType publishing_piwigo_publishing_options_pane_get_type (void) {
+GType
+publishing_piwigo_publishing_options_pane_get_type (void)
+{
static volatile gsize publishing_piwigo_publishing_options_pane_type_id__volatile = 0;
if (g_once_init_enter (&publishing_piwigo_publishing_options_pane_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingPiwigoPublishingOptionsPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_piwigo_publishing_options_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingPiwigoPublishingOptionsPane), 0, (GInstanceInitFunc) publishing_piwigo_publishing_options_pane_instance_init, NULL };
@@ -11011,7 +11561,12 @@ GType publishing_piwigo_publishing_options_pane_get_type (void) {
}
-static void _vala_publishing_piwigo_publishing_options_pane_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) {
+static void
+_vala_publishing_piwigo_publishing_options_pane_get_property (GObject * object,
+ guint property_id,
+ GValue * value,
+ GParamSpec * pspec)
+{
PublishingPiwigoPublishingOptionsPane * self;
self = G_TYPE_CHECK_INSTANCE_CAST (object, PUBLISHING_PIWIGO_TYPE_PUBLISHING_OPTIONS_PANE, PublishingPiwigoPublishingOptionsPane);
#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -11064,18 +11619,23 @@ static void _vala_publishing_piwigo_publishing_options_pane_get_property (GObjec
g_value_set_string (value, publishing_piwigo_publishing_options_pane_get_default_comment (self));
#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
break;
-#line 11053 "PiwigoPublishing.c"
+#line 11608 "PiwigoPublishing.c"
default:
#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
break;
-#line 11059 "PiwigoPublishing.c"
+#line 11614 "PiwigoPublishing.c"
}
}
-static void _vala_publishing_piwigo_publishing_options_pane_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) {
+static void
+_vala_publishing_piwigo_publishing_options_pane_set_property (GObject * object,
+ guint property_id,
+ const GValue * value,
+ GParamSpec * pspec)
+{
PublishingPiwigoPublishingOptionsPane * self;
self = G_TYPE_CHECK_INSTANCE_CAST (object, PUBLISHING_PIWIGO_TYPE_PUBLISHING_OPTIONS_PANE, PublishingPiwigoPublishingOptionsPane);
#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -11128,35 +11688,41 @@ static void _vala_publishing_piwigo_publishing_options_pane_set_property (GObjec
publishing_piwigo_publishing_options_pane_set_default_comment (self, g_value_get_string (value));
#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
break;
-#line 11117 "PiwigoPublishing.c"
+#line 11677 "PiwigoPublishing.c"
default:
#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
break;
-#line 11123 "PiwigoPublishing.c"
+#line 11683 "PiwigoPublishing.c"
}
}
-PublishingPiwigoSession* publishing_piwigo_session_construct (GType object_type) {
+PublishingPiwigoSession*
+publishing_piwigo_session_construct (GType object_type)
+{
PublishingPiwigoSession* self = NULL;
#line 1548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self = (PublishingPiwigoSession*) publishing_rest_support_session_construct (object_type, "");
#line 1547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return self;
-#line 11134 "PiwigoPublishing.c"
+#line 11696 "PiwigoPublishing.c"
}
-PublishingPiwigoSession* publishing_piwigo_session_new (void) {
+PublishingPiwigoSession*
+publishing_piwigo_session_new (void)
+{
#line 1547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return publishing_piwigo_session_construct (PUBLISHING_PIWIGO_TYPE_SESSION);
-#line 11141 "PiwigoPublishing.c"
+#line 11705 "PiwigoPublishing.c"
}
-static gboolean publishing_piwigo_session_real_is_authenticated (PublishingRESTSupportSession* base) {
+static gboolean
+publishing_piwigo_session_real_is_authenticated (PublishingRESTSupportSession* base)
+{
PublishingPiwigoSession * self;
gboolean result = FALSE;
gboolean _tmp0_ = FALSE;
@@ -11168,47 +11734,49 @@ static gboolean publishing_piwigo_session_real_is_authenticated (PublishingRESTS
_tmp2_ = self->priv->pwg_id;
#line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_tmp2_ != NULL) {
-#line 11157 "PiwigoPublishing.c"
+#line 11723 "PiwigoPublishing.c"
const gchar* _tmp3_;
#line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp3_ = self->priv->pwg_url;
#line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = _tmp3_ != NULL;
-#line 11163 "PiwigoPublishing.c"
+#line 11729 "PiwigoPublishing.c"
} else {
#line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = FALSE;
-#line 11167 "PiwigoPublishing.c"
+#line 11733 "PiwigoPublishing.c"
}
#line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_tmp1_) {
-#line 11171 "PiwigoPublishing.c"
+#line 11737 "PiwigoPublishing.c"
const gchar* _tmp4_;
#line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp4_ = self->priv->username;
#line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = _tmp4_ != NULL;
-#line 11177 "PiwigoPublishing.c"
+#line 11743 "PiwigoPublishing.c"
} else {
#line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = FALSE;
-#line 11181 "PiwigoPublishing.c"
+#line 11747 "PiwigoPublishing.c"
}
#line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
result = _tmp0_;
#line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 11187 "PiwigoPublishing.c"
+#line 11753 "PiwigoPublishing.c"
}
-void publishing_piwigo_session_authenticate (PublishingPiwigoSession* self, const gchar* url, const gchar* username, const gchar* id) {
- const gchar* _tmp0_;
+void
+publishing_piwigo_session_authenticate (PublishingPiwigoSession* self,
+ const gchar* url,
+ const gchar* username,
+ const gchar* id)
+{
+ gchar* _tmp0_;
gchar* _tmp1_;
- const gchar* _tmp2_;
- gchar* _tmp3_;
- const gchar* _tmp4_;
- gchar* _tmp5_;
+ gchar* _tmp2_;
#line 1555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_SESSION (self));
#line 1555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -11218,34 +11786,30 @@ void publishing_piwigo_session_authenticate (PublishingPiwigoSession* self, cons
#line 1555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (id != NULL);
#line 1556 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp0_ = url;
-#line 1556 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp1_ = g_strdup (_tmp0_);
+ _tmp0_ = g_strdup (url);
#line 1556 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (self->priv->pwg_url);
#line 1556 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->pwg_url = _tmp1_;
+ self->priv->pwg_url = _tmp0_;
#line 1557 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp2_ = username;
-#line 1557 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp3_ = g_strdup (_tmp2_);
+ _tmp1_ = g_strdup (username);
#line 1557 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (self->priv->username);
#line 1557 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->username = _tmp3_;
-#line 1558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp4_ = id;
+ self->priv->username = _tmp1_;
#line 1558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp5_ = g_strdup (_tmp4_);
+ _tmp2_ = g_strdup (id);
#line 1558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (self->priv->pwg_id);
#line 1558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->pwg_id = _tmp5_;
-#line 11230 "PiwigoPublishing.c"
+ self->priv->pwg_id = _tmp2_;
+#line 11792 "PiwigoPublishing.c"
}
-void publishing_piwigo_session_deauthenticate (PublishingPiwigoSession* self) {
+void
+publishing_piwigo_session_deauthenticate (PublishingPiwigoSession* self)
+{
#line 1561 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_SESSION (self));
#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -11260,11 +11824,13 @@ void publishing_piwigo_session_deauthenticate (PublishingPiwigoSession* self) {
_g_free0 (self->priv->username);
#line 1564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->priv->username = NULL;
-#line 11249 "PiwigoPublishing.c"
+#line 11813 "PiwigoPublishing.c"
}
-gchar* publishing_piwigo_session_get_username (PublishingPiwigoSession* self) {
+gchar*
+publishing_piwigo_session_get_username (PublishingPiwigoSession* self)
+{
gchar* result = NULL;
const gchar* _tmp0_;
gchar* _tmp1_;
@@ -11278,11 +11844,13 @@ gchar* publishing_piwigo_session_get_username (PublishingPiwigoSession* self) {
result = _tmp1_;
#line 1568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 11267 "PiwigoPublishing.c"
+#line 11833 "PiwigoPublishing.c"
}
-gchar* publishing_piwigo_session_get_pwg_url (PublishingPiwigoSession* self) {
+gchar*
+publishing_piwigo_session_get_pwg_url (PublishingPiwigoSession* self)
+{
gchar* result = NULL;
const gchar* _tmp0_;
gchar* _tmp1_;
@@ -11296,11 +11864,13 @@ gchar* publishing_piwigo_session_get_pwg_url (PublishingPiwigoSession* self) {
result = _tmp1_;
#line 1572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 11285 "PiwigoPublishing.c"
+#line 11853 "PiwigoPublishing.c"
}
-gchar* publishing_piwigo_session_get_pwg_id (PublishingPiwigoSession* self) {
+gchar*
+publishing_piwigo_session_get_pwg_id (PublishingPiwigoSession* self)
+{
gchar* result = NULL;
const gchar* _tmp0_;
gchar* _tmp1_;
@@ -11314,30 +11884,32 @@ gchar* publishing_piwigo_session_get_pwg_id (PublishingPiwigoSession* self) {
result = _tmp1_;
#line 1576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 11303 "PiwigoPublishing.c"
+#line 11873 "PiwigoPublishing.c"
}
-void publishing_piwigo_session_set_pwg_id (PublishingPiwigoSession* self, const gchar* id) {
- const gchar* _tmp0_;
- gchar* _tmp1_;
+void
+publishing_piwigo_session_set_pwg_id (PublishingPiwigoSession* self,
+ const gchar* id)
+{
+ gchar* _tmp0_;
#line 1579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_SESSION (self));
#line 1579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (id != NULL);
#line 1580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp0_ = id;
-#line 1580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp1_ = g_strdup (_tmp0_);
+ _tmp0_ = g_strdup (id);
#line 1580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (self->priv->pwg_id);
#line 1580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->pwg_id = _tmp1_;
-#line 11322 "PiwigoPublishing.c"
+ self->priv->pwg_id = _tmp0_;
+#line 11892 "PiwigoPublishing.c"
}
-static void publishing_piwigo_session_class_init (PublishingPiwigoSessionClass * klass) {
+static void
+publishing_piwigo_session_class_init (PublishingPiwigoSessionClass * klass)
+{
#line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_session_parent_class = g_type_class_peek_parent (klass);
#line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -11346,11 +11918,13 @@ static void publishing_piwigo_session_class_init (PublishingPiwigoSessionClass *
g_type_class_add_private (klass, sizeof (PublishingPiwigoSessionPrivate));
#line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*) (PublishingRESTSupportSession *)) publishing_piwigo_session_real_is_authenticated;
-#line 11335 "PiwigoPublishing.c"
+#line 11907 "PiwigoPublishing.c"
}
-static void publishing_piwigo_session_instance_init (PublishingPiwigoSession * self) {
+static void
+publishing_piwigo_session_instance_init (PublishingPiwigoSession * self)
+{
#line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->priv = PUBLISHING_PIWIGO_SESSION_GET_PRIVATE (self);
#line 1543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -11359,11 +11933,13 @@ static void publishing_piwigo_session_instance_init (PublishingPiwigoSession * s
self->priv->pwg_id = NULL;
#line 1545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->priv->username = NULL;
-#line 11348 "PiwigoPublishing.c"
+#line 11922 "PiwigoPublishing.c"
}
-static void publishing_piwigo_session_finalize (PublishingRESTSupportSession * obj) {
+static void
+publishing_piwigo_session_finalize (PublishingRESTSupportSession * obj)
+{
PublishingPiwigoSession * self;
#line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PIWIGO_TYPE_SESSION, PublishingPiwigoSession);
@@ -11375,7 +11951,7 @@ static void publishing_piwigo_session_finalize (PublishingRESTSupportSession * o
_g_free0 (self->priv->username);
#line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
PUBLISHING_REST_SUPPORT_SESSION_CLASS (publishing_piwigo_session_parent_class)->finalize (obj);
-#line 11364 "PiwigoPublishing.c"
+#line 11940 "PiwigoPublishing.c"
}
@@ -11383,7 +11959,9 @@ static void publishing_piwigo_session_finalize (PublishingRESTSupportSession * o
* Session class that keeps track of the authentication status and of the
* user token pwg_id.
*/
-GType publishing_piwigo_session_get_type (void) {
+GType
+publishing_piwigo_session_get_type (void)
+{
static volatile gsize publishing_piwigo_session_type_id__volatile = 0;
if (g_once_init_enter (&publishing_piwigo_session_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingPiwigoSessionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_piwigo_session_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingPiwigoSession), 0, (GInstanceInitFunc) publishing_piwigo_session_instance_init, NULL };
@@ -11395,194 +11973,179 @@ GType publishing_piwigo_session_get_type (void) {
}
-PublishingPiwigoTransaction* publishing_piwigo_transaction_construct (GType object_type, PublishingPiwigoSession* session) {
+PublishingPiwigoTransaction*
+publishing_piwigo_transaction_construct (GType object_type,
+ PublishingPiwigoSession* session)
+{
PublishingPiwigoTransaction* self = NULL;
- PublishingPiwigoSession* _tmp0_;
- PublishingPiwigoSession* _tmp1_;
- gboolean _tmp2_;
#line 1593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL);
#line 1594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp0_ = session;
-#line 1594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self = (PublishingPiwigoTransaction*) publishing_rest_support_transaction_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
+ self = (PublishingPiwigoTransaction*) publishing_rest_support_transaction_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
#line 1595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp1_ = session;
-#line 1595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp2_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 1595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (_tmp2_) {
-#line 11401 "PiwigoPublishing.c"
- PublishingPiwigoSession* _tmp3_;
- gchar* _tmp4_;
- gchar* _tmp5_;
- gchar* _tmp6_;
- gchar* _tmp7_;
+ if (publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession))) {
+#line 11973 "PiwigoPublishing.c"
+ gchar* _tmp0_;
+ gchar* _tmp1_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
#line 1596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp3_ = session;
+ _tmp0_ = publishing_piwigo_session_get_pwg_id (session);
#line 1596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp4_ = publishing_piwigo_session_get_pwg_id (_tmp3_);
+ _tmp1_ = _tmp0_;
#line 1596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp5_ = _tmp4_;
+ _tmp2_ = g_strconcat ("pwg_id=", _tmp1_, NULL);
#line 1596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp6_ = g_strconcat ("pwg_id=", _tmp5_, NULL);
+ _tmp3_ = _tmp2_;
#line 1596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp7_ = _tmp6_;
-#line 1596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "Cookie", _tmp7_);
+ publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "Cookie", _tmp3_);
#line 1596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_free0 (_tmp7_);
+ _g_free0 (_tmp3_);
#line 1596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_free0 (_tmp5_);
-#line 11423 "PiwigoPublishing.c"
+ _g_free0 (_tmp1_);
+#line 11992 "PiwigoPublishing.c"
}
#line 1593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return self;
-#line 11427 "PiwigoPublishing.c"
+#line 11996 "PiwigoPublishing.c"
}
-PublishingPiwigoTransaction* publishing_piwigo_transaction_new (PublishingPiwigoSession* session) {
+PublishingPiwigoTransaction*
+publishing_piwigo_transaction_new (PublishingPiwigoSession* session)
+{
#line 1593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return publishing_piwigo_transaction_construct (PUBLISHING_PIWIGO_TYPE_TRANSACTION, session);
-#line 11434 "PiwigoPublishing.c"
+#line 12005 "PiwigoPublishing.c"
}
-PublishingPiwigoTransaction* publishing_piwigo_transaction_construct_authenticated (GType object_type, PublishingPiwigoSession* session) {
+PublishingPiwigoTransaction*
+publishing_piwigo_transaction_construct_authenticated (GType object_type,
+ PublishingPiwigoSession* session)
+{
PublishingPiwigoTransaction* self = NULL;
- PublishingPiwigoSession* _tmp0_;
- PublishingPiwigoSession* _tmp1_;
+ gchar* _tmp0_;
+ gchar* _tmp1_;
gchar* _tmp2_;
gchar* _tmp3_;
- PublishingPiwigoSession* _tmp4_;
+ gchar* _tmp4_;
gchar* _tmp5_;
- gchar* _tmp6_;
- gchar* _tmp7_;
- gchar* _tmp8_;
#line 1600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL);
#line 1601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp0_ = session;
-#line 1601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp1_ = session;
-#line 1601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp2_ = publishing_piwigo_session_get_pwg_url (_tmp1_);
+ _tmp0_ = publishing_piwigo_session_get_pwg_url (session);
#line 1601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp3_ = _tmp2_;
+ _tmp1_ = _tmp0_;
#line 1601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self = (PublishingPiwigoTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp3_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
+ self = (PublishingPiwigoTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
#line 1601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_free0 (_tmp3_);
-#line 1602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp4_ = session;
+ _g_free0 (_tmp1_);
#line 1602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp5_ = publishing_piwigo_session_get_pwg_id (_tmp4_);
+ _tmp2_ = publishing_piwigo_session_get_pwg_id (session);
#line 1602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp6_ = _tmp5_;
+ _tmp3_ = _tmp2_;
#line 1602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp7_ = g_strconcat ("pwg_id=", _tmp6_, NULL);
+ _tmp4_ = g_strconcat ("pwg_id=", _tmp3_, NULL);
#line 1602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp8_ = _tmp7_;
+ _tmp5_ = _tmp4_;
#line 1602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "Cookie", _tmp8_);
+ publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "Cookie", _tmp5_);
#line 1602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_free0 (_tmp8_);
+ _g_free0 (_tmp5_);
#line 1602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_free0 (_tmp6_);
+ _g_free0 (_tmp3_);
#line 1600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return self;
-#line 11481 "PiwigoPublishing.c"
+#line 12046 "PiwigoPublishing.c"
}
-PublishingPiwigoTransaction* publishing_piwigo_transaction_new_authenticated (PublishingPiwigoSession* session) {
+PublishingPiwigoTransaction*
+publishing_piwigo_transaction_new_authenticated (PublishingPiwigoSession* session)
+{
#line 1600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return publishing_piwigo_transaction_construct_authenticated (PUBLISHING_PIWIGO_TYPE_TRANSACTION, session);
-#line 11488 "PiwigoPublishing.c"
+#line 12055 "PiwigoPublishing.c"
}
-gchar* publishing_piwigo_transaction_validate_xml (PublishingRESTSupportXmlDocument* doc) {
+gchar*
+publishing_piwigo_transaction_validate_xml (PublishingRESTSupportXmlDocument* doc)
+{
gchar* result = NULL;
xmlNode* root = NULL;
- PublishingRESTSupportXmlDocument* _tmp0_;
- xmlNode* _tmp1_;
+ xmlNode* _tmp0_;
gchar* status = NULL;
- xmlNode* _tmp2_;
- gchar* _tmp3_;
- const gchar* _tmp4_;
- const gchar* _tmp6_;
+ xmlNode* _tmp1_;
+ gchar* _tmp2_;
+ const gchar* _tmp3_;
+ const gchar* _tmp5_;
xmlNode* errcode = NULL;
- xmlNode* _tmp12_;
- gchar* _tmp13_;
+ xmlNode* _tmp10_;
+ gchar* _tmp11_;
+ gchar* _tmp12_;
+ xmlNode* _tmp13_;
gchar* _tmp14_;
- xmlNode* _tmp15_;
+ gchar* _tmp15_;
gchar* _tmp16_;
gchar* _tmp17_;
- gchar* _tmp18_;
- gchar* _tmp19_;
GError * _inner_error_ = NULL;
#line 1605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_XML_DOCUMENT (doc), NULL);
#line 1606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp0_ = doc;
-#line 1606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp1_ = publishing_rest_support_xml_document_get_root_node (_tmp0_);
+ _tmp0_ = publishing_rest_support_xml_document_get_root_node (doc);
#line 1606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- root = _tmp1_;
+ root = _tmp0_;
#line 1607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp2_ = root;
+ _tmp1_ = root;
#line 1607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp3_ = (gchar*) xmlGetProp (_tmp2_, (xmlChar*) "stat");
+ _tmp2_ = (gchar*) xmlGetProp (_tmp1_, (xmlChar*) "stat");
#line 1607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- status = _tmp3_;
+ status = _tmp2_;
#line 1610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp4_ = status;
+ _tmp3_ = status;
#line 1610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (_tmp4_ == NULL) {
-#line 11530 "PiwigoPublishing.c"
- gchar* _tmp5_;
+ if (_tmp3_ == NULL) {
+#line 12096 "PiwigoPublishing.c"
+ gchar* _tmp4_;
#line 1611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp5_ = g_strdup ("No status property in root node");
+ _tmp4_ = g_strdup ("No status property in root node");
#line 1611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- result = _tmp5_;
+ result = _tmp4_;
#line 1611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (status);
#line 1611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 11540 "PiwigoPublishing.c"
+#line 12106 "PiwigoPublishing.c"
}
#line 1613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp6_ = status;
+ _tmp5_ = status;
#line 1613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (g_strcmp0 (_tmp6_, "ok") == 0) {
+ if (g_strcmp0 (_tmp5_, "ok") == 0) {
#line 1614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
result = NULL;
#line 1614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (status);
#line 1614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 11552 "PiwigoPublishing.c"
+#line 12118 "PiwigoPublishing.c"
}
{
- xmlNode* _tmp7_ = NULL;
- PublishingRESTSupportXmlDocument* _tmp8_;
- xmlNode* _tmp9_;
- xmlNode* _tmp10_;
-#line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp8_ = doc;
+ xmlNode* _tmp6_ = NULL;
+ xmlNode* _tmp7_;
+ xmlNode* _tmp8_;
#line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp9_ = root;
+ _tmp7_ = root;
#line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp10_ = publishing_rest_support_xml_document_get_named_child (_tmp8_, _tmp9_, "err", &_inner_error_);
+ _tmp8_ = publishing_rest_support_xml_document_get_named_child (doc, _tmp7_, "err", &_inner_error_);
#line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp7_ = _tmp10_;
+ _tmp6_ = _tmp8_;
#line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 11571 "PiwigoPublishing.c"
+#line 12134 "PiwigoPublishing.c"
goto __catch40_spit_publishing_publishing_error;
}
#line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -11593,32 +12156,32 @@ gchar* publishing_piwigo_transaction_validate_xml (PublishingRESTSupportXmlDocum
g_clear_error (&_inner_error_);
#line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return NULL;
-#line 11582 "PiwigoPublishing.c"
+#line 12145 "PiwigoPublishing.c"
}
#line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- errcode = _tmp7_;
-#line 11586 "PiwigoPublishing.c"
+ errcode = _tmp6_;
+#line 12149 "PiwigoPublishing.c"
}
goto __finally40;
__catch40_spit_publishing_publishing_error:
{
GError* err = NULL;
- gchar* _tmp11_;
+ gchar* _tmp9_;
#line 1617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
err = _inner_error_;
#line 1617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_inner_error_ = NULL;
#line 1620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp11_ = g_strdup ("No error code specified");
+ _tmp9_ = g_strdup ("No error code specified");
#line 1620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- result = _tmp11_;
+ result = _tmp9_;
#line 1620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_error_free0 (err);
#line 1620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (status);
#line 1620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 11607 "PiwigoPublishing.c"
+#line 12170 "PiwigoPublishing.c"
}
__finally40:
#line 1617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -11631,74 +12194,70 @@ gchar* publishing_piwigo_transaction_validate_xml (PublishingRESTSupportXmlDocum
g_clear_error (&_inner_error_);
#line 1617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return NULL;
-#line 11620 "PiwigoPublishing.c"
+#line 12183 "PiwigoPublishing.c"
}
#line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp12_ = errcode;
+ _tmp10_ = errcode;
#line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp13_ = (gchar*) xmlGetProp (_tmp12_, (xmlChar*) "msg");
+ _tmp11_ = (gchar*) xmlGetProp (_tmp10_, (xmlChar*) "msg");
#line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp14_ = _tmp13_;
+ _tmp12_ = _tmp11_;
#line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp15_ = errcode;
+ _tmp13_ = errcode;
#line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp16_ = (gchar*) xmlGetProp (_tmp15_, (xmlChar*) "code");
+ _tmp14_ = (gchar*) xmlGetProp (_tmp13_, (xmlChar*) "code");
#line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp17_ = _tmp16_;
+ _tmp15_ = _tmp14_;
#line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp18_ = g_strdup_printf ("%s (error code %s)", _tmp14_, _tmp17_);
+ _tmp16_ = g_strdup_printf ("%s (error code %s)", _tmp12_, _tmp15_);
#line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp19_ = _tmp18_;
+ _tmp17_ = _tmp16_;
#line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_free0 (_tmp17_);
+ _g_free0 (_tmp15_);
#line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_free0 (_tmp14_);
+ _g_free0 (_tmp12_);
#line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- result = _tmp19_;
+ result = _tmp17_;
#line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (status);
#line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 11648 "PiwigoPublishing.c"
+#line 12211 "PiwigoPublishing.c"
}
-gchar* publishing_piwigo_transaction_get_error_code (PublishingRESTSupportXmlDocument* doc) {
+gchar*
+publishing_piwigo_transaction_get_error_code (PublishingRESTSupportXmlDocument* doc)
+{
gchar* result = NULL;
xmlNode* root = NULL;
- PublishingRESTSupportXmlDocument* _tmp0_;
- xmlNode* _tmp1_;
+ xmlNode* _tmp0_;
xmlNode* errcode = NULL;
- xmlNode* _tmp7_;
- gchar* _tmp8_;
+ xmlNode* _tmp5_;
+ gchar* _tmp6_;
GError * _inner_error_ = NULL;
#line 1626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_XML_DOCUMENT (doc), NULL);
#line 1627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp0_ = doc;
+ _tmp0_ = publishing_rest_support_xml_document_get_root_node (doc);
#line 1627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp1_ = publishing_rest_support_xml_document_get_root_node (_tmp0_);
-#line 1627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- root = _tmp1_;
-#line 11669 "PiwigoPublishing.c"
+ root = _tmp0_;
+#line 12231 "PiwigoPublishing.c"
{
- xmlNode* _tmp2_ = NULL;
- PublishingRESTSupportXmlDocument* _tmp3_;
- xmlNode* _tmp4_;
- xmlNode* _tmp5_;
-#line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp3_ = doc;
+ xmlNode* _tmp1_ = NULL;
+ xmlNode* _tmp2_;
+ xmlNode* _tmp3_;
#line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp4_ = root;
+ _tmp2_ = root;
#line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp5_ = publishing_rest_support_xml_document_get_named_child (_tmp3_, _tmp4_, "err", &_inner_error_);
+ _tmp3_ = publishing_rest_support_xml_document_get_named_child (doc, _tmp2_, "err", &_inner_error_);
#line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp2_ = _tmp5_;
+ _tmp1_ = _tmp3_;
#line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 11687 "PiwigoPublishing.c"
+#line 12246 "PiwigoPublishing.c"
goto __catch41_spit_publishing_publishing_error;
}
#line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -11707,30 +12266,30 @@ gchar* publishing_piwigo_transaction_get_error_code (PublishingRESTSupportXmlDoc
g_clear_error (&_inner_error_);
#line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return NULL;
-#line 11696 "PiwigoPublishing.c"
+#line 12255 "PiwigoPublishing.c"
}
#line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- errcode = _tmp2_;
-#line 11700 "PiwigoPublishing.c"
+ errcode = _tmp1_;
+#line 12259 "PiwigoPublishing.c"
}
goto __finally41;
__catch41_spit_publishing_publishing_error:
{
GError* err = NULL;
- gchar* _tmp6_;
+ gchar* _tmp4_;
#line 1629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
err = _inner_error_;
#line 1629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_inner_error_ = NULL;
#line 1632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp6_ = g_strdup ("0");
+ _tmp4_ = g_strdup ("0");
#line 1632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- result = _tmp6_;
+ result = _tmp4_;
#line 1632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_error_free0 (err);
#line 1632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 11719 "PiwigoPublishing.c"
+#line 12278 "PiwigoPublishing.c"
}
__finally41:
#line 1629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -11741,28 +12300,32 @@ gchar* publishing_piwigo_transaction_get_error_code (PublishingRESTSupportXmlDoc
g_clear_error (&_inner_error_);
#line 1629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return NULL;
-#line 11730 "PiwigoPublishing.c"
+#line 12289 "PiwigoPublishing.c"
}
#line 1634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp7_ = errcode;
+ _tmp5_ = errcode;
#line 1634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp8_ = (gchar*) xmlGetProp (_tmp7_, (xmlChar*) "code");
+ _tmp6_ = (gchar*) xmlGetProp (_tmp5_, (xmlChar*) "code");
#line 1634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- result = _tmp8_;
+ result = _tmp6_;
#line 1634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 11740 "PiwigoPublishing.c"
+#line 12299 "PiwigoPublishing.c"
}
-static void publishing_piwigo_transaction_class_init (PublishingPiwigoTransactionClass * klass) {
+static void
+publishing_piwigo_transaction_class_init (PublishingPiwigoTransactionClass * klass)
+{
#line 1592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 11747 "PiwigoPublishing.c"
+#line 12308 "PiwigoPublishing.c"
}
-static void publishing_piwigo_transaction_instance_init (PublishingPiwigoTransaction * self) {
+static void
+publishing_piwigo_transaction_instance_init (PublishingPiwigoTransaction * self)
+{
}
@@ -11774,7 +12337,9 @@ static void publishing_piwigo_transaction_instance_init (PublishingPiwigoTransac
* session has been authenticated, the pwg_id token is included in the
* transaction header.
*/
-GType publishing_piwigo_transaction_get_type (void) {
+GType
+publishing_piwigo_transaction_get_type (void)
+{
static volatile gsize publishing_piwigo_transaction_type_id__volatile = 0;
if (g_once_init_enter (&publishing_piwigo_transaction_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingPiwigoTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_piwigo_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingPiwigoTransaction), 0, (GInstanceInitFunc) publishing_piwigo_transaction_instance_init, NULL };
@@ -11786,16 +12351,18 @@ GType publishing_piwigo_transaction_get_type (void) {
}
-PublishingPiwigoSessionLoginTransaction* publishing_piwigo_session_login_transaction_construct (GType object_type, PublishingPiwigoSession* session, const gchar* url, const gchar* username, const gchar* password) {
+PublishingPiwigoSessionLoginTransaction*
+publishing_piwigo_session_login_transaction_construct (GType object_type,
+ PublishingPiwigoSession* session,
+ const gchar* url,
+ const gchar* username,
+ const gchar* password)
+{
PublishingPiwigoSessionLoginTransaction* self = NULL;
- PublishingPiwigoSession* _tmp0_;
- const gchar* _tmp1_;
- const gchar* _tmp2_;
+ gchar* _tmp0_;
+ gchar* _tmp1_;
+ gchar* _tmp2_;
gchar* _tmp3_;
- gchar* _tmp4_;
- const gchar* _tmp5_;
- gchar* _tmp6_;
- gchar* _tmp7_;
#line 1642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL);
#line 1642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -11805,154 +12372,157 @@ PublishingPiwigoSessionLoginTransaction* publishing_piwigo_session_login_transac
#line 1642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (password != NULL, NULL);
#line 1643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp0_ = session;
-#line 1643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp1_ = url;
-#line 1643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self = (PublishingPiwigoSessionLoginTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
+ self = (PublishingPiwigoSessionLoginTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), url, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
#line 1645 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "method", "pwg.session.login");
#line 1646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp2_ = username;
-#line 1646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp3_ = g_uri_escape_string (_tmp2_, NULL, TRUE);
+ _tmp0_ = g_uri_escape_string (username, NULL, TRUE);
#line 1646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp4_ = _tmp3_;
+ _tmp1_ = _tmp0_;
#line 1646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "username", _tmp4_);
+ publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "username", _tmp1_);
#line 1646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_free0 (_tmp4_);
-#line 1647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp5_ = password;
+ _g_free0 (_tmp1_);
#line 1647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp6_ = g_uri_escape_string (_tmp5_, NULL, TRUE);
+ _tmp2_ = g_uri_escape_string (password, NULL, TRUE);
#line 1647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp7_ = _tmp6_;
+ _tmp3_ = _tmp2_;
#line 1647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "password", _tmp7_);
+ publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "password", _tmp3_);
#line 1647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_free0 (_tmp7_);
+ _g_free0 (_tmp3_);
#line 1642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return self;
-#line 11823 "PiwigoPublishing.c"
+#line 12382 "PiwigoPublishing.c"
}
-PublishingPiwigoSessionLoginTransaction* publishing_piwigo_session_login_transaction_new (PublishingPiwigoSession* session, const gchar* url, const gchar* username, const gchar* password) {
+PublishingPiwigoSessionLoginTransaction*
+publishing_piwigo_session_login_transaction_new (PublishingPiwigoSession* session,
+ const gchar* url,
+ const gchar* username,
+ const gchar* password)
+{
#line 1642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return publishing_piwigo_session_login_transaction_construct (PUBLISHING_PIWIGO_TYPE_SESSION_LOGIN_TRANSACTION, session, url, username, password);
-#line 11830 "PiwigoPublishing.c"
+#line 12394 "PiwigoPublishing.c"
}
-static gpointer _publishing_rest_support_argument_ref0 (gpointer self) {
+static gpointer
+_publishing_rest_support_argument_ref0 (gpointer self)
+{
#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return self ? publishing_rest_support_argument_ref (self) : NULL;
-#line 11837 "PiwigoPublishing.c"
+#line 12403 "PiwigoPublishing.c"
}
-PublishingPiwigoSessionLoginTransaction* publishing_piwigo_session_login_transaction_construct_from_other (GType object_type, PublishingPiwigoSession* session, PublishingPiwigoTransaction* other) {
+PublishingPiwigoSessionLoginTransaction*
+publishing_piwigo_session_login_transaction_construct_from_other (GType object_type,
+ PublishingPiwigoSession* session,
+ PublishingPiwigoTransaction* other)
+{
PublishingPiwigoSessionLoginTransaction* self = NULL;
- PublishingPiwigoSession* _tmp0_;
- PublishingPiwigoTransaction* _tmp1_;
- gchar* _tmp2_;
- gchar* _tmp3_;
- PublishingPiwigoTransaction* _tmp4_;
- gint _tmp5_;
- PublishingRESTSupportArgument** _tmp6_;
+ gchar* _tmp0_;
+ gchar* _tmp1_;
+ gint _tmp2_;
+ PublishingRESTSupportArgument** _tmp3_;
#line 1650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL);
#line 1650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (PUBLISHING_PIWIGO_IS_TRANSACTION (other), NULL);
#line 1651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp0_ = session;
+ _tmp0_ = publishing_rest_support_transaction_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (other, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
#line 1651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp1_ = other;
-#line 1651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp2_ = publishing_rest_support_transaction_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
-#line 1651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp3_ = _tmp2_;
+ _tmp1_ = _tmp0_;
#line 1651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self = (PublishingPiwigoSessionLoginTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp3_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
+ self = (PublishingPiwigoSessionLoginTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
#line 1651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_free0 (_tmp3_);
-#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp4_ = other;
+ _g_free0 (_tmp1_);
#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp6_ = publishing_rest_support_transaction_get_arguments (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_tmp5_);
-#line 11870 "PiwigoPublishing.c"
+ _tmp3_ = publishing_rest_support_transaction_get_arguments (G_TYPE_CHECK_INSTANCE_CAST (other, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_tmp2_);
+#line 12431 "PiwigoPublishing.c"
{
PublishingRESTSupportArgument** argument_collection = NULL;
gint argument_collection_length1 = 0;
gint _argument_collection_size_ = 0;
gint argument_it = 0;
#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- argument_collection = _tmp6_;
+ argument_collection = _tmp3_;
#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- argument_collection_length1 = _tmp5_;
+ argument_collection_length1 = _tmp2_;
#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- for (argument_it = 0; argument_it < _tmp5_; argument_it = argument_it + 1) {
-#line 11882 "PiwigoPublishing.c"
- PublishingRESTSupportArgument* _tmp7_;
+ for (argument_it = 0; argument_it < _tmp2_; argument_it = argument_it + 1) {
+#line 12443 "PiwigoPublishing.c"
+ PublishingRESTSupportArgument* _tmp4_;
PublishingRESTSupportArgument* argument = NULL;
#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp7_ = _publishing_rest_support_argument_ref0 (argument_collection[argument_it]);
+ _tmp4_ = _publishing_rest_support_argument_ref0 (argument_collection[argument_it]);
#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- argument = _tmp7_;
-#line 11889 "PiwigoPublishing.c"
+ argument = _tmp4_;
+#line 12450 "PiwigoPublishing.c"
{
- PublishingRESTSupportArgument* _tmp8_;
- const gchar* _tmp9_;
- PublishingRESTSupportArgument* _tmp10_;
- const gchar* _tmp11_;
+ PublishingRESTSupportArgument* _tmp5_;
+ const gchar* _tmp6_;
+ PublishingRESTSupportArgument* _tmp7_;
+ const gchar* _tmp8_;
#line 1654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp8_ = argument;
+ _tmp5_ = argument;
#line 1654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp9_ = _tmp8_->key;
+ _tmp6_ = _tmp5_->key;
#line 1654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp10_ = argument;
+ _tmp7_ = argument;
#line 1654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp11_ = _tmp10_->value;
+ _tmp8_ = _tmp7_->value;
#line 1654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp9_, _tmp11_);
+ publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp6_, _tmp8_);
#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_rest_support_argument_unref0 (argument);
-#line 11907 "PiwigoPublishing.c"
+#line 12468 "PiwigoPublishing.c"
}
}
#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
argument_collection = (_vala_array_free (argument_collection, argument_collection_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
-#line 11912 "PiwigoPublishing.c"
+#line 12473 "PiwigoPublishing.c"
}
#line 1650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return self;
-#line 11916 "PiwigoPublishing.c"
+#line 12477 "PiwigoPublishing.c"
}
-PublishingPiwigoSessionLoginTransaction* publishing_piwigo_session_login_transaction_new_from_other (PublishingPiwigoSession* session, PublishingPiwigoTransaction* other) {
+PublishingPiwigoSessionLoginTransaction*
+publishing_piwigo_session_login_transaction_new_from_other (PublishingPiwigoSession* session,
+ PublishingPiwigoTransaction* other)
+{
#line 1650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return publishing_piwigo_session_login_transaction_construct_from_other (PUBLISHING_PIWIGO_TYPE_SESSION_LOGIN_TRANSACTION, session, other);
-#line 11923 "PiwigoPublishing.c"
+#line 12487 "PiwigoPublishing.c"
}
-static void publishing_piwigo_session_login_transaction_class_init (PublishingPiwigoSessionLoginTransactionClass * klass) {
+static void
+publishing_piwigo_session_login_transaction_class_init (PublishingPiwigoSessionLoginTransactionClass * klass)
+{
#line 1641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_session_login_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 11930 "PiwigoPublishing.c"
+#line 12496 "PiwigoPublishing.c"
}
-static void publishing_piwigo_session_login_transaction_instance_init (PublishingPiwigoSessionLoginTransaction * self) {
+static void
+publishing_piwigo_session_login_transaction_instance_init (PublishingPiwigoSessionLoginTransaction * self)
+{
}
/**
* Transaction used to implement the network login interaction.
*/
-GType publishing_piwigo_session_login_transaction_get_type (void) {
+GType
+publishing_piwigo_session_login_transaction_get_type (void)
+{
static volatile gsize publishing_piwigo_session_login_transaction_type_id__volatile = 0;
if (g_once_init_enter (&publishing_piwigo_session_login_transaction_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingPiwigoSessionLoginTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_piwigo_session_login_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingPiwigoSessionLoginTransaction), 0, (GInstanceInitFunc) publishing_piwigo_session_login_transaction_instance_init, NULL };
@@ -11964,15 +12534,17 @@ GType publishing_piwigo_session_login_transaction_get_type (void) {
}
-PublishingPiwigoSessionGetStatusTransaction* publishing_piwigo_session_get_status_transaction_construct_unauthenticated (GType object_type, PublishingPiwigoSession* session, const gchar* url, const gchar* pwg_id) {
+PublishingPiwigoSessionGetStatusTransaction*
+publishing_piwigo_session_get_status_transaction_construct_unauthenticated (GType object_type,
+ PublishingPiwigoSession* session,
+ const gchar* url,
+ const gchar* pwg_id)
+{
PublishingPiwigoSessionGetStatusTransaction* self = NULL;
- PublishingPiwigoSession* _tmp0_;
- const gchar* _tmp1_;
- PublishingPiwigoSession* _tmp2_;
+ gchar* _tmp0_;
+ gchar* _tmp1_;
+ gchar* _tmp2_;
gchar* _tmp3_;
- gchar* _tmp4_;
- gchar* _tmp5_;
- gchar* _tmp6_;
#line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL);
#line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -11980,81 +12552,87 @@ PublishingPiwigoSessionGetStatusTransaction* publishing_piwigo_session_get_statu
#line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (pwg_id != NULL, NULL);
#line 1664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp0_ = session;
-#line 1664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp1_ = url;
-#line 1664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self = (PublishingPiwigoSessionGetStatusTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
+ self = (PublishingPiwigoSessionGetStatusTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), url, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
#line 1665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp2_ = session;
+ _tmp0_ = publishing_piwigo_session_get_pwg_id (session);
#line 1665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp3_ = publishing_piwigo_session_get_pwg_id (_tmp2_);
-#line 1665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp4_ = _tmp3_;
+ _tmp1_ = _tmp0_;
#line 1665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp5_ = g_strconcat ("pwg_id=", _tmp4_, NULL);
+ _tmp2_ = g_strconcat ("pwg_id=", _tmp1_, NULL);
#line 1665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp6_ = _tmp5_;
+ _tmp3_ = _tmp2_;
#line 1665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "Cookie", _tmp6_);
+ publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "Cookie", _tmp3_);
#line 1665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_free0 (_tmp6_);
+ _g_free0 (_tmp3_);
#line 1665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_free0 (_tmp4_);
+ _g_free0 (_tmp1_);
#line 1667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "method", "pwg.session.getStatus");
#line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return self;
-#line 11994 "PiwigoPublishing.c"
+#line 12560 "PiwigoPublishing.c"
}
-PublishingPiwigoSessionGetStatusTransaction* publishing_piwigo_session_get_status_transaction_new_unauthenticated (PublishingPiwigoSession* session, const gchar* url, const gchar* pwg_id) {
+PublishingPiwigoSessionGetStatusTransaction*
+publishing_piwigo_session_get_status_transaction_new_unauthenticated (PublishingPiwigoSession* session,
+ const gchar* url,
+ const gchar* pwg_id)
+{
#line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return publishing_piwigo_session_get_status_transaction_construct_unauthenticated (PUBLISHING_PIWIGO_TYPE_SESSION_GET_STATUS_TRANSACTION, session, url, pwg_id);
-#line 12001 "PiwigoPublishing.c"
+#line 12571 "PiwigoPublishing.c"
}
-PublishingPiwigoSessionGetStatusTransaction* publishing_piwigo_session_get_status_transaction_construct (GType object_type, PublishingPiwigoSession* session) {
+PublishingPiwigoSessionGetStatusTransaction*
+publishing_piwigo_session_get_status_transaction_construct (GType object_type,
+ PublishingPiwigoSession* session)
+{
PublishingPiwigoSessionGetStatusTransaction* self = NULL;
- PublishingPiwigoSession* _tmp0_;
#line 1670 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL);
#line 1671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp0_ = session;
-#line 1671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self = (PublishingPiwigoSessionGetStatusTransaction*) publishing_piwigo_transaction_construct_authenticated (object_type, _tmp0_);
+ self = (PublishingPiwigoSessionGetStatusTransaction*) publishing_piwigo_transaction_construct_authenticated (object_type, session);
#line 1673 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "method", "pwg.session.getStatus");
#line 1670 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return self;
-#line 12018 "PiwigoPublishing.c"
+#line 12588 "PiwigoPublishing.c"
}
-PublishingPiwigoSessionGetStatusTransaction* publishing_piwigo_session_get_status_transaction_new (PublishingPiwigoSession* session) {
+PublishingPiwigoSessionGetStatusTransaction*
+publishing_piwigo_session_get_status_transaction_new (PublishingPiwigoSession* session)
+{
#line 1670 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return publishing_piwigo_session_get_status_transaction_construct (PUBLISHING_PIWIGO_TYPE_SESSION_GET_STATUS_TRANSACTION, session);
-#line 12025 "PiwigoPublishing.c"
+#line 12597 "PiwigoPublishing.c"
}
-static void publishing_piwigo_session_get_status_transaction_class_init (PublishingPiwigoSessionGetStatusTransactionClass * klass) {
+static void
+publishing_piwigo_session_get_status_transaction_class_init (PublishingPiwigoSessionGetStatusTransactionClass * klass)
+{
#line 1662 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_session_get_status_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 12032 "PiwigoPublishing.c"
+#line 12606 "PiwigoPublishing.c"
}
-static void publishing_piwigo_session_get_status_transaction_instance_init (PublishingPiwigoSessionGetStatusTransaction * self) {
+static void
+publishing_piwigo_session_get_status_transaction_instance_init (PublishingPiwigoSessionGetStatusTransaction * self)
+{
}
/**
* Transaction used to implement the get status interaction.
*/
-GType publishing_piwigo_session_get_status_transaction_get_type (void) {
+GType
+publishing_piwigo_session_get_status_transaction_get_type (void)
+{
static volatile gsize publishing_piwigo_session_get_status_transaction_type_id__volatile = 0;
if (g_once_init_enter (&publishing_piwigo_session_get_status_transaction_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingPiwigoSessionGetStatusTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_piwigo_session_get_status_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingPiwigoSessionGetStatusTransaction), 0, (GInstanceInitFunc) publishing_piwigo_session_get_status_transaction_instance_init, NULL };
@@ -12066,47 +12644,55 @@ GType publishing_piwigo_session_get_status_transaction_get_type (void) {
}
-PublishingPiwigoCategoriesGetListTransaction* publishing_piwigo_categories_get_list_transaction_construct (GType object_type, PublishingPiwigoSession* session) {
+PublishingPiwigoCategoriesGetListTransaction*
+publishing_piwigo_categories_get_list_transaction_construct (GType object_type,
+ PublishingPiwigoSession* session)
+{
PublishingPiwigoCategoriesGetListTransaction* self = NULL;
- PublishingPiwigoSession* _tmp0_;
#line 1681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL);
#line 1682 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp0_ = session;
-#line 1682 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self = (PublishingPiwigoCategoriesGetListTransaction*) publishing_piwigo_transaction_construct_authenticated (object_type, _tmp0_);
+ self = (PublishingPiwigoCategoriesGetListTransaction*) publishing_piwigo_transaction_construct_authenticated (object_type, session);
#line 1684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "method", "pwg.categories.getList");
#line 1685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "recursive", "true");
#line 1681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return self;
-#line 12070 "PiwigoPublishing.c"
+#line 12648 "PiwigoPublishing.c"
}
-PublishingPiwigoCategoriesGetListTransaction* publishing_piwigo_categories_get_list_transaction_new (PublishingPiwigoSession* session) {
+PublishingPiwigoCategoriesGetListTransaction*
+publishing_piwigo_categories_get_list_transaction_new (PublishingPiwigoSession* session)
+{
#line 1681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return publishing_piwigo_categories_get_list_transaction_construct (PUBLISHING_PIWIGO_TYPE_CATEGORIES_GET_LIST_TRANSACTION, session);
-#line 12077 "PiwigoPublishing.c"
+#line 12657 "PiwigoPublishing.c"
}
-static void publishing_piwigo_categories_get_list_transaction_class_init (PublishingPiwigoCategoriesGetListTransactionClass * klass) {
+static void
+publishing_piwigo_categories_get_list_transaction_class_init (PublishingPiwigoCategoriesGetListTransactionClass * klass)
+{
#line 1680 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_categories_get_list_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 12084 "PiwigoPublishing.c"
+#line 12666 "PiwigoPublishing.c"
}
-static void publishing_piwigo_categories_get_list_transaction_instance_init (PublishingPiwigoCategoriesGetListTransaction * self) {
+static void
+publishing_piwigo_categories_get_list_transaction_instance_init (PublishingPiwigoCategoriesGetListTransaction * self)
+{
}
/**
* Transaction used to implement the fetch categories interaction.
*/
-GType publishing_piwigo_categories_get_list_transaction_get_type (void) {
+GType
+publishing_piwigo_categories_get_list_transaction_get_type (void)
+{
static volatile gsize publishing_piwigo_categories_get_list_transaction_type_id__volatile = 0;
if (g_once_init_enter (&publishing_piwigo_categories_get_list_transaction_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingPiwigoCategoriesGetListTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_piwigo_categories_get_list_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingPiwigoCategoriesGetListTransaction), 0, (GInstanceInitFunc) publishing_piwigo_categories_get_list_transaction_instance_init, NULL };
@@ -12118,42 +12704,50 @@ GType publishing_piwigo_categories_get_list_transaction_get_type (void) {
}
-PublishingPiwigoSessionLogoutTransaction* publishing_piwigo_session_logout_transaction_construct (GType object_type, PublishingPiwigoSession* session) {
+PublishingPiwigoSessionLogoutTransaction*
+publishing_piwigo_session_logout_transaction_construct (GType object_type,
+ PublishingPiwigoSession* session)
+{
PublishingPiwigoSessionLogoutTransaction* self = NULL;
- PublishingPiwigoSession* _tmp0_;
#line 1690 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL);
#line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp0_ = session;
-#line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self = (PublishingPiwigoSessionLogoutTransaction*) publishing_piwigo_transaction_construct_authenticated (object_type, _tmp0_);
+ self = (PublishingPiwigoSessionLogoutTransaction*) publishing_piwigo_transaction_construct_authenticated (object_type, session);
#line 1693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "method", "pwg.session.logout");
#line 1690 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return self;
-#line 12120 "PiwigoPublishing.c"
+#line 12706 "PiwigoPublishing.c"
}
-PublishingPiwigoSessionLogoutTransaction* publishing_piwigo_session_logout_transaction_new (PublishingPiwigoSession* session) {
+PublishingPiwigoSessionLogoutTransaction*
+publishing_piwigo_session_logout_transaction_new (PublishingPiwigoSession* session)
+{
#line 1690 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return publishing_piwigo_session_logout_transaction_construct (PUBLISHING_PIWIGO_TYPE_SESSION_LOGOUT_TRANSACTION, session);
-#line 12127 "PiwigoPublishing.c"
+#line 12715 "PiwigoPublishing.c"
}
-static void publishing_piwigo_session_logout_transaction_class_init (PublishingPiwigoSessionLogoutTransactionClass * klass) {
+static void
+publishing_piwigo_session_logout_transaction_class_init (PublishingPiwigoSessionLogoutTransactionClass * klass)
+{
#line 1689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_session_logout_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 12134 "PiwigoPublishing.c"
+#line 12724 "PiwigoPublishing.c"
}
-static void publishing_piwigo_session_logout_transaction_instance_init (PublishingPiwigoSessionLogoutTransaction * self) {
+static void
+publishing_piwigo_session_logout_transaction_instance_init (PublishingPiwigoSessionLogoutTransaction * self)
+{
}
-GType publishing_piwigo_session_logout_transaction_get_type (void) {
+GType
+publishing_piwigo_session_logout_transaction_get_type (void)
+{
static volatile gsize publishing_piwigo_session_logout_transaction_type_id__volatile = 0;
if (g_once_init_enter (&publishing_piwigo_session_logout_transaction_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingPiwigoSessionLogoutTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_piwigo_session_logout_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingPiwigoSessionLogoutTransaction), 0, (GInstanceInitFunc) publishing_piwigo_session_logout_transaction_instance_init, NULL };
@@ -12165,83 +12759,81 @@ GType publishing_piwigo_session_logout_transaction_get_type (void) {
}
-PublishingPiwigoCategoriesAddTransaction* publishing_piwigo_categories_add_transaction_construct (GType object_type, PublishingPiwigoSession* session, const gchar* category, gint parent_id, const gchar* comment) {
+PublishingPiwigoCategoriesAddTransaction*
+publishing_piwigo_categories_add_transaction_construct (GType object_type,
+ PublishingPiwigoSession* session,
+ const gchar* category,
+ gint parent_id,
+ const gchar* comment)
+{
PublishingPiwigoCategoriesAddTransaction* self = NULL;
- PublishingPiwigoSession* _tmp0_;
- const gchar* _tmp1_;
- gint _tmp2_;
- const gchar* _tmp6_;
#line 1698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL);
#line 1698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (category != NULL, NULL);
#line 1699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp0_ = session;
-#line 1699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self = (PublishingPiwigoCategoriesAddTransaction*) publishing_piwigo_transaction_construct_authenticated (object_type, _tmp0_);
+ self = (PublishingPiwigoCategoriesAddTransaction*) publishing_piwigo_transaction_construct_authenticated (object_type, session);
#line 1701 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "method", "pwg.categories.add");
#line 1702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp1_ = category;
-#line 1702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "name", _tmp1_);
-#line 1704 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp2_ = parent_id;
+ publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "name", category);
#line 1704 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (_tmp2_ != 0) {
-#line 12178 "PiwigoPublishing.c"
- gint _tmp3_;
- gchar* _tmp4_;
- gchar* _tmp5_;
+ if (parent_id != 0) {
+#line 12768 "PiwigoPublishing.c"
+ gchar* _tmp0_;
+ gchar* _tmp1_;
#line 1705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp3_ = parent_id;
+ _tmp0_ = g_strdup_printf ("%i", parent_id);
#line 1705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp4_ = g_strdup_printf ("%i", _tmp3_);
+ _tmp1_ = _tmp0_;
#line 1705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp5_ = _tmp4_;
+ publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "parent", _tmp1_);
#line 1705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "parent", _tmp5_);
-#line 1705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_free0 (_tmp5_);
-#line 12192 "PiwigoPublishing.c"
+ _g_free0 (_tmp1_);
+#line 12779 "PiwigoPublishing.c"
}
#line 1708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp6_ = comment;
-#line 1708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (g_strcmp0 (_tmp6_, "") != 0) {
-#line 12198 "PiwigoPublishing.c"
- const gchar* _tmp7_;
-#line 1709 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp7_ = comment;
+ if (g_strcmp0 (comment, "") != 0) {
#line 1709 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "comment", _tmp7_);
-#line 12204 "PiwigoPublishing.c"
+ publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "comment", comment);
+#line 12785 "PiwigoPublishing.c"
}
#line 1698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return self;
-#line 12208 "PiwigoPublishing.c"
+#line 12789 "PiwigoPublishing.c"
}
-PublishingPiwigoCategoriesAddTransaction* publishing_piwigo_categories_add_transaction_new (PublishingPiwigoSession* session, const gchar* category, gint parent_id, const gchar* comment) {
+PublishingPiwigoCategoriesAddTransaction*
+publishing_piwigo_categories_add_transaction_new (PublishingPiwigoSession* session,
+ const gchar* category,
+ gint parent_id,
+ const gchar* comment)
+{
#line 1698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return publishing_piwigo_categories_add_transaction_construct (PUBLISHING_PIWIGO_TYPE_CATEGORIES_ADD_TRANSACTION, session, category, parent_id, comment);
-#line 12215 "PiwigoPublishing.c"
+#line 12801 "PiwigoPublishing.c"
}
-static void publishing_piwigo_categories_add_transaction_class_init (PublishingPiwigoCategoriesAddTransactionClass * klass) {
+static void
+publishing_piwigo_categories_add_transaction_class_init (PublishingPiwigoCategoriesAddTransactionClass * klass)
+{
#line 1697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_categories_add_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 12222 "PiwigoPublishing.c"
+#line 12810 "PiwigoPublishing.c"
}
-static void publishing_piwigo_categories_add_transaction_instance_init (PublishingPiwigoCategoriesAddTransaction * self) {
+static void
+publishing_piwigo_categories_add_transaction_instance_init (PublishingPiwigoCategoriesAddTransaction * self)
+{
}
-GType publishing_piwigo_categories_add_transaction_get_type (void) {
+GType
+publishing_piwigo_categories_add_transaction_get_type (void)
+{
static volatile gsize publishing_piwigo_categories_add_transaction_type_id__volatile = 0;
if (g_once_init_enter (&publishing_piwigo_categories_add_transaction_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingPiwigoCategoriesAddTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_piwigo_categories_add_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingPiwigoCategoriesAddTransaction), 0, (GInstanceInitFunc) publishing_piwigo_categories_add_transaction_instance_init, NULL };
@@ -12253,496 +12845,398 @@ GType publishing_piwigo_categories_add_transaction_get_type (void) {
}
-static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int str_array_length1) {
+static gchar*
+_vala_g_strjoinv (const gchar* separator,
+ gchar** str_array,
+ int str_array_length1)
+{
gchar* result = NULL;
- const gchar* _tmp0_;
- gboolean _tmp1_ = FALSE;
- gboolean _tmp2_ = FALSE;
- gchar** _tmp3_;
- gint _tmp3__length1;
-#line 1078 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp0_ = separator;
-#line 1078 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp0_ == NULL) {
-#line 1079 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ gboolean _tmp0_ = FALSE;
+#line 1092 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (separator == NULL) {
+#line 1093 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
separator = "";
-#line 12255 "PiwigoPublishing.c"
- }
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp3_ = str_array;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp3__length1 = str_array_length1;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp3_ != NULL) {
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp2_ = TRUE;
-#line 12265 "PiwigoPublishing.c"
- } else {
- gchar** _tmp4_;
- gint _tmp4__length1;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp4_ = str_array;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp4__length1 = str_array_length1;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp2_ = _tmp4__length1 > 0;
-#line 12275 "PiwigoPublishing.c"
- }
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp2_) {
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp1_ = TRUE;
-#line 12281 "PiwigoPublishing.c"
- } else {
- gboolean _tmp5_ = FALSE;
- gchar** _tmp6_;
- gint _tmp6__length1;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp6_ = str_array;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp6__length1 = str_array_length1;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp6__length1 == -1) {
-#line 12292 "PiwigoPublishing.c"
- gchar** _tmp7_;
- gint _tmp7__length1;
- const gchar* _tmp8_;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp7_ = str_array;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp7__length1 = str_array_length1;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp8_ = _tmp7_[0];
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp5_ = _tmp8_ != NULL;
-#line 12304 "PiwigoPublishing.c"
+#line 12845 "PiwigoPublishing.c"
+ }
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (str_array != NULL) {
+#line 12849 "PiwigoPublishing.c"
+ gboolean _tmp1_ = FALSE;
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (str_array_length1 > 0) {
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp1_ = TRUE;
+#line 12855 "PiwigoPublishing.c"
} else {
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp5_ = FALSE;
-#line 12308 "PiwigoPublishing.c"
+ gboolean _tmp2_ = FALSE;
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (str_array_length1 == -1) {
+#line 12860 "PiwigoPublishing.c"
+ const gchar* _tmp3_;
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp3_ = str_array[0];
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp2_ = _tmp3_ != NULL;
+#line 12866 "PiwigoPublishing.c"
+ } else {
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp2_ = FALSE;
+#line 12870 "PiwigoPublishing.c"
+ }
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp1_ = _tmp2_;
+#line 12874 "PiwigoPublishing.c"
}
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp1_ = _tmp5_;
-#line 12312 "PiwigoPublishing.c"
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp0_ = _tmp1_;
+#line 12878 "PiwigoPublishing.c"
+ } else {
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp0_ = FALSE;
+#line 12882 "PiwigoPublishing.c"
}
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp1_) {
-#line 12316 "PiwigoPublishing.c"
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (_tmp0_) {
+#line 12886 "PiwigoPublishing.c"
gint i = 0;
gsize len = 0UL;
- gint _tmp31_;
- gint _tmp33_;
- gint _tmp34_;
- gsize _tmp35_;
- const gchar* _tmp36_;
- gint _tmp37_;
- gint _tmp38_;
- gint _tmp39_;
+ gint _tmp20_;
+ gint _tmp22_;
+ gint _tmp23_;
+ gsize _tmp24_;
+ gint _tmp25_;
+ gint _tmp26_;
+ gint _tmp27_;
const gchar* res = NULL;
- gsize _tmp40_;
- void* _tmp41_;
+ gsize _tmp28_;
+ void* _tmp29_;
void* ptr = NULL;
- const gchar* _tmp42_;
- gchar** _tmp43_;
- gint _tmp43__length1;
- const gchar* _tmp44_;
- void* _tmp45_;
- const gchar* _tmp62_;
-#line 1083 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ const gchar* _tmp30_;
+ const gchar* _tmp31_;
+ void* _tmp32_;
+ const gchar* _tmp45_;
+#line 1097 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
len = (gsize) 1;
-#line 12339 "PiwigoPublishing.c"
+#line 12906 "PiwigoPublishing.c"
{
- gboolean _tmp9_ = FALSE;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ gboolean _tmp4_ = FALSE;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
i = 0;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp9_ = TRUE;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp4_ = TRUE;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
while (TRUE) {
-#line 12348 "PiwigoPublishing.c"
- gboolean _tmp11_ = FALSE;
- gboolean _tmp12_ = FALSE;
- gchar** _tmp13_;
- gint _tmp13__length1;
- gint _tmp21_ = 0;
- gchar** _tmp22_;
- gint _tmp22__length1;
- gint _tmp23_;
- const gchar* _tmp24_;
- gsize _tmp30_;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (!_tmp9_) {
-#line 12361 "PiwigoPublishing.c"
- gint _tmp10_;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp10_ = i;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- i = _tmp10_ + 1;
-#line 12367 "PiwigoPublishing.c"
+#line 12915 "PiwigoPublishing.c"
+ gboolean _tmp6_ = FALSE;
+ gboolean _tmp7_ = FALSE;
+ gint _tmp12_ = 0;
+ gint _tmp13_;
+ const gchar* _tmp14_;
+ gsize _tmp19_;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (!_tmp4_) {
+#line 12924 "PiwigoPublishing.c"
+ gint _tmp5_;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp5_ = i;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ i = _tmp5_ + 1;
+#line 12930 "PiwigoPublishing.c"
}
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp9_ = FALSE;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp13_ = str_array;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp13__length1 = str_array_length1;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp13__length1 != -1) {
-#line 12377 "PiwigoPublishing.c"
- gint _tmp14_;
- gchar** _tmp15_;
- gint _tmp15__length1;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp14_ = i;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp15_ = str_array;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp15__length1 = str_array_length1;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp12_ = _tmp14_ < _tmp15__length1;
-#line 12389 "PiwigoPublishing.c"
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp4_ = FALSE;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (str_array_length1 != -1) {
+#line 12936 "PiwigoPublishing.c"
+ gint _tmp8_;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp8_ = i;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp7_ = _tmp8_ < str_array_length1;
+#line 12942 "PiwigoPublishing.c"
} else {
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp12_ = FALSE;
-#line 12393 "PiwigoPublishing.c"
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp7_ = FALSE;
+#line 12946 "PiwigoPublishing.c"
}
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp12_) {
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp11_ = TRUE;
-#line 12399 "PiwigoPublishing.c"
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (_tmp7_) {
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp6_ = TRUE;
+#line 12952 "PiwigoPublishing.c"
} else {
- gboolean _tmp16_ = FALSE;
- gchar** _tmp17_;
- gint _tmp17__length1;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp17_ = str_array;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp17__length1 = str_array_length1;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp17__length1 == -1) {
-#line 12410 "PiwigoPublishing.c"
- gchar** _tmp18_;
- gint _tmp18__length1;
- gint _tmp19_;
- const gchar* _tmp20_;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp18_ = str_array;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp18__length1 = str_array_length1;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp19_ = i;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp20_ = _tmp18_[_tmp19_];
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp16_ = _tmp20_ != NULL;
-#line 12425 "PiwigoPublishing.c"
+ gboolean _tmp9_ = FALSE;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (str_array_length1 == -1) {
+#line 12957 "PiwigoPublishing.c"
+ gint _tmp10_;
+ const gchar* _tmp11_;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp10_ = i;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp11_ = str_array[_tmp10_];
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp9_ = _tmp11_ != NULL;
+#line 12966 "PiwigoPublishing.c"
} else {
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp16_ = FALSE;
-#line 12429 "PiwigoPublishing.c"
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp9_ = FALSE;
+#line 12970 "PiwigoPublishing.c"
}
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp11_ = _tmp16_;
-#line 12433 "PiwigoPublishing.c"
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp6_ = _tmp9_;
+#line 12974 "PiwigoPublishing.c"
}
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (!_tmp11_) {
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (!_tmp6_) {
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
break;
-#line 12439 "PiwigoPublishing.c"
+#line 12980 "PiwigoPublishing.c"
}
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp22_ = str_array;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp22__length1 = str_array_length1;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp23_ = i;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp24_ = _tmp22_[_tmp23_];
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp24_ != NULL) {
-#line 12451 "PiwigoPublishing.c"
- gchar** _tmp25_;
- gint _tmp25__length1;
- gint _tmp26_;
- const gchar* _tmp27_;
- gint _tmp28_;
- gint _tmp29_;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp25_ = str_array;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp25__length1 = str_array_length1;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp26_ = i;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp27_ = _tmp25_[_tmp26_];
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp28_ = strlen ((const gchar*) _tmp27_);
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp29_ = _tmp28_;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp21_ = _tmp29_;
-#line 12472 "PiwigoPublishing.c"
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp13_ = i;
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp14_ = str_array[_tmp13_];
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (_tmp14_ != NULL) {
+#line 12988 "PiwigoPublishing.c"
+ gint _tmp15_;
+ const gchar* _tmp16_;
+ gint _tmp17_;
+ gint _tmp18_;
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp15_ = i;
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp16_ = str_array[_tmp15_];
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp17_ = strlen ((const gchar*) _tmp16_);
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp18_ = _tmp17_;
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp12_ = _tmp18_;
+#line 13003 "PiwigoPublishing.c"
} else {
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp21_ = 0;
-#line 12476 "PiwigoPublishing.c"
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp12_ = 0;
+#line 13007 "PiwigoPublishing.c"
}
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp30_ = len;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- len = _tmp30_ + _tmp21_;
-#line 12482 "PiwigoPublishing.c"
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp19_ = len;
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ len = _tmp19_ + _tmp12_;
+#line 13013 "PiwigoPublishing.c"
}
}
-#line 1087 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp31_ = i;
-#line 1087 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp31_ == 0) {
-#line 12489 "PiwigoPublishing.c"
- gchar* _tmp32_;
-#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp32_ = g_strdup ("");
-#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- result = _tmp32_;
-#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1101 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp20_ = i;
+#line 1101 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (_tmp20_ == 0) {
+#line 13020 "PiwigoPublishing.c"
+ gchar* _tmp21_;
+#line 1102 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp21_ = g_strdup ("");
+#line 1102 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = _tmp21_;
+#line 1102 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 12497 "PiwigoPublishing.c"
+#line 13028 "PiwigoPublishing.c"
}
-#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp33_ = i;
-#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- str_array_length1 = _tmp33_;
-#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp34_ = str_array_length1;
-#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp35_ = len;
-#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp36_ = separator;
-#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp37_ = strlen ((const gchar*) _tmp36_);
-#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp38_ = _tmp37_;
-#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp39_ = i;
-#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- len = _tmp35_ + (_tmp38_ * (_tmp39_ - 1));
-#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp40_ = len;
-#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp41_ = g_malloc (_tmp40_);
-#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- res = _tmp41_;
-#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp42_ = res;
-#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp43_ = str_array;
-#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp43__length1 = str_array_length1;
-#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp44_ = _tmp43_[0];
-#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_);
-#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- ptr = _tmp45_;
-#line 12535 "PiwigoPublishing.c"
+#line 1104 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp22_ = i;
+#line 1104 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ str_array_length1 = _tmp22_;
+#line 1104 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp23_ = str_array_length1;
+#line 1105 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp24_ = len;
+#line 1105 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp25_ = strlen ((const gchar*) separator);
+#line 1105 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp26_ = _tmp25_;
+#line 1105 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp27_ = i;
+#line 1105 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ len = _tmp24_ + (_tmp26_ * (_tmp27_ - 1));
+#line 1107 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp28_ = len;
+#line 1107 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp29_ = g_malloc (_tmp28_);
+#line 1107 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ res = _tmp29_;
+#line 1108 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp30_ = res;
+#line 1108 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp31_ = str_array[0];
+#line 1108 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp32_ = g_stpcpy ((void*) _tmp30_, (const gchar*) _tmp31_);
+#line 1108 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ ptr = _tmp32_;
+#line 13060 "PiwigoPublishing.c"
{
- gboolean _tmp46_ = FALSE;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ gboolean _tmp33_ = FALSE;
+#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
i = 1;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp46_ = TRUE;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp33_ = TRUE;
+#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
while (TRUE) {
-#line 12544 "PiwigoPublishing.c"
- gint _tmp48_;
- gchar** _tmp49_;
- gint _tmp49__length1;
- void* _tmp50_;
- const gchar* _tmp51_;
- void* _tmp52_;
- const gchar* _tmp53_ = NULL;
- gchar** _tmp54_;
- gint _tmp54__length1;
- gint _tmp55_;
- const gchar* _tmp56_;
- void* _tmp60_;
- void* _tmp61_;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (!_tmp46_) {
-#line 12560 "PiwigoPublishing.c"
- gint _tmp47_;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp47_ = i;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- i = _tmp47_ + 1;
-#line 12566 "PiwigoPublishing.c"
+#line 13069 "PiwigoPublishing.c"
+ gint _tmp35_;
+ void* _tmp36_;
+ void* _tmp37_;
+ const gchar* _tmp38_ = NULL;
+ gint _tmp39_;
+ const gchar* _tmp40_;
+ void* _tmp43_;
+ void* _tmp44_;
+#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (!_tmp33_) {
+#line 13080 "PiwigoPublishing.c"
+ gint _tmp34_;
+#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp34_ = i;
+#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ i = _tmp34_ + 1;
+#line 13086 "PiwigoPublishing.c"
}
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp46_ = FALSE;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp48_ = i;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp49_ = str_array;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp49__length1 = str_array_length1;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (!(_tmp48_ < _tmp49__length1)) {
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp33_ = FALSE;
+#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp35_ = i;
+#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (!(_tmp35_ < str_array_length1)) {
+#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
break;
-#line 12580 "PiwigoPublishing.c"
+#line 13096 "PiwigoPublishing.c"
}
-#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp50_ = ptr;
-#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp51_ = separator;
-#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp52_ = g_stpcpy (_tmp50_, (const gchar*) _tmp51_);
-#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- ptr = _tmp52_;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp54_ = str_array;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp54__length1 = str_array_length1;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp55_ = i;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp56_ = _tmp54_[_tmp55_];
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp56_ != NULL) {
-#line 12600 "PiwigoPublishing.c"
- gchar** _tmp57_;
- gint _tmp57__length1;
- gint _tmp58_;
- const gchar* _tmp59_;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp57_ = str_array;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp57__length1 = str_array_length1;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp58_ = i;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp59_ = _tmp57_[_tmp58_];
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp53_ = (const gchar*) _tmp59_;
-#line 12615 "PiwigoPublishing.c"
+#line 1110 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp36_ = ptr;
+#line 1110 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp37_ = g_stpcpy (_tmp36_, (const gchar*) separator);
+#line 1110 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ ptr = _tmp37_;
+#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp39_ = i;
+#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp40_ = str_array[_tmp39_];
+#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (_tmp40_ != NULL) {
+#line 13110 "PiwigoPublishing.c"
+ gint _tmp41_;
+ const gchar* _tmp42_;
+#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp41_ = i;
+#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp42_ = str_array[_tmp41_];
+#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp38_ = (const gchar*) _tmp42_;
+#line 13119 "PiwigoPublishing.c"
} else {
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp53_ = "";
-#line 12619 "PiwigoPublishing.c"
+#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp38_ = "";
+#line 13123 "PiwigoPublishing.c"
}
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp60_ = ptr;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp61_ = g_stpcpy (_tmp60_, _tmp53_);
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- ptr = _tmp61_;
-#line 12627 "PiwigoPublishing.c"
+#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp43_ = ptr;
+#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp44_ = g_stpcpy (_tmp43_, _tmp38_);
+#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ ptr = _tmp44_;
+#line 13131 "PiwigoPublishing.c"
}
}
-#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp62_ = res;
-#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1114 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp45_ = res;
+#line 1114 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
res = NULL;
-#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- result = (gchar*) _tmp62_;
-#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1114 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = (gchar*) _tmp45_;
+#line 1114 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 12638 "PiwigoPublishing.c"
+#line 13142 "PiwigoPublishing.c"
} else {
- gchar* _tmp63_;
-#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp63_ = g_strdup ("");
-#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- result = _tmp63_;
-#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ gchar* _tmp46_;
+#line 1116 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp46_ = g_strdup ("");
+#line 1116 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = _tmp46_;
+#line 1116 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 12647 "PiwigoPublishing.c"
+#line 13151 "PiwigoPublishing.c"
}
}
-static void _g_free0_ (gpointer var) {
+static void
+_g_free0_ (gpointer var)
+{
#line 1774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
var = (g_free (var), NULL);
-#line 12655 "PiwigoPublishing.c"
+#line 13161 "PiwigoPublishing.c"
}
-PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_construct (GType object_type, PublishingPiwigoSession* session, PublishingPiwigoPublishingParameters* parameters, SpitPublishingPublishable* publishable) {
+PublishingPiwigoImagesAddTransaction*
+publishing_piwigo_images_add_transaction_construct (GType object_type,
+ PublishingPiwigoSession* session,
+ PublishingPiwigoPublishingParameters* parameters,
+ SpitPublishingPublishable* publishable)
+{
PublishingPiwigoImagesAddTransaction* self = NULL;
- PublishingPiwigoSession* _tmp0_;
- SpitPublishingPublishable* _tmp1_;
- PublishingPiwigoSession* _tmp2_;
- gchar* _tmp3_;
- gchar* _tmp4_;
- PublishingPiwigoSession* _tmp5_;
- gboolean _tmp6_;
- PublishingPiwigoPublishingParameters* _tmp12_;
- PublishingPiwigoPublishingParameters* _tmp13_;
+ gchar* _tmp0_;
+ gchar* _tmp1_;
+ PublishingPiwigoPublishingParameters* _tmp6_;
gchar** keywords = NULL;
- SpitPublishingPublishable* _tmp14_;
- gint _tmp15_;
- gchar** _tmp16_;
+ gint _tmp7_;
+ gchar** _tmp8_;
gint keywords_length1;
gint _keywords_size_;
gchar* tags = NULL;
- gchar* _tmp17_;
- gchar** _tmp18_;
- gint _tmp18__length1;
- SpitPublishingPublishable* _tmp21_;
- GFile* _tmp22_;
- GFile* _tmp23_;
- gchar* _tmp24_;
- gchar* _tmp25_;
- PublishingPiwigoPublishingParameters* _tmp26_;
- PublishingPiwigoCategory* _tmp27_;
- gint _tmp28_;
- PublishingPiwigoPublishingParameters* _tmp29_;
- PublishingPiwigoPermissionLevel* _tmp30_;
- gint _tmp31_;
+ gchar* _tmp9_;
+ gchar** _tmp10_;
+ gint _tmp10__length1;
+ GFile* _tmp13_;
+ GFile* _tmp14_;
+ gchar* _tmp15_;
+ gchar* _tmp16_;
+ PublishingPiwigoCategory* _tmp17_;
+ gint _tmp18_;
+ PublishingPiwigoPermissionLevel* _tmp19_;
+ gint _tmp20_;
gchar* name = NULL;
- SpitPublishingPublishable* _tmp32_;
- gchar* _tmp33_;
+ gchar* _tmp21_;
gchar* comment = NULL;
- SpitPublishingPublishable* _tmp34_;
- gchar* _tmp35_;
- gboolean _tmp36_ = FALSE;
- const gchar* _tmp37_;
- PublishingPiwigoPublishingParameters* _tmp55_;
- PublishingPiwigoCategory* _tmp56_;
- gint _tmp57_;
- gchar* _tmp58_;
- gchar* _tmp59_;
- PublishingPiwigoPublishingParameters* _tmp60_;
- PublishingPiwigoPermissionLevel* _tmp61_;
- gint _tmp62_;
- gchar* _tmp63_;
- gchar* _tmp64_;
- PublishingPiwigoPublishingParameters* _tmp65_;
- gboolean _tmp66_;
+ gchar* _tmp22_;
+ gboolean _tmp23_ = FALSE;
+ const gchar* _tmp24_;
+ PublishingPiwigoCategory* _tmp40_;
+ gint _tmp41_;
+ gchar* _tmp42_;
+ gchar* _tmp43_;
+ PublishingPiwigoPermissionLevel* _tmp44_;
+ gint _tmp45_;
+ gchar* _tmp46_;
+ gchar* _tmp47_;
+ gboolean _tmp48_;
GHashTable* disposition_table = NULL;
- GHashFunc _tmp69_;
- GEqualFunc _tmp70_;
- GHashTable* _tmp71_;
+ GHashFunc _tmp51_;
+ GEqualFunc _tmp52_;
+ GHashTable* _tmp53_;
gchar* basename = NULL;
- SpitPublishingPublishable* _tmp72_;
- gchar* _tmp73_;
- gboolean _tmp74_ = FALSE;
- const gchar* _tmp75_;
- gchar* _tmp76_;
- gchar* _tmp77_;
- gboolean _tmp78_;
- gboolean _tmp79_;
- GHashTable* _tmp86_;
- gchar* _tmp87_;
- const gchar* _tmp88_;
- gchar* _tmp89_;
- GHashTable* _tmp90_;
- gchar* _tmp91_;
- gchar* _tmp92_;
- GHashTable* _tmp93_;
+ gchar* _tmp54_;
+ gboolean _tmp55_ = FALSE;
+ const gchar* _tmp56_;
+ gchar* _tmp57_;
+ gchar* _tmp58_;
+ gboolean _tmp59_;
+ GHashTable* _tmp65_;
+ gchar* _tmp66_;
+ const gchar* _tmp67_;
+ gchar* _tmp68_;
+ GHashTable* _tmp69_;
+ gchar* _tmp70_;
+ gchar* _tmp71_;
+ GHashTable* _tmp72_;
#line 1717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL);
#line 1717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -12750,393 +13244,347 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_c
#line 1717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL);
#line 1718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp0_ = session;
-#line 1718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp1_ = publishable;
+ _tmp0_ = publishing_piwigo_session_get_pwg_url (session);
#line 1718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp2_ = session;
-#line 1718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp3_ = publishing_piwigo_session_get_pwg_url (_tmp2_);
-#line 1718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp4_ = _tmp3_;
+ _tmp1_ = _tmp0_;
#line 1718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self = (PublishingPiwigoImagesAddTransaction*) publishing_rest_support_upload_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, _tmp4_);
+ self = (PublishingPiwigoImagesAddTransaction*) publishing_rest_support_upload_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), publishable, _tmp1_);
#line 1718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_free0 (_tmp4_);
-#line 1719 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp5_ = session;
+ _g_free0 (_tmp1_);
#line 1719 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp6_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 1719 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (_tmp6_) {
-#line 12758 "PiwigoPublishing.c"
- PublishingPiwigoSession* _tmp7_;
- gchar* _tmp8_;
- gchar* _tmp9_;
- gchar* _tmp10_;
- gchar* _tmp11_;
-#line 1720 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp7_ = session;
+ if (publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession))) {
+#line 13242 "PiwigoPublishing.c"
+ gchar* _tmp2_;
+ gchar* _tmp3_;
+ gchar* _tmp4_;
+ gchar* _tmp5_;
#line 1720 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp8_ = publishing_piwigo_session_get_pwg_id (_tmp7_);
+ _tmp2_ = publishing_piwigo_session_get_pwg_id (session);
#line 1720 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp9_ = _tmp8_;
+ _tmp3_ = _tmp2_;
#line 1720 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp10_ = g_strconcat ("pwg_id=", _tmp9_, NULL);
+ _tmp4_ = g_strconcat ("pwg_id=", _tmp3_, NULL);
#line 1720 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp11_ = _tmp10_;
+ _tmp5_ = _tmp4_;
#line 1720 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "Cookie", _tmp11_);
+ publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "Cookie", _tmp5_);
#line 1720 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_free0 (_tmp11_);
+ _g_free0 (_tmp5_);
#line 1720 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_free0 (_tmp9_);
-#line 12780 "PiwigoPublishing.c"
+ _g_free0 (_tmp3_);
+#line 13261 "PiwigoPublishing.c"
}
#line 1722 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp12_ = parameters;
-#line 1722 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp13_ = _publishing_piwigo_publishing_parameters_ref0 (_tmp12_);
+ _tmp6_ = _publishing_piwigo_publishing_parameters_ref0 (parameters);
#line 1722 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_piwigo_publishing_parameters_unref0 (self->priv->parameters);
#line 1722 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->parameters = _tmp13_;
+ self->priv->parameters = _tmp6_;
#line 1724 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp14_ = publishable;
+ _tmp8_ = spit_publishing_publishable_get_publishing_keywords (publishable, &_tmp7_);
#line 1724 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp16_ = spit_publishing_publishable_get_publishing_keywords (_tmp14_, &_tmp15_);
+ keywords = _tmp8_;
#line 1724 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- keywords = _tmp16_;
-#line 1724 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- keywords_length1 = _tmp15_;
+ keywords_length1 = _tmp7_;
#line 1724 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_keywords_size_ = keywords_length1;
#line 1725 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp17_ = g_strdup ("");
+ _tmp9_ = g_strdup ("");
#line 1725 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- tags = _tmp17_;
+ tags = _tmp9_;
#line 1726 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp18_ = keywords;
+ _tmp10_ = keywords;
#line 1726 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp18__length1 = keywords_length1;
+ _tmp10__length1 = keywords_length1;
#line 1726 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (_tmp18_ != NULL) {
-#line 12810 "PiwigoPublishing.c"
- gchar** _tmp19_;
- gint _tmp19__length1;
- gchar* _tmp20_;
+ if (_tmp10_ != NULL) {
+#line 13287 "PiwigoPublishing.c"
+ gchar** _tmp11_;
+ gint _tmp11__length1;
+ gchar* _tmp12_;
#line 1727 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp19_ = keywords;
+ _tmp11_ = keywords;
#line 1727 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp19__length1 = keywords_length1;
+ _tmp11__length1 = keywords_length1;
#line 1727 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp20_ = _vala_g_strjoinv (",", _tmp19_, _tmp19__length1);
+ _tmp12_ = _vala_g_strjoinv (",", _tmp11_, _tmp11__length1);
#line 1727 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (tags);
#line 1727 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- tags = _tmp20_;
-#line 12824 "PiwigoPublishing.c"
+ tags = _tmp12_;
+#line 13301 "PiwigoPublishing.c"
}
#line 1730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp21_ = publishable;
-#line 1730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp22_ = spit_publishing_publishable_get_serialized_file (_tmp21_);
+ _tmp13_ = spit_publishing_publishable_get_serialized_file (publishable);
#line 1730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp23_ = _tmp22_;
-#line 1730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp24_ = g_file_get_basename (_tmp23_);
-#line 1730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp25_ = _tmp24_;
+ _tmp14_ = _tmp13_;
#line 1730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp26_ = parameters;
+ _tmp15_ = g_file_get_basename (_tmp14_);
#line 1730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp27_ = _tmp26_->category;
+ _tmp16_ = _tmp15_;
#line 1730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp28_ = _tmp27_->id;
+ _tmp17_ = parameters->category;
#line 1730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp29_ = parameters;
+ _tmp18_ = _tmp17_->id;
#line 1730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp30_ = _tmp29_->perm_level;
+ _tmp19_ = parameters->perm_level;
#line 1730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp31_ = _tmp30_->id;
+ _tmp20_ = _tmp19_->id;
#line 1730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_debug ("PiwigoPublishing.vala:1730: PiwigoConnector: Uploading photo %s to cat" \
-"egory id %d with perm level %d", _tmp25_, _tmp28_, _tmp31_);
+"egory id %d with perm level %d", _tmp16_, _tmp18_, _tmp20_);
#line 1730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_free0 (_tmp25_);
+ _g_free0 (_tmp16_);
#line 1730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_object_unref0 (_tmp23_);
-#line 1733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp32_ = publishable;
+ _g_object_unref0 (_tmp14_);
#line 1733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp33_ = spit_publishing_publishable_get_publishing_name (_tmp32_);
+ _tmp21_ = spit_publishing_publishable_get_publishing_name (publishable);
#line 1733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- name = _tmp33_;
+ name = _tmp21_;
#line 1734 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp34_ = publishable;
+ _tmp22_ = spit_publishing_publishable_get_param_string (publishable, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_COMMENT);
#line 1734 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp35_ = spit_publishing_publishable_get_param_string (_tmp34_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_COMMENT);
-#line 1734 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- comment = _tmp35_;
+ comment = _tmp22_;
#line 1736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp37_ = name;
+ _tmp24_ = name;
#line 1736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (_tmp37_ == NULL) {
+ if (_tmp24_ == NULL) {
#line 1736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp36_ = TRUE;
-#line 12872 "PiwigoPublishing.c"
+ _tmp23_ = TRUE;
+#line 13339 "PiwigoPublishing.c"
} else {
- const gchar* _tmp38_;
+ const gchar* _tmp25_;
#line 1736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp38_ = name;
+ _tmp25_ = name;
#line 1736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp36_ = g_strcmp0 (_tmp38_, "") == 0;
-#line 12879 "PiwigoPublishing.c"
+ _tmp23_ = g_strcmp0 (_tmp25_, "") == 0;
+#line 13346 "PiwigoPublishing.c"
}
#line 1736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (_tmp36_) {
-#line 12883 "PiwigoPublishing.c"
- SpitPublishingPublishable* _tmp39_;
- gchar* _tmp40_;
- const gchar* _tmp41_;
- gboolean _tmp42_ = FALSE;
- const gchar* _tmp43_;
-#line 1737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp39_ = publishable;
+ if (_tmp23_) {
+#line 13350 "PiwigoPublishing.c"
+ gchar* _tmp26_;
+ const gchar* _tmp27_;
+ gboolean _tmp28_ = FALSE;
+ const gchar* _tmp29_;
#line 1737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp40_ = spit_publishing_publishable_get_param_string (_tmp39_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME);
+ _tmp26_ = spit_publishing_publishable_get_param_string (publishable, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME);
#line 1737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (name);
#line 1737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- name = _tmp40_;
+ name = _tmp26_;
#line 1739 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp41_ = name;
+ _tmp27_ = name;
#line 1739 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "name", _tmp41_);
+ publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "name", _tmp27_);
#line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp43_ = comment;
+ _tmp29_ = comment;
#line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (_tmp43_ != NULL) {
-#line 12905 "PiwigoPublishing.c"
- const gchar* _tmp44_;
+ if (_tmp29_ != NULL) {
+#line 13369 "PiwigoPublishing.c"
+ const gchar* _tmp30_;
#line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp44_ = comment;
+ _tmp30_ = comment;
#line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp42_ = g_strcmp0 (_tmp44_, "") != 0;
-#line 12911 "PiwigoPublishing.c"
+ _tmp28_ = g_strcmp0 (_tmp30_, "") != 0;
+#line 13375 "PiwigoPublishing.c"
} else {
#line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp42_ = FALSE;
-#line 12915 "PiwigoPublishing.c"
+ _tmp28_ = FALSE;
+#line 13379 "PiwigoPublishing.c"
}
#line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (_tmp42_) {
-#line 12919 "PiwigoPublishing.c"
- const gchar* _tmp45_;
+ if (_tmp28_) {
+#line 13383 "PiwigoPublishing.c"
+ const gchar* _tmp31_;
#line 1741 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp45_ = comment;
+ _tmp31_ = comment;
#line 1741 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "comment", _tmp45_);
-#line 12925 "PiwigoPublishing.c"
+ publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "comment", _tmp31_);
+#line 13389 "PiwigoPublishing.c"
}
} else {
- gboolean _tmp46_ = FALSE;
- const gchar* _tmp47_;
+ gboolean _tmp32_ = FALSE;
+ const gchar* _tmp33_;
#line 1745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp47_ = comment;
+ _tmp33_ = comment;
#line 1745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (_tmp47_ != NULL) {
-#line 12934 "PiwigoPublishing.c"
- const gchar* _tmp48_;
+ if (_tmp33_ != NULL) {
+#line 13398 "PiwigoPublishing.c"
+ const gchar* _tmp34_;
#line 1745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp48_ = comment;
+ _tmp34_ = comment;
#line 1745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp46_ = g_strcmp0 (_tmp48_, "") != 0;
-#line 12940 "PiwigoPublishing.c"
+ _tmp32_ = g_strcmp0 (_tmp34_, "") != 0;
+#line 13404 "PiwigoPublishing.c"
} else {
#line 1745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp46_ = FALSE;
-#line 12944 "PiwigoPublishing.c"
+ _tmp32_ = FALSE;
+#line 13408 "PiwigoPublishing.c"
}
#line 1745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (_tmp46_) {
-#line 12948 "PiwigoPublishing.c"
- const gchar* _tmp49_;
- const gchar* _tmp50_;
+ if (_tmp32_) {
+#line 13412 "PiwigoPublishing.c"
+ const gchar* _tmp35_;
+ const gchar* _tmp36_;
#line 1746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp49_ = name;
+ _tmp35_ = name;
#line 1746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "name", _tmp49_);
+ publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "name", _tmp35_);
#line 1747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp50_ = comment;
+ _tmp36_ = comment;
#line 1747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "comment", _tmp50_);
-#line 12959 "PiwigoPublishing.c"
+ publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "comment", _tmp36_);
+#line 13423 "PiwigoPublishing.c"
} else {
- PublishingPiwigoPublishingParameters* _tmp51_;
- gboolean _tmp52_;
+ gboolean _tmp37_;
#line 1752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp51_ = parameters;
+ _tmp37_ = parameters->title_as_comment;
#line 1752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp52_ = _tmp51_->title_as_comment;
-#line 1752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (_tmp52_) {
-#line 12969 "PiwigoPublishing.c"
- const gchar* _tmp53_;
+ if (_tmp37_) {
+#line 13430 "PiwigoPublishing.c"
+ const gchar* _tmp38_;
#line 1753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp53_ = name;
+ _tmp38_ = name;
#line 1753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "comment", _tmp53_);
-#line 12975 "PiwigoPublishing.c"
+ publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "comment", _tmp38_);
+#line 13436 "PiwigoPublishing.c"
} else {
- const gchar* _tmp54_;
+ const gchar* _tmp39_;
#line 1755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp54_ = name;
+ _tmp39_ = name;
#line 1755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "name", _tmp54_);
-#line 12982 "PiwigoPublishing.c"
+ publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "name", _tmp39_);
+#line 13443 "PiwigoPublishing.c"
}
}
}
#line 1759 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "method", "pwg.images.addSimple");
#line 1760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp55_ = parameters;
-#line 1760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp56_ = _tmp55_->category;
+ _tmp40_ = parameters->category;
#line 1760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp57_ = _tmp56_->id;
+ _tmp41_ = _tmp40_->id;
#line 1760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp58_ = g_strdup_printf ("%i", _tmp57_);
+ _tmp42_ = g_strdup_printf ("%i", _tmp41_);
#line 1760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp59_ = _tmp58_;
+ _tmp43_ = _tmp42_;
#line 1760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "category", _tmp59_);
+ publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "category", _tmp43_);
#line 1760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_free0 (_tmp59_);
+ _g_free0 (_tmp43_);
#line 1761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp60_ = parameters;
+ _tmp44_ = parameters->perm_level;
#line 1761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp61_ = _tmp60_->perm_level;
+ _tmp45_ = _tmp44_->id;
#line 1761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp62_ = _tmp61_->id;
+ _tmp46_ = g_strdup_printf ("%i", _tmp45_);
#line 1761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp63_ = g_strdup_printf ("%i", _tmp62_);
+ _tmp47_ = _tmp46_;
#line 1761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp64_ = _tmp63_;
+ publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "level", _tmp47_);
#line 1761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "level", _tmp64_);
-#line 1761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_free0 (_tmp64_);
-#line 1762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp65_ = parameters;
+ _g_free0 (_tmp47_);
#line 1762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp66_ = _tmp65_->no_upload_tags;
+ _tmp48_ = parameters->no_upload_tags;
#line 1762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (!_tmp66_) {
-#line 13022 "PiwigoPublishing.c"
- const gchar* _tmp67_;
+ if (!_tmp48_) {
+#line 13477 "PiwigoPublishing.c"
+ const gchar* _tmp49_;
#line 1763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp67_ = tags;
+ _tmp49_ = tags;
#line 1763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (g_strcmp0 (_tmp67_, "") != 0) {
-#line 13028 "PiwigoPublishing.c"
- const gchar* _tmp68_;
+ if (g_strcmp0 (_tmp49_, "") != 0) {
+#line 13483 "PiwigoPublishing.c"
+ const gchar* _tmp50_;
#line 1764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp68_ = tags;
+ _tmp50_ = tags;
#line 1764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "tags", _tmp68_);
-#line 13034 "PiwigoPublishing.c"
+ publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "tags", _tmp50_);
+#line 13489 "PiwigoPublishing.c"
}
}
#line 1774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp69_ = g_str_hash;
+ _tmp51_ = g_str_hash;
#line 1774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp70_ = g_str_equal;
+ _tmp52_ = g_str_equal;
#line 1774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp71_ = g_hash_table_new_full (_tmp69_, _tmp70_, _g_free0_, _g_free0_);
+ _tmp53_ = g_hash_table_new_full (_tmp51_, _tmp52_, _g_free0_, _g_free0_);
#line 1774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- disposition_table = _tmp71_;
+ disposition_table = _tmp53_;
#line 1776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp72_ = publishable;
+ _tmp54_ = spit_publishing_publishable_get_param_string (publishable, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME);
#line 1776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp73_ = spit_publishing_publishable_get_param_string (_tmp72_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME);
-#line 1776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- basename = _tmp73_;
-#line 1777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp75_ = basename;
+ basename = _tmp54_;
#line 1777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp76_ = g_utf8_strdown (_tmp75_, (gssize) -1);
+ _tmp56_ = basename;
#line 1777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp77_ = _tmp76_;
+ _tmp57_ = g_utf8_strdown (_tmp56_, (gssize) -1);
#line 1777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp78_ = g_str_has_suffix (_tmp77_, ".jpeg");
+ _tmp58_ = _tmp57_;
#line 1777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp79_ = !_tmp78_;
+ _tmp59_ = !g_str_has_suffix (_tmp58_, ".jpeg");
#line 1777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_free0 (_tmp77_);
+ _g_free0 (_tmp58_);
#line 1777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (_tmp79_) {
-#line 13065 "PiwigoPublishing.c"
- const gchar* _tmp80_;
- gchar* _tmp81_;
- gchar* _tmp82_;
- gboolean _tmp83_;
+ if (_tmp59_) {
+#line 13516 "PiwigoPublishing.c"
+ const gchar* _tmp60_;
+ gchar* _tmp61_;
+ gchar* _tmp62_;
#line 1778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp80_ = basename;
+ _tmp60_ = basename;
#line 1778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp81_ = g_utf8_strdown (_tmp80_, (gssize) -1);
+ _tmp61_ = g_utf8_strdown (_tmp60_, (gssize) -1);
#line 1778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp82_ = _tmp81_;
+ _tmp62_ = _tmp61_;
#line 1778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp83_ = g_str_has_suffix (_tmp82_, ".jpg");
+ _tmp55_ = !g_str_has_suffix (_tmp62_, ".jpg");
#line 1778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp74_ = !_tmp83_;
-#line 1778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_free0 (_tmp82_);
-#line 13082 "PiwigoPublishing.c"
+ _g_free0 (_tmp62_);
+#line 13530 "PiwigoPublishing.c"
} else {
#line 1777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp74_ = FALSE;
-#line 13086 "PiwigoPublishing.c"
+ _tmp55_ = FALSE;
+#line 13534 "PiwigoPublishing.c"
}
#line 1777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (_tmp74_) {
-#line 13090 "PiwigoPublishing.c"
- const gchar* _tmp84_;
- gchar* _tmp85_;
+ if (_tmp55_) {
+#line 13538 "PiwigoPublishing.c"
+ const gchar* _tmp63_;
+ gchar* _tmp64_;
#line 1779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp84_ = basename;
+ _tmp63_ = basename;
#line 1779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp85_ = g_strconcat (_tmp84_, ".jpg", NULL);
+ _tmp64_ = g_strconcat (_tmp63_, ".jpg", NULL);
#line 1779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (basename);
#line 1779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- basename = _tmp85_;
-#line 13101 "PiwigoPublishing.c"
+ basename = _tmp64_;
+#line 13549 "PiwigoPublishing.c"
}
#line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp86_ = disposition_table;
+ _tmp65_ = disposition_table;
#line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp87_ = g_strdup ("filename");
+ _tmp66_ = g_strdup ("filename");
#line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp88_ = basename;
+ _tmp67_ = basename;
#line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp89_ = soup_uri_encode (_tmp88_, NULL);
+ _tmp68_ = soup_uri_encode (_tmp67_, NULL);
#line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_hash_table_insert (_tmp86_, _tmp87_, _tmp89_);
+ g_hash_table_insert (_tmp65_, _tmp66_, _tmp68_);
#line 1782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp90_ = disposition_table;
+ _tmp69_ = disposition_table;
#line 1782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp91_ = g_strdup ("name");
+ _tmp70_ = g_strdup ("name");
#line 1782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp92_ = g_strdup ("image");
+ _tmp71_ = g_strdup ("image");
#line 1782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_hash_table_insert (_tmp90_, _tmp91_, _tmp92_);
+ g_hash_table_insert (_tmp69_, _tmp70_, _tmp71_);
#line 1784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp93_ = disposition_table;
+ _tmp72_ = disposition_table;
#line 1784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- publishing_rest_support_upload_transaction_set_binary_disposition_table (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction), _tmp93_);
+ publishing_rest_support_upload_transaction_set_binary_disposition_table (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction), _tmp72_);
#line 1717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (basename);
#line 1717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -13151,38 +13599,48 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_c
keywords = (_vala_array_free (keywords, keywords_length1, (GDestroyNotify) g_free), NULL);
#line 1717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return self;
-#line 13139 "PiwigoPublishing.c"
+#line 13587 "PiwigoPublishing.c"
}
-PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_new (PublishingPiwigoSession* session, PublishingPiwigoPublishingParameters* parameters, SpitPublishingPublishable* publishable) {
+PublishingPiwigoImagesAddTransaction*
+publishing_piwigo_images_add_transaction_new (PublishingPiwigoSession* session,
+ PublishingPiwigoPublishingParameters* parameters,
+ SpitPublishingPublishable* publishable)
+{
#line 1717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return publishing_piwigo_images_add_transaction_construct (PUBLISHING_PIWIGO_TYPE_IMAGES_ADD_TRANSACTION, session, parameters, publishable);
-#line 13146 "PiwigoPublishing.c"
+#line 13598 "PiwigoPublishing.c"
}
-static void publishing_piwigo_images_add_transaction_class_init (PublishingPiwigoImagesAddTransactionClass * klass) {
+static void
+publishing_piwigo_images_add_transaction_class_init (PublishingPiwigoImagesAddTransactionClass * klass)
+{
#line 1714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_images_add_transaction_parent_class = g_type_class_peek_parent (klass);
#line 1714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
((PublishingRESTSupportTransactionClass *) klass)->finalize = publishing_piwigo_images_add_transaction_finalize;
#line 1714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_type_class_add_private (klass, sizeof (PublishingPiwigoImagesAddTransactionPrivate));
-#line 13157 "PiwigoPublishing.c"
+#line 13611 "PiwigoPublishing.c"
}
-static void publishing_piwigo_images_add_transaction_instance_init (PublishingPiwigoImagesAddTransaction * self) {
+static void
+publishing_piwigo_images_add_transaction_instance_init (PublishingPiwigoImagesAddTransaction * self)
+{
#line 1714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->priv = PUBLISHING_PIWIGO_IMAGES_ADD_TRANSACTION_GET_PRIVATE (self);
#line 1715 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->priv->parameters = NULL;
-#line 13166 "PiwigoPublishing.c"
+#line 13622 "PiwigoPublishing.c"
}
-static void publishing_piwigo_images_add_transaction_finalize (PublishingRESTSupportTransaction * obj) {
+static void
+publishing_piwigo_images_add_transaction_finalize (PublishingRESTSupportTransaction * obj)
+{
PublishingPiwigoImagesAddTransaction * self;
#line 1714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PIWIGO_TYPE_IMAGES_ADD_TRANSACTION, PublishingPiwigoImagesAddTransaction);
@@ -13190,11 +13648,13 @@ static void publishing_piwigo_images_add_transaction_finalize (PublishingRESTSup
_publishing_piwigo_publishing_parameters_unref0 (self->priv->parameters);
#line 1714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_piwigo_images_add_transaction_parent_class)->finalize (obj);
-#line 13178 "PiwigoPublishing.c"
+#line 13636 "PiwigoPublishing.c"
}
-GType publishing_piwigo_images_add_transaction_get_type (void) {
+GType
+publishing_piwigo_images_add_transaction_get_type (void)
+{
static volatile gsize publishing_piwigo_images_add_transaction_type_id__volatile = 0;
if (g_once_init_enter (&publishing_piwigo_images_add_transaction_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingPiwigoImagesAddTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_piwigo_images_add_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingPiwigoImagesAddTransaction), 0, (GInstanceInitFunc) publishing_piwigo_images_add_transaction_instance_init, NULL };
@@ -13206,7 +13666,11 @@ GType publishing_piwigo_images_add_transaction_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) {
@@ -13218,13 +13682,19 @@ 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);
}
-static gint _vala_array_length (gpointer array) {
+static gint
+_vala_array_length (gpointer array)
+{
int length;
length = 0;
if (array) {
diff --git a/plugins/shotwell-publishing/TumblrPublishing.c b/plugins/shotwell-publishing/TumblrPublishing.c
index 0a3643f..862982d 100644
--- a/plugins/shotwell-publishing/TumblrPublishing.c
+++ b/plugins/shotwell-publishing/TumblrPublishing.c
@@ -1,4 +1,4 @@
-/* TumblrPublishing.c generated by valac 0.36.6, the Vala compiler
+/* TumblrPublishing.c generated by valac 0.40.4, the Vala compiler
* generated from TumblrPublishing.vala, do not modify */
/* Copyright 2012 BJA Electronics
@@ -8,6 +8,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>
@@ -38,6 +39,11 @@
typedef struct _TumblrService TumblrService;
typedef struct _TumblrServiceClass TumblrServiceClass;
typedef struct _TumblrServicePrivate TumblrServicePrivate;
+enum {
+ TUMBLR_SERVICE_0_PROPERTY,
+ TUMBLR_SERVICE_NUM_PROPERTIES
+};
+static GParamSpec* tumblr_service_properties[TUMBLR_SERVICE_NUM_PROPERTIES];
#define _g_free0(var) (var = (g_free (var), NULL))
#define PUBLISHING_TUMBLR_TYPE_TUMBLR_PUBLISHER (publishing_tumblr_tumblr_publisher_get_type ())
@@ -84,6 +90,11 @@ typedef struct _PublishingTumblrTumblrPublisherPrivate PublishingTumblrTumblrPub
typedef struct _PublishingTumblrTumblrPublisherPublishingOptionsPane PublishingTumblrTumblrPublisherPublishingOptionsPane;
typedef struct _PublishingTumblrTumblrPublisherPublishingOptionsPaneClass PublishingTumblrTumblrPublisherPublishingOptionsPaneClass;
+enum {
+ PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_0_PROPERTY,
+ PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_NUM_PROPERTIES
+};
+static GParamSpec* publishing_tumblr_tumblr_publisher_properties[PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_NUM_PROPERTIES];
#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
#define _publishing_rest_support_session_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rest_support_session_unref (var), NULL)))
#define _g_variant_unref0(var) ((var == NULL) ? NULL : (var = (g_variant_unref (var), NULL)))
@@ -116,14 +127,19 @@ typedef struct _PublishingTumblrTumblrPublisherUploader PublishingTumblrTumblrPu
typedef struct _PublishingTumblrTumblrPublisherUploaderClass PublishingTumblrTumblrPublisherUploaderClass;
#define _publishing_rest_support_batch_uploader_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rest_support_batch_uploader_unref (var), NULL)))
typedef struct _PublishingTumblrTumblrPublisherPublishingOptionsPanePrivate PublishingTumblrTumblrPublisherPublishingOptionsPanePrivate;
+enum {
+ PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_0_PROPERTY,
+ PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_NUM_PROPERTIES
+};
+static GParamSpec* publishing_tumblr_tumblr_publisher_publishing_options_pane_properties[PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_NUM_PROPERTIES];
#define _publishing_tumblr_blog_entry_unref0(var) ((var == NULL) ? NULL : (var = (publishing_tumblr_blog_entry_unref (var), NULL)))
#define _publishing_tumblr_size_entry_unref0(var) ((var == NULL) ? NULL : (var = (publishing_tumblr_size_entry_unref (var), NULL)))
enum {
PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL,
PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL,
- PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL
+ PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_NUM_SIGNALS
};
-static guint publishing_tumblr_tumblr_publisher_publishing_options_pane_signals[PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL] = {0};
+static guint publishing_tumblr_tumblr_publisher_publishing_options_pane_signals[PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_NUM_SIGNALS] = {0};
typedef struct _PublishingTumblrTumblrPublisherUserInfoFetchTransactionPrivate PublishingTumblrTumblrPublisherUserInfoFetchTransactionPrivate;
#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOAD_TRANSACTION (publishing_tumblr_tumblr_publisher_upload_transaction_get_type ())
@@ -296,21 +312,28 @@ static gpointer publishing_tumblr_tumblr_publisher_uploader_parent_class = NULL;
static SpitPublishingPublisherIface * publishing_tumblr_tumblr_publisher_spit_publishing_publisher_parent_iface = NULL;
GType tumblr_service_get_type (void) G_GNUC_CONST;
-enum {
- TUMBLR_SERVICE_DUMMY_PROPERTY
-};
#define TUMBLR_SERVICE_ICON_FILENAME "tumblr.png"
TumblrService* tumblr_service_new (GFile* resource_directory);
-TumblrService* tumblr_service_construct (GType object_type, GFile* resource_directory);
-static gint tumblr_service_real_get_pluggable_interface (SpitPluggable* base, gint min_host_interface, gint max_host_interface);
+TumblrService* tumblr_service_construct (GType object_type,
+ GFile* resource_directory);
+static gint tumblr_service_real_get_pluggable_interface (SpitPluggable* base,
+ gint min_host_interface,
+ gint max_host_interface);
static const gchar* tumblr_service_real_get_id (SpitPluggable* base);
static const gchar* tumblr_service_real_get_pluggable_name (SpitPluggable* base);
-static void tumblr_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info);
-static GdkPixbuf** _vala_array_dup8 (GdkPixbuf** self, int length);
-static void tumblr_service_real_activation (SpitPluggable* base, gboolean enabled);
-static SpitPublishingPublisher* tumblr_service_real_create_publisher (SpitPublishingService* base, SpitPublishingPluginHost* host);
-PublishingTumblrTumblrPublisher* publishing_tumblr_tumblr_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host);
-PublishingTumblrTumblrPublisher* publishing_tumblr_tumblr_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host);
+static void tumblr_service_real_get_info (SpitPluggable* base,
+ SpitPluggableInfo* info);
+static GdkPixbuf** _vala_array_dup8 (GdkPixbuf** self,
+ int length);
+static void tumblr_service_real_activation (SpitPluggable* base,
+ gboolean enabled);
+static SpitPublishingPublisher* tumblr_service_real_create_publisher (SpitPublishingService* base,
+ SpitPublishingPluginHost* host);
+PublishingTumblrTumblrPublisher* publishing_tumblr_tumblr_publisher_new (SpitPublishingService* service,
+ SpitPublishingPluginHost* host);
+PublishingTumblrTumblrPublisher* publishing_tumblr_tumblr_publisher_construct (GType object_type,
+ SpitPublishingService* service,
+ SpitPublishingPluginHost* host);
GType publishing_tumblr_tumblr_publisher_get_type (void) G_GNUC_CONST;
static SpitPublishingPublisherMediaType tumblr_service_real_get_supported_media (SpitPublishingService* base);
static void tumblr_service_finalize (GObject * obj);
@@ -320,131 +343,214 @@ static void tumblr_service_finalize (GObject * obj);
#define PUBLISHING_TUMBLR_ORIGINAL_SIZE -1
gpointer publishing_tumblr_blog_entry_ref (gpointer instance);
void publishing_tumblr_blog_entry_unref (gpointer instance);
-GParamSpec* publishing_tumblr_param_spec_blog_entry (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void publishing_tumblr_value_set_blog_entry (GValue* value, gpointer v_object);
-void publishing_tumblr_value_take_blog_entry (GValue* value, gpointer v_object);
+GParamSpec* publishing_tumblr_param_spec_blog_entry (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void publishing_tumblr_value_set_blog_entry (GValue* value,
+ gpointer v_object);
+void publishing_tumblr_value_take_blog_entry (GValue* value,
+ gpointer v_object);
gpointer publishing_tumblr_value_get_blog_entry (const GValue* value);
GType publishing_tumblr_blog_entry_get_type (void) G_GNUC_CONST;
-enum {
- PUBLISHING_TUMBLR_BLOG_ENTRY_DUMMY_PROPERTY
-};
-PublishingTumblrBlogEntry* publishing_tumblr_blog_entry_new (const gchar* creator_blog, const gchar* creator_url);
-PublishingTumblrBlogEntry* publishing_tumblr_blog_entry_construct (GType object_type, const gchar* creator_blog, const gchar* creator_url);
+PublishingTumblrBlogEntry* publishing_tumblr_blog_entry_new (const gchar* creator_blog,
+ const gchar* creator_url);
+PublishingTumblrBlogEntry* publishing_tumblr_blog_entry_construct (GType object_type,
+ const gchar* creator_blog,
+ const gchar* creator_url);
static void publishing_tumblr_blog_entry_finalize (PublishingTumblrBlogEntry * obj);
gpointer publishing_tumblr_size_entry_ref (gpointer instance);
void publishing_tumblr_size_entry_unref (gpointer instance);
-GParamSpec* publishing_tumblr_param_spec_size_entry (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void publishing_tumblr_value_set_size_entry (GValue* value, gpointer v_object);
-void publishing_tumblr_value_take_size_entry (GValue* value, gpointer v_object);
+GParamSpec* publishing_tumblr_param_spec_size_entry (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void publishing_tumblr_value_set_size_entry (GValue* value,
+ gpointer v_object);
+void publishing_tumblr_value_take_size_entry (GValue* value,
+ gpointer v_object);
gpointer publishing_tumblr_value_get_size_entry (const GValue* value);
GType publishing_tumblr_size_entry_get_type (void) G_GNUC_CONST;
-enum {
- PUBLISHING_TUMBLR_SIZE_ENTRY_DUMMY_PROPERTY
-};
-PublishingTumblrSizeEntry* publishing_tumblr_size_entry_new (const gchar* creator_title, gint creator_size);
-PublishingTumblrSizeEntry* publishing_tumblr_size_entry_construct (GType object_type, const gchar* creator_title, gint creator_size);
+PublishingTumblrSizeEntry* publishing_tumblr_size_entry_new (const gchar* creator_title,
+ gint creator_size);
+PublishingTumblrSizeEntry* publishing_tumblr_size_entry_construct (GType object_type,
+ const gchar* creator_title,
+ gint creator_size);
static void publishing_tumblr_size_entry_finalize (PublishingTumblrSizeEntry * obj);
GType publishing_tumblr_tumblr_publisher_publishing_options_pane_get_type (void) G_GNUC_CONST;
#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_TUMBLR_TYPE_TUMBLR_PUBLISHER, PublishingTumblrTumblrPublisherPrivate))
-enum {
- PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_DUMMY_PROPERTY
-};
static void publishing_tumblr_tumblr_publisher_on_authenticator_authenticated (PublishingTumblrTumblrPublisher* self);
-static void _publishing_tumblr_tumblr_publisher_on_authenticator_authenticated_spit_publishing_authenticator_authenticated (SpitPublishingAuthenticator* _sender, gpointer self);
-static PublishingTumblrSizeEntry** publishing_tumblr_tumblr_publisher_create_sizes (PublishingTumblrTumblrPublisher* self, int* result_length1);
-static void _vala_array_add31 (PublishingTumblrSizeEntry** * array, int* length, int* size, PublishingTumblrSizeEntry* value);
-static void _vala_array_add32 (PublishingTumblrSizeEntry** * array, int* length, int* size, PublishingTumblrSizeEntry* value);
-static void _vala_array_add33 (PublishingTumblrSizeEntry** * array, int* length, int* size, PublishingTumblrSizeEntry* value);
-static PublishingTumblrBlogEntry** publishing_tumblr_tumblr_publisher_create_blogs (PublishingTumblrTumblrPublisher* self, int* result_length1);
+static void _publishing_tumblr_tumblr_publisher_on_authenticator_authenticated_spit_publishing_authenticator_authenticated (SpitPublishingAuthenticator* _sender,
+ gpointer self);
+static PublishingTumblrSizeEntry** publishing_tumblr_tumblr_publisher_create_sizes (PublishingTumblrTumblrPublisher* self,
+ int* result_length1);
+static void _vala_array_add31 (PublishingTumblrSizeEntry** * array,
+ int* length,
+ int* size,
+ PublishingTumblrSizeEntry* value);
+static void _vala_array_add32 (PublishingTumblrSizeEntry** * array,
+ int* length,
+ int* size,
+ PublishingTumblrSizeEntry* value);
+static void _vala_array_add33 (PublishingTumblrSizeEntry** * array,
+ int* length,
+ int* size,
+ PublishingTumblrSizeEntry* value);
+static PublishingTumblrBlogEntry** publishing_tumblr_tumblr_publisher_create_blogs (PublishingTumblrTumblrPublisher* self,
+ int* result_length1);
static SpitPublishingService* publishing_tumblr_tumblr_publisher_real_get_service (SpitPublishingPublisher* base);
SpitPublishingPluginHost* publishing_tumblr_tumblr_publisher_get_host (PublishingTumblrTumblrPublisher* self);
static gboolean publishing_tumblr_tumblr_publisher_real_is_running (SpitPublishingPublisher* base);
gint publishing_tumblr_tumblr_publisher_get_persistent_default_size (PublishingTumblrTumblrPublisher* self);
-void publishing_tumblr_tumblr_publisher_set_persistent_default_size (PublishingTumblrTumblrPublisher* self, gint size);
+void publishing_tumblr_tumblr_publisher_set_persistent_default_size (PublishingTumblrTumblrPublisher* self,
+ gint size);
gint publishing_tumblr_tumblr_publisher_get_persistent_default_blog (PublishingTumblrTumblrPublisher* self);
-void publishing_tumblr_tumblr_publisher_set_persistent_default_blog (PublishingTumblrTumblrPublisher* self, gint blog);
+void publishing_tumblr_tumblr_publisher_set_persistent_default_blog (PublishingTumblrTumblrPublisher* self,
+ gint blog);
static void publishing_tumblr_tumblr_publisher_do_get_blogs (PublishingTumblrTumblrPublisher* self);
GType publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_get_type (void) G_GNUC_CONST;
PublishingTumblrTumblrPublisherUserInfoFetchTransaction* publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_new (PublishingRESTSupportOAuth1Session* session);
-PublishingTumblrTumblrPublisherUserInfoFetchTransaction* publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_construct (GType object_type, PublishingRESTSupportOAuth1Session* session);
-static void publishing_tumblr_tumblr_publisher_on_info_request_txn_completed (PublishingTumblrTumblrPublisher* self, PublishingRESTSupportTransaction* txn);
-static void _publishing_tumblr_tumblr_publisher_on_info_request_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
-static void publishing_tumblr_tumblr_publisher_on_info_request_txn_error (PublishingTumblrTumblrPublisher* self, PublishingRESTSupportTransaction* txn, GError* err);
-static void _publishing_tumblr_tumblr_publisher_on_info_request_txn_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self);
-static void publishing_tumblr_tumblr_publisher_do_parse_token_info_from_user_request (PublishingTumblrTumblrPublisher* self, const gchar* response);
+PublishingTumblrTumblrPublisherUserInfoFetchTransaction* publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_construct (GType object_type,
+ PublishingRESTSupportOAuth1Session* session);
+static void publishing_tumblr_tumblr_publisher_on_info_request_txn_completed (PublishingTumblrTumblrPublisher* self,
+ PublishingRESTSupportTransaction* txn);
+static void _publishing_tumblr_tumblr_publisher_on_info_request_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+ gpointer self);
+static void publishing_tumblr_tumblr_publisher_on_info_request_txn_error (PublishingTumblrTumblrPublisher* self,
+ PublishingRESTSupportTransaction* txn,
+ GError* err);
+static void _publishing_tumblr_tumblr_publisher_on_info_request_txn_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+ GError* err,
+ gpointer self);
+static void publishing_tumblr_tumblr_publisher_do_parse_token_info_from_user_request (PublishingTumblrTumblrPublisher* self,
+ const gchar* response);
static void publishing_tumblr_tumblr_publisher_do_show_publishing_options_pane (PublishingTumblrTumblrPublisher* self);
-static void _vala_array_add34 (PublishingTumblrBlogEntry** * array, int* length, int* size, PublishingTumblrBlogEntry* value);
-PublishingTumblrTumblrPublisherPublishingOptionsPane* publishing_tumblr_tumblr_publisher_publishing_options_pane_new (PublishingTumblrTumblrPublisher* publisher, SpitPublishingPublisherMediaType media_type, PublishingTumblrSizeEntry** sizes, int sizes_length1, PublishingTumblrBlogEntry** blogs, int blogs_length1, const gchar* username);
-PublishingTumblrTumblrPublisherPublishingOptionsPane* publishing_tumblr_tumblr_publisher_publishing_options_pane_construct (GType object_type, PublishingTumblrTumblrPublisher* publisher, SpitPublishingPublisherMediaType media_type, PublishingTumblrSizeEntry** sizes, int sizes_length1, PublishingTumblrBlogEntry** blogs, int blogs_length1, const gchar* username);
+static void _vala_array_add34 (PublishingTumblrBlogEntry** * array,
+ int* length,
+ int* size,
+ PublishingTumblrBlogEntry* value);
+PublishingTumblrTumblrPublisherPublishingOptionsPane* publishing_tumblr_tumblr_publisher_publishing_options_pane_new (PublishingTumblrTumblrPublisher* publisher,
+ SpitPublishingPublisherMediaType media_type,
+ PublishingTumblrSizeEntry** sizes,
+ int sizes_length1,
+ PublishingTumblrBlogEntry** blogs,
+ int blogs_length1,
+ const gchar* username);
+PublishingTumblrTumblrPublisherPublishingOptionsPane* publishing_tumblr_tumblr_publisher_publishing_options_pane_construct (GType object_type,
+ PublishingTumblrTumblrPublisher* publisher,
+ SpitPublishingPublisherMediaType media_type,
+ PublishingTumblrSizeEntry** sizes,
+ int sizes_length1,
+ PublishingTumblrBlogEntry** blogs,
+ int blogs_length1,
+ const gchar* username);
static void publishing_tumblr_tumblr_publisher_on_publishing_options_pane_publish (PublishingTumblrTumblrPublisher* self);
-static void _publishing_tumblr_tumblr_publisher_on_publishing_options_pane_publish_publishing_tumblr_tumblr_publisher_publishing_options_pane_publish (PublishingTumblrTumblrPublisherPublishingOptionsPane* _sender, gpointer self);
+static void _publishing_tumblr_tumblr_publisher_on_publishing_options_pane_publish_publishing_tumblr_tumblr_publisher_publishing_options_pane_publish (PublishingTumblrTumblrPublisherPublishingOptionsPane* _sender,
+ gpointer self);
static void publishing_tumblr_tumblr_publisher_on_publishing_options_pane_logout (PublishingTumblrTumblrPublisher* self);
-static void _publishing_tumblr_tumblr_publisher_on_publishing_options_pane_logout_publishing_tumblr_tumblr_publisher_publishing_options_pane_logout (PublishingTumblrTumblrPublisherPublishingOptionsPane* _sender, gpointer self);
+static void _publishing_tumblr_tumblr_publisher_on_publishing_options_pane_logout_publishing_tumblr_tumblr_publisher_publishing_options_pane_logout (PublishingTumblrTumblrPublisherPublishingOptionsPane* _sender,
+ gpointer self);
static void publishing_tumblr_tumblr_publisher_do_publish (PublishingTumblrTumblrPublisher* self);
static void publishing_tumblr_tumblr_publisher_do_logout (PublishingTumblrTumblrPublisher* self);
-gint publishing_tumblr_tumblr_publisher_tumblr_date_time_compare_func (SpitPublishingPublishable* a, SpitPublishingPublishable* b);
-static gint _publishing_tumblr_tumblr_publisher_tumblr_date_time_compare_func_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self);
+gint publishing_tumblr_tumblr_publisher_tumblr_date_time_compare_func (SpitPublishingPublishable* a,
+ SpitPublishingPublishable* b);
+static gint _publishing_tumblr_tumblr_publisher_tumblr_date_time_compare_func_gcompare_data_func (gconstpointer a,
+ gconstpointer b,
+ gpointer self);
GType publishing_tumblr_tumblr_publisher_uploader_get_type (void) G_GNUC_CONST;
-PublishingTumblrTumblrPublisherUploader* publishing_tumblr_tumblr_publisher_uploader_new (PublishingRESTSupportOAuth1Session* session, SpitPublishingPublishable** publishables, int publishables_length1, const gchar* blog_url);
-PublishingTumblrTumblrPublisherUploader* publishing_tumblr_tumblr_publisher_uploader_construct (GType object_type, PublishingRESTSupportOAuth1Session* session, SpitPublishingPublishable** publishables, int publishables_length1, const gchar* blog_url);
-static void publishing_tumblr_tumblr_publisher_on_upload_complete (PublishingTumblrTumblrPublisher* self, PublishingRESTSupportBatchUploader* uploader, gint num_published);
-static void _publishing_tumblr_tumblr_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender, gint num_photos_published, gpointer self);
-static void publishing_tumblr_tumblr_publisher_on_upload_error (PublishingTumblrTumblrPublisher* self, PublishingRESTSupportBatchUploader* uploader, GError* err);
-static void _publishing_tumblr_tumblr_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender, GError* err, gpointer self);
-static void publishing_tumblr_tumblr_publisher_on_upload_status_updated (PublishingTumblrTumblrPublisher* self, gint file_number, gdouble completed_fraction);
-static void _publishing_tumblr_tumblr_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self);
+PublishingTumblrTumblrPublisherUploader* publishing_tumblr_tumblr_publisher_uploader_new (PublishingRESTSupportOAuth1Session* session,
+ SpitPublishingPublishable** publishables,
+ int publishables_length1,
+ const gchar* blog_url);
+PublishingTumblrTumblrPublisherUploader* publishing_tumblr_tumblr_publisher_uploader_construct (GType object_type,
+ PublishingRESTSupportOAuth1Session* session,
+ SpitPublishingPublishable** publishables,
+ int publishables_length1,
+ const gchar* blog_url);
+static void publishing_tumblr_tumblr_publisher_on_upload_complete (PublishingTumblrTumblrPublisher* self,
+ PublishingRESTSupportBatchUploader* uploader,
+ gint num_published);
+static void _publishing_tumblr_tumblr_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender,
+ gint num_photos_published,
+ gpointer self);
+static void publishing_tumblr_tumblr_publisher_on_upload_error (PublishingTumblrTumblrPublisher* self,
+ PublishingRESTSupportBatchUploader* uploader,
+ GError* err);
+static void _publishing_tumblr_tumblr_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender,
+ GError* err,
+ gpointer self);
+static void publishing_tumblr_tumblr_publisher_on_upload_status_updated (PublishingTumblrTumblrPublisher* self,
+ gint file_number,
+ gdouble completed_fraction);
+static void _publishing_tumblr_tumblr_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number,
+ gdouble fraction_complete,
+ gpointer self);
static void publishing_tumblr_tumblr_publisher_do_show_success_pane (PublishingTumblrTumblrPublisher* self);
void publishing_tumblr_tumblr_publisher_attempt_start (PublishingTumblrTumblrPublisher* self);
static void publishing_tumblr_tumblr_publisher_real_start (SpitPublishingPublisher* base);
static void publishing_tumblr_tumblr_publisher_real_stop (SpitPublishingPublisher* base);
#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, PublishingTumblrTumblrPublisherPublishingOptionsPanePrivate))
-enum {
- PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_DUMMY_PROPERTY
-};
-static PublishingTumblrSizeEntry** _vala_array_dup9 (PublishingTumblrSizeEntry** self, int length);
-static PublishingTumblrBlogEntry** _vala_array_dup10 (PublishingTumblrBlogEntry** self, int length);
+static PublishingTumblrSizeEntry** _vala_array_dup9 (PublishingTumblrSizeEntry** self,
+ int length);
+static PublishingTumblrBlogEntry** _vala_array_dup10 (PublishingTumblrBlogEntry** self,
+ int length);
static void publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_blog_combo (PublishingTumblrTumblrPublisherPublishingOptionsPane* self);
static void publishing_tumblr_tumblr_publisher_publishing_options_pane_on_blog_changed (PublishingTumblrTumblrPublisherPublishingOptionsPane* self);
-static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_blog_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
+static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_blog_changed_gtk_combo_box_changed (GtkComboBox* _sender,
+ gpointer self);
static void publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_size_combo (PublishingTumblrTumblrPublisherPublishingOptionsPane* self);
static void publishing_tumblr_tumblr_publisher_publishing_options_pane_on_size_changed (PublishingTumblrTumblrPublisherPublishingOptionsPane* self);
-static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_size_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
+static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_size_changed_gtk_combo_box_changed (GtkComboBox* _sender,
+ gpointer self);
static void publishing_tumblr_tumblr_publisher_publishing_options_pane_on_logout_clicked (PublishingTumblrTumblrPublisherPublishingOptionsPane* self);
-static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender,
+ gpointer self);
static void publishing_tumblr_tumblr_publisher_publishing_options_pane_on_publish_clicked (PublishingTumblrTumblrPublisherPublishingOptionsPane* self);
-static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender,
+ gpointer self);
void publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_publish (PublishingTumblrTumblrPublisherPublishingOptionsPane* self);
void publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_logout (PublishingTumblrTumblrPublisherPublishingOptionsPane* self);
static GtkWidget* publishing_tumblr_tumblr_publisher_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base);
static SpitPublishingDialogPaneGeometryOptions publishing_tumblr_tumblr_publisher_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base);
static void publishing_tumblr_tumblr_publisher_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base);
-static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_publish_publishing_tumblr_tumblr_publisher_publishing_options_pane_publish (PublishingTumblrTumblrPublisherPublishingOptionsPane* _sender, gpointer self);
-static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_logout_publishing_tumblr_tumblr_publisher_publishing_options_pane_logout (PublishingTumblrTumblrPublisherPublishingOptionsPane* _sender, gpointer self);
+static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_publish_publishing_tumblr_tumblr_publisher_publishing_options_pane_publish (PublishingTumblrTumblrPublisherPublishingOptionsPane* _sender,
+ gpointer self);
+static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_logout_publishing_tumblr_tumblr_publisher_publishing_options_pane_logout (PublishingTumblrTumblrPublisherPublishingOptionsPane* _sender,
+ gpointer self);
static void publishing_tumblr_tumblr_publisher_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base);
static void publishing_tumblr_tumblr_publisher_publishing_options_pane_finalize (GObject * obj);
-enum {
- PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_USER_INFO_FETCH_TRANSACTION_DUMMY_PROPERTY
-};
GType publishing_tumblr_tumblr_publisher_upload_transaction_get_type (void) G_GNUC_CONST;
-enum {
- PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_UPLOAD_TRANSACTION_DUMMY_PROPERTY
-};
-static gchar* publishing_tumblr_tumblr_publisher_upload_transaction_encode (PublishingTumblrTumblrPublisherUploadTransaction* self, guint8* data, int data_length1);
-PublishingTumblrTumblrPublisherUploadTransaction* publishing_tumblr_tumblr_publisher_upload_transaction_new (PublishingRESTSupportOAuth1Session* session, SpitPublishingPublishable* publishable, const gchar* blog_url);
-PublishingTumblrTumblrPublisherUploadTransaction* publishing_tumblr_tumblr_publisher_upload_transaction_construct (GType object_type, PublishingRESTSupportOAuth1Session* session, SpitPublishingPublishable* publishable, const gchar* blog_url);
-static void publishing_tumblr_tumblr_publisher_upload_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error);
+static gchar* publishing_tumblr_tumblr_publisher_upload_transaction_encode (PublishingTumblrTumblrPublisherUploadTransaction* self,
+ guint8* data,
+ int data_length1);
+PublishingTumblrTumblrPublisherUploadTransaction* publishing_tumblr_tumblr_publisher_upload_transaction_new (PublishingRESTSupportOAuth1Session* session,
+ SpitPublishingPublishable* publishable,
+ const gchar* blog_url);
+PublishingTumblrTumblrPublisherUploadTransaction* publishing_tumblr_tumblr_publisher_upload_transaction_construct (GType object_type,
+ PublishingRESTSupportOAuth1Session* session,
+ SpitPublishingPublishable* publishable,
+ const gchar* blog_url);
+static void publishing_tumblr_tumblr_publisher_upload_transaction_real_execute (PublishingRESTSupportTransaction* base,
+ GError** error);
#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_UPLOADER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOADER, PublishingTumblrTumblrPublisherUploaderPrivate))
-enum {
- PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_UPLOADER_DUMMY_PROPERTY
-};
-static PublishingRESTSupportTransaction* publishing_tumblr_tumblr_publisher_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base, SpitPublishingPublishable* publishable);
+static PublishingRESTSupportTransaction* publishing_tumblr_tumblr_publisher_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base,
+ SpitPublishingPublishable* publishable);
static void publishing_tumblr_tumblr_publisher_uploader_finalize (PublishingRESTSupportBatchUploader * obj);
static void publishing_tumblr_tumblr_publisher_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);
-
-
-TumblrService* tumblr_service_construct (GType object_type, GFile* resource_directory) {
+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);
+
+
+TumblrService*
+tumblr_service_construct (GType object_type,
+ GFile* resource_directory)
+{
TumblrService * self = NULL;
GdkPixbuf** _tmp0_;
gint _tmp0__length1;
@@ -458,7 +564,7 @@ TumblrService* tumblr_service_construct (GType object_type, GFile* resource_dire
_tmp0__length1 = tumblr_service_icon_pixbuf_set_length1;
#line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
if (_tmp0_ == NULL) {
-#line 462 "TumblrPublishing.c"
+#line 568 "TumblrPublishing.c"
gint _tmp1_;
GdkPixbuf** _tmp2_;
#line 15 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
@@ -471,44 +577,43 @@ TumblrService* tumblr_service_construct (GType object_type, GFile* resource_dire
tumblr_service_icon_pixbuf_set_length1 = _tmp1_;
#line 15 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_tumblr_service_icon_pixbuf_set_size_ = tumblr_service_icon_pixbuf_set_length1;
-#line 475 "TumblrPublishing.c"
+#line 581 "TumblrPublishing.c"
}
#line 13 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return self;
-#line 479 "TumblrPublishing.c"
+#line 585 "TumblrPublishing.c"
}
-TumblrService* tumblr_service_new (GFile* resource_directory) {
+TumblrService*
+tumblr_service_new (GFile* resource_directory)
+{
#line 13 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return tumblr_service_construct (TYPE_TUMBLR_SERVICE, resource_directory);
-#line 486 "TumblrPublishing.c"
+#line 594 "TumblrPublishing.c"
}
-static gint tumblr_service_real_get_pluggable_interface (SpitPluggable* base, gint min_host_interface, gint max_host_interface) {
+static gint
+tumblr_service_real_get_pluggable_interface (SpitPluggable* base,
+ gint min_host_interface,
+ gint max_host_interface)
+{
TumblrService * self;
gint result = 0;
- gint _tmp0_;
- gint _tmp1_;
- gint _tmp2_;
#line 20 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TUMBLR_SERVICE, TumblrService);
#line 21 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp0_ = min_host_interface;
-#line 21 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp1_ = max_host_interface;
-#line 21 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp2_ = spit_negotiate_interfaces (_tmp0_, _tmp1_, SPIT_PUBLISHING_CURRENT_INTERFACE);
-#line 21 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- result = _tmp2_;
+ result = spit_negotiate_interfaces (min_host_interface, max_host_interface, SPIT_PUBLISHING_CURRENT_INTERFACE);
#line 21 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return result;
-#line 508 "TumblrPublishing.c"
+#line 611 "TumblrPublishing.c"
}
-static const gchar* tumblr_service_real_get_id (SpitPluggable* base) {
+static const gchar*
+tumblr_service_real_get_id (SpitPluggable* base)
+{
TumblrService * self;
const gchar* result = NULL;
#line 25 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
@@ -517,11 +622,13 @@ static const gchar* tumblr_service_real_get_id (SpitPluggable* base) {
result = "org.yorba.shotwell.publishing.tumblr";
#line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return result;
-#line 521 "TumblrPublishing.c"
+#line 626 "TumblrPublishing.c"
}
-static const gchar* tumblr_service_real_get_pluggable_name (SpitPluggable* base) {
+static const gchar*
+tumblr_service_real_get_pluggable_name (SpitPluggable* base)
+{
TumblrService * self;
const gchar* result = NULL;
#line 29 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
@@ -530,39 +637,47 @@ static const gchar* tumblr_service_real_get_pluggable_name (SpitPluggable* base)
result = "Tumblr";
#line 30 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return result;
-#line 534 "TumblrPublishing.c"
+#line 641 "TumblrPublishing.c"
}
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
#line 42 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return self ? g_object_ref (self) : NULL;
-#line 541 "TumblrPublishing.c"
+#line 650 "TumblrPublishing.c"
}
-static GdkPixbuf** _vala_array_dup8 (GdkPixbuf** self, int length) {
+static GdkPixbuf**
+_vala_array_dup8 (GdkPixbuf** self,
+ int length)
+{
GdkPixbuf** result;
int i;
#line 42 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
result = g_new0 (GdkPixbuf*, length + 1);
#line 42 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
for (i = 0; i < length; i++) {
-#line 552 "TumblrPublishing.c"
+#line 664 "TumblrPublishing.c"
GdkPixbuf* _tmp0_;
#line 42 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_tmp0_ = _g_object_ref0 (self[i]);
#line 42 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
result[i] = _tmp0_;
-#line 558 "TumblrPublishing.c"
+#line 670 "TumblrPublishing.c"
}
#line 42 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return result;
-#line 562 "TumblrPublishing.c"
+#line 674 "TumblrPublishing.c"
}
-static void tumblr_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info) {
+static void
+tumblr_service_real_get_info (SpitPluggable* base,
+ SpitPluggableInfo* info)
+{
TumblrService * self;
gchar* _tmp0_;
gchar* _tmp1_;
@@ -637,40 +752,45 @@ static void tumblr_service_real_get_info (SpitPluggable* base, SpitPluggableInfo
(*info).icons = _tmp8_;
#line 42 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
(*info).icons_length1 = _tmp8__length1;
-#line 641 "TumblrPublishing.c"
+#line 756 "TumblrPublishing.c"
}
-static void tumblr_service_real_activation (SpitPluggable* base, gboolean enabled) {
+static void
+tumblr_service_real_activation (SpitPluggable* base,
+ gboolean enabled)
+{
TumblrService * self;
#line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TUMBLR_SERVICE, TumblrService);
-#line 649 "TumblrPublishing.c"
+#line 767 "TumblrPublishing.c"
}
-static SpitPublishingPublisher* tumblr_service_real_create_publisher (SpitPublishingService* base, SpitPublishingPluginHost* host) {
+static SpitPublishingPublisher*
+tumblr_service_real_create_publisher (SpitPublishingService* base,
+ SpitPublishingPluginHost* host)
+{
TumblrService * self;
SpitPublishingPublisher* result = NULL;
- SpitPublishingPluginHost* _tmp0_;
- PublishingTumblrTumblrPublisher* _tmp1_;
+ PublishingTumblrTumblrPublisher* _tmp0_;
#line 48 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TUMBLR_SERVICE, TumblrService);
#line 48 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL);
#line 49 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp0_ = host;
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp1_ = publishing_tumblr_tumblr_publisher_new (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_SERVICE, SpitPublishingService), _tmp0_);
+ _tmp0_ = publishing_tumblr_tumblr_publisher_new (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_SERVICE, SpitPublishingService), host);
#line 49 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher);
+ result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher);
#line 49 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return result;
-#line 670 "TumblrPublishing.c"
+#line 788 "TumblrPublishing.c"
}
-static SpitPublishingPublisherMediaType tumblr_service_real_get_supported_media (SpitPublishingService* base) {
+static SpitPublishingPublisherMediaType
+tumblr_service_real_get_supported_media (SpitPublishingService* base)
+{
TumblrService * self;
SpitPublishingPublisherMediaType result = 0;
#line 52 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
@@ -679,20 +799,24 @@ static SpitPublishingPublisherMediaType tumblr_service_real_get_supported_media
result = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO | SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO;
#line 53 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return result;
-#line 683 "TumblrPublishing.c"
+#line 803 "TumblrPublishing.c"
}
-static void tumblr_service_class_init (TumblrServiceClass * klass) {
+static void
+tumblr_service_class_init (TumblrServiceClass * klass)
+{
#line 8 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
tumblr_service_parent_class = g_type_class_peek_parent (klass);
#line 8 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
G_OBJECT_CLASS (klass)->finalize = tumblr_service_finalize;
-#line 692 "TumblrPublishing.c"
+#line 814 "TumblrPublishing.c"
}
-static void tumblr_service_spit_pluggable_interface_init (SpitPluggableIface * iface) {
+static void
+tumblr_service_spit_pluggable_interface_init (SpitPluggableIface * iface)
+{
#line 8 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
tumblr_service_spit_pluggable_parent_iface = g_type_interface_peek_parent (iface);
#line 8 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
@@ -705,36 +829,44 @@ static void tumblr_service_spit_pluggable_interface_init (SpitPluggableIface * i
iface->get_info = (void (*) (SpitPluggable *, SpitPluggableInfo*)) tumblr_service_real_get_info;
#line 8 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
iface->activation = (void (*) (SpitPluggable *, gboolean)) tumblr_service_real_activation;
-#line 709 "TumblrPublishing.c"
+#line 833 "TumblrPublishing.c"
}
-static void tumblr_service_spit_publishing_service_interface_init (SpitPublishingServiceIface * iface) {
+static void
+tumblr_service_spit_publishing_service_interface_init (SpitPublishingServiceIface * iface)
+{
#line 8 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
tumblr_service_spit_publishing_service_parent_iface = g_type_interface_peek_parent (iface);
#line 8 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
iface->create_publisher = (SpitPublishingPublisher* (*) (SpitPublishingService *, SpitPublishingPluginHost*)) tumblr_service_real_create_publisher;
#line 8 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
iface->get_supported_media = (SpitPublishingPublisherMediaType (*) (SpitPublishingService *)) tumblr_service_real_get_supported_media;
-#line 720 "TumblrPublishing.c"
+#line 846 "TumblrPublishing.c"
}
-static void tumblr_service_instance_init (TumblrService * self) {
+static void
+tumblr_service_instance_init (TumblrService * self)
+{
}
-static void tumblr_service_finalize (GObject * obj) {
+static void
+tumblr_service_finalize (GObject * obj)
+{
TumblrService * self;
#line 8 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TUMBLR_SERVICE, TumblrService);
#line 8 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
G_OBJECT_CLASS (tumblr_service_parent_class)->finalize (obj);
-#line 734 "TumblrPublishing.c"
+#line 864 "TumblrPublishing.c"
}
-GType tumblr_service_get_type (void) {
+GType
+tumblr_service_get_type (void)
+{
static volatile gsize tumblr_service_type_id__volatile = 0;
if (g_once_init_enter (&tumblr_service_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (TumblrServiceClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) tumblr_service_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (TumblrService), 0, (GInstanceInitFunc) tumblr_service_instance_init, NULL };
@@ -750,12 +882,14 @@ GType tumblr_service_get_type (void) {
}
-PublishingTumblrBlogEntry* publishing_tumblr_blog_entry_construct (GType object_type, const gchar* creator_blog, const gchar* creator_url) {
+PublishingTumblrBlogEntry*
+publishing_tumblr_blog_entry_construct (GType object_type,
+ const gchar* creator_blog,
+ const gchar* creator_url)
+{
PublishingTumblrBlogEntry* self = NULL;
- const gchar* _tmp0_;
+ gchar* _tmp0_;
gchar* _tmp1_;
- const gchar* _tmp2_;
- gchar* _tmp3_;
#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_return_val_if_fail (creator_blog != NULL, NULL);
#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
@@ -763,132 +897,156 @@ PublishingTumblrBlogEntry* publishing_tumblr_blog_entry_construct (GType object_
#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
self = (PublishingTumblrBlogEntry*) g_type_create_instance (object_type);
#line 71 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp0_ = creator_blog;
-#line 71 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp1_ = g_strdup (_tmp0_);
+ _tmp0_ = g_strdup (creator_blog);
#line 71 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_g_free0 (self->blog);
#line 71 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- self->blog = _tmp1_;
+ self->blog = _tmp0_;
#line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp2_ = creator_url;
-#line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp3_ = g_strdup (_tmp2_);
+ _tmp1_ = g_strdup (creator_url);
#line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_g_free0 (self->url);
#line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- self->url = _tmp3_;
+ self->url = _tmp1_;
#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return self;
-#line 784 "TumblrPublishing.c"
+#line 914 "TumblrPublishing.c"
}
-PublishingTumblrBlogEntry* publishing_tumblr_blog_entry_new (const gchar* creator_blog, const gchar* creator_url) {
+PublishingTumblrBlogEntry*
+publishing_tumblr_blog_entry_new (const gchar* creator_blog,
+ const gchar* creator_url)
+{
#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return publishing_tumblr_blog_entry_construct (PUBLISHING_TUMBLR_TYPE_BLOG_ENTRY, creator_blog, creator_url);
-#line 791 "TumblrPublishing.c"
+#line 924 "TumblrPublishing.c"
}
-static void publishing_tumblr_value_blog_entry_init (GValue* value) {
+static void
+publishing_tumblr_value_blog_entry_init (GValue* value)
+{
#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 798 "TumblrPublishing.c"
+#line 933 "TumblrPublishing.c"
}
-static void publishing_tumblr_value_blog_entry_free_value (GValue* value) {
+static void
+publishing_tumblr_value_blog_entry_free_value (GValue* value)
+{
#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
if (value->data[0].v_pointer) {
#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
publishing_tumblr_blog_entry_unref (value->data[0].v_pointer);
-#line 807 "TumblrPublishing.c"
+#line 944 "TumblrPublishing.c"
}
}
-static void publishing_tumblr_value_blog_entry_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+publishing_tumblr_value_blog_entry_copy_value (const GValue* src_value,
+ GValue* dest_value)
+{
#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
if (src_value->data[0].v_pointer) {
#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
dest_value->data[0].v_pointer = publishing_tumblr_blog_entry_ref (src_value->data[0].v_pointer);
-#line 817 "TumblrPublishing.c"
+#line 957 "TumblrPublishing.c"
} else {
#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
dest_value->data[0].v_pointer = NULL;
-#line 821 "TumblrPublishing.c"
+#line 961 "TumblrPublishing.c"
}
}
-static gpointer publishing_tumblr_value_blog_entry_peek_pointer (const GValue* value) {
+static gpointer
+publishing_tumblr_value_blog_entry_peek_pointer (const GValue* value)
+{
#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return value->data[0].v_pointer;
-#line 829 "TumblrPublishing.c"
+#line 971 "TumblrPublishing.c"
}
-static gchar* publishing_tumblr_value_blog_entry_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_tumblr_value_blog_entry_collect_value (GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
if (collect_values[0].v_pointer) {
-#line 836 "TumblrPublishing.c"
+#line 983 "TumblrPublishing.c"
PublishingTumblrBlogEntry * object;
object = collect_values[0].v_pointer;
#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
if (object->parent_instance.g_class == NULL) {
#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 843 "TumblrPublishing.c"
+#line 990 "TumblrPublishing.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 847 "TumblrPublishing.c"
+#line 994 "TumblrPublishing.c"
}
#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
value->data[0].v_pointer = publishing_tumblr_blog_entry_ref (object);
-#line 851 "TumblrPublishing.c"
+#line 998 "TumblrPublishing.c"
} else {
#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 855 "TumblrPublishing.c"
+#line 1002 "TumblrPublishing.c"
}
#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return NULL;
-#line 859 "TumblrPublishing.c"
+#line 1006 "TumblrPublishing.c"
}
-static gchar* publishing_tumblr_value_blog_entry_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_tumblr_value_blog_entry_lcopy_value (const GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
PublishingTumblrBlogEntry ** object_p;
object_p = collect_values[0].v_pointer;
#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
if (!object_p) {
#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 870 "TumblrPublishing.c"
+#line 1022 "TumblrPublishing.c"
}
#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
if (!value->data[0].v_pointer) {
#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
*object_p = NULL;
-#line 876 "TumblrPublishing.c"
+#line 1028 "TumblrPublishing.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
*object_p = value->data[0].v_pointer;
-#line 880 "TumblrPublishing.c"
+#line 1032 "TumblrPublishing.c"
} else {
#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
*object_p = publishing_tumblr_blog_entry_ref (value->data[0].v_pointer);
-#line 884 "TumblrPublishing.c"
+#line 1036 "TumblrPublishing.c"
}
#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return NULL;
-#line 888 "TumblrPublishing.c"
+#line 1040 "TumblrPublishing.c"
}
-GParamSpec* publishing_tumblr_param_spec_blog_entry (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+publishing_tumblr_param_spec_blog_entry (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags)
+{
PublishingTumblrParamSpecBlogEntry* spec;
#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_TUMBLR_TYPE_BLOG_ENTRY), NULL);
@@ -898,20 +1056,25 @@ GParamSpec* publishing_tumblr_param_spec_blog_entry (const gchar* name, const gc
G_PARAM_SPEC (spec)->value_type = object_type;
#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return G_PARAM_SPEC (spec);
-#line 902 "TumblrPublishing.c"
+#line 1060 "TumblrPublishing.c"
}
-gpointer publishing_tumblr_value_get_blog_entry (const GValue* value) {
+gpointer
+publishing_tumblr_value_get_blog_entry (const GValue* value)
+{
#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_TUMBLR_TYPE_BLOG_ENTRY), NULL);
#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return value->data[0].v_pointer;
-#line 911 "TumblrPublishing.c"
+#line 1071 "TumblrPublishing.c"
}
-void publishing_tumblr_value_set_blog_entry (GValue* value, gpointer v_object) {
+void
+publishing_tumblr_value_set_blog_entry (GValue* value,
+ gpointer v_object)
+{
PublishingTumblrBlogEntry * old;
#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_TUMBLR_TYPE_BLOG_ENTRY));
@@ -927,22 +1090,25 @@ void publishing_tumblr_value_set_blog_entry (GValue* value, gpointer v_object) {
value->data[0].v_pointer = v_object;
#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
publishing_tumblr_blog_entry_ref (value->data[0].v_pointer);
-#line 931 "TumblrPublishing.c"
+#line 1094 "TumblrPublishing.c"
} else {
#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 935 "TumblrPublishing.c"
+#line 1098 "TumblrPublishing.c"
}
#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
if (old) {
#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
publishing_tumblr_blog_entry_unref (old);
-#line 941 "TumblrPublishing.c"
+#line 1104 "TumblrPublishing.c"
}
}
-void publishing_tumblr_value_take_blog_entry (GValue* value, gpointer v_object) {
+void
+publishing_tumblr_value_take_blog_entry (GValue* value,
+ gpointer v_object)
+{
PublishingTumblrBlogEntry * old;
#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_TUMBLR_TYPE_BLOG_ENTRY));
@@ -956,38 +1122,44 @@ void publishing_tumblr_value_take_blog_entry (GValue* value, gpointer v_object)
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
value->data[0].v_pointer = v_object;
-#line 960 "TumblrPublishing.c"
+#line 1126 "TumblrPublishing.c"
} else {
#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 964 "TumblrPublishing.c"
+#line 1130 "TumblrPublishing.c"
}
#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
if (old) {
#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
publishing_tumblr_blog_entry_unref (old);
-#line 970 "TumblrPublishing.c"
+#line 1136 "TumblrPublishing.c"
}
}
-static void publishing_tumblr_blog_entry_class_init (PublishingTumblrBlogEntryClass * klass) {
+static void
+publishing_tumblr_blog_entry_class_init (PublishingTumblrBlogEntryClass * klass)
+{
#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
publishing_tumblr_blog_entry_parent_class = g_type_class_peek_parent (klass);
#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
((PublishingTumblrBlogEntryClass *) klass)->finalize = publishing_tumblr_blog_entry_finalize;
-#line 980 "TumblrPublishing.c"
+#line 1148 "TumblrPublishing.c"
}
-static void publishing_tumblr_blog_entry_instance_init (PublishingTumblrBlogEntry * self) {
+static void
+publishing_tumblr_blog_entry_instance_init (PublishingTumblrBlogEntry * self)
+{
#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
self->ref_count = 1;
-#line 987 "TumblrPublishing.c"
+#line 1157 "TumblrPublishing.c"
}
-static void publishing_tumblr_blog_entry_finalize (PublishingTumblrBlogEntry * obj) {
+static void
+publishing_tumblr_blog_entry_finalize (PublishingTumblrBlogEntry * obj)
+{
PublishingTumblrBlogEntry * self;
#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_TUMBLR_TYPE_BLOG_ENTRY, PublishingTumblrBlogEntry);
@@ -997,11 +1169,13 @@ static void publishing_tumblr_blog_entry_finalize (PublishingTumblrBlogEntry * o
_g_free0 (self->blog);
#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_g_free0 (self->url);
-#line 1001 "TumblrPublishing.c"
+#line 1173 "TumblrPublishing.c"
}
-GType publishing_tumblr_blog_entry_get_type (void) {
+GType
+publishing_tumblr_blog_entry_get_type (void)
+{
static volatile gsize publishing_tumblr_blog_entry_type_id__volatile = 0;
if (g_once_init_enter (&publishing_tumblr_blog_entry_type_id__volatile)) {
static const GTypeValueTable g_define_type_value_table = { publishing_tumblr_value_blog_entry_init, publishing_tumblr_value_blog_entry_free_value, publishing_tumblr_value_blog_entry_copy_value, publishing_tumblr_value_blog_entry_peek_pointer, "p", publishing_tumblr_value_blog_entry_collect_value, "p", publishing_tumblr_value_blog_entry_lcopy_value };
@@ -1015,18 +1189,22 @@ GType publishing_tumblr_blog_entry_get_type (void) {
}
-gpointer publishing_tumblr_blog_entry_ref (gpointer instance) {
+gpointer
+publishing_tumblr_blog_entry_ref (gpointer instance)
+{
PublishingTumblrBlogEntry * self;
self = instance;
#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_atomic_int_inc (&self->ref_count);
#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return instance;
-#line 1026 "TumblrPublishing.c"
+#line 1202 "TumblrPublishing.c"
}
-void publishing_tumblr_blog_entry_unref (gpointer instance) {
+void
+publishing_tumblr_blog_entry_unref (gpointer instance)
+{
PublishingTumblrBlogEntry * self;
self = instance;
#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
@@ -1035,143 +1213,169 @@ void publishing_tumblr_blog_entry_unref (gpointer instance) {
PUBLISHING_TUMBLR_BLOG_ENTRY_GET_CLASS (self)->finalize (self);
#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 1039 "TumblrPublishing.c"
+#line 1217 "TumblrPublishing.c"
}
}
-PublishingTumblrSizeEntry* publishing_tumblr_size_entry_construct (GType object_type, const gchar* creator_title, gint creator_size) {
+PublishingTumblrSizeEntry*
+publishing_tumblr_size_entry_construct (GType object_type,
+ const gchar* creator_title,
+ gint creator_size)
+{
PublishingTumblrSizeEntry* self = NULL;
- const gchar* _tmp0_;
- gchar* _tmp1_;
- gint _tmp2_;
+ gchar* _tmp0_;
#line 80 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_return_val_if_fail (creator_title != NULL, NULL);
#line 80 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
self = (PublishingTumblrSizeEntry*) g_type_create_instance (object_type);
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp0_ = creator_title;
-#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp1_ = g_strdup (_tmp0_);
+ _tmp0_ = g_strdup (creator_title);
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_g_free0 (self->title);
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- self->title = _tmp1_;
+ self->title = _tmp0_;
#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp2_ = creator_size;
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- self->size = _tmp2_;
+ self->size = creator_size;
#line 80 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return self;
-#line 1067 "TumblrPublishing.c"
+#line 1243 "TumblrPublishing.c"
}
-PublishingTumblrSizeEntry* publishing_tumblr_size_entry_new (const gchar* creator_title, gint creator_size) {
+PublishingTumblrSizeEntry*
+publishing_tumblr_size_entry_new (const gchar* creator_title,
+ gint creator_size)
+{
#line 80 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return publishing_tumblr_size_entry_construct (PUBLISHING_TUMBLR_TYPE_SIZE_ENTRY, creator_title, creator_size);
-#line 1074 "TumblrPublishing.c"
+#line 1253 "TumblrPublishing.c"
}
-static void publishing_tumblr_value_size_entry_init (GValue* value) {
+static void
+publishing_tumblr_value_size_entry_init (GValue* value)
+{
#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 1081 "TumblrPublishing.c"
+#line 1262 "TumblrPublishing.c"
}
-static void publishing_tumblr_value_size_entry_free_value (GValue* value) {
+static void
+publishing_tumblr_value_size_entry_free_value (GValue* value)
+{
#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
if (value->data[0].v_pointer) {
#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
publishing_tumblr_size_entry_unref (value->data[0].v_pointer);
-#line 1090 "TumblrPublishing.c"
+#line 1273 "TumblrPublishing.c"
}
}
-static void publishing_tumblr_value_size_entry_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+publishing_tumblr_value_size_entry_copy_value (const GValue* src_value,
+ GValue* dest_value)
+{
#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
if (src_value->data[0].v_pointer) {
#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
dest_value->data[0].v_pointer = publishing_tumblr_size_entry_ref (src_value->data[0].v_pointer);
-#line 1100 "TumblrPublishing.c"
+#line 1286 "TumblrPublishing.c"
} else {
#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
dest_value->data[0].v_pointer = NULL;
-#line 1104 "TumblrPublishing.c"
+#line 1290 "TumblrPublishing.c"
}
}
-static gpointer publishing_tumblr_value_size_entry_peek_pointer (const GValue* value) {
+static gpointer
+publishing_tumblr_value_size_entry_peek_pointer (const GValue* value)
+{
#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return value->data[0].v_pointer;
-#line 1112 "TumblrPublishing.c"
+#line 1300 "TumblrPublishing.c"
}
-static gchar* publishing_tumblr_value_size_entry_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_tumblr_value_size_entry_collect_value (GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
if (collect_values[0].v_pointer) {
-#line 1119 "TumblrPublishing.c"
+#line 1312 "TumblrPublishing.c"
PublishingTumblrSizeEntry * object;
object = collect_values[0].v_pointer;
#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
if (object->parent_instance.g_class == NULL) {
#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1126 "TumblrPublishing.c"
+#line 1319 "TumblrPublishing.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1130 "TumblrPublishing.c"
+#line 1323 "TumblrPublishing.c"
}
#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
value->data[0].v_pointer = publishing_tumblr_size_entry_ref (object);
-#line 1134 "TumblrPublishing.c"
+#line 1327 "TumblrPublishing.c"
} else {
#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 1138 "TumblrPublishing.c"
+#line 1331 "TumblrPublishing.c"
}
#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return NULL;
-#line 1142 "TumblrPublishing.c"
+#line 1335 "TumblrPublishing.c"
}
-static gchar* publishing_tumblr_value_size_entry_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_tumblr_value_size_entry_lcopy_value (const GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
PublishingTumblrSizeEntry ** object_p;
object_p = collect_values[0].v_pointer;
#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
if (!object_p) {
#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1153 "TumblrPublishing.c"
+#line 1351 "TumblrPublishing.c"
}
#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
if (!value->data[0].v_pointer) {
#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
*object_p = NULL;
-#line 1159 "TumblrPublishing.c"
+#line 1357 "TumblrPublishing.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
*object_p = value->data[0].v_pointer;
-#line 1163 "TumblrPublishing.c"
+#line 1361 "TumblrPublishing.c"
} else {
#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
*object_p = publishing_tumblr_size_entry_ref (value->data[0].v_pointer);
-#line 1167 "TumblrPublishing.c"
+#line 1365 "TumblrPublishing.c"
}
#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return NULL;
-#line 1171 "TumblrPublishing.c"
+#line 1369 "TumblrPublishing.c"
}
-GParamSpec* publishing_tumblr_param_spec_size_entry (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+publishing_tumblr_param_spec_size_entry (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags)
+{
PublishingTumblrParamSpecSizeEntry* spec;
#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_TUMBLR_TYPE_SIZE_ENTRY), NULL);
@@ -1181,20 +1385,25 @@ GParamSpec* publishing_tumblr_param_spec_size_entry (const gchar* name, const gc
G_PARAM_SPEC (spec)->value_type = object_type;
#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return G_PARAM_SPEC (spec);
-#line 1185 "TumblrPublishing.c"
+#line 1389 "TumblrPublishing.c"
}
-gpointer publishing_tumblr_value_get_size_entry (const GValue* value) {
+gpointer
+publishing_tumblr_value_get_size_entry (const GValue* value)
+{
#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_TUMBLR_TYPE_SIZE_ENTRY), NULL);
#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return value->data[0].v_pointer;
-#line 1194 "TumblrPublishing.c"
+#line 1400 "TumblrPublishing.c"
}
-void publishing_tumblr_value_set_size_entry (GValue* value, gpointer v_object) {
+void
+publishing_tumblr_value_set_size_entry (GValue* value,
+ gpointer v_object)
+{
PublishingTumblrSizeEntry * old;
#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_TUMBLR_TYPE_SIZE_ENTRY));
@@ -1210,22 +1419,25 @@ void publishing_tumblr_value_set_size_entry (GValue* value, gpointer v_object) {
value->data[0].v_pointer = v_object;
#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
publishing_tumblr_size_entry_ref (value->data[0].v_pointer);
-#line 1214 "TumblrPublishing.c"
+#line 1423 "TumblrPublishing.c"
} else {
#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 1218 "TumblrPublishing.c"
+#line 1427 "TumblrPublishing.c"
}
#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
if (old) {
#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
publishing_tumblr_size_entry_unref (old);
-#line 1224 "TumblrPublishing.c"
+#line 1433 "TumblrPublishing.c"
}
}
-void publishing_tumblr_value_take_size_entry (GValue* value, gpointer v_object) {
+void
+publishing_tumblr_value_take_size_entry (GValue* value,
+ gpointer v_object)
+{
PublishingTumblrSizeEntry * old;
#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_TUMBLR_TYPE_SIZE_ENTRY));
@@ -1239,38 +1451,44 @@ void publishing_tumblr_value_take_size_entry (GValue* value, gpointer v_object)
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
value->data[0].v_pointer = v_object;
-#line 1243 "TumblrPublishing.c"
+#line 1455 "TumblrPublishing.c"
} else {
#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 1247 "TumblrPublishing.c"
+#line 1459 "TumblrPublishing.c"
}
#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
if (old) {
#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
publishing_tumblr_size_entry_unref (old);
-#line 1253 "TumblrPublishing.c"
+#line 1465 "TumblrPublishing.c"
}
}
-static void publishing_tumblr_size_entry_class_init (PublishingTumblrSizeEntryClass * klass) {
+static void
+publishing_tumblr_size_entry_class_init (PublishingTumblrSizeEntryClass * klass)
+{
#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
publishing_tumblr_size_entry_parent_class = g_type_class_peek_parent (klass);
#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
((PublishingTumblrSizeEntryClass *) klass)->finalize = publishing_tumblr_size_entry_finalize;
-#line 1263 "TumblrPublishing.c"
+#line 1477 "TumblrPublishing.c"
}
-static void publishing_tumblr_size_entry_instance_init (PublishingTumblrSizeEntry * self) {
+static void
+publishing_tumblr_size_entry_instance_init (PublishingTumblrSizeEntry * self)
+{
#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
self->ref_count = 1;
-#line 1270 "TumblrPublishing.c"
+#line 1486 "TumblrPublishing.c"
}
-static void publishing_tumblr_size_entry_finalize (PublishingTumblrSizeEntry * obj) {
+static void
+publishing_tumblr_size_entry_finalize (PublishingTumblrSizeEntry * obj)
+{
PublishingTumblrSizeEntry * self;
#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_TUMBLR_TYPE_SIZE_ENTRY, PublishingTumblrSizeEntry);
@@ -1278,11 +1496,13 @@ static void publishing_tumblr_size_entry_finalize (PublishingTumblrSizeEntry * o
g_signal_handlers_destroy (self);
#line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_g_free0 (self->title);
-#line 1282 "TumblrPublishing.c"
+#line 1500 "TumblrPublishing.c"
}
-GType publishing_tumblr_size_entry_get_type (void) {
+GType
+publishing_tumblr_size_entry_get_type (void)
+{
static volatile gsize publishing_tumblr_size_entry_type_id__volatile = 0;
if (g_once_init_enter (&publishing_tumblr_size_entry_type_id__volatile)) {
static const GTypeValueTable g_define_type_value_table = { publishing_tumblr_value_size_entry_init, publishing_tumblr_value_size_entry_free_value, publishing_tumblr_value_size_entry_copy_value, publishing_tumblr_value_size_entry_peek_pointer, "p", publishing_tumblr_value_size_entry_collect_value, "p", publishing_tumblr_value_size_entry_lcopy_value };
@@ -1296,18 +1516,22 @@ GType publishing_tumblr_size_entry_get_type (void) {
}
-gpointer publishing_tumblr_size_entry_ref (gpointer instance) {
+gpointer
+publishing_tumblr_size_entry_ref (gpointer instance)
+{
PublishingTumblrSizeEntry * self;
self = instance;
#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_atomic_int_inc (&self->ref_count);
#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return instance;
-#line 1307 "TumblrPublishing.c"
+#line 1529 "TumblrPublishing.c"
}
-void publishing_tumblr_size_entry_unref (gpointer instance) {
+void
+publishing_tumblr_size_entry_unref (gpointer instance)
+{
PublishingTumblrSizeEntry * self;
self = instance;
#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
@@ -1316,70 +1540,91 @@ void publishing_tumblr_size_entry_unref (gpointer instance) {
PUBLISHING_TUMBLR_SIZE_ENTRY_GET_CLASS (self)->finalize (self);
#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 1320 "TumblrPublishing.c"
+#line 1544 "TumblrPublishing.c"
}
}
-static void _publishing_tumblr_tumblr_publisher_on_authenticator_authenticated_spit_publishing_authenticator_authenticated (SpitPublishingAuthenticator* _sender, gpointer self) {
+static void
+_publishing_tumblr_tumblr_publisher_on_authenticator_authenticated_spit_publishing_authenticator_authenticated (SpitPublishingAuthenticator* _sender,
+ gpointer self)
+{
#line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
publishing_tumblr_tumblr_publisher_on_authenticator_authenticated ((PublishingTumblrTumblrPublisher*) self);
-#line 1328 "TumblrPublishing.c"
+#line 1555 "TumblrPublishing.c"
}
-static void _vala_array_add31 (PublishingTumblrSizeEntry** * array, int* length, int* size, PublishingTumblrSizeEntry* value) {
+static void
+_vala_array_add31 (PublishingTumblrSizeEntry** * array,
+ int* length,
+ int* size,
+ PublishingTumblrSizeEntry* value)
+{
#line 103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
if ((*length) == (*size)) {
#line 103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
*array = g_renew (PublishingTumblrSizeEntry*, *array, (*size) + 1);
-#line 1339 "TumblrPublishing.c"
+#line 1571 "TumblrPublishing.c"
}
#line 103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
(*array)[(*length)++] = value;
#line 103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
(*array)[*length] = NULL;
-#line 1345 "TumblrPublishing.c"
+#line 1577 "TumblrPublishing.c"
}
-static void _vala_array_add32 (PublishingTumblrSizeEntry** * array, int* length, int* size, PublishingTumblrSizeEntry* value) {
+static void
+_vala_array_add32 (PublishingTumblrSizeEntry** * array,
+ int* length,
+ int* size,
+ PublishingTumblrSizeEntry* value)
+{
#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
if ((*length) == (*size)) {
#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
*array = g_renew (PublishingTumblrSizeEntry*, *array, (*size) + 1);
-#line 1356 "TumblrPublishing.c"
+#line 1593 "TumblrPublishing.c"
}
#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
(*array)[(*length)++] = value;
#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
(*array)[*length] = NULL;
-#line 1362 "TumblrPublishing.c"
+#line 1599 "TumblrPublishing.c"
}
-static void _vala_array_add33 (PublishingTumblrSizeEntry** * array, int* length, int* size, PublishingTumblrSizeEntry* value) {
+static void
+_vala_array_add33 (PublishingTumblrSizeEntry** * array,
+ int* length,
+ int* size,
+ PublishingTumblrSizeEntry* value)
+{
#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
if ((*length) == (*size)) {
#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
*array = g_renew (PublishingTumblrSizeEntry*, *array, (*size) + 1);
-#line 1373 "TumblrPublishing.c"
+#line 1615 "TumblrPublishing.c"
}
#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
(*array)[(*length)++] = value;
#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
(*array)[*length] = NULL;
-#line 1379 "TumblrPublishing.c"
+#line 1621 "TumblrPublishing.c"
}
-static PublishingTumblrSizeEntry** publishing_tumblr_tumblr_publisher_create_sizes (PublishingTumblrTumblrPublisher* self, int* result_length1) {
+static PublishingTumblrSizeEntry**
+publishing_tumblr_tumblr_publisher_create_sizes (PublishingTumblrTumblrPublisher* self,
+ int* result_length1)
+{
PublishingTumblrSizeEntry** result = NULL;
PublishingTumblrSizeEntry** _result_ = NULL;
PublishingTumblrSizeEntry** _tmp0_;
@@ -1438,17 +1683,20 @@ static PublishingTumblrSizeEntry** publishing_tumblr_tumblr_publisher_create_siz
if (result_length1) {
#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
*result_length1 = _tmp7__length1;
-#line 1442 "TumblrPublishing.c"
+#line 1687 "TumblrPublishing.c"
}
#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
result = _tmp7_;
#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return result;
-#line 1448 "TumblrPublishing.c"
+#line 1693 "TumblrPublishing.c"
}
-static PublishingTumblrBlogEntry** publishing_tumblr_tumblr_publisher_create_blogs (PublishingTumblrTumblrPublisher* self, int* result_length1) {
+static PublishingTumblrBlogEntry**
+publishing_tumblr_tumblr_publisher_create_blogs (PublishingTumblrTumblrPublisher* self,
+ int* result_length1)
+{
PublishingTumblrBlogEntry** result = NULL;
PublishingTumblrBlogEntry** _result_ = NULL;
PublishingTumblrBlogEntry** _tmp0_;
@@ -1474,32 +1722,33 @@ static PublishingTumblrBlogEntry** publishing_tumblr_tumblr_publisher_create_blo
if (result_length1) {
#line 118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
*result_length1 = _tmp1__length1;
-#line 1478 "TumblrPublishing.c"
+#line 1726 "TumblrPublishing.c"
}
#line 118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
result = _tmp1_;
#line 118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return result;
-#line 1484 "TumblrPublishing.c"
+#line 1732 "TumblrPublishing.c"
}
-PublishingTumblrTumblrPublisher* publishing_tumblr_tumblr_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host) {
+PublishingTumblrTumblrPublisher*
+publishing_tumblr_tumblr_publisher_construct (GType object_type,
+ SpitPublishingService* service,
+ SpitPublishingPluginHost* host)
+{
PublishingTumblrTumblrPublisher * self = NULL;
SpitPublishingService* _tmp0_;
- SpitPublishingService* _tmp1_;
- SpitPublishingPluginHost* _tmp2_;
- SpitPublishingPluginHost* _tmp3_;
- PublishingRESTSupportOAuth1Session* _tmp4_;
+ SpitPublishingPluginHost* _tmp1_;
+ PublishingRESTSupportOAuth1Session* _tmp2_;
+ gint _tmp3_;
+ PublishingTumblrSizeEntry** _tmp4_;
gint _tmp5_;
- PublishingTumblrSizeEntry** _tmp6_;
- gint _tmp7_;
- PublishingTumblrBlogEntry** _tmp8_;
- PublishingAuthenticatorFactory* _tmp9_;
- PublishingAuthenticatorFactory* _tmp10_;
- SpitPublishingPluginHost* _tmp11_;
- SpitPublishingAuthenticator* _tmp12_;
- SpitPublishingAuthenticator* _tmp13_;
+ PublishingTumblrBlogEntry** _tmp6_;
+ PublishingAuthenticatorFactory* _tmp7_;
+ PublishingAuthenticatorFactory* _tmp8_;
+ SpitPublishingAuthenticator* _tmp9_;
+ SpitPublishingAuthenticator* _tmp10_;
#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_return_val_if_fail (SPIT_PUBLISHING_IS_SERVICE (service), NULL);
#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
@@ -1509,79 +1758,78 @@ PublishingTumblrTumblrPublisher* publishing_tumblr_tumblr_publisher_construct (G
#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_debug ("TumblrPublishing.vala:123: TumblrPublisher instantiated.");
#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp0_ = service;
-#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp1_ = _g_object_ref0 (_tmp0_);
+ _tmp0_ = _g_object_ref0 (service);
#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_g_object_unref0 (self->priv->service);
#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- self->priv->service = _tmp1_;
-#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp2_ = host;
+ self->priv->service = _tmp0_;
#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp3_ = _g_object_ref0 (_tmp2_);
+ _tmp1_ = _g_object_ref0 (host);
#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_g_object_unref0 (self->priv->host);
#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- self->priv->host = _tmp3_;
+ self->priv->host = _tmp1_;
#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp4_ = publishing_rest_support_oauth1_session_new (PUBLISHING_TUMBLR_ENDPOINT_URL);
+ _tmp2_ = publishing_rest_support_oauth1_session_new (PUBLISHING_TUMBLR_ENDPOINT_URL);
#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_publishing_rest_support_session_unref0 (self->priv->session);
#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- self->priv->session = _tmp4_;
+ self->priv->session = _tmp2_;
#line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp6_ = publishing_tumblr_tumblr_publisher_create_sizes (self, &_tmp5_);
+ _tmp4_ = publishing_tumblr_tumblr_publisher_create_sizes (self, &_tmp3_);
#line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
self->priv->sizes = (_vala_array_free (self->priv->sizes, self->priv->sizes_length1, (GDestroyNotify) publishing_tumblr_size_entry_unref), NULL);
#line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- self->priv->sizes = _tmp6_;
+ self->priv->sizes = _tmp4_;
#line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- self->priv->sizes_length1 = _tmp5_;
+ self->priv->sizes_length1 = _tmp3_;
#line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
self->priv->_sizes_size_ = self->priv->sizes_length1;
#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp8_ = publishing_tumblr_tumblr_publisher_create_blogs (self, &_tmp7_);
+ _tmp6_ = publishing_tumblr_tumblr_publisher_create_blogs (self, &_tmp5_);
#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
self->priv->blogs = (_vala_array_free (self->priv->blogs, self->priv->blogs_length1, (GDestroyNotify) publishing_tumblr_blog_entry_unref), NULL);
#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- self->priv->blogs = _tmp8_;
+ self->priv->blogs = _tmp6_;
#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- self->priv->blogs_length1 = _tmp7_;
+ self->priv->blogs_length1 = _tmp5_;
#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
self->priv->_blogs_size_ = self->priv->blogs_length1;
#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp9_ = publishing_authenticator_factory_get_instance ();
-#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp10_ = _tmp9_;
+ _tmp7_ = publishing_authenticator_factory_get_instance ();
#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp11_ = host;
+ _tmp8_ = _tmp7_;
#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp12_ = spit_publishing_authenticator_factory_create (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, SPIT_PUBLISHING_TYPE_AUTHENTICATOR_FACTORY, SpitPublishingAuthenticatorFactory), "tumblr", _tmp11_);
+ _tmp9_ = spit_publishing_authenticator_factory_create (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, SPIT_PUBLISHING_TYPE_AUTHENTICATOR_FACTORY, SpitPublishingAuthenticatorFactory), "tumblr", host);
#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_g_object_unref0 (self->priv->authenticator);
#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- self->priv->authenticator = _tmp12_;
+ self->priv->authenticator = _tmp9_;
#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _g_object_unref0 (_tmp10_);
+ _g_object_unref0 (_tmp8_);
#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp13_ = self->priv->authenticator;
+ _tmp10_ = self->priv->authenticator;
#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- g_signal_connect_object (_tmp13_, "authenticated", (GCallback) _publishing_tumblr_tumblr_publisher_on_authenticator_authenticated_spit_publishing_authenticator_authenticated, self, 0);
+ g_signal_connect_object (_tmp10_, "authenticated", (GCallback) _publishing_tumblr_tumblr_publisher_on_authenticator_authenticated_spit_publishing_authenticator_authenticated, self, 0);
#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return self;
-#line 1574 "TumblrPublishing.c"
+#line 1817 "TumblrPublishing.c"
}
-PublishingTumblrTumblrPublisher* publishing_tumblr_tumblr_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host) {
+PublishingTumblrTumblrPublisher*
+publishing_tumblr_tumblr_publisher_new (SpitPublishingService* service,
+ SpitPublishingPluginHost* host)
+{
#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return publishing_tumblr_tumblr_publisher_construct (PUBLISHING_TUMBLR_TYPE_TUMBLR_PUBLISHER, service, host);
-#line 1581 "TumblrPublishing.c"
+#line 1827 "TumblrPublishing.c"
}
-static SpitPublishingService* publishing_tumblr_tumblr_publisher_real_get_service (SpitPublishingPublisher* base) {
+static SpitPublishingService*
+publishing_tumblr_tumblr_publisher_real_get_service (SpitPublishingPublisher* base)
+{
PublishingTumblrTumblrPublisher * self;
SpitPublishingService* result = NULL;
SpitPublishingService* _tmp0_;
@@ -1596,11 +1844,13 @@ static SpitPublishingService* publishing_tumblr_tumblr_publisher_real_get_servic
result = _tmp1_;
#line 141 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return result;
-#line 1600 "TumblrPublishing.c"
+#line 1848 "TumblrPublishing.c"
}
-SpitPublishingPluginHost* publishing_tumblr_tumblr_publisher_get_host (PublishingTumblrTumblrPublisher* self) {
+SpitPublishingPluginHost*
+publishing_tumblr_tumblr_publisher_get_host (PublishingTumblrTumblrPublisher* self)
+{
SpitPublishingPluginHost* result = NULL;
SpitPublishingPluginHost* _tmp0_;
SpitPublishingPluginHost* _tmp1_;
@@ -1614,11 +1864,13 @@ SpitPublishingPluginHost* publishing_tumblr_tumblr_publisher_get_host (Publishin
result = _tmp1_;
#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return result;
-#line 1618 "TumblrPublishing.c"
+#line 1868 "TumblrPublishing.c"
}
-static gboolean publishing_tumblr_tumblr_publisher_real_is_running (SpitPublishingPublisher* base) {
+static gboolean
+publishing_tumblr_tumblr_publisher_real_is_running (SpitPublishingPublisher* base)
+{
PublishingTumblrTumblrPublisher * self;
gboolean result = FALSE;
gboolean _tmp0_;
@@ -1630,133 +1882,132 @@ static gboolean publishing_tumblr_tumblr_publisher_real_is_running (SpitPublishi
result = _tmp0_;
#line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return result;
-#line 1634 "TumblrPublishing.c"
+#line 1886 "TumblrPublishing.c"
}
-gint publishing_tumblr_tumblr_publisher_get_persistent_default_size (PublishingTumblrTumblrPublisher* self) {
+gint
+publishing_tumblr_tumblr_publisher_get_persistent_default_size (PublishingTumblrTumblrPublisher* self)
+{
gint result = 0;
SpitPublishingPluginHost* _tmp0_;
- gint _tmp1_;
#line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_return_val_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self), 0);
#line 153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_tmp0_ = self->priv->host;
#line 153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp1_ = spit_host_interface_get_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "default_size", 1);
-#line 153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- result = _tmp1_;
+ result = spit_host_interface_get_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "default_size", 1);
#line 153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return result;
-#line 1652 "TumblrPublishing.c"
+#line 1903 "TumblrPublishing.c"
}
-void publishing_tumblr_tumblr_publisher_set_persistent_default_size (PublishingTumblrTumblrPublisher* self, gint size) {
+void
+publishing_tumblr_tumblr_publisher_set_persistent_default_size (PublishingTumblrTumblrPublisher* self,
+ gint size)
+{
SpitPublishingPluginHost* _tmp0_;
- gint _tmp1_;
#line 156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
#line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_tmp0_ = self->priv->host;
#line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp1_ = size;
-#line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "default_size", _tmp1_);
-#line 1667 "TumblrPublishing.c"
+ spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "default_size", size);
+#line 1918 "TumblrPublishing.c"
}
-gint publishing_tumblr_tumblr_publisher_get_persistent_default_blog (PublishingTumblrTumblrPublisher* self) {
+gint
+publishing_tumblr_tumblr_publisher_get_persistent_default_blog (PublishingTumblrTumblrPublisher* self)
+{
gint result = 0;
SpitPublishingPluginHost* _tmp0_;
- gint _tmp1_;
#line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_return_val_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self), 0);
#line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_tmp0_ = self->priv->host;
#line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp1_ = spit_host_interface_get_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "default_blog", 0);
-#line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- result = _tmp1_;
+ result = spit_host_interface_get_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "default_blog", 0);
#line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return result;
-#line 1685 "TumblrPublishing.c"
+#line 1935 "TumblrPublishing.c"
}
-void publishing_tumblr_tumblr_publisher_set_persistent_default_blog (PublishingTumblrTumblrPublisher* self, gint blog) {
+void
+publishing_tumblr_tumblr_publisher_set_persistent_default_blog (PublishingTumblrTumblrPublisher* self,
+ gint blog)
+{
SpitPublishingPluginHost* _tmp0_;
- gint _tmp1_;
#line 164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
#line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_tmp0_ = self->priv->host;
#line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp1_ = blog;
-#line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "default_blog", _tmp1_);
-#line 1700 "TumblrPublishing.c"
+ spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "default_blog", blog);
+#line 1950 "TumblrPublishing.c"
}
-static gpointer _g_variant_ref0 (gpointer self) {
+static gpointer
+_g_variant_ref0 (gpointer self)
+{
#line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return self ? g_variant_ref (self) : NULL;
-#line 1707 "TumblrPublishing.c"
+#line 1959 "TumblrPublishing.c"
}
-static void publishing_tumblr_tumblr_publisher_on_authenticator_authenticated (PublishingTumblrTumblrPublisher* self) {
- gboolean _tmp0_;
+static void
+publishing_tumblr_tumblr_publisher_on_authenticator_authenticated (PublishingTumblrTumblrPublisher* self)
+{
GHashTable* params = NULL;
- SpitPublishingAuthenticator* _tmp1_;
- GHashTable* _tmp2_;
+ SpitPublishingAuthenticator* _tmp0_;
+ GHashTable* _tmp1_;
GVariant* consumer_key = NULL;
GVariant* consumer_secret = NULL;
GVariant* auth_token = NULL;
GVariant* auth_token_secret = NULL;
- GHashTable* _tmp3_;
- gconstpointer _tmp4_ = NULL;
- GVariant* _tmp5_;
- GHashTable* _tmp6_;
- gconstpointer _tmp7_ = NULL;
- GVariant* _tmp8_;
- PublishingRESTSupportOAuth1Session* _tmp9_;
- GVariant* _tmp10_;
- const gchar* _tmp11_;
- GVariant* _tmp12_;
- const gchar* _tmp13_;
- GHashTable* _tmp14_;
- gconstpointer _tmp15_ = NULL;
- GVariant* _tmp16_;
- GHashTable* _tmp17_;
- gconstpointer _tmp18_ = NULL;
- GVariant* _tmp19_;
- PublishingRESTSupportOAuth1Session* _tmp20_;
- GVariant* _tmp21_;
- const gchar* _tmp22_;
- GVariant* _tmp23_;
- const gchar* _tmp24_;
+ GHashTable* _tmp2_;
+ gconstpointer _tmp3_ = NULL;
+ GVariant* _tmp4_;
+ GHashTable* _tmp5_;
+ gconstpointer _tmp6_ = NULL;
+ GVariant* _tmp7_;
+ PublishingRESTSupportOAuth1Session* _tmp8_;
+ GVariant* _tmp9_;
+ const gchar* _tmp10_;
+ GVariant* _tmp11_;
+ const gchar* _tmp12_;
+ GHashTable* _tmp13_;
+ gconstpointer _tmp14_ = NULL;
+ GVariant* _tmp15_;
+ GHashTable* _tmp16_;
+ gconstpointer _tmp17_ = NULL;
+ GVariant* _tmp18_;
+ PublishingRESTSupportOAuth1Session* _tmp19_;
+ GVariant* _tmp20_;
+ const gchar* _tmp21_;
+ GVariant* _tmp22_;
+ const gchar* _tmp23_;
#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
#line 171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- if (!_tmp0_) {
+ if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
#line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return;
-#line 1750 "TumblrPublishing.c"
+#line 2001 "TumblrPublishing.c"
}
#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_debug ("TumblrPublishing.vala:174: EVENT: a fully authenticated session has be" \
"come available");
#line 176 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp1_ = self->priv->authenticator;
+ _tmp0_ = self->priv->authenticator;
#line 176 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp2_ = spit_publishing_authenticator_get_authentication_parameter (_tmp1_);
+ _tmp1_ = spit_publishing_authenticator_get_authentication_parameter (_tmp0_);
#line 176 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- params = _tmp2_;
+ params = _tmp1_;
#line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
consumer_key = NULL;
#line 178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
@@ -1766,69 +2017,69 @@ static void publishing_tumblr_tumblr_publisher_on_authenticator_authenticated (P
#line 180 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
auth_token_secret = NULL;
#line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp3_ = params;
+ _tmp2_ = params;
#line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- g_hash_table_lookup_extended (_tmp3_, "ConsumerKey", NULL, &_tmp4_);
+ g_hash_table_lookup_extended (_tmp2_, "ConsumerKey", NULL, &_tmp3_);
#line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_g_variant_unref0 (consumer_key);
#line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp5_ = _g_variant_ref0 (_tmp4_);
+ _tmp4_ = _g_variant_ref0 (_tmp3_);
#line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- consumer_key = _tmp5_;
+ consumer_key = _tmp4_;
#line 183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp6_ = params;
+ _tmp5_ = params;
#line 183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- g_hash_table_lookup_extended (_tmp6_, "ConsumerSecret", NULL, &_tmp7_);
+ g_hash_table_lookup_extended (_tmp5_, "ConsumerSecret", NULL, &_tmp6_);
#line 183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_g_variant_unref0 (consumer_secret);
#line 183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp8_ = _g_variant_ref0 (_tmp7_);
+ _tmp7_ = _g_variant_ref0 (_tmp6_);
#line 183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- consumer_secret = _tmp8_;
+ consumer_secret = _tmp7_;
#line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp9_ = self->priv->session;
+ _tmp8_ = self->priv->session;
#line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp10_ = consumer_key;
+ _tmp9_ = consumer_key;
#line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp11_ = g_variant_get_string (_tmp10_, NULL);
+ _tmp10_ = g_variant_get_string (_tmp9_, NULL);
#line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp12_ = consumer_secret;
+ _tmp11_ = consumer_secret;
#line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp13_ = g_variant_get_string (_tmp12_, NULL);
+ _tmp12_ = g_variant_get_string (_tmp11_, NULL);
#line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- publishing_rest_support_oauth1_session_set_api_credentials (_tmp9_, _tmp11_, _tmp13_);
+ publishing_rest_support_oauth1_session_set_api_credentials (_tmp8_, _tmp10_, _tmp12_);
#line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp14_ = params;
+ _tmp13_ = params;
#line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- g_hash_table_lookup_extended (_tmp14_, "AuthToken", NULL, &_tmp15_);
+ g_hash_table_lookup_extended (_tmp13_, "AuthToken", NULL, &_tmp14_);
#line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_g_variant_unref0 (auth_token);
#line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp16_ = _g_variant_ref0 (_tmp15_);
+ _tmp15_ = _g_variant_ref0 (_tmp14_);
#line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- auth_token = _tmp16_;
+ auth_token = _tmp15_;
#line 187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp17_ = params;
+ _tmp16_ = params;
#line 187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- g_hash_table_lookup_extended (_tmp17_, "AuthTokenSecret", NULL, &_tmp18_);
+ g_hash_table_lookup_extended (_tmp16_, "AuthTokenSecret", NULL, &_tmp17_);
#line 187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_g_variant_unref0 (auth_token_secret);
#line 187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp19_ = _g_variant_ref0 (_tmp18_);
+ _tmp18_ = _g_variant_ref0 (_tmp17_);
#line 187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- auth_token_secret = _tmp19_;
+ auth_token_secret = _tmp18_;
#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp20_ = self->priv->session;
+ _tmp19_ = self->priv->session;
#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp21_ = auth_token;
+ _tmp20_ = auth_token;
#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp22_ = g_variant_get_string (_tmp21_, NULL);
+ _tmp21_ = g_variant_get_string (_tmp20_, NULL);
#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp23_ = auth_token_secret;
+ _tmp22_ = auth_token_secret;
#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp24_ = g_variant_get_string (_tmp23_, NULL);
+ _tmp23_ = g_variant_get_string (_tmp22_, NULL);
#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- publishing_rest_support_oauth1_session_set_access_phase_credentials (_tmp20_, _tmp22_, _tmp24_, "");
+ publishing_rest_support_oauth1_session_set_access_phase_credentials (_tmp19_, _tmp21_, _tmp23_, "");
#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
publishing_tumblr_tumblr_publisher_do_get_blogs (self);
#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
@@ -1841,25 +2092,34 @@ static void publishing_tumblr_tumblr_publisher_on_authenticator_authenticated (P
_g_variant_unref0 (consumer_key);
#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_g_hash_table_unref0 (params);
-#line 1844 "TumblrPublishing.c"
+#line 2095 "TumblrPublishing.c"
}
-static void _publishing_tumblr_tumblr_publisher_on_info_request_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
+static void
+_publishing_tumblr_tumblr_publisher_on_info_request_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+ gpointer self)
+{
#line 198 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
publishing_tumblr_tumblr_publisher_on_info_request_txn_completed ((PublishingTumblrTumblrPublisher*) self, _sender);
-#line 1851 "TumblrPublishing.c"
+#line 2105 "TumblrPublishing.c"
}
-static void _publishing_tumblr_tumblr_publisher_on_info_request_txn_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
+static void
+_publishing_tumblr_tumblr_publisher_on_info_request_txn_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+ GError* err,
+ gpointer self)
+{
#line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
publishing_tumblr_tumblr_publisher_on_info_request_txn_error ((PublishingTumblrTumblrPublisher*) self, _sender, err);
-#line 1858 "TumblrPublishing.c"
+#line 2116 "TumblrPublishing.c"
}
-static void publishing_tumblr_tumblr_publisher_do_get_blogs (PublishingTumblrTumblrPublisher* self) {
+static void
+publishing_tumblr_tumblr_publisher_do_get_blogs (PublishingTumblrTumblrPublisher* self)
+{
PublishingTumblrTumblrPublisherUserInfoFetchTransaction* txn = NULL;
PublishingRESTSupportOAuth1Session* _tmp0_;
PublishingTumblrTumblrPublisherUserInfoFetchTransaction* _tmp1_;
@@ -1878,7 +2138,7 @@ static void publishing_tumblr_tumblr_publisher_do_get_blogs (PublishingTumblrTum
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_tumblr_tumblr_publisher_on_info_request_txn_completed_publishing_rest_support_transaction_completed, self, 0);
#line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_tumblr_tumblr_publisher_on_info_request_txn_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 1881 "TumblrPublishing.c"
+#line 2141 "TumblrPublishing.c"
{
#line 202 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
@@ -1886,7 +2146,7 @@ static void publishing_tumblr_tumblr_publisher_do_get_blogs (PublishingTumblrTum
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 202 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 1889 "TumblrPublishing.c"
+#line 2149 "TumblrPublishing.c"
goto __catch20_spit_publishing_publishing_error;
}
#line 202 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
@@ -1897,7 +2157,7 @@ static void publishing_tumblr_tumblr_publisher_do_get_blogs (PublishingTumblrTum
g_clear_error (&_inner_error_);
#line 202 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return;
-#line 1900 "TumblrPublishing.c"
+#line 2160 "TumblrPublishing.c"
}
}
goto __finally20;
@@ -1918,7 +2178,7 @@ static void publishing_tumblr_tumblr_publisher_do_get_blogs (PublishingTumblrTum
spit_publishing_plugin_host_post_error (_tmp2_, _tmp3_);
#line 201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_g_error_free0 (err);
-#line 1921 "TumblrPublishing.c"
+#line 2181 "TumblrPublishing.c"
}
__finally20:
#line 201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
@@ -1931,470 +2191,451 @@ static void publishing_tumblr_tumblr_publisher_do_get_blogs (PublishingTumblrTum
g_clear_error (&_inner_error_);
#line 201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return;
-#line 1934 "TumblrPublishing.c"
+#line 2194 "TumblrPublishing.c"
}
#line 195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_publishing_rest_support_transaction_unref0 (txn);
-#line 1938 "TumblrPublishing.c"
+#line 2198 "TumblrPublishing.c"
}
-static void publishing_tumblr_tumblr_publisher_on_info_request_txn_completed (PublishingTumblrTumblrPublisher* self, PublishingRESTSupportTransaction* txn) {
- PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_tumblr_tumblr_publisher_on_info_request_txn_completed (PublishingTumblrTumblrPublisher* self,
+ PublishingRESTSupportTransaction* txn)
+{
+ guint _tmp0_;
guint _tmp1_;
- PublishingRESTSupportTransaction* _tmp2_;
- guint _tmp3_;
- gboolean _tmp4_;
- PublishingRESTSupportTransaction* _tmp5_;
- gchar* _tmp6_;
- gchar* _tmp7_;
- PublishingRESTSupportTransaction* _tmp8_;
- gchar* _tmp9_;
- gchar* _tmp10_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
+ gchar* _tmp4_;
+ gchar* _tmp5_;
#line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
#line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp0_ = txn;
+ g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_info_request_txn_completed_publishing_rest_support_transaction_completed, self);
-#line 213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp2_ = txn;
+ g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_info_request_txn_completed_publishing_rest_support_transaction_completed, self);
#line 213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
+ g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
#line 213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_info_request_txn_error_publishing_rest_support_transaction_network_error, self);
+ g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_info_request_txn_error_publishing_rest_support_transaction_network_error, self);
#line 215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- if (!_tmp4_) {
+ if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
#line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return;
-#line 1976 "TumblrPublishing.c"
+#line 2228 "TumblrPublishing.c"
}
#line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp5_ = txn;
-#line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp6_ = publishing_rest_support_transaction_get_response (_tmp5_);
+ _tmp2_ = publishing_rest_support_transaction_get_response (txn);
#line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp7_ = _tmp6_;
+ _tmp3_ = _tmp2_;
#line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_debug ("TumblrPublishing.vala:218: EVENT: user info request transaction comple" \
-"ted; response = '%s'", _tmp7_);
+"ted; response = '%s'", _tmp3_);
#line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _g_free0 (_tmp7_);
+ _g_free0 (_tmp3_);
#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp8_ = txn;
+ _tmp4_ = publishing_rest_support_transaction_get_response (txn);
#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp9_ = publishing_rest_support_transaction_get_response (_tmp8_);
-#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp10_ = _tmp9_;
+ _tmp5_ = _tmp4_;
#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- publishing_tumblr_tumblr_publisher_do_parse_token_info_from_user_request (self, _tmp10_);
+ publishing_tumblr_tumblr_publisher_do_parse_token_info_from_user_request (self, _tmp5_);
#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _g_free0 (_tmp10_);
+ _g_free0 (_tmp5_);
#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
publishing_tumblr_tumblr_publisher_do_show_publishing_options_pane (self);
-#line 2000 "TumblrPublishing.c"
+#line 2248 "TumblrPublishing.c"
}
-static gpointer _json_object_ref0 (gpointer self) {
+static gpointer
+_json_object_ref0 (gpointer self)
+{
#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return self ? json_object_ref (self) : NULL;
-#line 2007 "TumblrPublishing.c"
+#line 2257 "TumblrPublishing.c"
}
-static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
+static gchar*
+string_replace (const gchar* self,
+ const gchar* old,
+ const gchar* replacement)
+{
gchar* result = NULL;
gboolean _tmp0_ = FALSE;
gboolean _tmp1_ = FALSE;
GError * _inner_error_ = NULL;
-#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (old != NULL, NULL);
-#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (replacement != NULL, NULL);
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
if ((*((gchar*) self)) == '\0') {
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp1_ = TRUE;
-#line 2026 "TumblrPublishing.c"
+#line 2280 "TumblrPublishing.c"
} else {
- const gchar* _tmp2_;
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp2_ = old;
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp1_ = (*((gchar*) _tmp2_)) == '\0';
-#line 2033 "TumblrPublishing.c"
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp1_ = (*((gchar*) old)) == '\0';
+#line 2284 "TumblrPublishing.c"
}
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
if (_tmp1_) {
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp0_ = TRUE;
-#line 2039 "TumblrPublishing.c"
+#line 2290 "TumblrPublishing.c"
} else {
- const gchar* _tmp3_;
- const gchar* _tmp4_;
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp3_ = old;
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp4_ = replacement;
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp0_ = g_strcmp0 (_tmp3_, _tmp4_) == 0;
-#line 2049 "TumblrPublishing.c"
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp0_ = g_strcmp0 (old, replacement) == 0;
+#line 2294 "TumblrPublishing.c"
}
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
if (_tmp0_) {
-#line 2053 "TumblrPublishing.c"
- gchar* _tmp5_;
-#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp5_ = g_strdup (self);
-#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- result = _tmp5_;
-#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 2298 "TumblrPublishing.c"
+ gchar* _tmp2_;
+#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp2_ = g_strdup (self);
+#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = _tmp2_;
+#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 2061 "TumblrPublishing.c"
+#line 2306 "TumblrPublishing.c"
}
{
GRegex* regex = NULL;
- const gchar* _tmp6_;
- gchar* _tmp7_;
- gchar* _tmp8_;
- GRegex* _tmp9_;
- GRegex* _tmp10_;
- gchar* _tmp11_ = NULL;
- GRegex* _tmp12_;
- const gchar* _tmp13_;
- gchar* _tmp14_;
- gchar* _tmp15_;
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp6_ = old;
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp7_ = g_regex_escape_string (_tmp6_, -1);
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp8_ = _tmp7_;
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp9_ = g_regex_new (_tmp8_, 0, 0, &_inner_error_);
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp10_ = _tmp9_;
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _g_free0 (_tmp8_);
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- regex = _tmp10_;
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ gchar* _tmp3_;
+ gchar* _tmp4_;
+ GRegex* _tmp5_;
+ GRegex* _tmp6_;
+ gchar* _tmp7_ = NULL;
+ GRegex* _tmp8_;
+ gchar* _tmp9_;
+ gchar* _tmp10_;
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp3_ = g_regex_escape_string (old, -1);
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp4_ = _tmp3_;
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp5_ = g_regex_new (_tmp4_, 0, 0, &_inner_error_);
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp6_ = _tmp5_;
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _g_free0 (_tmp4_);
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ regex = _tmp6_;
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 2093 "TumblrPublishing.c"
+#line 2334 "TumblrPublishing.c"
goto __catch22_g_regex_error;
}
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_clear_error (&_inner_error_);
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return NULL;
-#line 2102 "TumblrPublishing.c"
+#line 2343 "TumblrPublishing.c"
}
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp12_ = regex;
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp13_ = replacement;
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp14_ = g_regex_replace_literal (_tmp12_, self, (gssize) -1, 0, _tmp13_, 0, &_inner_error_);
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp11_ = _tmp14_;
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp8_ = regex;
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp9_ = g_regex_replace_literal (_tmp8_, self, (gssize) -1, 0, replacement, 0, &_inner_error_);
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp7_ = _tmp9_;
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_g_regex_unref0 (regex);
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 2118 "TumblrPublishing.c"
+#line 2357 "TumblrPublishing.c"
goto __catch22_g_regex_error;
}
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_g_regex_unref0 (regex);
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_clear_error (&_inner_error_);
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return NULL;
-#line 2129 "TumblrPublishing.c"
+#line 2368 "TumblrPublishing.c"
}
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp15_ = _tmp11_;
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp11_ = NULL;
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- result = _tmp15_;
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _g_free0 (_tmp11_);
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp10_ = _tmp7_;
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp7_ = NULL;
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = _tmp10_;
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _g_free0 (_tmp7_);
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_g_regex_unref0 (regex);
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 2143 "TumblrPublishing.c"
+#line 2382 "TumblrPublishing.c"
}
goto __finally22;
__catch22_g_regex_error:
{
GError* e = NULL;
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
e = _inner_error_;
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_inner_error_ = NULL;
-#line 1415 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1429 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_assert_not_reached ();
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_g_error_free0 (e);
-#line 2157 "TumblrPublishing.c"
+#line 2396 "TumblrPublishing.c"
}
__finally22:
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_clear_error (&_inner_error_);
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return NULL;
-#line 2168 "TumblrPublishing.c"
+#line 2407 "TumblrPublishing.c"
}
}
-static void _vala_array_add34 (PublishingTumblrBlogEntry** * array, int* length, int* size, PublishingTumblrBlogEntry* value) {
+static void
+_vala_array_add34 (PublishingTumblrBlogEntry** * array,
+ int* length,
+ int* size,
+ PublishingTumblrBlogEntry* value)
+{
#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
if ((*length) == (*size)) {
#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
*array = g_renew (PublishingTumblrBlogEntry*, *array, (*size) + 1);
-#line 2180 "TumblrPublishing.c"
+#line 2424 "TumblrPublishing.c"
}
#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
(*array)[(*length)++] = value;
#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
(*array)[*length] = NULL;
-#line 2186 "TumblrPublishing.c"
+#line 2430 "TumblrPublishing.c"
}
-static void publishing_tumblr_tumblr_publisher_do_parse_token_info_from_user_request (PublishingTumblrTumblrPublisher* self, const gchar* response) {
- const gchar* _tmp0_;
+static void
+publishing_tumblr_tumblr_publisher_do_parse_token_info_from_user_request (PublishingTumblrTumblrPublisher* self,
+ const gchar* response)
+{
GError * _inner_error_ = NULL;
#line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
#line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_return_if_fail (response != NULL);
#line 226 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp0_ = response;
-#line 226 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_debug ("TumblrPublishing.vala:226: ACTION: parsing info request response '%s' " \
-"into list of available blogs", _tmp0_);
-#line 2201 "TumblrPublishing.c"
+"into list of available blogs", response);
+#line 2445 "TumblrPublishing.c"
{
JsonParser* parser = NULL;
- JsonParser* _tmp1_;
- const gchar* _tmp2_;
+ JsonParser* _tmp0_;
JsonObject* root_object = NULL;
- JsonNode* _tmp3_;
+ JsonNode* _tmp1_;
+ JsonObject* _tmp2_;
+ JsonObject* _tmp3_;
JsonObject* _tmp4_;
JsonObject* _tmp5_;
JsonObject* _tmp6_;
- JsonObject* _tmp7_;
- JsonObject* _tmp8_;
+ const gchar* _tmp7_;
+ gchar* _tmp8_;
const gchar* _tmp9_;
- gchar* _tmp10_;
- const gchar* _tmp11_;
+ JsonObject* _tmp10_;
+ JsonObject* _tmp11_;
JsonObject* _tmp12_;
- JsonObject* _tmp13_;
- JsonObject* _tmp14_;
- JsonArray* _tmp15_;
- GList* _tmp16_;
+ JsonArray* _tmp13_;
+ GList* _tmp14_;
#line 228 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp1_ = json_parser_new ();
+ _tmp0_ = json_parser_new ();
#line 228 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- parser = _tmp1_;
+ parser = _tmp0_;
#line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp2_ = response;
-#line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- json_parser_load_from_data (parser, _tmp2_, (gssize) -1, &_inner_error_);
+ json_parser_load_from_data (parser, response, (gssize) -1, &_inner_error_);
#line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_g_object_unref0 (parser);
-#line 2233 "TumblrPublishing.c"
+#line 2474 "TumblrPublishing.c"
goto __catch21_g_error;
}
#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp3_ = json_parser_get_root (parser);
+ _tmp1_ = json_parser_get_root (parser);
#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp4_ = json_node_get_object (_tmp3_);
+ _tmp2_ = json_node_get_object (_tmp1_);
#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp5_ = _json_object_ref0 (_tmp4_);
+ _tmp3_ = _json_object_ref0 (_tmp2_);
#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- root_object = _tmp5_;
+ root_object = _tmp3_;
#line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp6_ = root_object;
+ _tmp4_ = root_object;
#line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp7_ = json_object_get_object_member (_tmp6_, "response");
+ _tmp5_ = json_object_get_object_member (_tmp4_, "response");
#line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp8_ = json_object_get_object_member (_tmp7_, "user");
+ _tmp6_ = json_object_get_object_member (_tmp5_, "user");
#line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp9_ = json_object_get_string_member (_tmp8_, "name");
+ _tmp7_ = json_object_get_string_member (_tmp6_, "name");
#line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp10_ = g_strdup (_tmp9_);
+ _tmp8_ = g_strdup (_tmp7_);
#line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_g_free0 (self->priv->username);
#line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- self->priv->username = _tmp10_;
+ self->priv->username = _tmp8_;
#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp11_ = self->priv->username;
+ _tmp9_ = self->priv->username;
#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- g_debug ("TumblrPublishing.vala:232: Got user name: %s", _tmp11_);
+ g_debug ("TumblrPublishing.vala:232: Got user name: %s", _tmp9_);
#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp12_ = root_object;
+ _tmp10_ = root_object;
#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp13_ = json_object_get_object_member (_tmp12_, "response");
+ _tmp11_ = json_object_get_object_member (_tmp10_, "response");
#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp14_ = json_object_get_object_member (_tmp13_, "user");
+ _tmp12_ = json_object_get_object_member (_tmp11_, "user");
#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp15_ = json_object_get_array_member (_tmp14_, "blogs");
+ _tmp13_ = json_object_get_array_member (_tmp12_, "blogs");
#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp16_ = json_array_get_elements (_tmp15_);
-#line 2272 "TumblrPublishing.c"
+ _tmp14_ = json_array_get_elements (_tmp13_);
+#line 2513 "TumblrPublishing.c"
{
GList* blognode_collection = NULL;
GList* blognode_it = NULL;
#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- blognode_collection = _tmp16_;
+ blognode_collection = _tmp14_;
#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
for (blognode_it = blognode_collection; blognode_it != NULL; blognode_it = blognode_it->next) {
-#line 2280 "TumblrPublishing.c"
+#line 2521 "TumblrPublishing.c"
JsonNode* blognode = NULL;
#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
blognode = (JsonNode*) blognode_it->data;
-#line 2284 "TumblrPublishing.c"
+#line 2525 "TumblrPublishing.c"
{
JsonObject* blog = NULL;
- JsonNode* _tmp17_;
- JsonObject* _tmp18_;
- JsonObject* _tmp19_;
+ JsonNode* _tmp15_;
+ JsonObject* _tmp16_;
+ JsonObject* _tmp17_;
gchar* name = NULL;
- JsonObject* _tmp20_;
- const gchar* _tmp21_;
- gchar* _tmp22_;
+ JsonObject* _tmp18_;
+ const gchar* _tmp19_;
+ gchar* _tmp20_;
gchar* url = NULL;
- JsonObject* _tmp23_;
- const gchar* _tmp24_;
+ JsonObject* _tmp21_;
+ const gchar* _tmp22_;
+ gchar* _tmp23_;
+ gchar* _tmp24_;
gchar* _tmp25_;
gchar* _tmp26_;
- gchar* _tmp27_;
- gchar* _tmp28_;
- const gchar* _tmp29_;
+ const gchar* _tmp27_;
+ const gchar* _tmp28_;
+ PublishingTumblrBlogEntry** _tmp29_;
+ gint _tmp29__length1;
const gchar* _tmp30_;
- PublishingTumblrBlogEntry** _tmp31_;
- gint _tmp31__length1;
- const gchar* _tmp32_;
- const gchar* _tmp33_;
- PublishingTumblrBlogEntry* _tmp34_;
+ const gchar* _tmp31_;
+ PublishingTumblrBlogEntry* _tmp32_;
#line 234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp17_ = blognode;
+ _tmp15_ = blognode;
#line 234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp18_ = json_node_get_object (_tmp17_);
+ _tmp16_ = json_node_get_object (_tmp15_);
#line 234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp19_ = _json_object_ref0 (_tmp18_);
+ _tmp17_ = _json_object_ref0 (_tmp16_);
#line 234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- blog = _tmp19_;
+ blog = _tmp17_;
#line 235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp20_ = blog;
+ _tmp18_ = blog;
#line 235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp21_ = json_object_get_string_member (_tmp20_, "name");
+ _tmp19_ = json_object_get_string_member (_tmp18_, "name");
#line 235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp22_ = g_strdup (_tmp21_);
+ _tmp20_ = g_strdup (_tmp19_);
#line 235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- name = _tmp22_;
+ name = _tmp20_;
#line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp23_ = blog;
+ _tmp21_ = blog;
#line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp24_ = json_object_get_string_member (_tmp23_, "url");
+ _tmp22_ = json_object_get_string_member (_tmp21_, "url");
#line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp25_ = string_replace (_tmp24_, "http://", "");
+ _tmp23_ = string_replace (_tmp22_, "http://", "");
#line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp26_ = _tmp25_;
+ _tmp24_ = _tmp23_;
#line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp27_ = string_replace (_tmp26_, "/", "");
+ _tmp25_ = string_replace (_tmp24_, "/", "");
#line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp28_ = _tmp27_;
+ _tmp26_ = _tmp25_;
#line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _g_free0 (_tmp26_);
+ _g_free0 (_tmp24_);
#line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- url = _tmp28_;
+ url = _tmp26_;
#line 237 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp29_ = name;
+ _tmp27_ = name;
#line 237 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp30_ = url;
+ _tmp28_ = url;
#line 237 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- g_debug ("TumblrPublishing.vala:237: Got blog name: %s and url: %s", _tmp29_, _tmp30_);
+ g_debug ("TumblrPublishing.vala:237: Got blog name: %s and url: %s", _tmp27_, _tmp28_);
#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp31_ = self->priv->blogs;
+ _tmp29_ = self->priv->blogs;
#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp31__length1 = self->priv->blogs_length1;
+ _tmp29__length1 = self->priv->blogs_length1;
#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp32_ = name;
+ _tmp30_ = name;
#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp33_ = url;
+ _tmp31_ = url;
#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp34_ = publishing_tumblr_blog_entry_new (_tmp32_, _tmp33_);
+ _tmp32_ = publishing_tumblr_blog_entry_new (_tmp30_, _tmp31_);
#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _vala_array_add34 (&self->priv->blogs, &self->priv->blogs_length1, &self->priv->_blogs_size_, _tmp34_);
+ _vala_array_add34 (&self->priv->blogs, &self->priv->blogs_length1, &self->priv->_blogs_size_, _tmp32_);
#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_g_free0 (url);
#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_g_free0 (name);
#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_json_object_unref0 (blog);
-#line 2364 "TumblrPublishing.c"
+#line 2605 "TumblrPublishing.c"
}
}
#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_g_list_free0 (blognode_collection);
-#line 2369 "TumblrPublishing.c"
+#line 2610 "TumblrPublishing.c"
}
#line 227 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_json_object_unref0 (root_object);
#line 227 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_g_object_unref0 (parser);
-#line 2375 "TumblrPublishing.c"
+#line 2616 "TumblrPublishing.c"
}
goto __finally21;
__catch21_g_error:
{
GError* err = NULL;
- SpitPublishingPluginHost* _tmp35_;
- GError* _tmp36_;
+ SpitPublishingPluginHost* _tmp33_;
+ GError* _tmp34_;
#line 227 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
err = _inner_error_;
#line 227 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_inner_error_ = NULL;
#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp35_ = self->priv->host;
+ _tmp33_ = self->priv->host;
#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp36_ = err;
+ _tmp34_ = err;
#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- spit_publishing_plugin_host_post_error (_tmp35_, _tmp36_);
+ spit_publishing_plugin_host_post_error (_tmp33_, _tmp34_);
#line 227 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_g_error_free0 (err);
-#line 2395 "TumblrPublishing.c"
+#line 2636 "TumblrPublishing.c"
}
__finally21:
#line 227 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
@@ -2405,87 +2646,86 @@ static void publishing_tumblr_tumblr_publisher_do_parse_token_info_from_user_req
g_clear_error (&_inner_error_);
#line 227 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return;
-#line 2406 "TumblrPublishing.c"
+#line 2647 "TumblrPublishing.c"
}
}
-static void publishing_tumblr_tumblr_publisher_on_info_request_txn_error (PublishingTumblrTumblrPublisher* self, PublishingRESTSupportTransaction* txn, GError* err) {
- PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_tumblr_tumblr_publisher_on_info_request_txn_error (PublishingTumblrTumblrPublisher* self,
+ PublishingRESTSupportTransaction* txn,
+ GError* err)
+{
+ guint _tmp0_;
guint _tmp1_;
- PublishingRESTSupportTransaction* _tmp2_;
- guint _tmp3_;
- gboolean _tmp4_;
- PublishingRESTSupportOAuth1Session* _tmp5_;
- SpitPublishingPluginHost* _tmp6_;
- GError* _tmp7_;
+ PublishingRESTSupportOAuth1Session* _tmp2_;
+ SpitPublishingPluginHost* _tmp3_;
#line 245 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
#line 245 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
#line 247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp0_ = txn;
+ g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
#line 247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_info_request_txn_completed_publishing_rest_support_transaction_completed, self);
-#line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp2_ = txn;
+ g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_info_request_txn_completed_publishing_rest_support_transaction_completed, self);
#line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
+ g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
#line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_info_request_txn_error_publishing_rest_support_transaction_network_error, self);
+ g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_info_request_txn_error_publishing_rest_support_transaction_network_error, self);
#line 250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- if (!_tmp4_) {
+ if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
#line 251 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return;
-#line 2442 "TumblrPublishing.c"
+#line 2677 "TumblrPublishing.c"
}
#line 253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp5_ = self->priv->session;
+ _tmp2_ = self->priv->session;
#line 253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- publishing_rest_support_oauth1_session_deauthenticate (_tmp5_);
+ publishing_rest_support_oauth1_session_deauthenticate (_tmp2_);
#line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_debug ("TumblrPublishing.vala:255: EVENT: user info request transaction caused" \
" a network error");
#line 256 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp6_ = self->priv->host;
-#line 256 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp7_ = err;
+ _tmp3_ = self->priv->host;
#line 256 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- spit_publishing_plugin_host_post_error (_tmp6_, _tmp7_);
-#line 2456 "TumblrPublishing.c"
+ spit_publishing_plugin_host_post_error (_tmp3_, err);
+#line 2689 "TumblrPublishing.c"
}
-static void _publishing_tumblr_tumblr_publisher_on_publishing_options_pane_publish_publishing_tumblr_tumblr_publisher_publishing_options_pane_publish (PublishingTumblrTumblrPublisherPublishingOptionsPane* _sender, gpointer self) {
+static void
+_publishing_tumblr_tumblr_publisher_on_publishing_options_pane_publish_publishing_tumblr_tumblr_publisher_publishing_options_pane_publish (PublishingTumblrTumblrPublisherPublishingOptionsPane* _sender,
+ gpointer self)
+{
#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
publishing_tumblr_tumblr_publisher_on_publishing_options_pane_publish ((PublishingTumblrTumblrPublisher*) self);
-#line 2463 "TumblrPublishing.c"
+#line 2699 "TumblrPublishing.c"
}
-static void _publishing_tumblr_tumblr_publisher_on_publishing_options_pane_logout_publishing_tumblr_tumblr_publisher_publishing_options_pane_logout (PublishingTumblrTumblrPublisherPublishingOptionsPane* _sender, gpointer self) {
+static void
+_publishing_tumblr_tumblr_publisher_on_publishing_options_pane_logout_publishing_tumblr_tumblr_publisher_publishing_options_pane_logout (PublishingTumblrTumblrPublisherPublishingOptionsPane* _sender,
+ gpointer self)
+{
#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
publishing_tumblr_tumblr_publisher_on_publishing_options_pane_logout ((PublishingTumblrTumblrPublisher*) self);
-#line 2470 "TumblrPublishing.c"
+#line 2709 "TumblrPublishing.c"
}
-static void publishing_tumblr_tumblr_publisher_do_show_publishing_options_pane (PublishingTumblrTumblrPublisher* self) {
+static void
+publishing_tumblr_tumblr_publisher_do_show_publishing_options_pane (PublishingTumblrTumblrPublisher* self)
+{
SpitPublishingPluginHost* _tmp0_;
PublishingTumblrTumblrPublisherPublishingOptionsPane* publishing_options_pane = NULL;
SpitPublishingPluginHost* _tmp1_;
- SpitPublishingPublisherMediaType _tmp2_;
- PublishingTumblrSizeEntry** _tmp3_;
+ PublishingTumblrSizeEntry** _tmp2_;
+ gint _tmp2__length1;
+ PublishingTumblrBlogEntry** _tmp3_;
gint _tmp3__length1;
- PublishingTumblrBlogEntry** _tmp4_;
- gint _tmp4__length1;
- const gchar* _tmp5_;
- PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp6_;
- SpitPublishingPluginHost* _tmp7_;
+ const gchar* _tmp4_;
+ PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp5_;
+ SpitPublishingPluginHost* _tmp6_;
#line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
#line 260 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
@@ -2497,45 +2737,44 @@ static void publishing_tumblr_tumblr_publisher_do_show_publishing_options_pane (
#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_tmp1_ = self->priv->host;
#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp2_ = spit_publishing_plugin_host_get_publishable_media_type (_tmp1_);
-#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp3_ = self->priv->sizes;
+ _tmp2_ = self->priv->sizes;
#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp3__length1 = self->priv->sizes_length1;
+ _tmp2__length1 = self->priv->sizes_length1;
#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp4_ = self->priv->blogs;
+ _tmp3_ = self->priv->blogs;
#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp4__length1 = self->priv->blogs_length1;
+ _tmp3__length1 = self->priv->blogs_length1;
#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp5_ = self->priv->username;
+ _tmp4_ = self->priv->username;
#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp6_ = publishing_tumblr_tumblr_publisher_publishing_options_pane_new (self, _tmp2_, _tmp3_, _tmp3__length1, _tmp4_, _tmp4__length1, _tmp5_);
+ _tmp5_ = publishing_tumblr_tumblr_publisher_publishing_options_pane_new (self, spit_publishing_plugin_host_get_publishable_media_type (_tmp1_), _tmp2_, _tmp2__length1, _tmp3_, _tmp3__length1, _tmp4_);
#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- publishing_options_pane = _tmp6_;
+ publishing_options_pane = _tmp5_;
#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_signal_connect_object (publishing_options_pane, "publish", (GCallback) _publishing_tumblr_tumblr_publisher_on_publishing_options_pane_publish_publishing_tumblr_tumblr_publisher_publishing_options_pane_publish, self, 0);
#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_signal_connect_object (publishing_options_pane, "logout", (GCallback) _publishing_tumblr_tumblr_publisher_on_publishing_options_pane_logout_publishing_tumblr_tumblr_publisher_publishing_options_pane_logout, self, 0);
#line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp7_ = self->priv->host;
+ _tmp6_ = self->priv->host;
#line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- spit_publishing_plugin_host_install_dialog_pane (_tmp7_, G_TYPE_CHECK_INSTANCE_CAST (publishing_options_pane, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
+ spit_publishing_plugin_host_install_dialog_pane (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (publishing_options_pane, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
#line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_g_object_unref0 (publishing_options_pane);
-#line 2522 "TumblrPublishing.c"
+#line 2760 "TumblrPublishing.c"
}
-static void publishing_tumblr_tumblr_publisher_on_publishing_options_pane_publish (PublishingTumblrTumblrPublisher* self) {
+static void
+publishing_tumblr_tumblr_publisher_on_publishing_options_pane_publish (PublishingTumblrTumblrPublisher* self)
+{
PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp0_;
- gboolean _tmp5_;
#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_tmp0_ = self->priv->publishing_options_pane;
#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
if (_tmp0_ != NULL) {
-#line 2535 "TumblrPublishing.c"
+#line 2774 "TumblrPublishing.c"
PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp1_;
guint _tmp2_;
PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp3_;
@@ -2552,35 +2791,34 @@ static void publishing_tumblr_tumblr_publisher_on_publishing_options_pane_publis
g_signal_parse_name ("logout", PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp4_, NULL, FALSE);
#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_signal_handlers_disconnect_matched (_tmp3_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_publishing_options_pane_logout_publishing_tumblr_tumblr_publisher_publishing_options_pane_logout, self);
-#line 2552 "TumblrPublishing.c"
+#line 2791 "TumblrPublishing.c"
}
#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp5_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- if (!_tmp5_) {
+ if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return;
-#line 2560 "TumblrPublishing.c"
+#line 2797 "TumblrPublishing.c"
}
#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_debug ("TumblrPublishing.vala:280: EVENT: user clicked the 'Publish' button in" \
" the publishing options pane");
#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
publishing_tumblr_tumblr_publisher_do_publish (self);
-#line 2566 "TumblrPublishing.c"
+#line 2803 "TumblrPublishing.c"
}
-static void publishing_tumblr_tumblr_publisher_on_publishing_options_pane_logout (PublishingTumblrTumblrPublisher* self) {
+static void
+publishing_tumblr_tumblr_publisher_on_publishing_options_pane_logout (PublishingTumblrTumblrPublisher* self)
+{
PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp0_;
- gboolean _tmp5_;
#line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
#line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_tmp0_ = self->priv->publishing_options_pane;
#line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
if (_tmp0_ != NULL) {
-#line 2579 "TumblrPublishing.c"
+#line 2817 "TumblrPublishing.c"
PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp1_;
guint _tmp2_;
PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp3_;
@@ -2597,140 +2835,147 @@ static void publishing_tumblr_tumblr_publisher_on_publishing_options_pane_logout
g_signal_parse_name ("logout", PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp4_, NULL, FALSE);
#line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_signal_handlers_disconnect_matched (_tmp3_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_publishing_options_pane_logout_publishing_tumblr_tumblr_publisher_publishing_options_pane_logout, self);
-#line 2596 "TumblrPublishing.c"
+#line 2834 "TumblrPublishing.c"
}
#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp5_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- if (!_tmp5_) {
+ if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return;
-#line 2604 "TumblrPublishing.c"
+#line 2840 "TumblrPublishing.c"
}
#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_debug ("TumblrPublishing.vala:293: EVENT: user clicked the 'Logout' button in " \
"the publishing options pane");
#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
publishing_tumblr_tumblr_publisher_do_logout (self);
-#line 2610 "TumblrPublishing.c"
+#line 2846 "TumblrPublishing.c"
}
-gint publishing_tumblr_tumblr_publisher_tumblr_date_time_compare_func (SpitPublishingPublishable* a, SpitPublishingPublishable* b) {
+gint
+publishing_tumblr_tumblr_publisher_tumblr_date_time_compare_func (SpitPublishingPublishable* a,
+ SpitPublishingPublishable* b)
+{
gint result = 0;
- SpitPublishingPublishable* _tmp0_;
+ GDateTime* _tmp0_;
GDateTime* _tmp1_;
GDateTime* _tmp2_;
- SpitPublishingPublishable* _tmp3_;
- GDateTime* _tmp4_;
- GDateTime* _tmp5_;
- gint _tmp6_;
- gint _tmp7_;
+ GDateTime* _tmp3_;
+ gint _tmp4_;
#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (a), 0);
#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (b), 0);
#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp0_ = a;
-#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp1_ = spit_publishing_publishable_get_exposure_date_time (_tmp0_);
+ _tmp0_ = spit_publishing_publishable_get_exposure_date_time (a);
#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp2_ = _tmp1_;
-#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp3_ = b;
+ _tmp1_ = _tmp0_;
#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp4_ = spit_publishing_publishable_get_exposure_date_time (_tmp3_);
+ _tmp2_ = spit_publishing_publishable_get_exposure_date_time (b);
#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp5_ = _tmp4_;
-#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp6_ = g_date_time_compare (_tmp2_, _tmp5_);
+ _tmp3_ = _tmp2_;
#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp7_ = _tmp6_;
+ _tmp4_ = g_date_time_compare (_tmp1_, _tmp3_);
#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _g_date_time_unref0 (_tmp5_);
+ _g_date_time_unref0 (_tmp3_);
#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _g_date_time_unref0 (_tmp2_);
+ _g_date_time_unref0 (_tmp1_);
#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- result = _tmp7_;
+ result = _tmp4_;
#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return result;
-#line 2652 "TumblrPublishing.c"
+#line 2882 "TumblrPublishing.c"
}
-static gint _publishing_tumblr_tumblr_publisher_tumblr_date_time_compare_func_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self) {
+static gint
+_publishing_tumblr_tumblr_publisher_tumblr_date_time_compare_func_gcompare_data_func (gconstpointer a,
+ gconstpointer b,
+ gpointer self)
+{
gint result;
result = publishing_tumblr_tumblr_publisher_tumblr_date_time_compare_func ((SpitPublishingPublishable*) a, (SpitPublishingPublishable*) b);
#line 325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return result;
-#line 2661 "TumblrPublishing.c"
+#line 2895 "TumblrPublishing.c"
}
-static void _publishing_tumblr_tumblr_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender, gint num_photos_published, gpointer self) {
+static void
+_publishing_tumblr_tumblr_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender,
+ gint num_photos_published,
+ gpointer self)
+{
#line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
publishing_tumblr_tumblr_publisher_on_upload_complete ((PublishingTumblrTumblrPublisher*) self, _sender, num_photos_published);
-#line 2668 "TumblrPublishing.c"
+#line 2906 "TumblrPublishing.c"
}
-static void _publishing_tumblr_tumblr_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender, GError* err, gpointer self) {
+static void
+_publishing_tumblr_tumblr_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender,
+ GError* err,
+ gpointer self)
+{
#line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
publishing_tumblr_tumblr_publisher_on_upload_error ((PublishingTumblrTumblrPublisher*) self, _sender, err);
-#line 2675 "TumblrPublishing.c"
+#line 2917 "TumblrPublishing.c"
}
-static void _publishing_tumblr_tumblr_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self) {
+static void
+_publishing_tumblr_tumblr_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number,
+ gdouble fraction_complete,
+ gpointer self)
+{
#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
publishing_tumblr_tumblr_publisher_on_upload_status_updated ((PublishingTumblrTumblrPublisher*) self, file_number, fraction_complete);
-#line 2682 "TumblrPublishing.c"
+#line 2928 "TumblrPublishing.c"
}
-static void publishing_tumblr_tumblr_publisher_do_publish (PublishingTumblrTumblrPublisher* self) {
+static void
+publishing_tumblr_tumblr_publisher_do_publish (PublishingTumblrTumblrPublisher* self)
+{
SpitPublishingPluginHost* _tmp0_;
SpitPublishingPluginHost* _tmp1_;
PublishingTumblrSizeEntry** _tmp2_;
gint _tmp2__length1;
- gint _tmp3_;
- PublishingTumblrSizeEntry* _tmp4_;
- gint _tmp5_;
- void* _tmp6_;
- GDestroyNotify _tmp7_;
- SpitPublishingProgressCallback _tmp8_;
- gboolean _tmp9_;
+ PublishingTumblrSizeEntry* _tmp3_;
+ gint _tmp4_;
+ void* _tmp5_;
+ GDestroyNotify _tmp6_;
+ SpitPublishingProgressCallback _tmp7_;
SpitPublishingPublishable** publishables = NULL;
- SpitPublishingPluginHost* _tmp10_;
- gint _tmp11_;
- SpitPublishingPublishable** _tmp12_;
+ SpitPublishingPluginHost* _tmp8_;
+ gint _tmp9_;
+ SpitPublishingPublishable** _tmp10_;
gint publishables_length1;
gint _publishables_size_;
GeeArrayList* sorted_list = NULL;
- GeeArrayList* _tmp13_;
- SpitPublishingPublishable** _tmp14_;
- gint _tmp14__length1;
- GeeArrayList* _tmp18_;
+ GeeArrayList* _tmp11_;
+ SpitPublishingPublishable** _tmp12_;
+ gint _tmp12__length1;
+ GeeArrayList* _tmp16_;
gchar* blog_url = NULL;
- PublishingTumblrBlogEntry** _tmp19_;
- gint _tmp19__length1;
- gint _tmp20_;
- PublishingTumblrBlogEntry* _tmp21_;
- const gchar* _tmp22_;
- gchar* _tmp23_;
+ PublishingTumblrBlogEntry** _tmp17_;
+ gint _tmp17__length1;
+ PublishingTumblrBlogEntry* _tmp18_;
+ const gchar* _tmp19_;
+ gchar* _tmp20_;
PublishingTumblrTumblrPublisherUploader* uploader = NULL;
- PublishingRESTSupportOAuth1Session* _tmp24_;
- GeeArrayList* _tmp25_;
- gint _tmp26_;
- gpointer* _tmp27_;
- SpitPublishingPublishable** _tmp28_;
- gint _tmp28__length1;
- const gchar* _tmp29_;
+ PublishingRESTSupportOAuth1Session* _tmp21_;
+ GeeArrayList* _tmp22_;
+ gint _tmp23_;
+ gpointer* _tmp24_;
+ SpitPublishingPublishable** _tmp25_;
+ gint _tmp25__length1;
+ const gchar* _tmp26_;
+ PublishingTumblrTumblrPublisherUploader* _tmp27_;
+ PublishingTumblrTumblrPublisherUploader* _tmp28_;
+ PublishingTumblrTumblrPublisherUploader* _tmp29_;
PublishingTumblrTumblrPublisherUploader* _tmp30_;
PublishingTumblrTumblrPublisherUploader* _tmp31_;
- PublishingTumblrTumblrPublisherUploader* _tmp32_;
- PublishingTumblrTumblrPublisherUploader* _tmp33_;
- PublishingTumblrTumblrPublisherUploader* _tmp34_;
#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
@@ -2747,13 +2992,11 @@ static void publishing_tumblr_tumblr_publisher_do_publish (PublishingTumblrTumbl
#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_tmp2__length1 = self->priv->sizes_length1;
#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp3_ = publishing_tumblr_tumblr_publisher_get_persistent_default_size (self);
-#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp4_ = _tmp2_[_tmp3_];
+ _tmp3_ = _tmp2_[publishing_tumblr_tumblr_publisher_get_persistent_default_size (self)];
#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp5_ = _tmp4_->size;
+ _tmp4_ = _tmp3_->size;
#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp8_ = spit_publishing_plugin_host_serialize_publishables (_tmp1_, _tmp5_, FALSE, &_tmp6_, &_tmp7_);
+ _tmp7_ = spit_publishing_plugin_host_serialize_publishables (_tmp1_, _tmp4_, FALSE, &_tmp5_, &_tmp6_);
#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
(self->priv->progress_reporter_target_destroy_notify == NULL) ? NULL : (self->priv->progress_reporter_target_destroy_notify (self->priv->progress_reporter_target), NULL);
#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
@@ -2763,124 +3006,120 @@ static void publishing_tumblr_tumblr_publisher_do_publish (PublishingTumblrTumbl
#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
self->priv->progress_reporter_target_destroy_notify = NULL;
#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- self->priv->progress_reporter = _tmp8_;
+ self->priv->progress_reporter = _tmp7_;
#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- self->priv->progress_reporter_target = _tmp6_;
+ self->priv->progress_reporter_target = _tmp5_;
#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- self->priv->progress_reporter_target_destroy_notify = _tmp7_;
+ self->priv->progress_reporter_target_destroy_notify = _tmp6_;
#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp9_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- if (!_tmp9_) {
+ if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
#line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return;
-#line 2771 "TumblrPublishing.c"
+#line 3012 "TumblrPublishing.c"
}
#line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp10_ = self->priv->host;
+ _tmp8_ = self->priv->host;
#line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp12_ = spit_publishing_plugin_host_get_publishables (_tmp10_, &_tmp11_);
+ _tmp10_ = spit_publishing_plugin_host_get_publishables (_tmp8_, &_tmp9_);
#line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- publishables = _tmp12_;
+ publishables = _tmp10_;
#line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- publishables_length1 = _tmp11_;
+ publishables_length1 = _tmp9_;
#line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_publishables_size_ = publishables_length1;
#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp13_ = gee_array_list_new (SPIT_PUBLISHING_TYPE_PUBLISHABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
+ _tmp11_ = gee_array_list_new (SPIT_PUBLISHING_TYPE_PUBLISHABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- sorted_list = _tmp13_;
+ sorted_list = _tmp11_;
#line 321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp14_ = publishables;
+ _tmp12_ = publishables;
#line 321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp14__length1 = publishables_length1;
-#line 2791 "TumblrPublishing.c"
+ _tmp12__length1 = publishables_length1;
+#line 3032 "TumblrPublishing.c"
{
SpitPublishingPublishable** p_collection = NULL;
gint p_collection_length1 = 0;
gint _p_collection_size_ = 0;
gint p_it = 0;
#line 321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- p_collection = _tmp14_;
+ p_collection = _tmp12_;
#line 321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- p_collection_length1 = _tmp14__length1;
+ p_collection_length1 = _tmp12__length1;
#line 321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- for (p_it = 0; p_it < _tmp14__length1; p_it = p_it + 1) {
-#line 2803 "TumblrPublishing.c"
- SpitPublishingPublishable* _tmp15_;
+ for (p_it = 0; p_it < _tmp12__length1; p_it = p_it + 1) {
+#line 3044 "TumblrPublishing.c"
+ SpitPublishingPublishable* _tmp13_;
SpitPublishingPublishable* p = NULL;
#line 321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp15_ = _g_object_ref0 (p_collection[p_it]);
+ _tmp13_ = _g_object_ref0 (p_collection[p_it]);
#line 321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- p = _tmp15_;
-#line 2810 "TumblrPublishing.c"
+ p = _tmp13_;
+#line 3051 "TumblrPublishing.c"
{
- GeeArrayList* _tmp16_;
- SpitPublishingPublishable* _tmp17_;
+ GeeArrayList* _tmp14_;
+ SpitPublishingPublishable* _tmp15_;
#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_debug ("TumblrPublishing.vala:322: ACTION: add publishable");
#line 323 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp16_ = sorted_list;
+ _tmp14_ = sorted_list;
#line 323 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp17_ = p;
+ _tmp15_ = p;
#line 323 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp17_);
+ gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp15_);
#line 321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_g_object_unref0 (p);
-#line 2824 "TumblrPublishing.c"
+#line 3065 "TumblrPublishing.c"
}
}
}
#line 325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp18_ = sorted_list;
+ _tmp16_ = sorted_list;
#line 325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- gee_list_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_LIST, GeeList), _publishing_tumblr_tumblr_publisher_tumblr_date_time_compare_func_gcompare_data_func, NULL, NULL);
-#line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp19_ = self->priv->blogs;
+ gee_list_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_LIST, GeeList), _publishing_tumblr_tumblr_publisher_tumblr_date_time_compare_func_gcompare_data_func, NULL, NULL);
#line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp19__length1 = self->priv->blogs_length1;
+ _tmp17_ = self->priv->blogs;
#line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp20_ = publishing_tumblr_tumblr_publisher_get_persistent_default_blog (self);
+ _tmp17__length1 = self->priv->blogs_length1;
#line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp21_ = _tmp19_[_tmp20_];
+ _tmp18_ = _tmp17_[publishing_tumblr_tumblr_publisher_get_persistent_default_blog (self)];
#line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp22_ = _tmp21_->url;
+ _tmp19_ = _tmp18_->url;
#line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp23_ = g_strdup (_tmp22_);
+ _tmp20_ = g_strdup (_tmp19_);
#line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- blog_url = _tmp23_;
+ blog_url = _tmp20_;
#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp24_ = self->priv->session;
+ _tmp21_ = self->priv->session;
#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp25_ = sorted_list;
+ _tmp22_ = sorted_list;
#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp27_ = gee_collection_to_array (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_COLLECTION, GeeCollection), &_tmp26_);
+ _tmp24_ = gee_collection_to_array (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection), &_tmp23_);
#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp28_ = _tmp27_;
+ _tmp25_ = _tmp24_;
#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp28__length1 = _tmp26_;
+ _tmp25__length1 = _tmp23_;
#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp29_ = blog_url;
+ _tmp26_ = blog_url;
#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp30_ = publishing_tumblr_tumblr_publisher_uploader_new (_tmp24_, _tmp28_, _tmp26_, _tmp29_);
+ _tmp27_ = publishing_tumblr_tumblr_publisher_uploader_new (_tmp21_, _tmp25_, _tmp23_, _tmp26_);
#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp31_ = _tmp30_;
+ _tmp28_ = _tmp27_;
#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp28_ = (_vala_array_free (_tmp28_, _tmp28__length1, (GDestroyNotify) g_object_unref), NULL);
+ _tmp25_ = (_vala_array_free (_tmp25_, _tmp25__length1, (GDestroyNotify) g_object_unref), NULL);
#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- uploader = _tmp31_;
+ uploader = _tmp28_;
#line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp32_ = uploader;
+ _tmp29_ = uploader;
#line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), "upload-complete", (GCallback) _publishing_tumblr_tumblr_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self, 0);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), "upload-complete", (GCallback) _publishing_tumblr_tumblr_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self, 0);
#line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp33_ = uploader;
+ _tmp30_ = uploader;
#line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), "upload-error", (GCallback) _publishing_tumblr_tumblr_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self, 0);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), "upload-error", (GCallback) _publishing_tumblr_tumblr_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self, 0);
#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp34_ = uploader;
+ _tmp31_ = uploader;
#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- publishing_rest_support_batch_uploader_upload (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), _publishing_tumblr_tumblr_publisher_on_upload_status_updated_spit_publishing_progress_callback, self);
+ publishing_rest_support_batch_uploader_upload (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), _publishing_tumblr_tumblr_publisher_on_upload_status_updated_spit_publishing_progress_callback, self);
#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_publishing_rest_support_batch_uploader_unref0 (uploader);
#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
@@ -2889,11 +3128,13 @@ static void publishing_tumblr_tumblr_publisher_do_publish (PublishingTumblrTumbl
_g_object_unref0 (sorted_list);
#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
publishables = (_vala_array_free (publishables, publishables_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 2886 "TumblrPublishing.c"
+#line 3125 "TumblrPublishing.c"
}
-static void publishing_tumblr_tumblr_publisher_do_show_success_pane (PublishingTumblrTumblrPublisher* self) {
+static void
+publishing_tumblr_tumblr_publisher_do_show_success_pane (PublishingTumblrTumblrPublisher* self)
+{
SpitPublishingPluginHost* _tmp0_;
SpitPublishingPluginHost* _tmp1_;
#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
@@ -2908,150 +3149,124 @@ static void publishing_tumblr_tumblr_publisher_do_show_success_pane (PublishingT
_tmp1_ = self->priv->host;
#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
spit_publishing_plugin_host_install_success_pane (_tmp1_);
-#line 2905 "TumblrPublishing.c"
+#line 3146 "TumblrPublishing.c"
}
-static void publishing_tumblr_tumblr_publisher_on_upload_status_updated (PublishingTumblrTumblrPublisher* self, gint file_number, gdouble completed_fraction) {
- gboolean _tmp0_;
- gdouble _tmp1_;
- SpitPublishingProgressCallback _tmp2_;
- void* _tmp2__target;
- SpitPublishingProgressCallback _tmp3_;
- void* _tmp3__target;
- gint _tmp4_;
- gdouble _tmp5_;
+static void
+publishing_tumblr_tumblr_publisher_on_upload_status_updated (PublishingTumblrTumblrPublisher* self,
+ gint file_number,
+ gdouble completed_fraction)
+{
+ SpitPublishingProgressCallback _tmp0_;
+ void* _tmp0__target;
+ SpitPublishingProgressCallback _tmp1_;
+ void* _tmp1__target;
#line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
#line 343 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 343 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- if (!_tmp0_) {
+ if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return;
-#line 2926 "TumblrPublishing.c"
+#line 3165 "TumblrPublishing.c"
}
#line 346 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp1_ = completed_fraction;
-#line 346 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_debug ("TumblrPublishing.vala:346: EVENT: uploader reports upload %.2f percent" \
-" complete.", 100.0 * _tmp1_);
+" complete.", 100.0 * completed_fraction);
#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp2_ = self->priv->progress_reporter;
+ _tmp0_ = self->priv->progress_reporter;
#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp2__target = self->priv->progress_reporter_target;
+ _tmp0__target = self->priv->progress_reporter_target;
#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _vala_assert (_tmp2_ != NULL, "progress_reporter != null");
-#line 350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp3_ = self->priv->progress_reporter;
+ _vala_assert (_tmp0_ != NULL, "progress_reporter != null");
#line 350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp3__target = self->priv->progress_reporter_target;
+ _tmp1_ = self->priv->progress_reporter;
#line 350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp4_ = file_number;
+ _tmp1__target = self->priv->progress_reporter_target;
#line 350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp5_ = completed_fraction;
-#line 350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp3_ (_tmp4_, _tmp5_, _tmp3__target);
-#line 2948 "TumblrPublishing.c"
+ _tmp1_ (file_number, completed_fraction, _tmp1__target);
+#line 3181 "TumblrPublishing.c"
}
-static void publishing_tumblr_tumblr_publisher_on_upload_complete (PublishingTumblrTumblrPublisher* self, PublishingRESTSupportBatchUploader* uploader, gint num_published) {
- gboolean _tmp0_;
- gint _tmp1_;
- PublishingRESTSupportBatchUploader* _tmp2_;
- guint _tmp3_;
- PublishingRESTSupportBatchUploader* _tmp4_;
- guint _tmp5_;
+static void
+publishing_tumblr_tumblr_publisher_on_upload_complete (PublishingTumblrTumblrPublisher* self,
+ PublishingRESTSupportBatchUploader* uploader,
+ gint num_published)
+{
+ guint _tmp0_;
+ guint _tmp1_;
#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (uploader));
#line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- if (!_tmp0_) {
+ if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
#line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return;
-#line 2969 "TumblrPublishing.c"
+#line 3200 "TumblrPublishing.c"
}
#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp1_ = num_published;
-#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_debug ("TumblrPublishing.vala:358: EVENT: uploader reports upload complete; %d" \
-" items published.", _tmp1_);
-#line 360 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp2_ = uploader;
+" items published.", num_published);
#line 360 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp3_, NULL, FALSE);
+ g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp0_, NULL, FALSE);
#line 360 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self);
+ g_signal_handlers_disconnect_matched (uploader, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self);
#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp4_ = uploader;
+ g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp1_, NULL, FALSE);
#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp5_, NULL, FALSE);
-#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self);
+ g_signal_handlers_disconnect_matched (uploader, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self);
#line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
publishing_tumblr_tumblr_publisher_do_show_success_pane (self);
-#line 2989 "TumblrPublishing.c"
+#line 3214 "TumblrPublishing.c"
}
-static void publishing_tumblr_tumblr_publisher_on_upload_error (PublishingTumblrTumblrPublisher* self, PublishingRESTSupportBatchUploader* uploader, GError* err) {
- gboolean _tmp0_;
- GError* _tmp1_;
- const gchar* _tmp2_;
- PublishingRESTSupportBatchUploader* _tmp3_;
- guint _tmp4_;
- PublishingRESTSupportBatchUploader* _tmp5_;
- guint _tmp6_;
- SpitPublishingPluginHost* _tmp7_;
- GError* _tmp8_;
+static void
+publishing_tumblr_tumblr_publisher_on_upload_error (PublishingTumblrTumblrPublisher* self,
+ PublishingRESTSupportBatchUploader* uploader,
+ GError* err)
+{
+ const gchar* _tmp0_;
+ guint _tmp1_;
+ guint _tmp2_;
+ SpitPublishingPluginHost* _tmp3_;
#line 366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
#line 366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (uploader));
#line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- if (!_tmp0_) {
+ if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
#line 369 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return;
-#line 3013 "TumblrPublishing.c"
+#line 3235 "TumblrPublishing.c"
}
#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp1_ = err;
-#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp2_ = _tmp1_->message;
+ _tmp0_ = err->message;
#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_debug ("TumblrPublishing.vala:371: EVENT: uploader reports upload error = '%s'" \
-".", _tmp2_);
+".", _tmp0_);
#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp3_ = uploader;
+ g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp1_, NULL, FALSE);
#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp4_, NULL, FALSE);
-#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp3_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self);
-#line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp5_ = uploader;
+ g_signal_handlers_disconnect_matched (uploader, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self);
#line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp6_, NULL, FALSE);
+ g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp2_, NULL, FALSE);
#line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp5_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp6_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self);
+ g_signal_handlers_disconnect_matched (uploader, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self);
#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp7_ = self->priv->host;
+ _tmp3_ = self->priv->host;
#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp8_ = err;
-#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- spit_publishing_plugin_host_post_error (_tmp7_, _tmp8_);
-#line 3039 "TumblrPublishing.c"
+ spit_publishing_plugin_host_post_error (_tmp3_, err);
+#line 3253 "TumblrPublishing.c"
}
-static void publishing_tumblr_tumblr_publisher_do_logout (PublishingTumblrTumblrPublisher* self) {
+static void
+publishing_tumblr_tumblr_publisher_do_logout (PublishingTumblrTumblrPublisher* self)
+{
SpitPublishingAuthenticator* _tmp0_;
- gboolean _tmp1_;
#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
#line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
@@ -3060,82 +3275,80 @@ static void publishing_tumblr_tumblr_publisher_do_logout (PublishingTumblrTumblr
#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_tmp0_ = self->priv->authenticator;
#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp1_ = spit_publishing_authenticator_can_logout (_tmp0_);
-#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- if (_tmp1_) {
-#line 3056 "TumblrPublishing.c"
- SpitPublishingAuthenticator* _tmp2_;
+ if (spit_publishing_authenticator_can_logout (_tmp0_)) {
+#line 3269 "TumblrPublishing.c"
+ SpitPublishingAuthenticator* _tmp1_;
#line 384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp2_ = self->priv->authenticator;
+ _tmp1_ = self->priv->authenticator;
#line 384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- spit_publishing_authenticator_logout (_tmp2_);
-#line 3062 "TumblrPublishing.c"
+ spit_publishing_authenticator_logout (_tmp1_);
+#line 3275 "TumblrPublishing.c"
}
#line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
self->priv->running = FALSE;
#line 389 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
publishing_tumblr_tumblr_publisher_attempt_start (self);
-#line 3068 "TumblrPublishing.c"
+#line 3281 "TumblrPublishing.c"
}
-void publishing_tumblr_tumblr_publisher_attempt_start (PublishingTumblrTumblrPublisher* self) {
- gboolean _tmp0_;
- SpitPublishingAuthenticator* _tmp1_;
+void
+publishing_tumblr_tumblr_publisher_attempt_start (PublishingTumblrTumblrPublisher* self)
+{
+ SpitPublishingAuthenticator* _tmp0_;
#line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- if (_tmp0_) {
+ if (spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
#line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return;
-#line 3083 "TumblrPublishing.c"
+#line 3295 "TumblrPublishing.c"
}
#line 396 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_debug ("TumblrPublishing.vala:396: TumblrPublisher: starting interaction.");
#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
self->priv->running = TRUE;
#line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp1_ = self->priv->authenticator;
+ _tmp0_ = self->priv->authenticator;
#line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- spit_publishing_authenticator_authenticate (_tmp1_);
-#line 3093 "TumblrPublishing.c"
+ spit_publishing_authenticator_authenticate (_tmp0_);
+#line 3305 "TumblrPublishing.c"
}
-static void publishing_tumblr_tumblr_publisher_real_start (SpitPublishingPublisher* base) {
+static void
+publishing_tumblr_tumblr_publisher_real_start (SpitPublishingPublisher* base)
+{
PublishingTumblrTumblrPublisher * self;
gboolean _tmp0_;
- gboolean _tmp1_;
#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TYPE_TUMBLR_PUBLISHER, PublishingTumblrTumblrPublisher);
#line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- if (_tmp0_) {
+ if (spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
#line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return;
-#line 3109 "TumblrPublishing.c"
+#line 3320 "TumblrPublishing.c"
}
#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp1_ = self->priv->was_started;
+ _tmp0_ = self->priv->was_started;
#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- if (_tmp1_) {
+ if (_tmp0_) {
#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_error ("TumblrPublishing.vala:407: %s", _ ("TumblrPublisher: start( ): can’t start; this publisher is not restarta" \
"ble."));
-#line 3117 "TumblrPublishing.c"
+#line 3328 "TumblrPublishing.c"
}
#line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_debug ("TumblrPublishing.vala:409: TumblrPublisher: starting interaction.");
#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
publishing_tumblr_tumblr_publisher_attempt_start (self);
-#line 3123 "TumblrPublishing.c"
+#line 3334 "TumblrPublishing.c"
}
-static void publishing_tumblr_tumblr_publisher_real_stop (SpitPublishingPublisher* base) {
+static void
+publishing_tumblr_tumblr_publisher_real_stop (SpitPublishingPublisher* base)
+{
PublishingTumblrTumblrPublisher * self;
#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TYPE_TUMBLR_PUBLISHER, PublishingTumblrTumblrPublisher);
@@ -3143,110 +3356,134 @@ static void publishing_tumblr_tumblr_publisher_real_stop (SpitPublishingPublishe
g_debug ("TumblrPublishing.vala:415: TumblrPublisher: stop( ) invoked.");
#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
self->priv->running = FALSE;
-#line 3135 "TumblrPublishing.c"
+#line 3348 "TumblrPublishing.c"
}
-static gpointer _publishing_tumblr_size_entry_ref0 (gpointer self) {
+static gpointer
+_publishing_tumblr_size_entry_ref0 (gpointer self)
+{
#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return self ? publishing_tumblr_size_entry_ref (self) : NULL;
-#line 3142 "TumblrPublishing.c"
+#line 3357 "TumblrPublishing.c"
}
-static PublishingTumblrSizeEntry** _vala_array_dup9 (PublishingTumblrSizeEntry** self, int length) {
+static PublishingTumblrSizeEntry**
+_vala_array_dup9 (PublishingTumblrSizeEntry** self,
+ int length)
+{
PublishingTumblrSizeEntry** result;
int i;
#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
result = g_new0 (PublishingTumblrSizeEntry*, length + 1);
#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
for (i = 0; i < length; i++) {
-#line 3153 "TumblrPublishing.c"
+#line 3371 "TumblrPublishing.c"
PublishingTumblrSizeEntry* _tmp0_;
#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_tmp0_ = _publishing_tumblr_size_entry_ref0 (self[i]);
#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
result[i] = _tmp0_;
-#line 3159 "TumblrPublishing.c"
+#line 3377 "TumblrPublishing.c"
}
#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return result;
-#line 3163 "TumblrPublishing.c"
+#line 3381 "TumblrPublishing.c"
}
-static gpointer _publishing_tumblr_blog_entry_ref0 (gpointer self) {
+static gpointer
+_publishing_tumblr_blog_entry_ref0 (gpointer self)
+{
#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return self ? publishing_tumblr_blog_entry_ref (self) : NULL;
-#line 3170 "TumblrPublishing.c"
+#line 3390 "TumblrPublishing.c"
}
-static PublishingTumblrBlogEntry** _vala_array_dup10 (PublishingTumblrBlogEntry** self, int length) {
+static PublishingTumblrBlogEntry**
+_vala_array_dup10 (PublishingTumblrBlogEntry** self,
+ int length)
+{
PublishingTumblrBlogEntry** result;
int i;
#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
result = g_new0 (PublishingTumblrBlogEntry*, length + 1);
#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
for (i = 0; i < length; i++) {
-#line 3181 "TumblrPublishing.c"
+#line 3404 "TumblrPublishing.c"
PublishingTumblrBlogEntry* _tmp0_;
#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_tmp0_ = _publishing_tumblr_blog_entry_ref0 (self[i]);
#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
result[i] = _tmp0_;
-#line 3187 "TumblrPublishing.c"
+#line 3410 "TumblrPublishing.c"
}
#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return result;
-#line 3191 "TumblrPublishing.c"
+#line 3414 "TumblrPublishing.c"
}
-static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_blog_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
+static void
+_publishing_tumblr_tumblr_publisher_publishing_options_pane_on_blog_changed_gtk_combo_box_changed (GtkComboBox* _sender,
+ gpointer self)
+{
#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
publishing_tumblr_tumblr_publisher_publishing_options_pane_on_blog_changed ((PublishingTumblrTumblrPublisherPublishingOptionsPane*) self);
-#line 3198 "TumblrPublishing.c"
+#line 3424 "TumblrPublishing.c"
}
-static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_size_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
+static void
+_publishing_tumblr_tumblr_publisher_publishing_options_pane_on_size_changed_gtk_combo_box_changed (GtkComboBox* _sender,
+ gpointer self)
+{
#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
publishing_tumblr_tumblr_publisher_publishing_options_pane_on_size_changed ((PublishingTumblrTumblrPublisherPublishingOptionsPane*) self);
-#line 3205 "TumblrPublishing.c"
+#line 3434 "TumblrPublishing.c"
}
-static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+_publishing_tumblr_tumblr_publisher_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender,
+ gpointer self)
+{
#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
publishing_tumblr_tumblr_publisher_publishing_options_pane_on_logout_clicked ((PublishingTumblrTumblrPublisherPublishingOptionsPane*) self);
-#line 3212 "TumblrPublishing.c"
+#line 3444 "TumblrPublishing.c"
}
-static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+_publishing_tumblr_tumblr_publisher_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender,
+ gpointer self)
+{
#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
publishing_tumblr_tumblr_publisher_publishing_options_pane_on_publish_clicked ((PublishingTumblrTumblrPublisherPublishingOptionsPane*) self);
-#line 3219 "TumblrPublishing.c"
+#line 3454 "TumblrPublishing.c"
}
-PublishingTumblrTumblrPublisherPublishingOptionsPane* publishing_tumblr_tumblr_publisher_publishing_options_pane_construct (GType object_type, PublishingTumblrTumblrPublisher* publisher, SpitPublishingPublisherMediaType media_type, PublishingTumblrSizeEntry** sizes, int sizes_length1, PublishingTumblrBlogEntry** blogs, int blogs_length1, const gchar* username) {
+PublishingTumblrTumblrPublisherPublishingOptionsPane*
+publishing_tumblr_tumblr_publisher_publishing_options_pane_construct (GType object_type,
+ PublishingTumblrTumblrPublisher* publisher,
+ SpitPublishingPublisherMediaType media_type,
+ PublishingTumblrSizeEntry** sizes,
+ int sizes_length1,
+ PublishingTumblrBlogEntry** blogs,
+ int blogs_length1,
+ const gchar* username)
+{
PublishingTumblrTumblrPublisherPublishingOptionsPane * self = NULL;
GtkBox* _tmp0_;
- const gchar* _tmp1_;
- gchar* _tmp2_;
- PublishingTumblrTumblrPublisher* _tmp3_;
- PublishingTumblrTumblrPublisher* _tmp4_;
- SpitPublishingPublisherMediaType _tmp5_;
- PublishingTumblrSizeEntry** _tmp6_;
- gint _tmp6__length1;
- PublishingTumblrSizeEntry** _tmp7_;
- gint _tmp7__length1;
- PublishingTumblrBlogEntry** _tmp8_;
- gint _tmp8__length1;
- PublishingTumblrBlogEntry** _tmp9_;
- gint _tmp9__length1;
+ gchar* _tmp1_;
+ PublishingTumblrTumblrPublisher* _tmp2_;
+ PublishingTumblrSizeEntry** _tmp3_;
+ gint _tmp3__length1;
+ PublishingTumblrBlogEntry** _tmp4_;
+ gint _tmp4__length1;
GError * _inner_error_ = NULL;
#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_return_val_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (publisher), NULL);
@@ -3263,269 +3500,252 @@ PublishingTumblrTumblrPublisherPublishingOptionsPane* publishing_tumblr_tumblr_p
#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
self->priv->pane_widget = _tmp0_;
#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp1_ = username;
-#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp2_ = g_strdup (_tmp1_);
+ _tmp1_ = g_strdup (username);
#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_g_free0 (self->priv->username);
#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- self->priv->username = _tmp2_;
+ self->priv->username = _tmp1_;
#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp3_ = publisher;
-#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp4_ = _g_object_ref0 (_tmp3_);
+ _tmp2_ = _g_object_ref0 (publisher);
#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_g_object_unref0 (self->priv->publisher);
#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- self->priv->publisher = _tmp4_;
-#line 459 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp5_ = media_type;
+ self->priv->publisher = _tmp2_;
#line 459 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- self->priv->media_type = _tmp5_;
+ self->priv->media_type = media_type;
#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp6_ = sizes;
+ _tmp3_ = (sizes != NULL) ? _vala_array_dup9 (sizes, sizes_length1) : ((gpointer) sizes);
#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp6__length1 = sizes_length1;
-#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp7_ = (_tmp6_ != NULL) ? _vala_array_dup9 (_tmp6_, _tmp6__length1) : ((gpointer) _tmp6_);
-#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp7__length1 = _tmp6__length1;
+ _tmp3__length1 = sizes_length1;
#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
self->priv->sizes = (_vala_array_free (self->priv->sizes, self->priv->sizes_length1, (GDestroyNotify) publishing_tumblr_size_entry_unref), NULL);
#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- self->priv->sizes = _tmp7_;
+ self->priv->sizes = _tmp3_;
#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- self->priv->sizes_length1 = _tmp7__length1;
+ self->priv->sizes_length1 = _tmp3__length1;
#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
self->priv->_sizes_size_ = self->priv->sizes_length1;
#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp8_ = blogs;
-#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp8__length1 = blogs_length1;
-#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp9_ = (_tmp8_ != NULL) ? _vala_array_dup10 (_tmp8_, _tmp8__length1) : ((gpointer) _tmp8_);
+ _tmp4_ = (blogs != NULL) ? _vala_array_dup10 (blogs, blogs_length1) : ((gpointer) blogs);
#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp9__length1 = _tmp8__length1;
+ _tmp4__length1 = blogs_length1;
#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
self->priv->blogs = (_vala_array_free (self->priv->blogs, self->priv->blogs_length1, (GDestroyNotify) publishing_tumblr_blog_entry_unref), NULL);
#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- self->priv->blogs = _tmp9_;
+ self->priv->blogs = _tmp4_;
#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- self->priv->blogs_length1 = _tmp9__length1;
+ self->priv->blogs_length1 = _tmp4__length1;
#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
self->priv->_blogs_size_ = self->priv->blogs_length1;
-#line 3306 "TumblrPublishing.c"
+#line 3529 "TumblrPublishing.c"
{
- GtkBuilder* _tmp10_;
+ GtkBuilder* _tmp5_;
+ GtkBuilder* _tmp6_;
+ GtkBuilder* _tmp7_;
+ GtkBuilder* _tmp8_;
+ GObject* _tmp9_;
+ GtkBox* _tmp10_;
GtkBuilder* _tmp11_;
- GtkBuilder* _tmp12_;
- GtkBuilder* _tmp13_;
- GObject* _tmp14_;
- GtkBox* _tmp15_;
- GtkBuilder* _tmp16_;
- GObject* _tmp17_;
- GtkLabel* _tmp18_;
- GtkBuilder* _tmp19_;
- GObject* _tmp20_;
- GtkButton* _tmp21_;
- GtkBuilder* _tmp22_;
- GObject* _tmp23_;
- GtkButton* _tmp24_;
- GtkBuilder* _tmp25_;
- GObject* _tmp26_;
- GtkComboBoxText* _tmp27_;
- GtkBuilder* _tmp28_;
- GObject* _tmp29_;
- GtkLabel* _tmp30_;
- GtkBuilder* _tmp31_;
- GObject* _tmp32_;
- GtkComboBoxText* _tmp33_;
- GtkBuilder* _tmp34_;
- GObject* _tmp35_;
- GtkLabel* _tmp36_;
+ GObject* _tmp12_;
+ GtkLabel* _tmp13_;
+ GtkBuilder* _tmp14_;
+ GObject* _tmp15_;
+ GtkButton* _tmp16_;
+ GtkBuilder* _tmp17_;
+ GObject* _tmp18_;
+ GtkButton* _tmp19_;
+ GtkBuilder* _tmp20_;
+ GObject* _tmp21_;
+ GtkComboBoxText* _tmp22_;
+ GtkBuilder* _tmp23_;
+ GObject* _tmp24_;
+ GtkLabel* _tmp25_;
+ GtkBuilder* _tmp26_;
+ GObject* _tmp27_;
+ GtkComboBoxText* _tmp28_;
+ GtkBuilder* _tmp29_;
+ GObject* _tmp30_;
+ GtkLabel* _tmp31_;
gchar* upload_label_text = NULL;
- const gchar* _tmp37_;
- gchar* _tmp38_;
- GtkLabel* _tmp39_;
- const gchar* _tmp40_;
- GtkComboBoxText* _tmp41_;
- SpitPublishingPublisherMediaType _tmp42_;
- GtkButton* _tmp46_;
- GtkButton* _tmp47_;
+ const gchar* _tmp32_;
+ gchar* _tmp33_;
+ GtkLabel* _tmp34_;
+ const gchar* _tmp35_;
+ GtkComboBoxText* _tmp36_;
+ GtkButton* _tmp40_;
+ GtkButton* _tmp41_;
#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp10_ = gtk_builder_new ();
+ _tmp5_ = gtk_builder_new ();
#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_g_object_unref0 (self->priv->builder);
#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- self->priv->builder = _tmp10_;
+ self->priv->builder = _tmp5_;
#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp11_ = self->priv->builder;
+ _tmp6_ = self->priv->builder;
#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- gtk_builder_add_from_resource (_tmp11_, PLUGIN_RESOURCE_PATH "/tumblr_publishing_options_pane.ui", &_inner_error_);
+ gtk_builder_add_from_resource (_tmp6_, PLUGIN_RESOURCE_PATH "/tumblr_publishing_options_pane.ui", &_inner_error_);
#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3356 "TumblrPublishing.c"
+#line 3578 "TumblrPublishing.c"
goto __catch23_g_error;
}
#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp12_ = self->priv->builder;
+ _tmp7_ = self->priv->builder;
#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- gtk_builder_connect_signals (_tmp12_, NULL);
+ gtk_builder_connect_signals (_tmp7_, NULL);
#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp13_ = self->priv->builder;
+ _tmp8_ = self->priv->builder;
#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp14_ = gtk_builder_get_object (_tmp13_, "tumblr_pane");
+ _tmp9_ = gtk_builder_get_object (_tmp8_, "tumblr_pane");
#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp15_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_box_get_type (), GtkBox));
+ _tmp10_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_box_get_type (), GtkBox));
#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_g_object_unref0 (self->priv->pane_widget);
#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- self->priv->pane_widget = _tmp15_;
+ self->priv->pane_widget = _tmp10_;
#line 471 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp16_ = self->priv->builder;
+ _tmp11_ = self->priv->builder;
#line 471 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp17_ = gtk_builder_get_object (_tmp16_, "upload_info_label");
+ _tmp12_ = gtk_builder_get_object (_tmp11_, "upload_info_label");
#line 471 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp18_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_label_get_type (), GtkLabel));
+ _tmp13_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_label_get_type (), GtkLabel));
#line 471 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_g_object_unref0 (self->priv->upload_info_label);
#line 471 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- self->priv->upload_info_label = _tmp18_;
+ self->priv->upload_info_label = _tmp13_;
#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp19_ = self->priv->builder;
+ _tmp14_ = self->priv->builder;
#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp20_ = gtk_builder_get_object (_tmp19_, "logout_button");
+ _tmp15_ = gtk_builder_get_object (_tmp14_, "logout_button");
#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp21_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_button_get_type (), GtkButton));
+ _tmp16_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_button_get_type (), GtkButton));
#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_g_object_unref0 (self->priv->logout_button);
#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- self->priv->logout_button = _tmp21_;
+ self->priv->logout_button = _tmp16_;
#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp22_ = self->priv->builder;
+ _tmp17_ = self->priv->builder;
#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp23_ = gtk_builder_get_object (_tmp22_, "publish_button");
+ _tmp18_ = gtk_builder_get_object (_tmp17_, "publish_button");
#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp24_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_button_get_type (), GtkButton));
+ _tmp19_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_button_get_type (), GtkButton));
#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_g_object_unref0 (self->priv->publish_button);
#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- self->priv->publish_button = _tmp24_;
+ self->priv->publish_button = _tmp19_;
#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp25_ = self->priv->builder;
+ _tmp20_ = self->priv->builder;
#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp26_ = gtk_builder_get_object (_tmp25_, "size_combo");
+ _tmp21_ = gtk_builder_get_object (_tmp20_, "size_combo");
#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp27_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_combo_box_text_get_type (), GtkComboBoxText));
+ _tmp22_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_combo_box_text_get_type (), GtkComboBoxText));
#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_g_object_unref0 (self->priv->size_combo);
#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- self->priv->size_combo = _tmp27_;
+ self->priv->size_combo = _tmp22_;
#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp28_ = self->priv->builder;
+ _tmp23_ = self->priv->builder;
#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp29_ = gtk_builder_get_object (_tmp28_, "size_label");
+ _tmp24_ = gtk_builder_get_object (_tmp23_, "size_label");
#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp30_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_label_get_type (), GtkLabel));
+ _tmp25_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_label_get_type (), GtkLabel));
#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_g_object_unref0 (self->priv->size_label);
#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- self->priv->size_label = _tmp30_;
+ self->priv->size_label = _tmp25_;
#line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp31_ = self->priv->builder;
+ _tmp26_ = self->priv->builder;
#line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp32_ = gtk_builder_get_object (_tmp31_, "blog_combo");
+ _tmp27_ = gtk_builder_get_object (_tmp26_, "blog_combo");
#line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp33_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_combo_box_text_get_type (), GtkComboBoxText));
+ _tmp28_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_combo_box_text_get_type (), GtkComboBoxText));
#line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_g_object_unref0 (self->priv->blog_combo);
#line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- self->priv->blog_combo = _tmp33_;
+ self->priv->blog_combo = _tmp28_;
#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp34_ = self->priv->builder;
+ _tmp29_ = self->priv->builder;
#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp35_ = gtk_builder_get_object (_tmp34_, "blog_label");
+ _tmp30_ = gtk_builder_get_object (_tmp29_, "blog_label");
#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp36_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_label_get_type (), GtkLabel));
+ _tmp31_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_label_get_type (), GtkLabel));
#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_g_object_unref0 (self->priv->blog_label);
#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- self->priv->blog_label = _tmp36_;
+ self->priv->blog_label = _tmp31_;
#line 480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp37_ = self->priv->username;
+ _tmp32_ = self->priv->username;
#line 480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp38_ = g_strdup_printf (_ ("You are logged into Tumblr as %s.\n\n"), _tmp37_);
+ _tmp33_ = g_strdup_printf (_ ("You are logged into Tumblr as %s.\n\n"), _tmp32_);
#line 480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- upload_label_text = _tmp38_;
+ upload_label_text = _tmp33_;
#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp39_ = self->priv->upload_info_label;
+ _tmp34_ = self->priv->upload_info_label;
#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp40_ = upload_label_text;
+ _tmp35_ = upload_label_text;
#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- gtk_label_set_label (_tmp39_, _tmp40_);
+ gtk_label_set_label (_tmp34_, _tmp35_);
#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_blog_combo (self);
#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp41_ = self->priv->blog_combo;
+ _tmp36_ = self->priv->blog_combo;
#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_blog_changed_gtk_combo_box_changed, self, 0);
-#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp42_ = media_type;
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_blog_changed_gtk_combo_box_changed, self, 0);
#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- if (_tmp42_ != SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 3465 "TumblrPublishing.c"
- GtkComboBoxText* _tmp43_;
+ if (media_type != SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
+#line 3685 "TumblrPublishing.c"
+ GtkComboBoxText* _tmp37_;
#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_size_combo (self);
#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp43_ = self->priv->size_combo;
+ _tmp37_ = self->priv->size_combo;
#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_size_changed_gtk_combo_box_changed, self, 0);
-#line 3473 "TumblrPublishing.c"
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_size_changed_gtk_combo_box_changed, self, 0);
+#line 3693 "TumblrPublishing.c"
} else {
- GtkComboBoxText* _tmp44_;
- GtkLabel* _tmp45_;
+ GtkComboBoxText* _tmp38_;
+ GtkLabel* _tmp39_;
#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp44_ = self->priv->size_combo;
+ _tmp38_ = self->priv->size_combo;
#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_widget_get_type (), GtkWidget), FALSE);
+ gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_widget_get_type (), GtkWidget), FALSE);
#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp45_ = self->priv->size_label;
+ _tmp39_ = self->priv->size_label;
#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 3485 "TumblrPublishing.c"
+ gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 3705 "TumblrPublishing.c"
}
#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp46_ = self->priv->logout_button;
+ _tmp40_ = self->priv->logout_button;
#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- g_signal_connect_object (_tmp46_, "clicked", (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0);
+ g_signal_connect_object (_tmp40_, "clicked", (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0);
#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp47_ = self->priv->publish_button;
+ _tmp41_ = self->priv->publish_button;
#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- g_signal_connect_object (_tmp47_, "clicked", (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0);
+ g_signal_connect_object (_tmp41_, "clicked", (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0);
#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_g_free0 (upload_label_text);
-#line 3497 "TumblrPublishing.c"
+#line 3717 "TumblrPublishing.c"
}
goto __finally23;
__catch23_g_error:
{
GError* e = NULL;
- GError* _tmp48_;
- const gchar* _tmp49_;
+ GError* _tmp42_;
+ const gchar* _tmp43_;
#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
e = _inner_error_;
#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_inner_error_ = NULL;
#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp48_ = e;
+ _tmp42_ = e;
#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp49_ = _tmp48_->message;
+ _tmp43_ = _tmp42_->message;
#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- g_warning (_ ("Could not load UI: %s"), _tmp49_);
+ g_warning (_ ("Could not load UI: %s"), _tmp43_);
#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_g_error_free0 (e);
-#line 3517 "TumblrPublishing.c"
+#line 3737 "TumblrPublishing.c"
}
__finally23:
#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
@@ -3536,40 +3756,54 @@ PublishingTumblrTumblrPublisherPublishingOptionsPane* publishing_tumblr_tumblr_p
g_clear_error (&_inner_error_);
#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return NULL;
-#line 3528 "TumblrPublishing.c"
+#line 3748 "TumblrPublishing.c"
}
#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return self;
-#line 3532 "TumblrPublishing.c"
+#line 3752 "TumblrPublishing.c"
}
-PublishingTumblrTumblrPublisherPublishingOptionsPane* publishing_tumblr_tumblr_publisher_publishing_options_pane_new (PublishingTumblrTumblrPublisher* publisher, SpitPublishingPublisherMediaType media_type, PublishingTumblrSizeEntry** sizes, int sizes_length1, PublishingTumblrBlogEntry** blogs, int blogs_length1, const gchar* username) {
+PublishingTumblrTumblrPublisherPublishingOptionsPane*
+publishing_tumblr_tumblr_publisher_publishing_options_pane_new (PublishingTumblrTumblrPublisher* publisher,
+ SpitPublishingPublisherMediaType media_type,
+ PublishingTumblrSizeEntry** sizes,
+ int sizes_length1,
+ PublishingTumblrBlogEntry** blogs,
+ int blogs_length1,
+ const gchar* username)
+{
#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return publishing_tumblr_tumblr_publisher_publishing_options_pane_construct (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, publisher, media_type, sizes, sizes_length1, blogs, blogs_length1, username);
-#line 3539 "TumblrPublishing.c"
+#line 3767 "TumblrPublishing.c"
}
-static void publishing_tumblr_tumblr_publisher_publishing_options_pane_on_logout_clicked (PublishingTumblrTumblrPublisherPublishingOptionsPane* self) {
+static void
+publishing_tumblr_tumblr_publisher_publishing_options_pane_on_logout_clicked (PublishingTumblrTumblrPublisherPublishingOptionsPane* self)
+{
#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self));
#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_signal_emit (self, publishing_tumblr_tumblr_publisher_publishing_options_pane_signals[PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL], 0);
-#line 3548 "TumblrPublishing.c"
+#line 3778 "TumblrPublishing.c"
}
-static void publishing_tumblr_tumblr_publisher_publishing_options_pane_on_publish_clicked (PublishingTumblrTumblrPublisherPublishingOptionsPane* self) {
+static void
+publishing_tumblr_tumblr_publisher_publishing_options_pane_on_publish_clicked (PublishingTumblrTumblrPublisherPublishingOptionsPane* self)
+{
#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self));
#line 513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_signal_emit (self, publishing_tumblr_tumblr_publisher_publishing_options_pane_signals[PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0);
-#line 3557 "TumblrPublishing.c"
+#line 3789 "TumblrPublishing.c"
}
-static void publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_blog_combo (PublishingTumblrTumblrPublisherPublishingOptionsPane* self) {
+static void
+publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_blog_combo (PublishingTumblrTumblrPublisherPublishingOptionsPane* self)
+{
PublishingTumblrBlogEntry** _tmp0_;
gint _tmp0__length1;
#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
@@ -3580,17 +3814,16 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_
_tmp0__length1 = self->priv->blogs_length1;
#line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
if (_tmp0_ != NULL) {
-#line 3572 "TumblrPublishing.c"
+#line 3806 "TumblrPublishing.c"
PublishingTumblrBlogEntry** _tmp1_;
gint _tmp1__length1;
GtkComboBoxText* _tmp6_;
PublishingTumblrTumblrPublisher* _tmp7_;
- gint _tmp8_;
#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_tmp1_ = self->priv->blogs;
#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_tmp1__length1 = self->priv->blogs_length1;
-#line 3582 "TumblrPublishing.c"
+#line 3815 "TumblrPublishing.c"
{
PublishingTumblrBlogEntry** b_collection = NULL;
gint b_collection_length1 = 0;
@@ -3602,14 +3835,14 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_
b_collection_length1 = _tmp1__length1;
#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
for (b_it = 0; b_it < _tmp1__length1; b_it = b_it + 1) {
-#line 3594 "TumblrPublishing.c"
+#line 3827 "TumblrPublishing.c"
PublishingTumblrBlogEntry* _tmp2_;
PublishingTumblrBlogEntry* b = NULL;
#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_tmp2_ = _publishing_tumblr_blog_entry_ref0 (b_collection[b_it]);
#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
b = _tmp2_;
-#line 3601 "TumblrPublishing.c"
+#line 3834 "TumblrPublishing.c"
{
GtkComboBoxText* _tmp3_;
PublishingTumblrBlogEntry* _tmp4_;
@@ -3624,7 +3857,7 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_
gtk_combo_box_text_append_text (_tmp3_, _tmp5_);
#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_publishing_tumblr_blog_entry_unref0 (b);
-#line 3616 "TumblrPublishing.c"
+#line 3849 "TumblrPublishing.c"
}
}
}
@@ -3633,18 +3866,17 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_
#line 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_tmp7_ = self->priv->publisher;
#line 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp8_ = publishing_tumblr_tumblr_publisher_get_persistent_default_blog (_tmp7_);
-#line 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_combo_box_get_type (), GtkComboBox), _tmp8_);
-#line 3628 "TumblrPublishing.c"
+ gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_combo_box_get_type (), GtkComboBox), publishing_tumblr_tumblr_publisher_get_persistent_default_blog (_tmp7_));
+#line 3859 "TumblrPublishing.c"
}
}
-static void publishing_tumblr_tumblr_publisher_publishing_options_pane_on_blog_changed (PublishingTumblrTumblrPublisherPublishingOptionsPane* self) {
+static void
+publishing_tumblr_tumblr_publisher_publishing_options_pane_on_blog_changed (PublishingTumblrTumblrPublisherPublishingOptionsPane* self)
+{
PublishingTumblrTumblrPublisher* _tmp0_;
GtkComboBoxText* _tmp1_;
- gint _tmp2_;
#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self));
#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
@@ -3652,14 +3884,14 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_on_blog_c
#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_tmp1_ = self->priv->blog_combo;
#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp2_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox));
-#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- publishing_tumblr_tumblr_publisher_set_persistent_default_blog (_tmp0_, _tmp2_);
-#line 3647 "TumblrPublishing.c"
+ publishing_tumblr_tumblr_publisher_set_persistent_default_blog (_tmp0_, gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox)));
+#line 3877 "TumblrPublishing.c"
}
-static void publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_size_combo (PublishingTumblrTumblrPublisherPublishingOptionsPane* self) {
+static void
+publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_size_combo (PublishingTumblrTumblrPublisherPublishingOptionsPane* self)
+{
PublishingTumblrSizeEntry** _tmp0_;
gint _tmp0__length1;
#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
@@ -3670,17 +3902,16 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_
_tmp0__length1 = self->priv->sizes_length1;
#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
if (_tmp0_ != NULL) {
-#line 3662 "TumblrPublishing.c"
+#line 3894 "TumblrPublishing.c"
PublishingTumblrSizeEntry** _tmp1_;
gint _tmp1__length1;
GtkComboBoxText* _tmp6_;
PublishingTumblrTumblrPublisher* _tmp7_;
- gint _tmp8_;
#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_tmp1_ = self->priv->sizes;
#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_tmp1__length1 = self->priv->sizes_length1;
-#line 3672 "TumblrPublishing.c"
+#line 3903 "TumblrPublishing.c"
{
PublishingTumblrSizeEntry** e_collection = NULL;
gint e_collection_length1 = 0;
@@ -3692,14 +3923,14 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_
e_collection_length1 = _tmp1__length1;
#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
for (e_it = 0; e_it < _tmp1__length1; e_it = e_it + 1) {
-#line 3684 "TumblrPublishing.c"
+#line 3915 "TumblrPublishing.c"
PublishingTumblrSizeEntry* _tmp2_;
PublishingTumblrSizeEntry* e = NULL;
#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_tmp2_ = _publishing_tumblr_size_entry_ref0 (e_collection[e_it]);
#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
e = _tmp2_;
-#line 3691 "TumblrPublishing.c"
+#line 3922 "TumblrPublishing.c"
{
GtkComboBoxText* _tmp3_;
PublishingTumblrSizeEntry* _tmp4_;
@@ -3714,7 +3945,7 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_
gtk_combo_box_text_append_text (_tmp3_, _tmp5_);
#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_publishing_tumblr_size_entry_unref0 (e);
-#line 3706 "TumblrPublishing.c"
+#line 3937 "TumblrPublishing.c"
}
}
}
@@ -3723,18 +3954,17 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_
#line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_tmp7_ = self->priv->publisher;
#line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp8_ = publishing_tumblr_tumblr_publisher_get_persistent_default_size (_tmp7_);
-#line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_combo_box_get_type (), GtkComboBox), _tmp8_);
-#line 3718 "TumblrPublishing.c"
+ gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_combo_box_get_type (), GtkComboBox), publishing_tumblr_tumblr_publisher_get_persistent_default_size (_tmp7_));
+#line 3947 "TumblrPublishing.c"
}
}
-static void publishing_tumblr_tumblr_publisher_publishing_options_pane_on_size_changed (PublishingTumblrTumblrPublisherPublishingOptionsPane* self) {
+static void
+publishing_tumblr_tumblr_publisher_publishing_options_pane_on_size_changed (PublishingTumblrTumblrPublisherPublishingOptionsPane* self)
+{
PublishingTumblrTumblrPublisher* _tmp0_;
GtkComboBoxText* _tmp1_;
- gint _tmp2_;
#line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self));
#line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
@@ -3742,32 +3972,36 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_on_size_c
#line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_tmp1_ = self->priv->size_combo;
#line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp2_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox));
-#line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- publishing_tumblr_tumblr_publisher_set_persistent_default_size (_tmp0_, _tmp2_);
-#line 3737 "TumblrPublishing.c"
+ publishing_tumblr_tumblr_publisher_set_persistent_default_size (_tmp0_, gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox)));
+#line 3965 "TumblrPublishing.c"
}
-void publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_publish (PublishingTumblrTumblrPublisherPublishingOptionsPane* self) {
+void
+publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_publish (PublishingTumblrTumblrPublisherPublishingOptionsPane* self)
+{
#line 542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self));
#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_signal_emit (self, publishing_tumblr_tumblr_publisher_publishing_options_pane_signals[PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0);
-#line 3746 "TumblrPublishing.c"
+#line 3976 "TumblrPublishing.c"
}
-void publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_logout (PublishingTumblrTumblrPublisherPublishingOptionsPane* self) {
+void
+publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_logout (PublishingTumblrTumblrPublisherPublishingOptionsPane* self)
+{
#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self));
#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_signal_emit (self, publishing_tumblr_tumblr_publisher_publishing_options_pane_signals[PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL], 0);
-#line 3755 "TumblrPublishing.c"
+#line 3987 "TumblrPublishing.c"
}
-static GtkWidget* publishing_tumblr_tumblr_publisher_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base) {
+static GtkWidget*
+publishing_tumblr_tumblr_publisher_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base)
+{
PublishingTumblrTumblrPublisherPublishingOptionsPane * self;
GtkWidget* result = NULL;
GtkBox* _tmp0_;
@@ -3782,11 +4016,13 @@ static GtkWidget* publishing_tumblr_tumblr_publisher_publishing_options_pane_rea
result = _tmp1_;
#line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return result;
-#line 3774 "TumblrPublishing.c"
+#line 4008 "TumblrPublishing.c"
}
-static SpitPublishingDialogPaneGeometryOptions publishing_tumblr_tumblr_publisher_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) {
+static SpitPublishingDialogPaneGeometryOptions
+publishing_tumblr_tumblr_publisher_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base)
+{
PublishingTumblrTumblrPublisherPublishingOptionsPane * self;
SpitPublishingDialogPaneGeometryOptions result = 0;
#line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
@@ -3795,25 +4031,33 @@ static SpitPublishingDialogPaneGeometryOptions publishing_tumblr_tumblr_publishe
result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return result;
-#line 3787 "TumblrPublishing.c"
+#line 4023 "TumblrPublishing.c"
}
-static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_publish_publishing_tumblr_tumblr_publisher_publishing_options_pane_publish (PublishingTumblrTumblrPublisherPublishingOptionsPane* _sender, gpointer self) {
+static void
+_publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_publish_publishing_tumblr_tumblr_publisher_publishing_options_pane_publish (PublishingTumblrTumblrPublisherPublishingOptionsPane* _sender,
+ gpointer self)
+{
#line 559 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_publish ((PublishingTumblrTumblrPublisherPublishingOptionsPane*) self);
-#line 3794 "TumblrPublishing.c"
+#line 4033 "TumblrPublishing.c"
}
-static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_logout_publishing_tumblr_tumblr_publisher_publishing_options_pane_logout (PublishingTumblrTumblrPublisherPublishingOptionsPane* _sender, gpointer self) {
+static void
+_publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_logout_publishing_tumblr_tumblr_publisher_publishing_options_pane_logout (PublishingTumblrTumblrPublisherPublishingOptionsPane* _sender,
+ gpointer self)
+{
#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_logout ((PublishingTumblrTumblrPublisherPublishingOptionsPane*) self);
-#line 3801 "TumblrPublishing.c"
+#line 4043 "TumblrPublishing.c"
}
-static void publishing_tumblr_tumblr_publisher_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base) {
+static void
+publishing_tumblr_tumblr_publisher_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base)
+{
PublishingTumblrTumblrPublisherPublishingOptionsPane * self;
#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, PublishingTumblrTumblrPublisherPublishingOptionsPane);
@@ -3821,11 +4065,13 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_real_on_p
g_signal_connect_object (self, "publish", (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_publish_publishing_tumblr_tumblr_publisher_publishing_options_pane_publish, self, 0);
#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_signal_connect_object (self, "logout", (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_logout_publishing_tumblr_tumblr_publisher_publishing_options_pane_logout, self, 0);
-#line 3813 "TumblrPublishing.c"
+#line 4057 "TumblrPublishing.c"
}
-static void publishing_tumblr_tumblr_publisher_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) {
+static void
+publishing_tumblr_tumblr_publisher_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base)
+{
PublishingTumblrTumblrPublisherPublishingOptionsPane * self;
guint _tmp0_;
guint _tmp1_;
@@ -3839,11 +4085,13 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_real_on_p
g_signal_parse_name ("logout", PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp1_, NULL, FALSE);
#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_signal_handlers_disconnect_matched (self, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_logout_publishing_tumblr_tumblr_publisher_publishing_options_pane_logout, self);
-#line 3831 "TumblrPublishing.c"
+#line 4077 "TumblrPublishing.c"
}
-static void publishing_tumblr_tumblr_publisher_publishing_options_pane_class_init (PublishingTumblrTumblrPublisherPublishingOptionsPaneClass * klass) {
+static void
+publishing_tumblr_tumblr_publisher_publishing_options_pane_class_init (PublishingTumblrTumblrPublisherPublishingOptionsPaneClass * klass)
+{
#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
publishing_tumblr_tumblr_publisher_publishing_options_pane_parent_class = g_type_class_peek_parent (klass);
#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
@@ -3854,11 +4102,13 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_class_ini
publishing_tumblr_tumblr_publisher_publishing_options_pane_signals[PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL] = g_signal_new ("publish", PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
publishing_tumblr_tumblr_publisher_publishing_options_pane_signals[PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL] = g_signal_new ("logout", PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 3846 "TumblrPublishing.c"
+#line 4094 "TumblrPublishing.c"
}
-static void publishing_tumblr_tumblr_publisher_publishing_options_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) {
+static void
+publishing_tumblr_tumblr_publisher_publishing_options_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface)
+{
#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
publishing_tumblr_tumblr_publisher_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
@@ -3869,11 +4119,13 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_spit_publ
iface->on_pane_installed = (void (*) (SpitPublishingDialogPane *)) publishing_tumblr_tumblr_publisher_publishing_options_pane_real_on_pane_installed;
#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
iface->on_pane_uninstalled = (void (*) (SpitPublishingDialogPane *)) publishing_tumblr_tumblr_publisher_publishing_options_pane_real_on_pane_uninstalled;
-#line 3861 "TumblrPublishing.c"
+#line 4111 "TumblrPublishing.c"
}
-static void publishing_tumblr_tumblr_publisher_publishing_options_pane_instance_init (PublishingTumblrTumblrPublisherPublishingOptionsPane * self) {
+static void
+publishing_tumblr_tumblr_publisher_publishing_options_pane_instance_init (PublishingTumblrTumblrPublisherPublishingOptionsPane * self)
+{
gchar* _tmp0_;
#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
self->priv = PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_GET_PRIVATE (self);
@@ -3911,11 +4163,13 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_instance_
self->priv->username = _tmp0_;
#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
self->priv->publisher = NULL;
-#line 3903 "TumblrPublishing.c"
+#line 4155 "TumblrPublishing.c"
}
-static void publishing_tumblr_tumblr_publisher_publishing_options_pane_finalize (GObject * obj) {
+static void
+publishing_tumblr_tumblr_publisher_publishing_options_pane_finalize (GObject * obj)
+{
PublishingTumblrTumblrPublisherPublishingOptionsPane * self;
#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, PublishingTumblrTumblrPublisherPublishingOptionsPane);
@@ -3947,14 +4201,16 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_finalize
_g_object_unref0 (self->priv->publisher);
#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
G_OBJECT_CLASS (publishing_tumblr_tumblr_publisher_publishing_options_pane_parent_class)->finalize (obj);
-#line 3939 "TumblrPublishing.c"
+#line 4193 "TumblrPublishing.c"
}
/**
* The publishing options pane.
*/
-GType publishing_tumblr_tumblr_publisher_publishing_options_pane_get_type (void) {
+GType
+publishing_tumblr_tumblr_publisher_publishing_options_pane_get_type (void)
+{
static volatile gsize publishing_tumblr_tumblr_publisher_publishing_options_pane_type_id__volatile = 0;
if (g_once_init_enter (&publishing_tumblr_tumblr_publisher_publishing_options_pane_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingTumblrTumblrPublisherPublishingOptionsPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_tumblr_tumblr_publisher_publishing_options_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingTumblrTumblrPublisherPublishingOptionsPane), 0, (GInstanceInitFunc) publishing_tumblr_tumblr_publisher_publishing_options_pane_instance_init, NULL };
@@ -3968,40 +4224,48 @@ GType publishing_tumblr_tumblr_publisher_publishing_options_pane_get_type (void)
}
-PublishingTumblrTumblrPublisherUserInfoFetchTransaction* publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_construct (GType object_type, PublishingRESTSupportOAuth1Session* session) {
+PublishingTumblrTumblrPublisherUserInfoFetchTransaction*
+publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_construct (GType object_type,
+ PublishingRESTSupportOAuth1Session* session)
+{
PublishingTumblrTumblrPublisherUserInfoFetchTransaction* self = NULL;
- PublishingRESTSupportOAuth1Session* _tmp0_;
#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION (session), NULL);
#line 571 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp0_ = session;
-#line 571 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- self = (PublishingTumblrTumblrPublisherUserInfoFetchTransaction*) publishing_rest_support_oauth1_transaction_construct_with_uri (object_type, _tmp0_, "https://api.tumblr.com/v2/user/info", PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
+ self = (PublishingTumblrTumblrPublisherUserInfoFetchTransaction*) publishing_rest_support_oauth1_transaction_construct_with_uri (object_type, session, "https://api.tumblr.com/v2/user/info", PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return self;
-#line 3971 "TumblrPublishing.c"
+#line 4227 "TumblrPublishing.c"
}
-PublishingTumblrTumblrPublisherUserInfoFetchTransaction* publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_new (PublishingRESTSupportOAuth1Session* session) {
+PublishingTumblrTumblrPublisherUserInfoFetchTransaction*
+publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_new (PublishingRESTSupportOAuth1Session* session)
+{
#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_construct (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_USER_INFO_FETCH_TRANSACTION, session);
-#line 3978 "TumblrPublishing.c"
+#line 4236 "TumblrPublishing.c"
}
-static void publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_class_init (PublishingTumblrTumblrPublisherUserInfoFetchTransactionClass * klass) {
+static void
+publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_class_init (PublishingTumblrTumblrPublisherUserInfoFetchTransactionClass * klass)
+{
#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 3985 "TumblrPublishing.c"
+#line 4245 "TumblrPublishing.c"
}
-static void publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_instance_init (PublishingTumblrTumblrPublisherUserInfoFetchTransaction * self) {
+static void
+publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_instance_init (PublishingTumblrTumblrPublisherUserInfoFetchTransaction * self)
+{
}
-GType publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_get_type (void) {
+GType
+publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_get_type (void)
+{
static volatile gsize publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_type_id__volatile = 0;
if (g_once_init_enter (&publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingTumblrTumblrPublisherUserInfoFetchTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingTumblrTumblrPublisherUserInfoFetchTransaction), 0, (GInstanceInitFunc) publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_instance_init, NULL };
@@ -4013,7 +4277,11 @@ GType publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_get_type (v
}
-static gchar* publishing_tumblr_tumblr_publisher_upload_transaction_encode (PublishingTumblrTumblrPublisherUploadTransaction* self, guint8* data, int data_length1) {
+static gchar*
+publishing_tumblr_tumblr_publisher_upload_transaction_encode (PublishingTumblrTumblrPublisherUploadTransaction* self,
+ guint8* data,
+ int data_length1)
+{
gchar* result = NULL;
GString* s = NULL;
GString* _tmp0_;
@@ -4024,11 +4292,9 @@ static gchar* publishing_tumblr_tumblr_publisher_upload_transaction_encode (Publ
gchar* _tmp2_;
gint _tmp2__length1;
gchar _tmp3_;
- guint8* _tmp4_;
- gint _tmp4__length1;
- GString* _tmp14_;
- const gchar* _tmp15_;
- gchar* _tmp16_;
+ GString* _tmp13_;
+ const gchar* _tmp14_;
+ gchar* _tmp15_;
#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_UPLOAD_TRANSACTION (self), NULL);
#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
@@ -4051,104 +4317,102 @@ static gchar* publishing_tumblr_tumblr_publisher_upload_transaction_encode (Publ
_tmp2_[1] = (gchar) 0;
#line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_tmp3_ = _tmp2_[1];
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp4_ = data;
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp4__length1 = data_length1;
-#line 4047 "TumblrPublishing.c"
+#line 4309 "TumblrPublishing.c"
{
guint8* byte_collection = NULL;
gint byte_collection_length1 = 0;
gint _byte_collection_size_ = 0;
gint byte_it = 0;
#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- byte_collection = _tmp4_;
+ byte_collection = data;
#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- byte_collection_length1 = _tmp4__length1;
+ byte_collection_length1 = data_length1;
#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- for (byte_it = 0; byte_it < _tmp4__length1; byte_it = byte_it + 1) {
-#line 4059 "TumblrPublishing.c"
+ for (byte_it = 0; byte_it < data_length1; byte_it = byte_it + 1) {
+#line 4321 "TumblrPublishing.c"
guint8 byte = 0U;
#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
byte = byte_collection[byte_it];
-#line 4063 "TumblrPublishing.c"
+#line 4325 "TumblrPublishing.c"
{
- guint8 _tmp5_;
+ guint8 _tmp4_;
#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp5_ = byte;
+ _tmp4_ = byte;
#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- if (((gint) _tmp5_) == 0) {
-#line 4070 "TumblrPublishing.c"
- GString* _tmp6_;
+ if (((gint) _tmp4_) == 0) {
+#line 4332 "TumblrPublishing.c"
+ GString* _tmp5_;
#line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp6_ = s;
+ _tmp5_ = s;
#line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- g_string_append (_tmp6_, "%00");
-#line 4076 "TumblrPublishing.c"
+ g_string_append (_tmp5_, "%00");
+#line 4338 "TumblrPublishing.c"
} else {
- gchar* _tmp7_;
- gint _tmp7__length1;
- guint8 _tmp8_;
- gchar _tmp9_;
- GString* _tmp10_;
+ gchar* _tmp6_;
+ gint _tmp6__length1;
+ guint8 _tmp7_;
+ gchar _tmp8_;
+ GString* _tmp9_;
+ gchar* _tmp10_;
+ gint _tmp10__length1;
gchar* _tmp11_;
- gint _tmp11__length1;
gchar* _tmp12_;
- gchar* _tmp13_;
#line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp7_ = bytes;
+ _tmp6_ = bytes;
#line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp7__length1 = bytes_length1;
+ _tmp6__length1 = bytes_length1;
#line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp8_ = byte;
+ _tmp7_ = byte;
#line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp7_[0] = (gchar) _tmp8_;
+ _tmp6_[0] = (gchar) _tmp7_;
#line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp9_ = _tmp7_[0];
+ _tmp8_ = _tmp6_[0];
#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp10_ = s;
+ _tmp9_ = s;
#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp11_ = bytes;
+ _tmp10_ = bytes;
#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp11__length1 = bytes_length1;
+ _tmp10__length1 = bytes_length1;
#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp12_ = soup_uri_encode ((const gchar*) _tmp11_, PUBLISHING_TUMBLR_ENCODE_RFC_3986_EXTRA);
+ _tmp11_ = soup_uri_encode ((const gchar*) _tmp10_, PUBLISHING_TUMBLR_ENCODE_RFC_3986_EXTRA);
#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp13_ = _tmp12_;
+ _tmp12_ = _tmp11_;
#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- g_string_append (_tmp10_, _tmp13_);
+ g_string_append (_tmp9_, _tmp12_);
#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _g_free0 (_tmp13_);
-#line 4111 "TumblrPublishing.c"
+ _g_free0 (_tmp12_);
+#line 4373 "TumblrPublishing.c"
}
}
}
}
#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp14_ = s;
+ _tmp13_ = s;
#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp15_ = _tmp14_->str;
+ _tmp14_ = _tmp13_->str;
#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp16_ = g_strdup (_tmp15_);
+ _tmp15_ = g_strdup (_tmp14_);
#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- result = _tmp16_;
+ result = _tmp15_;
#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
bytes = (g_free (bytes), NULL);
#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_g_string_free0 (s);
#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return result;
-#line 4130 "TumblrPublishing.c"
+#line 4392 "TumblrPublishing.c"
}
-PublishingTumblrTumblrPublisherUploadTransaction* publishing_tumblr_tumblr_publisher_upload_transaction_construct (GType object_type, PublishingRESTSupportOAuth1Session* session, SpitPublishingPublishable* publishable, const gchar* blog_url) {
+PublishingTumblrTumblrPublisherUploadTransaction*
+publishing_tumblr_tumblr_publisher_upload_transaction_construct (GType object_type,
+ PublishingRESTSupportOAuth1Session* session,
+ SpitPublishingPublishable* publishable,
+ const gchar* blog_url)
+{
PublishingTumblrTumblrPublisherUploadTransaction* self = NULL;
- PublishingRESTSupportOAuth1Session* _tmp0_;
- SpitPublishingPublishable* _tmp1_;
- const gchar* _tmp2_;
- gchar* _tmp3_;
- gchar* _tmp4_;
+ gchar* _tmp0_;
+ gchar* _tmp1_;
#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION (session), NULL);
#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
@@ -4158,33 +4422,34 @@ PublishingTumblrTumblrPublisherUploadTransaction* publishing_tumblr_tumblr_publi
#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_debug ("TumblrPublishing.vala:596: Init upload transaction");
#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp0_ = session;
-#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp1_ = publishable;
-#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp2_ = blog_url;
+ _tmp0_ = g_strdup_printf ("https://api.tumblr.com/v2/blog/%s/post", blog_url);
#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp3_ = g_strdup_printf ("https://api.tumblr.com/v2/blog/%s/post", _tmp2_);
-#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp4_ = _tmp3_;
+ _tmp1_ = _tmp0_;
#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- self = (PublishingTumblrTumblrPublisherUploadTransaction*) publishing_rest_support_oauth1_upload_transaction_construct (object_type, _tmp0_, _tmp1_, _tmp4_);
+ self = (PublishingTumblrTumblrPublisherUploadTransaction*) publishing_rest_support_oauth1_upload_transaction_construct (object_type, session, publishable, _tmp1_);
#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _g_free0 (_tmp4_);
+ _g_free0 (_tmp1_);
#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return self;
-#line 4165 "TumblrPublishing.c"
+#line 4423 "TumblrPublishing.c"
}
-PublishingTumblrTumblrPublisherUploadTransaction* publishing_tumblr_tumblr_publisher_upload_transaction_new (PublishingRESTSupportOAuth1Session* session, SpitPublishingPublishable* publishable, const gchar* blog_url) {
+PublishingTumblrTumblrPublisherUploadTransaction*
+publishing_tumblr_tumblr_publisher_upload_transaction_new (PublishingRESTSupportOAuth1Session* session,
+ SpitPublishingPublishable* publishable,
+ const gchar* blog_url)
+{
#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return publishing_tumblr_tumblr_publisher_upload_transaction_construct (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOAD_TRANSACTION, session, publishable, blog_url);
-#line 4172 "TumblrPublishing.c"
+#line 4434 "TumblrPublishing.c"
}
-static guint8* string_get_data (const gchar* self, int* result_length1) {
+static guint8*
+string_get_data (const gchar* self,
+ int* result_length1)
+{
guint8* result;
guint8* res = NULL;
gint res_length1;
@@ -4196,455 +4461,370 @@ static guint8* string_get_data (const gchar* self, int* result_length1) {
gint _tmp3__length1;
guint8* _tmp4_;
gint _tmp4__length1;
-#line 1428 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1442 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1443 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
res = (guint8*) self;
-#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1443 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
res_length1 = -1;
-#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1443 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_res_size_ = res_length1;
-#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1444 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp0_ = strlen (self);
-#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1444 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp1_ = _tmp0_;
-#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1444 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
res_length1 = (gint) _tmp1_;
-#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1444 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp2_ = res_length1;
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp3_ = res;
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp3__length1 = res_length1;
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp4_ = _tmp3_;
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp4__length1 = _tmp3__length1;
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
if (result_length1) {
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
*result_length1 = _tmp4__length1;
-#line 4216 "TumblrPublishing.c"
+#line 4481 "TumblrPublishing.c"
}
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
result = _tmp4_;
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 4222 "TumblrPublishing.c"
+#line 4487 "TumblrPublishing.c"
}
-static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int str_array_length1) {
+static gchar*
+_vala_g_strjoinv (const gchar* separator,
+ gchar** str_array,
+ int str_array_length1)
+{
gchar* result = NULL;
- const gchar* _tmp0_;
- gboolean _tmp1_ = FALSE;
- gboolean _tmp2_ = FALSE;
- gchar** _tmp3_;
- gint _tmp3__length1;
-#line 1078 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp0_ = separator;
-#line 1078 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp0_ == NULL) {
-#line 1079 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ gboolean _tmp0_ = FALSE;
+#line 1092 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (separator == NULL) {
+#line 1093 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
separator = "";
-#line 4239 "TumblrPublishing.c"
+#line 4502 "TumblrPublishing.c"
}
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp3_ = str_array;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp3__length1 = str_array_length1;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp3_ != NULL) {
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp2_ = TRUE;
-#line 4249 "TumblrPublishing.c"
- } else {
- gchar** _tmp4_;
- gint _tmp4__length1;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp4_ = str_array;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp4__length1 = str_array_length1;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp2_ = _tmp4__length1 > 0;
-#line 4259 "TumblrPublishing.c"
- }
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp2_) {
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp1_ = TRUE;
-#line 4265 "TumblrPublishing.c"
- } else {
- gboolean _tmp5_ = FALSE;
- gchar** _tmp6_;
- gint _tmp6__length1;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp6_ = str_array;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp6__length1 = str_array_length1;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp6__length1 == -1) {
-#line 4276 "TumblrPublishing.c"
- gchar** _tmp7_;
- gint _tmp7__length1;
- const gchar* _tmp8_;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp7_ = str_array;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp7__length1 = str_array_length1;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp8_ = _tmp7_[0];
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp5_ = _tmp8_ != NULL;
-#line 4288 "TumblrPublishing.c"
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (str_array != NULL) {
+#line 4506 "TumblrPublishing.c"
+ gboolean _tmp1_ = FALSE;
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (str_array_length1 > 0) {
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp1_ = TRUE;
+#line 4512 "TumblrPublishing.c"
} else {
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp5_ = FALSE;
-#line 4292 "TumblrPublishing.c"
+ gboolean _tmp2_ = FALSE;
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (str_array_length1 == -1) {
+#line 4517 "TumblrPublishing.c"
+ const gchar* _tmp3_;
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp3_ = str_array[0];
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp2_ = _tmp3_ != NULL;
+#line 4523 "TumblrPublishing.c"
+ } else {
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp2_ = FALSE;
+#line 4527 "TumblrPublishing.c"
+ }
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp1_ = _tmp2_;
+#line 4531 "TumblrPublishing.c"
}
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp1_ = _tmp5_;
-#line 4296 "TumblrPublishing.c"
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp0_ = _tmp1_;
+#line 4535 "TumblrPublishing.c"
+ } else {
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp0_ = FALSE;
+#line 4539 "TumblrPublishing.c"
}
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp1_) {
-#line 4300 "TumblrPublishing.c"
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (_tmp0_) {
+#line 4543 "TumblrPublishing.c"
gint i = 0;
gsize len = 0UL;
- gint _tmp31_;
- gint _tmp33_;
- gint _tmp34_;
- gsize _tmp35_;
- const gchar* _tmp36_;
- gint _tmp37_;
- gint _tmp38_;
- gint _tmp39_;
+ gint _tmp20_;
+ gint _tmp22_;
+ gint _tmp23_;
+ gsize _tmp24_;
+ gint _tmp25_;
+ gint _tmp26_;
+ gint _tmp27_;
const gchar* res = NULL;
- gsize _tmp40_;
- void* _tmp41_;
+ gsize _tmp28_;
+ void* _tmp29_;
void* ptr = NULL;
- const gchar* _tmp42_;
- gchar** _tmp43_;
- gint _tmp43__length1;
- const gchar* _tmp44_;
- void* _tmp45_;
- const gchar* _tmp62_;
-#line 1083 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ const gchar* _tmp30_;
+ const gchar* _tmp31_;
+ void* _tmp32_;
+ const gchar* _tmp45_;
+#line 1097 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
len = (gsize) 1;
-#line 4323 "TumblrPublishing.c"
+#line 4563 "TumblrPublishing.c"
{
- gboolean _tmp9_ = FALSE;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ gboolean _tmp4_ = FALSE;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
i = 0;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp9_ = TRUE;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp4_ = TRUE;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
while (TRUE) {
-#line 4332 "TumblrPublishing.c"
- gboolean _tmp11_ = FALSE;
- gboolean _tmp12_ = FALSE;
- gchar** _tmp13_;
- gint _tmp13__length1;
- gint _tmp21_ = 0;
- gchar** _tmp22_;
- gint _tmp22__length1;
- gint _tmp23_;
- const gchar* _tmp24_;
- gsize _tmp30_;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (!_tmp9_) {
-#line 4345 "TumblrPublishing.c"
- gint _tmp10_;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp10_ = i;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- i = _tmp10_ + 1;
-#line 4351 "TumblrPublishing.c"
+#line 4572 "TumblrPublishing.c"
+ gboolean _tmp6_ = FALSE;
+ gboolean _tmp7_ = FALSE;
+ gint _tmp12_ = 0;
+ gint _tmp13_;
+ const gchar* _tmp14_;
+ gsize _tmp19_;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (!_tmp4_) {
+#line 4581 "TumblrPublishing.c"
+ gint _tmp5_;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp5_ = i;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ i = _tmp5_ + 1;
+#line 4587 "TumblrPublishing.c"
}
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp9_ = FALSE;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp13_ = str_array;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp13__length1 = str_array_length1;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp13__length1 != -1) {
-#line 4361 "TumblrPublishing.c"
- gint _tmp14_;
- gchar** _tmp15_;
- gint _tmp15__length1;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp14_ = i;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp15_ = str_array;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp15__length1 = str_array_length1;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp12_ = _tmp14_ < _tmp15__length1;
-#line 4373 "TumblrPublishing.c"
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp4_ = FALSE;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (str_array_length1 != -1) {
+#line 4593 "TumblrPublishing.c"
+ gint _tmp8_;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp8_ = i;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp7_ = _tmp8_ < str_array_length1;
+#line 4599 "TumblrPublishing.c"
} else {
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp12_ = FALSE;
-#line 4377 "TumblrPublishing.c"
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp7_ = FALSE;
+#line 4603 "TumblrPublishing.c"
}
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp12_) {
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp11_ = TRUE;
-#line 4383 "TumblrPublishing.c"
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (_tmp7_) {
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp6_ = TRUE;
+#line 4609 "TumblrPublishing.c"
} else {
- gboolean _tmp16_ = FALSE;
- gchar** _tmp17_;
- gint _tmp17__length1;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp17_ = str_array;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp17__length1 = str_array_length1;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp17__length1 == -1) {
-#line 4394 "TumblrPublishing.c"
- gchar** _tmp18_;
- gint _tmp18__length1;
- gint _tmp19_;
- const gchar* _tmp20_;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp18_ = str_array;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp18__length1 = str_array_length1;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp19_ = i;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp20_ = _tmp18_[_tmp19_];
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp16_ = _tmp20_ != NULL;
-#line 4409 "TumblrPublishing.c"
+ gboolean _tmp9_ = FALSE;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (str_array_length1 == -1) {
+#line 4614 "TumblrPublishing.c"
+ gint _tmp10_;
+ const gchar* _tmp11_;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp10_ = i;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp11_ = str_array[_tmp10_];
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp9_ = _tmp11_ != NULL;
+#line 4623 "TumblrPublishing.c"
} else {
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp16_ = FALSE;
-#line 4413 "TumblrPublishing.c"
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp9_ = FALSE;
+#line 4627 "TumblrPublishing.c"
}
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp11_ = _tmp16_;
-#line 4417 "TumblrPublishing.c"
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp6_ = _tmp9_;
+#line 4631 "TumblrPublishing.c"
}
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (!_tmp11_) {
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (!_tmp6_) {
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
break;
-#line 4423 "TumblrPublishing.c"
+#line 4637 "TumblrPublishing.c"
}
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp22_ = str_array;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp22__length1 = str_array_length1;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp23_ = i;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp24_ = _tmp22_[_tmp23_];
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp24_ != NULL) {
-#line 4435 "TumblrPublishing.c"
- gchar** _tmp25_;
- gint _tmp25__length1;
- gint _tmp26_;
- const gchar* _tmp27_;
- gint _tmp28_;
- gint _tmp29_;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp25_ = str_array;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp25__length1 = str_array_length1;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp26_ = i;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp27_ = _tmp25_[_tmp26_];
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp28_ = strlen ((const gchar*) _tmp27_);
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp29_ = _tmp28_;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp21_ = _tmp29_;
-#line 4456 "TumblrPublishing.c"
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp13_ = i;
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp14_ = str_array[_tmp13_];
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (_tmp14_ != NULL) {
+#line 4645 "TumblrPublishing.c"
+ gint _tmp15_;
+ const gchar* _tmp16_;
+ gint _tmp17_;
+ gint _tmp18_;
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp15_ = i;
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp16_ = str_array[_tmp15_];
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp17_ = strlen ((const gchar*) _tmp16_);
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp18_ = _tmp17_;
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp12_ = _tmp18_;
+#line 4660 "TumblrPublishing.c"
} else {
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp21_ = 0;
-#line 4460 "TumblrPublishing.c"
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp12_ = 0;
+#line 4664 "TumblrPublishing.c"
}
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp30_ = len;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- len = _tmp30_ + _tmp21_;
-#line 4466 "TumblrPublishing.c"
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp19_ = len;
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ len = _tmp19_ + _tmp12_;
+#line 4670 "TumblrPublishing.c"
}
}
-#line 1087 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp31_ = i;
-#line 1087 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp31_ == 0) {
-#line 4473 "TumblrPublishing.c"
- gchar* _tmp32_;
-#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp32_ = g_strdup ("");
-#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- result = _tmp32_;
-#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1101 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp20_ = i;
+#line 1101 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (_tmp20_ == 0) {
+#line 4677 "TumblrPublishing.c"
+ gchar* _tmp21_;
+#line 1102 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp21_ = g_strdup ("");
+#line 1102 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = _tmp21_;
+#line 1102 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 4481 "TumblrPublishing.c"
+#line 4685 "TumblrPublishing.c"
}
-#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp33_ = i;
-#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- str_array_length1 = _tmp33_;
-#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp34_ = str_array_length1;
-#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp35_ = len;
-#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp36_ = separator;
-#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp37_ = strlen ((const gchar*) _tmp36_);
-#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp38_ = _tmp37_;
-#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp39_ = i;
-#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- len = _tmp35_ + (_tmp38_ * (_tmp39_ - 1));
-#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp40_ = len;
-#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp41_ = g_malloc (_tmp40_);
-#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- res = _tmp41_;
-#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp42_ = res;
-#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp43_ = str_array;
-#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp43__length1 = str_array_length1;
-#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp44_ = _tmp43_[0];
-#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_);
-#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- ptr = _tmp45_;
-#line 4519 "TumblrPublishing.c"
+#line 1104 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp22_ = i;
+#line 1104 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ str_array_length1 = _tmp22_;
+#line 1104 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp23_ = str_array_length1;
+#line 1105 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp24_ = len;
+#line 1105 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp25_ = strlen ((const gchar*) separator);
+#line 1105 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp26_ = _tmp25_;
+#line 1105 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp27_ = i;
+#line 1105 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ len = _tmp24_ + (_tmp26_ * (_tmp27_ - 1));
+#line 1107 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp28_ = len;
+#line 1107 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp29_ = g_malloc (_tmp28_);
+#line 1107 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ res = _tmp29_;
+#line 1108 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp30_ = res;
+#line 1108 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp31_ = str_array[0];
+#line 1108 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp32_ = g_stpcpy ((void*) _tmp30_, (const gchar*) _tmp31_);
+#line 1108 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ ptr = _tmp32_;
+#line 4717 "TumblrPublishing.c"
{
- gboolean _tmp46_ = FALSE;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ gboolean _tmp33_ = FALSE;
+#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
i = 1;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp46_ = TRUE;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp33_ = TRUE;
+#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
while (TRUE) {
-#line 4528 "TumblrPublishing.c"
- gint _tmp48_;
- gchar** _tmp49_;
- gint _tmp49__length1;
- void* _tmp50_;
- const gchar* _tmp51_;
- void* _tmp52_;
- const gchar* _tmp53_ = NULL;
- gchar** _tmp54_;
- gint _tmp54__length1;
- gint _tmp55_;
- const gchar* _tmp56_;
- void* _tmp60_;
- void* _tmp61_;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (!_tmp46_) {
-#line 4544 "TumblrPublishing.c"
- gint _tmp47_;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp47_ = i;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- i = _tmp47_ + 1;
-#line 4550 "TumblrPublishing.c"
+#line 4726 "TumblrPublishing.c"
+ gint _tmp35_;
+ void* _tmp36_;
+ void* _tmp37_;
+ const gchar* _tmp38_ = NULL;
+ gint _tmp39_;
+ const gchar* _tmp40_;
+ void* _tmp43_;
+ void* _tmp44_;
+#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (!_tmp33_) {
+#line 4737 "TumblrPublishing.c"
+ gint _tmp34_;
+#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp34_ = i;
+#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ i = _tmp34_ + 1;
+#line 4743 "TumblrPublishing.c"
}
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp46_ = FALSE;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp48_ = i;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp49_ = str_array;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp49__length1 = str_array_length1;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (!(_tmp48_ < _tmp49__length1)) {
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp33_ = FALSE;
+#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp35_ = i;
+#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (!(_tmp35_ < str_array_length1)) {
+#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
break;
-#line 4564 "TumblrPublishing.c"
+#line 4753 "TumblrPublishing.c"
}
-#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp50_ = ptr;
-#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp51_ = separator;
-#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp52_ = g_stpcpy (_tmp50_, (const gchar*) _tmp51_);
-#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- ptr = _tmp52_;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp54_ = str_array;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp54__length1 = str_array_length1;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp55_ = i;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp56_ = _tmp54_[_tmp55_];
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp56_ != NULL) {
-#line 4584 "TumblrPublishing.c"
- gchar** _tmp57_;
- gint _tmp57__length1;
- gint _tmp58_;
- const gchar* _tmp59_;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp57_ = str_array;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp57__length1 = str_array_length1;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp58_ = i;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp59_ = _tmp57_[_tmp58_];
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp53_ = (const gchar*) _tmp59_;
-#line 4599 "TumblrPublishing.c"
+#line 1110 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp36_ = ptr;
+#line 1110 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp37_ = g_stpcpy (_tmp36_, (const gchar*) separator);
+#line 1110 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ ptr = _tmp37_;
+#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp39_ = i;
+#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp40_ = str_array[_tmp39_];
+#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (_tmp40_ != NULL) {
+#line 4767 "TumblrPublishing.c"
+ gint _tmp41_;
+ const gchar* _tmp42_;
+#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp41_ = i;
+#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp42_ = str_array[_tmp41_];
+#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp38_ = (const gchar*) _tmp42_;
+#line 4776 "TumblrPublishing.c"
} else {
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp53_ = "";
-#line 4603 "TumblrPublishing.c"
+#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp38_ = "";
+#line 4780 "TumblrPublishing.c"
}
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp60_ = ptr;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp61_ = g_stpcpy (_tmp60_, _tmp53_);
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- ptr = _tmp61_;
-#line 4611 "TumblrPublishing.c"
+#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp43_ = ptr;
+#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp44_ = g_stpcpy (_tmp43_, _tmp38_);
+#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ ptr = _tmp44_;
+#line 4788 "TumblrPublishing.c"
}
}
-#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp62_ = res;
-#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1114 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp45_ = res;
+#line 1114 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
res = NULL;
-#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- result = (gchar*) _tmp62_;
-#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1114 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = (gchar*) _tmp45_;
+#line 1114 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 4622 "TumblrPublishing.c"
+#line 4799 "TumblrPublishing.c"
} else {
- gchar* _tmp63_;
-#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp63_ = g_strdup ("");
-#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- result = _tmp63_;
-#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ gchar* _tmp46_;
+#line 1116 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp46_ = g_strdup ("");
+#line 1116 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = _tmp46_;
+#line 1116 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 4631 "TumblrPublishing.c"
+#line 4808 "TumblrPublishing.c"
}
}
-static void publishing_tumblr_tumblr_publisher_upload_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error) {
+static void
+publishing_tumblr_tumblr_publisher_upload_transaction_real_execute (PublishingRESTSupportTransaction* base,
+ GError** error)
+{
PublishingTumblrTumblrPublisherUploadTransaction * self;
gchar* payload = NULL;
gsize payload_length = 0UL;
@@ -4675,12 +4855,11 @@ static void publishing_tumblr_tumblr_publisher_upload_transaction_real_execute (
GeeMapIterator* _tmp38_;
gboolean cont = FALSE;
GeeMapIterator* _tmp39_;
- gboolean _tmp40_;
- SoupMessage* _tmp52_;
+ SoupMessage* _tmp50_;
GError * _inner_error_ = NULL;
#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOAD_TRANSACTION, PublishingTumblrTumblrPublisherUploadTransaction);
-#line 4672 "TumblrPublishing.c"
+#line 4851 "TumblrPublishing.c"
{
SpitPublishingPublishable* _tmp0_;
GFile* _tmp1_;
@@ -4737,7 +4916,7 @@ static void publishing_tumblr_tumblr_publisher_upload_transaction_real_execute (
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
if (_inner_error_->domain == G_FILE_ERROR) {
-#line 4729 "TumblrPublishing.c"
+#line 4908 "TumblrPublishing.c"
goto __catch24_g_file_error;
}
#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
@@ -4748,7 +4927,7 @@ static void publishing_tumblr_tumblr_publisher_upload_transaction_real_execute (
g_clear_error (&_inner_error_);
#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return;
-#line 4740 "TumblrPublishing.c"
+#line 4919 "TumblrPublishing.c"
}
#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_tmp7_ = payload;
@@ -4790,7 +4969,7 @@ static void publishing_tumblr_tumblr_publisher_upload_transaction_real_execute (
_tmp17__length1 = keywords_length1;
#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
if (_tmp17_ != NULL) {
-#line 4782 "TumblrPublishing.c"
+#line 4961 "TumblrPublishing.c"
gchar** _tmp18_;
gint _tmp18__length1;
gchar* _tmp19_;
@@ -4804,7 +4983,7 @@ static void publishing_tumblr_tumblr_publisher_upload_transaction_real_execute (
_g_free0 (tags);
#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
tags = _tmp19_;
-#line 4796 "TumblrPublishing.c"
+#line 4975 "TumblrPublishing.c"
}
#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_tmp20_ = tags;
@@ -4822,7 +5001,7 @@ static void publishing_tumblr_tumblr_publisher_upload_transaction_real_execute (
keywords = (_vala_array_free (keywords, keywords_length1, (GDestroyNotify) g_free), NULL);
#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_g_free0 (reqdata);
-#line 4814 "TumblrPublishing.c"
+#line 4993 "TumblrPublishing.c"
}
goto __finally24;
__catch24_g_file_error:
@@ -4839,7 +5018,7 @@ static void publishing_tumblr_tumblr_publisher_upload_transaction_real_execute (
_inner_error_ = _tmp23_;
#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_g_error_free0 (e);
-#line 4831 "TumblrPublishing.c"
+#line 5010 "TumblrPublishing.c"
goto __finally24;
}
__finally24:
@@ -4853,7 +5032,7 @@ static void publishing_tumblr_tumblr_publisher_upload_transaction_real_execute (
_g_free0 (payload);
#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return;
-#line 4845 "TumblrPublishing.c"
+#line 5024 "TumblrPublishing.c"
} else {
#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_g_free0 (payload);
@@ -4863,7 +5042,7 @@ static void publishing_tumblr_tumblr_publisher_upload_transaction_real_execute (
g_clear_error (&_inner_error_);
#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return;
-#line 4855 "TumblrPublishing.c"
+#line 5034 "TumblrPublishing.c"
}
}
#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
@@ -4923,65 +5102,60 @@ static void publishing_tumblr_tumblr_publisher_upload_transaction_real_execute (
#line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_tmp39_ = i;
#line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp40_ = gee_map_iterator_next (_tmp39_);
-#line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- cont = _tmp40_;
+ cont = gee_map_iterator_next (_tmp39_);
#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
while (TRUE) {
-#line 4920 "TumblrPublishing.c"
- gboolean _tmp41_;
- SoupMessage* _tmp42_;
- SoupMessageHeaders* _tmp43_;
- GeeMapIterator* _tmp44_;
- gpointer _tmp45_;
- gchar* _tmp46_;
- GeeMapIterator* _tmp47_;
- gpointer _tmp48_;
- gchar* _tmp49_;
- GeeMapIterator* _tmp50_;
- gboolean _tmp51_;
+#line 5097 "TumblrPublishing.c"
+ gboolean _tmp40_;
+ SoupMessage* _tmp41_;
+ SoupMessageHeaders* _tmp42_;
+ GeeMapIterator* _tmp43_;
+ gpointer _tmp44_;
+ gchar* _tmp45_;
+ GeeMapIterator* _tmp46_;
+ gpointer _tmp47_;
+ gchar* _tmp48_;
+ GeeMapIterator* _tmp49_;
#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp41_ = cont;
+ _tmp40_ = cont;
#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- if (!_tmp41_) {
+ if (!_tmp40_) {
#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
break;
-#line 4938 "TumblrPublishing.c"
+#line 5114 "TumblrPublishing.c"
}
#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp42_ = outbound_message;
+ _tmp41_ = outbound_message;
#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp43_ = _tmp42_->request_headers;
+ _tmp42_ = _tmp41_->request_headers;
#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp44_ = i;
+ _tmp43_ = i;
#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp45_ = gee_map_iterator_get_key (_tmp44_);
+ _tmp44_ = gee_map_iterator_get_key (_tmp43_);
#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp46_ = (gchar*) _tmp45_;
+ _tmp45_ = (gchar*) _tmp44_;
#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp47_ = i;
+ _tmp46_ = i;
#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp48_ = gee_map_iterator_get_value (_tmp47_);
+ _tmp47_ = gee_map_iterator_get_value (_tmp46_);
#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp49_ = (gchar*) _tmp48_;
+ _tmp48_ = (gchar*) _tmp47_;
#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- soup_message_headers_append (_tmp43_, _tmp46_, _tmp49_);
+ soup_message_headers_append (_tmp42_, _tmp45_, _tmp48_);
#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _g_free0 (_tmp49_);
+ _g_free0 (_tmp48_);
#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _g_free0 (_tmp46_);
-#line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp50_ = i;
+ _g_free0 (_tmp45_);
#line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp51_ = gee_map_iterator_next (_tmp50_);
+ _tmp49_ = i;
#line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- cont = _tmp51_;
-#line 4968 "TumblrPublishing.c"
+ cont = gee_map_iterator_next (_tmp49_);
+#line 5142 "TumblrPublishing.c"
}
#line 644 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp52_ = outbound_message;
+ _tmp50_ = outbound_message;
#line 644 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- publishing_rest_support_transaction_set_message (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp52_);
+ publishing_rest_support_transaction_set_message (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp50_);
#line 646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
publishing_rest_support_transaction_set_is_executed (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), TRUE);
#line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
@@ -5004,7 +5178,7 @@ static void publishing_tumblr_tumblr_publisher_upload_transaction_real_execute (
_g_free0 (payload);
#line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return;
-#line 4996 "TumblrPublishing.c"
+#line 5170 "TumblrPublishing.c"
} else {
#line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_g_object_unref0 (i);
@@ -5022,7 +5196,7 @@ static void publishing_tumblr_tumblr_publisher_upload_transaction_real_execute (
g_clear_error (&_inner_error_);
#line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return;
-#line 5014 "TumblrPublishing.c"
+#line 5188 "TumblrPublishing.c"
}
}
#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
@@ -5035,24 +5209,30 @@ static void publishing_tumblr_tumblr_publisher_upload_transaction_real_execute (
request_arguments = (_vala_array_free (request_arguments, request_arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_g_free0 (payload);
-#line 5027 "TumblrPublishing.c"
+#line 5201 "TumblrPublishing.c"
}
-static void publishing_tumblr_tumblr_publisher_upload_transaction_class_init (PublishingTumblrTumblrPublisherUploadTransactionClass * klass) {
+static void
+publishing_tumblr_tumblr_publisher_upload_transaction_class_init (PublishingTumblrTumblrPublisherUploadTransactionClass * klass)
+{
#line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
publishing_tumblr_tumblr_publisher_upload_transaction_parent_class = g_type_class_peek_parent (klass);
#line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*) (PublishingRESTSupportTransaction *, GError**)) publishing_tumblr_tumblr_publisher_upload_transaction_real_execute;
-#line 5036 "TumblrPublishing.c"
+#line 5212 "TumblrPublishing.c"
}
-static void publishing_tumblr_tumblr_publisher_upload_transaction_instance_init (PublishingTumblrTumblrPublisherUploadTransaction * self) {
+static void
+publishing_tumblr_tumblr_publisher_upload_transaction_instance_init (PublishingTumblrTumblrPublisherUploadTransaction * self)
+{
}
-GType publishing_tumblr_tumblr_publisher_upload_transaction_get_type (void) {
+GType
+publishing_tumblr_tumblr_publisher_upload_transaction_get_type (void)
+{
static volatile gsize publishing_tumblr_tumblr_publisher_upload_transaction_type_id__volatile = 0;
if (g_once_init_enter (&publishing_tumblr_tumblr_publisher_upload_transaction_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingTumblrTumblrPublisherUploadTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_tumblr_tumblr_publisher_upload_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingTumblrTumblrPublisherUploadTransaction), 0, (GInstanceInitFunc) publishing_tumblr_tumblr_publisher_upload_transaction_instance_init, NULL };
@@ -5064,47 +5244,49 @@ GType publishing_tumblr_tumblr_publisher_upload_transaction_get_type (void) {
}
-PublishingTumblrTumblrPublisherUploader* publishing_tumblr_tumblr_publisher_uploader_construct (GType object_type, PublishingRESTSupportOAuth1Session* session, SpitPublishingPublishable** publishables, int publishables_length1, const gchar* blog_url) {
+PublishingTumblrTumblrPublisherUploader*
+publishing_tumblr_tumblr_publisher_uploader_construct (GType object_type,
+ PublishingRESTSupportOAuth1Session* session,
+ SpitPublishingPublishable** publishables,
+ int publishables_length1,
+ const gchar* blog_url)
+{
PublishingTumblrTumblrPublisherUploader* self = NULL;
- PublishingRESTSupportOAuth1Session* _tmp0_;
- SpitPublishingPublishable** _tmp1_;
- gint _tmp1__length1;
- const gchar* _tmp2_;
- gchar* _tmp3_;
+ gchar* _tmp0_;
#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION (session), NULL);
#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_return_val_if_fail (blog_url != NULL, NULL);
#line 657 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp0_ = session;
-#line 657 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp1_ = publishables;
-#line 657 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp1__length1 = publishables_length1;
-#line 657 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- self = (PublishingTumblrTumblrPublisherUploader*) publishing_rest_support_batch_uploader_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, _tmp1__length1);
+ self = (PublishingTumblrTumblrPublisherUploader*) publishing_rest_support_batch_uploader_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), publishables, publishables_length1);
#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp2_ = blog_url;
-#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- _tmp3_ = g_strdup (_tmp2_);
+ _tmp0_ = g_strdup (blog_url);
#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
_g_free0 (self->priv->blog_url);
#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
- self->priv->blog_url = _tmp3_;
+ self->priv->blog_url = _tmp0_;
#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return self;
-#line 5085 "TumblrPublishing.c"
+#line 5259 "TumblrPublishing.c"
}
-PublishingTumblrTumblrPublisherUploader* publishing_tumblr_tumblr_publisher_uploader_new (PublishingRESTSupportOAuth1Session* session, SpitPublishingPublishable** publishables, int publishables_length1, const gchar* blog_url) {
+PublishingTumblrTumblrPublisherUploader*
+publishing_tumblr_tumblr_publisher_uploader_new (PublishingRESTSupportOAuth1Session* session,
+ SpitPublishingPublishable** publishables,
+ int publishables_length1,
+ const gchar* blog_url)
+{
#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return publishing_tumblr_tumblr_publisher_uploader_construct (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOADER, session, publishables, publishables_length1, blog_url);
-#line 5092 "TumblrPublishing.c"
+#line 5271 "TumblrPublishing.c"
}
-static PublishingRESTSupportTransaction* publishing_tumblr_tumblr_publisher_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base, SpitPublishingPublishable* publishable) {
+static PublishingRESTSupportTransaction*
+publishing_tumblr_tumblr_publisher_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base,
+ SpitPublishingPublishable* publishable)
+{
PublishingTumblrTumblrPublisherUploader * self;
PublishingRESTSupportTransaction* result = NULL;
PublishingRESTSupportSession* _tmp0_;
@@ -5142,11 +5324,13 @@ static PublishingRESTSupportTransaction* publishing_tumblr_tumblr_publisher_uplo
result = _tmp6_;
#line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
return result;
-#line 5134 "TumblrPublishing.c"
+#line 5316 "TumblrPublishing.c"
}
-static void publishing_tumblr_tumblr_publisher_uploader_class_init (PublishingTumblrTumblrPublisherUploaderClass * klass) {
+static void
+publishing_tumblr_tumblr_publisher_uploader_class_init (PublishingTumblrTumblrPublisherUploaderClass * klass)
+{
#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
publishing_tumblr_tumblr_publisher_uploader_parent_class = g_type_class_peek_parent (klass);
#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
@@ -5155,11 +5339,13 @@ static void publishing_tumblr_tumblr_publisher_uploader_class_init (PublishingTu
g_type_class_add_private (klass, sizeof (PublishingTumblrTumblrPublisherUploaderPrivate));
#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = (PublishingRESTSupportTransaction* (*) (PublishingRESTSupportBatchUploader *, SpitPublishingPublishable*)) publishing_tumblr_tumblr_publisher_uploader_real_create_transaction;
-#line 5147 "TumblrPublishing.c"
+#line 5331 "TumblrPublishing.c"
}
-static void publishing_tumblr_tumblr_publisher_uploader_instance_init (PublishingTumblrTumblrPublisherUploader * self) {
+static void
+publishing_tumblr_tumblr_publisher_uploader_instance_init (PublishingTumblrTumblrPublisherUploader * self)
+{
gchar* _tmp0_;
#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
self->priv = PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_UPLOADER_GET_PRIVATE (self);
@@ -5167,11 +5353,13 @@ static void publishing_tumblr_tumblr_publisher_uploader_instance_init (Publishin
_tmp0_ = g_strdup ("");
#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
self->priv->blog_url = _tmp0_;
-#line 5159 "TumblrPublishing.c"
+#line 5345 "TumblrPublishing.c"
}
-static void publishing_tumblr_tumblr_publisher_uploader_finalize (PublishingRESTSupportBatchUploader * obj) {
+static void
+publishing_tumblr_tumblr_publisher_uploader_finalize (PublishingRESTSupportBatchUploader * obj)
+{
PublishingTumblrTumblrPublisherUploader * self;
#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOADER, PublishingTumblrTumblrPublisherUploader);
@@ -5179,11 +5367,13 @@ static void publishing_tumblr_tumblr_publisher_uploader_finalize (PublishingREST
_g_free0 (self->priv->blog_url);
#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_CLASS (publishing_tumblr_tumblr_publisher_uploader_parent_class)->finalize (obj);
-#line 5171 "TumblrPublishing.c"
+#line 5359 "TumblrPublishing.c"
}
-GType publishing_tumblr_tumblr_publisher_uploader_get_type (void) {
+GType
+publishing_tumblr_tumblr_publisher_uploader_get_type (void)
+{
static volatile gsize publishing_tumblr_tumblr_publisher_uploader_type_id__volatile = 0;
if (g_once_init_enter (&publishing_tumblr_tumblr_publisher_uploader_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingTumblrTumblrPublisherUploaderClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_tumblr_tumblr_publisher_uploader_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingTumblrTumblrPublisherUploader), 0, (GInstanceInitFunc) publishing_tumblr_tumblr_publisher_uploader_instance_init, NULL };
@@ -5195,18 +5385,22 @@ GType publishing_tumblr_tumblr_publisher_uploader_get_type (void) {
}
-static void publishing_tumblr_tumblr_publisher_class_init (PublishingTumblrTumblrPublisherClass * klass) {
+static void
+publishing_tumblr_tumblr_publisher_class_init (PublishingTumblrTumblrPublisherClass * klass)
+{
#line 86 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
publishing_tumblr_tumblr_publisher_parent_class = g_type_class_peek_parent (klass);
#line 86 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
g_type_class_add_private (klass, sizeof (PublishingTumblrTumblrPublisherPrivate));
#line 86 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
G_OBJECT_CLASS (klass)->finalize = publishing_tumblr_tumblr_publisher_finalize;
-#line 5194 "TumblrPublishing.c"
+#line 5386 "TumblrPublishing.c"
}
-static void publishing_tumblr_tumblr_publisher_spit_publishing_publisher_interface_init (SpitPublishingPublisherIface * iface) {
+static void
+publishing_tumblr_tumblr_publisher_spit_publishing_publisher_interface_init (SpitPublishingPublisherIface * iface)
+{
#line 86 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
publishing_tumblr_tumblr_publisher_spit_publishing_publisher_parent_iface = g_type_interface_peek_parent (iface);
#line 86 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
@@ -5217,11 +5411,13 @@ static void publishing_tumblr_tumblr_publisher_spit_publishing_publisher_interfa
iface->start = (void (*) (SpitPublishingPublisher *)) publishing_tumblr_tumblr_publisher_real_start;
#line 86 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
iface->stop = (void (*) (SpitPublishingPublisher *)) publishing_tumblr_tumblr_publisher_real_stop;
-#line 5209 "TumblrPublishing.c"
+#line 5403 "TumblrPublishing.c"
}
-static void publishing_tumblr_tumblr_publisher_instance_init (PublishingTumblrTumblrPublisher * self) {
+static void
+publishing_tumblr_tumblr_publisher_instance_init (PublishingTumblrTumblrPublisher * self)
+{
gchar* _tmp0_;
#line 86 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
self->priv = PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_GET_PRIVATE (self);
@@ -5255,11 +5451,13 @@ static void publishing_tumblr_tumblr_publisher_instance_init (PublishingTumblrTu
_tmp0_ = g_strdup ("");
#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
self->priv->username = _tmp0_;
-#line 5247 "TumblrPublishing.c"
+#line 5443 "TumblrPublishing.c"
}
-static void publishing_tumblr_tumblr_publisher_finalize (GObject * obj) {
+static void
+publishing_tumblr_tumblr_publisher_finalize (GObject * obj)
+{
PublishingTumblrTumblrPublisher * self;
SpitPublishingAuthenticator* _tmp0_;
guint _tmp1_;
@@ -5297,11 +5495,13 @@ static void publishing_tumblr_tumblr_publisher_finalize (GObject * obj) {
_g_object_unref0 (self->priv->authenticator);
#line 86 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
G_OBJECT_CLASS (publishing_tumblr_tumblr_publisher_parent_class)->finalize (obj);
-#line 5289 "TumblrPublishing.c"
+#line 5487 "TumblrPublishing.c"
}
-GType publishing_tumblr_tumblr_publisher_get_type (void) {
+GType
+publishing_tumblr_tumblr_publisher_get_type (void)
+{
static volatile gsize publishing_tumblr_tumblr_publisher_type_id__volatile = 0;
if (g_once_init_enter (&publishing_tumblr_tumblr_publisher_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingTumblrTumblrPublisherClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_tumblr_tumblr_publisher_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingTumblrTumblrPublisher), 0, (GInstanceInitFunc) publishing_tumblr_tumblr_publisher_instance_init, NULL };
@@ -5315,7 +5515,11 @@ GType publishing_tumblr_tumblr_publisher_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) {
@@ -5327,7 +5531,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/plugins/shotwell-publishing/YouTubePublishing.c b/plugins/shotwell-publishing/YouTubePublishing.c
index c94360b..f823262 100644
--- a/plugins/shotwell-publishing/YouTubePublishing.c
+++ b/plugins/shotwell-publishing/YouTubePublishing.c
@@ -1,4 +1,4 @@
-/* YouTubePublishing.c generated by valac 0.36.6, the Vala compiler
+/* YouTubePublishing.c generated by valac 0.40.4, the Vala compiler
* generated from YouTubePublishing.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -7,6 +7,7 @@
* See the COPYING file in this distribution.
*/
+
#include <glib.h>
#include <glib-object.h>
#include <shotwell-plugin-dev-1.0.h>
@@ -35,6 +36,11 @@
typedef struct _YouTubeService YouTubeService;
typedef struct _YouTubeServiceClass YouTubeServiceClass;
typedef struct _YouTubeServicePrivate YouTubeServicePrivate;
+enum {
+ YOU_TUBE_SERVICE_0_PROPERTY,
+ YOU_TUBE_SERVICE_NUM_PROPERTIES
+};
+static GParamSpec* you_tube_service_properties[YOU_TUBE_SERVICE_NUM_PROPERTIES];
#define _g_free0(var) (var = (g_free (var), NULL))
#define PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_PUBLISHER (publishing_you_tube_you_tube_publisher_get_type ())
@@ -71,9 +77,19 @@ typedef struct _PublishingYouTubeParamSpecPublishingParameters PublishingYouTube
typedef struct _PublishingYouTubeYouTubeAuthorizer PublishingYouTubeYouTubeAuthorizer;
typedef struct _PublishingYouTubeYouTubeAuthorizerClass PublishingYouTubeYouTubeAuthorizerClass;
typedef struct _PublishingYouTubeYouTubeAuthorizerPrivate PublishingYouTubeYouTubeAuthorizerPrivate;
+enum {
+ PUBLISHING_YOU_TUBE_YOU_TUBE_AUTHORIZER_0_PROPERTY,
+ PUBLISHING_YOU_TUBE_YOU_TUBE_AUTHORIZER_NUM_PROPERTIES
+};
+static GParamSpec* publishing_you_tube_you_tube_authorizer_properties[PUBLISHING_YOU_TUBE_YOU_TUBE_AUTHORIZER_NUM_PROPERTIES];
#define _publishing_rest_support_session_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rest_support_session_unref (var), NULL)))
#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
typedef struct _PublishingYouTubeYouTubePublisherPrivate PublishingYouTubeYouTubePublisherPrivate;
+enum {
+ PUBLISHING_YOU_TUBE_YOU_TUBE_PUBLISHER_0_PROPERTY,
+ PUBLISHING_YOU_TUBE_YOU_TUBE_PUBLISHER_NUM_PROPERTIES
+};
+static GParamSpec* publishing_you_tube_you_tube_publisher_properties[PUBLISHING_YOU_TUBE_YOU_TUBE_PUBLISHER_NUM_PROPERTIES];
#define _publishing_you_tube_publishing_parameters_unref0(var) ((var == NULL) ? NULL : (var = (publishing_you_tube_publishing_parameters_unref (var), NULL)))
#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
@@ -108,6 +124,11 @@ typedef struct _PublishingYouTubePublishingOptionsPanePrivate PublishingYouTubeP
typedef struct _PublishingYouTubePublishingOptionsPanePrivacyDescription PublishingYouTubePublishingOptionsPanePrivacyDescription;
typedef struct _PublishingYouTubePublishingOptionsPanePrivacyDescriptionClass PublishingYouTubePublishingOptionsPanePrivacyDescriptionClass;
+enum {
+ PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_0_PROPERTY,
+ PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_NUM_PROPERTIES
+};
+static GParamSpec* publishing_you_tube_publishing_options_pane_properties[PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_NUM_PROPERTIES];
#define _g_slist_free0(var) ((var == NULL) ? NULL : (var = (g_slist_free (var), NULL)))
typedef struct _PublishingYouTubePublishingOptionsPanePrivacyDescriptionPrivate PublishingYouTubePublishingOptionsPanePrivacyDescriptionPrivate;
#define _publishing_you_tube_publishing_options_pane_privacy_description_unref0(var) ((var == NULL) ? NULL : (var = (publishing_you_tube_publishing_options_pane_privacy_description_unref (var), NULL)))
@@ -115,9 +136,9 @@ typedef struct _PublishingYouTubePublishingOptionsPaneParamSpecPrivacyDescriptio
enum {
PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL,
PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL,
- PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL
+ PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_NUM_SIGNALS
};
-static guint publishing_you_tube_publishing_options_pane_signals[PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL] = {0};
+static guint publishing_you_tube_publishing_options_pane_signals[PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_NUM_SIGNALS] = {0};
#define PUBLISHING_YOU_TUBE_TYPE_UPLOAD_TRANSACTION (publishing_you_tube_upload_transaction_get_type ())
#define PUBLISHING_YOU_TUBE_UPLOAD_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_YOU_TUBE_TYPE_UPLOAD_TRANSACTION, PublishingYouTubeUploadTransaction))
@@ -281,27 +302,19 @@ struct _PublishingYouTubeUploadTransactionSpliceWithProgressData {
GInputStream* input;
GOutputStream* output;
gint64 total_bytes;
- GFileInfo* _tmp0_;
- gint64 _tmp1_;
gint64 bytes_to_write;
- gint64 _tmp2_;
+ gint64 _tmp0_;
guint8 buffer[8192];
- gint64 _tmp3_;
+ gint64 _tmp1_;
gssize bytes_read;
- GInputStream* _tmp4_;
- gssize _tmp5_;
- gssize _tmp6_;
+ gssize _tmp2_;
gssize bytes_written;
- GOutputStream* _tmp7_;
- gssize _tmp8_;
- gssize _tmp9_;
- gint64 _tmp10_;
- gssize _tmp11_;
- gint64 _tmp12_;
- gint64 _tmp13_;
- gint64 _tmp14_;
- GOutputStream* _tmp15_;
- GInputStream* _tmp16_;
+ gssize _tmp3_;
+ gint64 _tmp4_;
+ gssize _tmp5_;
+ gint64 _tmp6_;
+ gint64 _tmp7_;
+ gint64 _tmp8_;
GError * _inner_error_;
};
@@ -339,59 +352,73 @@ static gpointer publishing_you_tube_upload_transaction_parent_class = NULL;
static gpointer publishing_you_tube_uploader_parent_class = NULL;
GType you_tube_service_get_type (void) G_GNUC_CONST;
-enum {
- YOU_TUBE_SERVICE_DUMMY_PROPERTY
-};
#define YOU_TUBE_SERVICE_ICON_FILENAME "youtube.png"
YouTubeService* you_tube_service_new (GFile* resource_directory);
-YouTubeService* you_tube_service_construct (GType object_type, GFile* resource_directory);
-static gint you_tube_service_real_get_pluggable_interface (SpitPluggable* base, gint min_host_interface, gint max_host_interface);
+YouTubeService* you_tube_service_construct (GType object_type,
+ GFile* resource_directory);
+static gint you_tube_service_real_get_pluggable_interface (SpitPluggable* base,
+ gint min_host_interface,
+ gint max_host_interface);
static const gchar* you_tube_service_real_get_id (SpitPluggable* base);
static const gchar* you_tube_service_real_get_pluggable_name (SpitPluggable* base);
-static void you_tube_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info);
-static GdkPixbuf** _vala_array_dup11 (GdkPixbuf** self, int length);
-static SpitPublishingPublisher* you_tube_service_real_create_publisher (SpitPublishingService* base, SpitPublishingPluginHost* host);
-PublishingYouTubeYouTubePublisher* publishing_you_tube_you_tube_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host);
-PublishingYouTubeYouTubePublisher* publishing_you_tube_you_tube_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host);
+static void you_tube_service_real_get_info (SpitPluggable* base,
+ SpitPluggableInfo* info);
+static GdkPixbuf** _vala_array_dup11 (GdkPixbuf** self,
+ int length);
+static SpitPublishingPublisher* you_tube_service_real_create_publisher (SpitPublishingService* base,
+ SpitPublishingPluginHost* host);
+PublishingYouTubeYouTubePublisher* publishing_you_tube_you_tube_publisher_new (SpitPublishingService* service,
+ SpitPublishingPluginHost* host);
+PublishingYouTubeYouTubePublisher* publishing_you_tube_you_tube_publisher_construct (GType object_type,
+ SpitPublishingService* service,
+ SpitPublishingPluginHost* host);
GType publishing_you_tube_you_tube_publisher_get_type (void) G_GNUC_CONST;
static SpitPublishingPublisherMediaType you_tube_service_real_get_supported_media (SpitPublishingService* base);
-static void you_tube_service_real_activation (SpitPluggable* base, gboolean enabled);
+static void you_tube_service_real_activation (SpitPluggable* base,
+ gboolean enabled);
static void you_tube_service_finalize (GObject * obj);
#define PUBLISHING_YOU_TUBE_DEVELOPER_KEY "AIzaSyB6hLnm0n5j8Y6Bkvh9bz3i8ADM2bJdYeY"
GType publishing_you_tube_privacy_setting_get_type (void) G_GNUC_CONST;
gpointer publishing_you_tube_publishing_parameters_ref (gpointer instance);
void publishing_you_tube_publishing_parameters_unref (gpointer instance);
-GParamSpec* publishing_you_tube_param_spec_publishing_parameters (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void publishing_you_tube_value_set_publishing_parameters (GValue* value, gpointer v_object);
-void publishing_you_tube_value_take_publishing_parameters (GValue* value, gpointer v_object);
+GParamSpec* publishing_you_tube_param_spec_publishing_parameters (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void publishing_you_tube_value_set_publishing_parameters (GValue* value,
+ gpointer v_object);
+void publishing_you_tube_value_take_publishing_parameters (GValue* value,
+ gpointer v_object);
gpointer publishing_you_tube_value_get_publishing_parameters (const GValue* value);
GType publishing_you_tube_publishing_parameters_get_type (void) G_GNUC_CONST;
#define PUBLISHING_YOU_TUBE_PUBLISHING_PARAMETERS_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_PARAMETERS, PublishingYouTubePublishingParametersPrivate))
-enum {
- PUBLISHING_YOU_TUBE_PUBLISHING_PARAMETERS_DUMMY_PROPERTY
-};
PublishingYouTubePublishingParameters* publishing_you_tube_publishing_parameters_new (void);
PublishingYouTubePublishingParameters* publishing_you_tube_publishing_parameters_construct (GType object_type);
PublishingYouTubePrivacySetting publishing_you_tube_publishing_parameters_get_privacy (PublishingYouTubePublishingParameters* self);
-void publishing_you_tube_publishing_parameters_set_privacy (PublishingYouTubePublishingParameters* self, PublishingYouTubePrivacySetting privacy);
+void publishing_you_tube_publishing_parameters_set_privacy (PublishingYouTubePublishingParameters* self,
+ PublishingYouTubePrivacySetting privacy);
gchar* publishing_you_tube_publishing_parameters_get_user_name (PublishingYouTubePublishingParameters* self);
-void publishing_you_tube_publishing_parameters_set_user_name (PublishingYouTubePublishingParameters* self, const gchar* user_name);
+void publishing_you_tube_publishing_parameters_set_user_name (PublishingYouTubePublishingParameters* self,
+ const gchar* user_name);
static void publishing_you_tube_publishing_parameters_finalize (PublishingYouTubePublishingParameters * obj);
GType publishing_you_tube_you_tube_authorizer_get_type (void) G_GNUC_CONST;
#define PUBLISHING_YOU_TUBE_YOU_TUBE_AUTHORIZER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_AUTHORIZER, PublishingYouTubeYouTubeAuthorizerPrivate))
-enum {
- PUBLISHING_YOU_TUBE_YOU_TUBE_AUTHORIZER_DUMMY_PROPERTY
-};
-PublishingYouTubeYouTubeAuthorizer* publishing_you_tube_you_tube_authorizer_new (PublishingRESTSupportGoogleSession* session, SpitPublishingAuthenticator* authenticator);
-PublishingYouTubeYouTubeAuthorizer* publishing_you_tube_you_tube_authorizer_construct (GType object_type, PublishingRESTSupportGoogleSession* session, SpitPublishingAuthenticator* authenticator);
-static gboolean publishing_you_tube_you_tube_authorizer_real_is_authorized_for_domain (GDataAuthorizer* base, GDataAuthorizationDomain* domain);
-static void publishing_you_tube_you_tube_authorizer_real_process_request (GDataAuthorizer* base, GDataAuthorizationDomain* domain, SoupMessage* message);
-static gboolean publishing_you_tube_you_tube_authorizer_real_refresh_authorization (GDataAuthorizer* base, GCancellable* cancellable, GError** error);
+PublishingYouTubeYouTubeAuthorizer* publishing_you_tube_you_tube_authorizer_new (PublishingRESTSupportGoogleSession* session,
+ SpitPublishingAuthenticator* authenticator);
+PublishingYouTubeYouTubeAuthorizer* publishing_you_tube_you_tube_authorizer_construct (GType object_type,
+ PublishingRESTSupportGoogleSession* session,
+ SpitPublishingAuthenticator* authenticator);
+static gboolean publishing_you_tube_you_tube_authorizer_real_is_authorized_for_domain (GDataAuthorizer* base,
+ GDataAuthorizationDomain* domain);
+static void publishing_you_tube_you_tube_authorizer_real_process_request (GDataAuthorizer* base,
+ GDataAuthorizationDomain* domain,
+ SoupMessage* message);
+static gboolean publishing_you_tube_you_tube_authorizer_real_refresh_authorization (GDataAuthorizer* base,
+ GCancellable* cancellable,
+ GError** error);
static void publishing_you_tube_you_tube_authorizer_finalize (GObject * obj);
#define PUBLISHING_YOU_TUBE_YOU_TUBE_PUBLISHER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_PUBLISHER, PublishingYouTubeYouTubePublisherPrivate))
-enum {
- PUBLISHING_YOU_TUBE_YOU_TUBE_PUBLISHER_DUMMY_PROPERTY
-};
static gboolean publishing_you_tube_you_tube_publisher_real_is_running (PublishingRESTSupportGooglePublisher* base);
static void publishing_you_tube_you_tube_publisher_real_start (PublishingRESTSupportGooglePublisher* base);
static void publishing_you_tube_you_tube_publisher_real_stop (PublishingRESTSupportGooglePublisher* base);
@@ -400,86 +427,156 @@ static void publishing_you_tube_you_tube_publisher_do_show_publishing_options_pa
static void publishing_you_tube_you_tube_publisher_on_publishing_options_logout (PublishingYouTubeYouTubePublisher* self);
static void publishing_you_tube_you_tube_publisher_on_publishing_options_publish (PublishingYouTubeYouTubePublisher* self);
static void publishing_you_tube_you_tube_publisher_do_upload (PublishingYouTubeYouTubePublisher* self);
-static void publishing_you_tube_you_tube_publisher_on_upload_status_updated (PublishingYouTubeYouTubePublisher* self, gint file_number, gdouble completed_fraction);
-static void publishing_you_tube_you_tube_publisher_on_upload_complete (PublishingYouTubeYouTubePublisher* self, PublishingRESTSupportBatchUploader* uploader, gint num_published);
-static void _publishing_you_tube_you_tube_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender, gint num_photos_published, gpointer self);
-static void publishing_you_tube_you_tube_publisher_on_upload_error (PublishingYouTubeYouTubePublisher* self, PublishingRESTSupportBatchUploader* uploader, GError* err);
-static void _publishing_you_tube_you_tube_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender, GError* err, gpointer self);
+static void publishing_you_tube_you_tube_publisher_on_upload_status_updated (PublishingYouTubeYouTubePublisher* self,
+ gint file_number,
+ gdouble completed_fraction);
+static void publishing_you_tube_you_tube_publisher_on_upload_complete (PublishingYouTubeYouTubePublisher* self,
+ PublishingRESTSupportBatchUploader* uploader,
+ gint num_published);
+static void _publishing_you_tube_you_tube_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender,
+ gint num_photos_published,
+ gpointer self);
+static void publishing_you_tube_you_tube_publisher_on_upload_error (PublishingYouTubeYouTubePublisher* self,
+ PublishingRESTSupportBatchUploader* uploader,
+ GError* err);
+static void _publishing_you_tube_you_tube_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender,
+ GError* err,
+ gpointer self);
static void publishing_you_tube_you_tube_publisher_do_show_success_pane (PublishingYouTubeYouTubePublisher* self);
GType publishing_you_tube_publishing_options_pane_get_type (void) G_GNUC_CONST;
-PublishingYouTubePublishingOptionsPane* publishing_you_tube_publishing_options_pane_new (SpitPublishingAuthenticator* authenticator, SpitPublishingPluginHost* host, GtkBuilder* builder, PublishingYouTubePublishingParameters* publishing_parameters);
-PublishingYouTubePublishingOptionsPane* publishing_you_tube_publishing_options_pane_construct (GType object_type, SpitPublishingAuthenticator* authenticator, SpitPublishingPluginHost* host, GtkBuilder* builder, PublishingYouTubePublishingParameters* publishing_parameters);
-static void _publishing_you_tube_you_tube_publisher_on_publishing_options_publish_publishing_you_tube_publishing_options_pane_publish (PublishingYouTubePublishingOptionsPane* _sender, gpointer self);
-static void _publishing_you_tube_you_tube_publisher_on_publishing_options_logout_publishing_you_tube_publishing_options_pane_logout (PublishingYouTubePublishingOptionsPane* _sender, gpointer self);
+PublishingYouTubePublishingOptionsPane* publishing_you_tube_publishing_options_pane_new (SpitPublishingAuthenticator* authenticator,
+ SpitPublishingPluginHost* host,
+ GtkBuilder* builder,
+ PublishingYouTubePublishingParameters* publishing_parameters);
+PublishingYouTubePublishingOptionsPane* publishing_you_tube_publishing_options_pane_construct (GType object_type,
+ SpitPublishingAuthenticator* authenticator,
+ SpitPublishingPluginHost* host,
+ GtkBuilder* builder,
+ PublishingYouTubePublishingParameters* publishing_parameters);
+static void _publishing_you_tube_you_tube_publisher_on_publishing_options_publish_publishing_you_tube_publishing_options_pane_publish (PublishingYouTubePublishingOptionsPane* _sender,
+ gpointer self);
+static void _publishing_you_tube_you_tube_publisher_on_publishing_options_logout_publishing_you_tube_publishing_options_pane_logout (PublishingYouTubePublishingOptionsPane* _sender,
+ gpointer self);
GType publishing_you_tube_uploader_get_type (void) G_GNUC_CONST;
-PublishingYouTubeUploader* publishing_you_tube_uploader_new (GDataYouTubeService* youtube_service, PublishingRESTSupportGoogleSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingYouTubePublishingParameters* parameters);
-PublishingYouTubeUploader* publishing_you_tube_uploader_construct (GType object_type, GDataYouTubeService* youtube_service, PublishingRESTSupportGoogleSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingYouTubePublishingParameters* parameters);
-static void _publishing_you_tube_you_tube_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self);
+PublishingYouTubeUploader* publishing_you_tube_uploader_new (GDataYouTubeService* youtube_service,
+ PublishingRESTSupportGoogleSession* session,
+ SpitPublishingPublishable** publishables,
+ int publishables_length1,
+ PublishingYouTubePublishingParameters* parameters);
+PublishingYouTubeUploader* publishing_you_tube_uploader_construct (GType object_type,
+ GDataYouTubeService* youtube_service,
+ PublishingRESTSupportGoogleSession* session,
+ SpitPublishingPublishable** publishables,
+ int publishables_length1,
+ PublishingYouTubePublishingParameters* parameters);
+static void _publishing_you_tube_you_tube_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number,
+ gdouble fraction_complete,
+ gpointer self);
static void publishing_you_tube_you_tube_publisher_real_do_logout (PublishingRESTSupportGooglePublisher* base);
static SpitPublishingAuthenticator* publishing_you_tube_you_tube_publisher_real_get_authenticator (PublishingRESTSupportGooglePublisher* base);
static void publishing_you_tube_you_tube_publisher_finalize (GObject * obj);
static gpointer publishing_you_tube_publishing_options_pane_privacy_description_ref (gpointer instance);
static void publishing_you_tube_publishing_options_pane_privacy_description_unref (gpointer instance);
-static GParamSpec* publishing_you_tube_publishing_options_pane_param_spec_privacy_description (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) G_GNUC_UNUSED;
-static void publishing_you_tube_publishing_options_pane_value_set_privacy_description (GValue* value, gpointer v_object) G_GNUC_UNUSED;
-static void publishing_you_tube_publishing_options_pane_value_take_privacy_description (GValue* value, gpointer v_object) G_GNUC_UNUSED;
+static GParamSpec* publishing_you_tube_publishing_options_pane_param_spec_privacy_description (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags) G_GNUC_UNUSED;
+static void publishing_you_tube_publishing_options_pane_value_set_privacy_description (GValue* value,
+ gpointer v_object) G_GNUC_UNUSED;
+static void publishing_you_tube_publishing_options_pane_value_take_privacy_description (GValue* value,
+ gpointer v_object) G_GNUC_UNUSED;
static gpointer publishing_you_tube_publishing_options_pane_value_get_privacy_description (const GValue* value) G_GNUC_UNUSED;
static GType publishing_you_tube_publishing_options_pane_privacy_description_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
#define PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_OPTIONS_PANE, PublishingYouTubePublishingOptionsPanePrivate))
-enum {
- PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_DUMMY_PROPERTY
-};
-static PublishingYouTubePublishingOptionsPanePrivacyDescription** publishing_you_tube_publishing_options_pane_create_privacy_descriptions (PublishingYouTubePublishingOptionsPane* self, int* result_length1);
+static PublishingYouTubePublishingOptionsPanePrivacyDescription** publishing_you_tube_publishing_options_pane_create_privacy_descriptions (PublishingYouTubePublishingOptionsPane* self,
+ int* result_length1);
static void publishing_you_tube_publishing_options_pane_on_logout_clicked (PublishingYouTubePublishingOptionsPane* self);
-static void _publishing_you_tube_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void _publishing_you_tube_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender,
+ gpointer self);
static void publishing_you_tube_publishing_options_pane_on_publish_clicked (PublishingYouTubePublishingOptionsPane* self);
-static void _publishing_you_tube_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void _publishing_you_tube_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender,
+ gpointer self);
static void publishing_you_tube_publishing_options_pane_update_publish_button_sensitivity (PublishingYouTubePublishingOptionsPane* self);
-static PublishingYouTubePublishingOptionsPanePrivacyDescription* publishing_you_tube_publishing_options_pane_privacy_description_new (const gchar* description, PublishingYouTubePrivacySetting privacy_setting);
-static PublishingYouTubePublishingOptionsPanePrivacyDescription* publishing_you_tube_publishing_options_pane_privacy_description_construct (GType object_type, const gchar* description, PublishingYouTubePrivacySetting privacy_setting);
-static void _vala_array_add35 (PublishingYouTubePublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingYouTubePublishingOptionsPanePrivacyDescription* value);
-static void _vala_array_add36 (PublishingYouTubePublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingYouTubePublishingOptionsPanePrivacyDescription* value);
-static void _vala_array_add37 (PublishingYouTubePublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingYouTubePublishingOptionsPanePrivacyDescription* value);
+static PublishingYouTubePublishingOptionsPanePrivacyDescription* publishing_you_tube_publishing_options_pane_privacy_description_new (const gchar* description,
+ PublishingYouTubePrivacySetting privacy_setting);
+static PublishingYouTubePublishingOptionsPanePrivacyDescription* publishing_you_tube_publishing_options_pane_privacy_description_construct (GType object_type,
+ const gchar* description,
+ PublishingYouTubePrivacySetting privacy_setting);
+static void _vala_array_add35 (PublishingYouTubePublishingOptionsPanePrivacyDescription** * array,
+ int* length,
+ int* size,
+ PublishingYouTubePublishingOptionsPanePrivacyDescription* value);
+static void _vala_array_add36 (PublishingYouTubePublishingOptionsPanePrivacyDescription** * array,
+ int* length,
+ int* size,
+ PublishingYouTubePublishingOptionsPanePrivacyDescription* value);
+static void _vala_array_add37 (PublishingYouTubePublishingOptionsPanePrivacyDescription** * array,
+ int* length,
+ int* size,
+ PublishingYouTubePublishingOptionsPanePrivacyDescription* value);
static GtkWidget* publishing_you_tube_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base);
static SpitPublishingDialogPaneGeometryOptions publishing_you_tube_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base);
static void publishing_you_tube_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base);
static void publishing_you_tube_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base);
-enum {
- PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_PRIVACY_DESCRIPTION_DUMMY_PROPERTY
-};
static void publishing_you_tube_publishing_options_pane_privacy_description_finalize (PublishingYouTubePublishingOptionsPanePrivacyDescription * obj);
static void publishing_you_tube_publishing_options_pane_finalize (GObject * obj);
GType publishing_you_tube_upload_transaction_get_type (void) G_GNUC_CONST;
#define PUBLISHING_YOU_TUBE_UPLOAD_TRANSACTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_YOU_TUBE_TYPE_UPLOAD_TRANSACTION, PublishingYouTubeUploadTransactionPrivate))
-enum {
- PUBLISHING_YOU_TUBE_UPLOAD_TRANSACTION_DUMMY_PROPERTY
-};
#define PUBLISHING_YOU_TUBE_UPLOAD_TRANSACTION_ENDPOINT_URL "https://uploads.gdata.youtube.com/feeds/api/users/default/uploads"
-PublishingYouTubeUploadTransaction* publishing_you_tube_upload_transaction_new (GDataYouTubeService* youtube_service, PublishingRESTSupportGoogleSession* session, PublishingYouTubePublishingParameters* parameters, SpitPublishingPublishable* publishable);
-PublishingYouTubeUploadTransaction* publishing_you_tube_upload_transaction_construct (GType object_type, GDataYouTubeService* youtube_service, PublishingRESTSupportGoogleSession* session, PublishingYouTubePublishingParameters* parameters, SpitPublishingPublishable* publishable);
-static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error);
+PublishingYouTubeUploadTransaction* publishing_you_tube_upload_transaction_new (GDataYouTubeService* youtube_service,
+ PublishingRESTSupportGoogleSession* session,
+ PublishingYouTubePublishingParameters* parameters,
+ SpitPublishingPublishable* publishable);
+PublishingYouTubeUploadTransaction* publishing_you_tube_upload_transaction_construct (GType object_type,
+ GDataYouTubeService* youtube_service,
+ PublishingRESTSupportGoogleSession* session,
+ PublishingYouTubePublishingParameters* parameters,
+ SpitPublishingPublishable* publishable);
+static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTSupportTransaction* base,
+ GError** error);
static Block1Data* block1_data_ref (Block1Data* _data1_);
static void block1_data_unref (void * _userdata_);
-static void publishing_you_tube_upload_transaction_splice_with_progress (PublishingYouTubeUploadTransaction* self, GFileInfo* info, GInputStream* input, GOutputStream* output, GAsyncReadyCallback _callback_, gpointer _user_data_);
-static void publishing_you_tube_upload_transaction_splice_with_progress_finish (PublishingYouTubeUploadTransaction* self, GAsyncResult* _res_, GError** error);
-static void ___lambda4_ (Block1Data* _data1_, GObject* obj, GAsyncResult* res);
-static void ____lambda4__gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self);
+static void publishing_you_tube_upload_transaction_splice_with_progress (PublishingYouTubeUploadTransaction* self,
+ GFileInfo* info,
+ GInputStream* input,
+ GOutputStream* output,
+ GAsyncReadyCallback _callback_,
+ gpointer _user_data_);
+static void publishing_you_tube_upload_transaction_splice_with_progress_finish (PublishingYouTubeUploadTransaction* self,
+ GAsyncResult* _res_,
+ GError** error);
+static void ___lambda4_ (Block1Data* _data1_,
+ GObject* obj,
+ GAsyncResult* res);
+static void ____lambda4__gasync_ready_callback (GObject* source_object,
+ GAsyncResult* res,
+ gpointer self);
static void publishing_you_tube_upload_transaction_splice_with_progress_data_free (gpointer _data);
-static void publishing_you_tube_upload_transaction_splice_with_progress_async_ready_wrapper (GObject *source_object, GAsyncResult *res, void *user_data);
+static void publishing_you_tube_upload_transaction_splice_with_progress_async_ready_wrapper (GObject *source_object,
+ GAsyncResult *res,
+ void *user_data);
static gboolean publishing_you_tube_upload_transaction_splice_with_progress_co (PublishingYouTubeUploadTransactionSpliceWithProgressData* _data_);
-static void publishing_you_tube_upload_transaction_splice_with_progress_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_);
+static void publishing_you_tube_upload_transaction_splice_with_progress_ready (GObject* source_object,
+ GAsyncResult* _res_,
+ gpointer _user_data_);
static void publishing_you_tube_upload_transaction_finalize (PublishingRESTSupportTransaction * obj);
#define PUBLISHING_YOU_TUBE_UPLOADER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_YOU_TUBE_TYPE_UPLOADER, PublishingYouTubeUploaderPrivate))
-enum {
- PUBLISHING_YOU_TUBE_UPLOADER_DUMMY_PROPERTY
-};
-static PublishingRESTSupportTransaction* publishing_you_tube_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base, SpitPublishingPublishable* publishable);
+static PublishingRESTSupportTransaction* publishing_you_tube_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base,
+ SpitPublishingPublishable* publishable);
static void publishing_you_tube_uploader_finalize (PublishingRESTSupportBatchUploader * 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);
-
-
-YouTubeService* you_tube_service_construct (GType object_type, GFile* resource_directory) {
+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);
+
+
+YouTubeService*
+you_tube_service_construct (GType object_type,
+ GFile* resource_directory)
+{
YouTubeService * self = NULL;
GdkPixbuf** _tmp0_;
gint _tmp0__length1;
@@ -493,7 +590,7 @@ YouTubeService* you_tube_service_construct (GType object_type, GFile* resource_d
_tmp0__length1 = you_tube_service_icon_pixbuf_set_length1;
#line 13 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
if (_tmp0_ == NULL) {
-#line 497 "YouTubePublishing.c"
+#line 594 "YouTubePublishing.c"
gint _tmp1_;
GdkPixbuf** _tmp2_;
#line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -506,44 +603,43 @@ YouTubeService* you_tube_service_construct (GType object_type, GFile* resource_d
you_tube_service_icon_pixbuf_set_length1 = _tmp1_;
#line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_you_tube_service_icon_pixbuf_set_size_ = you_tube_service_icon_pixbuf_set_length1;
-#line 510 "YouTubePublishing.c"
+#line 607 "YouTubePublishing.c"
}
#line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return self;
-#line 514 "YouTubePublishing.c"
+#line 611 "YouTubePublishing.c"
}
-YouTubeService* you_tube_service_new (GFile* resource_directory) {
+YouTubeService*
+you_tube_service_new (GFile* resource_directory)
+{
#line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return you_tube_service_construct (TYPE_YOU_TUBE_SERVICE, resource_directory);
-#line 521 "YouTubePublishing.c"
+#line 620 "YouTubePublishing.c"
}
-static gint you_tube_service_real_get_pluggable_interface (SpitPluggable* base, gint min_host_interface, gint max_host_interface) {
+static gint
+you_tube_service_real_get_pluggable_interface (SpitPluggable* base,
+ gint min_host_interface,
+ gint max_host_interface)
+{
YouTubeService * self;
gint result = 0;
- gint _tmp0_;
- gint _tmp1_;
- gint _tmp2_;
#line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_YOU_TUBE_SERVICE, YouTubeService);
#line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp0_ = min_host_interface;
-#line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp1_ = max_host_interface;
-#line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp2_ = spit_negotiate_interfaces (_tmp0_, _tmp1_, SPIT_PUBLISHING_CURRENT_INTERFACE);
-#line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- result = _tmp2_;
+ result = spit_negotiate_interfaces (min_host_interface, max_host_interface, SPIT_PUBLISHING_CURRENT_INTERFACE);
#line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return result;
-#line 543 "YouTubePublishing.c"
+#line 637 "YouTubePublishing.c"
}
-static const gchar* you_tube_service_real_get_id (SpitPluggable* base) {
+static const gchar*
+you_tube_service_real_get_id (SpitPluggable* base)
+{
YouTubeService * self;
const gchar* result = NULL;
#line 23 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -552,11 +648,13 @@ static const gchar* you_tube_service_real_get_id (SpitPluggable* base) {
result = "org.yorba.shotwell.publishing.youtube";
#line 24 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return result;
-#line 556 "YouTubePublishing.c"
+#line 652 "YouTubePublishing.c"
}
-static const gchar* you_tube_service_real_get_pluggable_name (SpitPluggable* base) {
+static const gchar*
+you_tube_service_real_get_pluggable_name (SpitPluggable* base)
+{
YouTubeService * self;
const gchar* result = NULL;
#line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -565,39 +663,47 @@ static const gchar* you_tube_service_real_get_pluggable_name (SpitPluggable* bas
result = "YouTube";
#line 28 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return result;
-#line 569 "YouTubePublishing.c"
+#line 667 "YouTubePublishing.c"
}
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return self ? g_object_ref (self) : NULL;
-#line 576 "YouTubePublishing.c"
+#line 676 "YouTubePublishing.c"
}
-static GdkPixbuf** _vala_array_dup11 (GdkPixbuf** self, int length) {
+static GdkPixbuf**
+_vala_array_dup11 (GdkPixbuf** self,
+ int length)
+{
GdkPixbuf** result;
int i;
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
result = g_new0 (GdkPixbuf*, length + 1);
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
for (i = 0; i < length; i++) {
-#line 587 "YouTubePublishing.c"
+#line 690 "YouTubePublishing.c"
GdkPixbuf* _tmp0_;
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_tmp0_ = _g_object_ref0 (self[i]);
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
result[i] = _tmp0_;
-#line 593 "YouTubePublishing.c"
+#line 696 "YouTubePublishing.c"
}
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return result;
-#line 597 "YouTubePublishing.c"
+#line 700 "YouTubePublishing.c"
}
-static void you_tube_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info) {
+static void
+you_tube_service_real_get_info (SpitPluggable* base,
+ SpitPluggableInfo* info)
+{
YouTubeService * self;
gchar* _tmp0_;
gchar* _tmp1_;
@@ -672,32 +778,34 @@ static void you_tube_service_real_get_info (SpitPluggable* base, SpitPluggableIn
(*info).icons = _tmp8_;
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
(*info).icons_length1 = _tmp8__length1;
-#line 676 "YouTubePublishing.c"
+#line 782 "YouTubePublishing.c"
}
-static SpitPublishingPublisher* you_tube_service_real_create_publisher (SpitPublishingService* base, SpitPublishingPluginHost* host) {
+static SpitPublishingPublisher*
+you_tube_service_real_create_publisher (SpitPublishingService* base,
+ SpitPublishingPluginHost* host)
+{
YouTubeService * self;
SpitPublishingPublisher* result = NULL;
- SpitPublishingPluginHost* _tmp0_;
- PublishingYouTubeYouTubePublisher* _tmp1_;
+ PublishingYouTubeYouTubePublisher* _tmp0_;
#line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_YOU_TUBE_SERVICE, YouTubeService);
#line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL);
#line 44 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp0_ = host;
+ _tmp0_ = publishing_you_tube_you_tube_publisher_new (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_SERVICE, SpitPublishingService), host);
#line 44 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp1_ = publishing_you_tube_you_tube_publisher_new (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_SERVICE, SpitPublishingService), _tmp0_);
-#line 44 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher);
+ result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher);
#line 44 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return result;
-#line 697 "YouTubePublishing.c"
+#line 803 "YouTubePublishing.c"
}
-static SpitPublishingPublisherMediaType you_tube_service_real_get_supported_media (SpitPublishingService* base) {
+static SpitPublishingPublisherMediaType
+you_tube_service_real_get_supported_media (SpitPublishingService* base)
+{
YouTubeService * self;
SpitPublishingPublisherMediaType result = 0;
#line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -706,28 +814,35 @@ static SpitPublishingPublisherMediaType you_tube_service_real_get_supported_medi
result = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO;
#line 48 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return result;
-#line 710 "YouTubePublishing.c"
+#line 818 "YouTubePublishing.c"
}
-static void you_tube_service_real_activation (SpitPluggable* base, gboolean enabled) {
+static void
+you_tube_service_real_activation (SpitPluggable* base,
+ gboolean enabled)
+{
YouTubeService * self;
#line 51 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_YOU_TUBE_SERVICE, YouTubeService);
-#line 718 "YouTubePublishing.c"
+#line 829 "YouTubePublishing.c"
}
-static void you_tube_service_class_init (YouTubeServiceClass * klass) {
+static void
+you_tube_service_class_init (YouTubeServiceClass * klass)
+{
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
you_tube_service_parent_class = g_type_class_peek_parent (klass);
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
G_OBJECT_CLASS (klass)->finalize = you_tube_service_finalize;
-#line 727 "YouTubePublishing.c"
+#line 840 "YouTubePublishing.c"
}
-static void you_tube_service_spit_pluggable_interface_init (SpitPluggableIface * iface) {
+static void
+you_tube_service_spit_pluggable_interface_init (SpitPluggableIface * iface)
+{
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
you_tube_service_spit_pluggable_parent_iface = g_type_interface_peek_parent (iface);
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -740,36 +855,44 @@ static void you_tube_service_spit_pluggable_interface_init (SpitPluggableIface *
iface->get_info = (void (*) (SpitPluggable *, SpitPluggableInfo*)) you_tube_service_real_get_info;
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
iface->activation = (void (*) (SpitPluggable *, gboolean)) you_tube_service_real_activation;
-#line 744 "YouTubePublishing.c"
+#line 859 "YouTubePublishing.c"
}
-static void you_tube_service_spit_publishing_service_interface_init (SpitPublishingServiceIface * iface) {
+static void
+you_tube_service_spit_publishing_service_interface_init (SpitPublishingServiceIface * iface)
+{
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
you_tube_service_spit_publishing_service_parent_iface = g_type_interface_peek_parent (iface);
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
iface->create_publisher = (SpitPublishingPublisher* (*) (SpitPublishingService *, SpitPublishingPluginHost*)) you_tube_service_real_create_publisher;
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
iface->get_supported_media = (SpitPublishingPublisherMediaType (*) (SpitPublishingService *)) you_tube_service_real_get_supported_media;
-#line 755 "YouTubePublishing.c"
+#line 872 "YouTubePublishing.c"
}
-static void you_tube_service_instance_init (YouTubeService * self) {
+static void
+you_tube_service_instance_init (YouTubeService * self)
+{
}
-static void you_tube_service_finalize (GObject * obj) {
+static void
+you_tube_service_finalize (GObject * obj)
+{
YouTubeService * self;
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_YOU_TUBE_SERVICE, YouTubeService);
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
G_OBJECT_CLASS (you_tube_service_parent_class)->finalize (obj);
-#line 769 "YouTubePublishing.c"
+#line 890 "YouTubePublishing.c"
}
-GType you_tube_service_get_type (void) {
+GType
+you_tube_service_get_type (void)
+{
static volatile gsize you_tube_service_type_id__volatile = 0;
if (g_once_init_enter (&you_tube_service_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (YouTubeServiceClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) you_tube_service_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (YouTubeService), 0, (GInstanceInitFunc) you_tube_service_instance_init, NULL };
@@ -785,7 +908,9 @@ GType you_tube_service_get_type (void) {
}
-GType publishing_you_tube_privacy_setting_get_type (void) {
+GType
+publishing_you_tube_privacy_setting_get_type (void)
+{
static volatile gsize publishing_you_tube_privacy_setting_type_id__volatile = 0;
if (g_once_init_enter (&publishing_you_tube_privacy_setting_type_id__volatile)) {
static const GEnumValue values[] = {{PUBLISHING_YOU_TUBE_PRIVACY_SETTING_PUBLIC, "PUBLISHING_YOU_TUBE_PRIVACY_SETTING_PUBLIC", "public"}, {PUBLISHING_YOU_TUBE_PRIVACY_SETTING_UNLISTED, "PUBLISHING_YOU_TUBE_PRIVACY_SETTING_UNLISTED", "unlisted"}, {PUBLISHING_YOU_TUBE_PRIVACY_SETTING_PRIVATE, "PUBLISHING_YOU_TUBE_PRIVACY_SETTING_PRIVATE", "private"}, {0, NULL, NULL}};
@@ -797,7 +922,9 @@ GType publishing_you_tube_privacy_setting_get_type (void) {
}
-PublishingYouTubePublishingParameters* publishing_you_tube_publishing_parameters_construct (GType object_type) {
+PublishingYouTubePublishingParameters*
+publishing_you_tube_publishing_parameters_construct (GType object_type)
+{
PublishingYouTubePublishingParameters* self = NULL;
#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
self = (PublishingYouTubePublishingParameters*) g_type_create_instance (object_type);
@@ -809,18 +936,22 @@ PublishingYouTubePublishingParameters* publishing_you_tube_publishing_parameters
self->priv->user_name = NULL;
#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return self;
-#line 813 "YouTubePublishing.c"
+#line 940 "YouTubePublishing.c"
}
-PublishingYouTubePublishingParameters* publishing_you_tube_publishing_parameters_new (void) {
+PublishingYouTubePublishingParameters*
+publishing_you_tube_publishing_parameters_new (void)
+{
#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return publishing_you_tube_publishing_parameters_construct (PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_PARAMETERS);
-#line 820 "YouTubePublishing.c"
+#line 949 "YouTubePublishing.c"
}
-PublishingYouTubePrivacySetting publishing_you_tube_publishing_parameters_get_privacy (PublishingYouTubePublishingParameters* self) {
+PublishingYouTubePrivacySetting
+publishing_you_tube_publishing_parameters_get_privacy (PublishingYouTubePublishingParameters* self)
+{
PublishingYouTubePrivacySetting result = 0;
PublishingYouTubePrivacySetting _tmp0_;
#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -831,23 +962,25 @@ PublishingYouTubePrivacySetting publishing_you_tube_publishing_parameters_get_pr
result = _tmp0_;
#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return result;
-#line 835 "YouTubePublishing.c"
+#line 966 "YouTubePublishing.c"
}
-void publishing_you_tube_publishing_parameters_set_privacy (PublishingYouTubePublishingParameters* self, PublishingYouTubePrivacySetting privacy) {
- PublishingYouTubePrivacySetting _tmp0_;
+void
+publishing_you_tube_publishing_parameters_set_privacy (PublishingYouTubePublishingParameters* self,
+ PublishingYouTubePrivacySetting privacy)
+{
#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
g_return_if_fail (PUBLISHING_YOU_TUBE_IS_PUBLISHING_PARAMETERS (self));
#line 80 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp0_ = privacy;
-#line 80 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- self->priv->privacy = _tmp0_;
-#line 847 "YouTubePublishing.c"
+ self->priv->privacy = privacy;
+#line 978 "YouTubePublishing.c"
}
-gchar* publishing_you_tube_publishing_parameters_get_user_name (PublishingYouTubePublishingParameters* self) {
+gchar*
+publishing_you_tube_publishing_parameters_get_user_name (PublishingYouTubePublishingParameters* self)
+{
gchar* result = NULL;
const gchar* _tmp0_;
gchar* _tmp1_;
@@ -861,125 +994,150 @@ gchar* publishing_you_tube_publishing_parameters_get_user_name (PublishingYouTub
result = _tmp1_;
#line 84 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return result;
-#line 865 "YouTubePublishing.c"
+#line 998 "YouTubePublishing.c"
}
-void publishing_you_tube_publishing_parameters_set_user_name (PublishingYouTubePublishingParameters* self, const gchar* user_name) {
- const gchar* _tmp0_;
- gchar* _tmp1_;
+void
+publishing_you_tube_publishing_parameters_set_user_name (PublishingYouTubePublishingParameters* self,
+ const gchar* user_name)
+{
+ gchar* _tmp0_;
#line 87 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
g_return_if_fail (PUBLISHING_YOU_TUBE_IS_PUBLISHING_PARAMETERS (self));
#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp0_ = user_name;
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp1_ = g_strdup (_tmp0_);
+ _tmp0_ = g_strdup (user_name);
#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_g_free0 (self->priv->user_name);
#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- self->priv->user_name = _tmp1_;
-#line 882 "YouTubePublishing.c"
+ self->priv->user_name = _tmp0_;
+#line 1015 "YouTubePublishing.c"
}
-static void publishing_you_tube_value_publishing_parameters_init (GValue* value) {
+static void
+publishing_you_tube_value_publishing_parameters_init (GValue* value)
+{
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
value->data[0].v_pointer = NULL;
-#line 889 "YouTubePublishing.c"
+#line 1024 "YouTubePublishing.c"
}
-static void publishing_you_tube_value_publishing_parameters_free_value (GValue* value) {
+static void
+publishing_you_tube_value_publishing_parameters_free_value (GValue* value)
+{
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
if (value->data[0].v_pointer) {
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
publishing_you_tube_publishing_parameters_unref (value->data[0].v_pointer);
-#line 898 "YouTubePublishing.c"
+#line 1035 "YouTubePublishing.c"
}
}
-static void publishing_you_tube_value_publishing_parameters_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+publishing_you_tube_value_publishing_parameters_copy_value (const GValue* src_value,
+ GValue* dest_value)
+{
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
if (src_value->data[0].v_pointer) {
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
dest_value->data[0].v_pointer = publishing_you_tube_publishing_parameters_ref (src_value->data[0].v_pointer);
-#line 908 "YouTubePublishing.c"
+#line 1048 "YouTubePublishing.c"
} else {
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
dest_value->data[0].v_pointer = NULL;
-#line 912 "YouTubePublishing.c"
+#line 1052 "YouTubePublishing.c"
}
}
-static gpointer publishing_you_tube_value_publishing_parameters_peek_pointer (const GValue* value) {
+static gpointer
+publishing_you_tube_value_publishing_parameters_peek_pointer (const GValue* value)
+{
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return value->data[0].v_pointer;
-#line 920 "YouTubePublishing.c"
+#line 1062 "YouTubePublishing.c"
}
-static gchar* publishing_you_tube_value_publishing_parameters_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_you_tube_value_publishing_parameters_collect_value (GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
if (collect_values[0].v_pointer) {
-#line 927 "YouTubePublishing.c"
+#line 1074 "YouTubePublishing.c"
PublishingYouTubePublishingParameters * object;
object = collect_values[0].v_pointer;
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
if (object->parent_instance.g_class == NULL) {
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 934 "YouTubePublishing.c"
+#line 1081 "YouTubePublishing.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 938 "YouTubePublishing.c"
+#line 1085 "YouTubePublishing.c"
}
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
value->data[0].v_pointer = publishing_you_tube_publishing_parameters_ref (object);
-#line 942 "YouTubePublishing.c"
+#line 1089 "YouTubePublishing.c"
} else {
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
value->data[0].v_pointer = NULL;
-#line 946 "YouTubePublishing.c"
+#line 1093 "YouTubePublishing.c"
}
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return NULL;
-#line 950 "YouTubePublishing.c"
+#line 1097 "YouTubePublishing.c"
}
-static gchar* publishing_you_tube_value_publishing_parameters_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_you_tube_value_publishing_parameters_lcopy_value (const GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
PublishingYouTubePublishingParameters ** object_p;
object_p = collect_values[0].v_pointer;
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
if (!object_p) {
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 961 "YouTubePublishing.c"
+#line 1113 "YouTubePublishing.c"
}
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
if (!value->data[0].v_pointer) {
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
*object_p = NULL;
-#line 967 "YouTubePublishing.c"
+#line 1119 "YouTubePublishing.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
*object_p = value->data[0].v_pointer;
-#line 971 "YouTubePublishing.c"
+#line 1123 "YouTubePublishing.c"
} else {
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
*object_p = publishing_you_tube_publishing_parameters_ref (value->data[0].v_pointer);
-#line 975 "YouTubePublishing.c"
+#line 1127 "YouTubePublishing.c"
}
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return NULL;
-#line 979 "YouTubePublishing.c"
+#line 1131 "YouTubePublishing.c"
}
-GParamSpec* publishing_you_tube_param_spec_publishing_parameters (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+publishing_you_tube_param_spec_publishing_parameters (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags)
+{
PublishingYouTubeParamSpecPublishingParameters* spec;
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_PARAMETERS), NULL);
@@ -989,20 +1147,25 @@ GParamSpec* publishing_you_tube_param_spec_publishing_parameters (const gchar* n
G_PARAM_SPEC (spec)->value_type = object_type;
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return G_PARAM_SPEC (spec);
-#line 993 "YouTubePublishing.c"
+#line 1151 "YouTubePublishing.c"
}
-gpointer publishing_you_tube_value_get_publishing_parameters (const GValue* value) {
+gpointer
+publishing_you_tube_value_get_publishing_parameters (const GValue* value)
+{
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_PARAMETERS), NULL);
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return value->data[0].v_pointer;
-#line 1002 "YouTubePublishing.c"
+#line 1162 "YouTubePublishing.c"
}
-void publishing_you_tube_value_set_publishing_parameters (GValue* value, gpointer v_object) {
+void
+publishing_you_tube_value_set_publishing_parameters (GValue* value,
+ gpointer v_object)
+{
PublishingYouTubePublishingParameters * old;
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_PARAMETERS));
@@ -1018,22 +1181,25 @@ void publishing_you_tube_value_set_publishing_parameters (GValue* value, gpointe
value->data[0].v_pointer = v_object;
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
publishing_you_tube_publishing_parameters_ref (value->data[0].v_pointer);
-#line 1022 "YouTubePublishing.c"
+#line 1185 "YouTubePublishing.c"
} else {
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
value->data[0].v_pointer = NULL;
-#line 1026 "YouTubePublishing.c"
+#line 1189 "YouTubePublishing.c"
}
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
if (old) {
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
publishing_you_tube_publishing_parameters_unref (old);
-#line 1032 "YouTubePublishing.c"
+#line 1195 "YouTubePublishing.c"
}
}
-void publishing_you_tube_value_take_publishing_parameters (GValue* value, gpointer v_object) {
+void
+publishing_you_tube_value_take_publishing_parameters (GValue* value,
+ gpointer v_object)
+{
PublishingYouTubePublishingParameters * old;
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_PARAMETERS));
@@ -1047,42 +1213,48 @@ void publishing_you_tube_value_take_publishing_parameters (GValue* value, gpoint
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
value->data[0].v_pointer = v_object;
-#line 1051 "YouTubePublishing.c"
+#line 1217 "YouTubePublishing.c"
} else {
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
value->data[0].v_pointer = NULL;
-#line 1055 "YouTubePublishing.c"
+#line 1221 "YouTubePublishing.c"
}
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
if (old) {
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
publishing_you_tube_publishing_parameters_unref (old);
-#line 1061 "YouTubePublishing.c"
+#line 1227 "YouTubePublishing.c"
}
}
-static void publishing_you_tube_publishing_parameters_class_init (PublishingYouTubePublishingParametersClass * klass) {
+static void
+publishing_you_tube_publishing_parameters_class_init (PublishingYouTubePublishingParametersClass * klass)
+{
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
publishing_you_tube_publishing_parameters_parent_class = g_type_class_peek_parent (klass);
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
((PublishingYouTubePublishingParametersClass *) klass)->finalize = publishing_you_tube_publishing_parameters_finalize;
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
g_type_class_add_private (klass, sizeof (PublishingYouTubePublishingParametersPrivate));
-#line 1073 "YouTubePublishing.c"
+#line 1241 "YouTubePublishing.c"
}
-static void publishing_you_tube_publishing_parameters_instance_init (PublishingYouTubePublishingParameters * self) {
+static void
+publishing_you_tube_publishing_parameters_instance_init (PublishingYouTubePublishingParameters * self)
+{
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
self->priv = PUBLISHING_YOU_TUBE_PUBLISHING_PARAMETERS_GET_PRIVATE (self);
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
self->ref_count = 1;
-#line 1082 "YouTubePublishing.c"
+#line 1252 "YouTubePublishing.c"
}
-static void publishing_you_tube_publishing_parameters_finalize (PublishingYouTubePublishingParameters * obj) {
+static void
+publishing_you_tube_publishing_parameters_finalize (PublishingYouTubePublishingParameters * obj)
+{
PublishingYouTubePublishingParameters * self;
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_PARAMETERS, PublishingYouTubePublishingParameters);
@@ -1090,11 +1262,13 @@ static void publishing_you_tube_publishing_parameters_finalize (PublishingYouTub
g_signal_handlers_destroy (self);
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_g_free0 (self->priv->user_name);
-#line 1094 "YouTubePublishing.c"
+#line 1266 "YouTubePublishing.c"
}
-GType publishing_you_tube_publishing_parameters_get_type (void) {
+GType
+publishing_you_tube_publishing_parameters_get_type (void)
+{
static volatile gsize publishing_you_tube_publishing_parameters_type_id__volatile = 0;
if (g_once_init_enter (&publishing_you_tube_publishing_parameters_type_id__volatile)) {
static const GTypeValueTable g_define_type_value_table = { publishing_you_tube_value_publishing_parameters_init, publishing_you_tube_value_publishing_parameters_free_value, publishing_you_tube_value_publishing_parameters_copy_value, publishing_you_tube_value_publishing_parameters_peek_pointer, "p", publishing_you_tube_value_publishing_parameters_collect_value, "p", publishing_you_tube_value_publishing_parameters_lcopy_value };
@@ -1108,18 +1282,22 @@ GType publishing_you_tube_publishing_parameters_get_type (void) {
}
-gpointer publishing_you_tube_publishing_parameters_ref (gpointer instance) {
+gpointer
+publishing_you_tube_publishing_parameters_ref (gpointer instance)
+{
PublishingYouTubePublishingParameters * self;
self = instance;
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
g_atomic_int_inc (&self->ref_count);
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return instance;
-#line 1119 "YouTubePublishing.c"
+#line 1295 "YouTubePublishing.c"
}
-void publishing_you_tube_publishing_parameters_unref (gpointer instance) {
+void
+publishing_you_tube_publishing_parameters_unref (gpointer instance)
+{
PublishingYouTubePublishingParameters * self;
self = instance;
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -1128,24 +1306,28 @@ void publishing_you_tube_publishing_parameters_unref (gpointer instance) {
PUBLISHING_YOU_TUBE_PUBLISHING_PARAMETERS_GET_CLASS (self)->finalize (self);
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 1132 "YouTubePublishing.c"
+#line 1310 "YouTubePublishing.c"
}
}
-static gpointer _publishing_rest_support_session_ref0 (gpointer self) {
+static gpointer
+_publishing_rest_support_session_ref0 (gpointer self)
+{
#line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return self ? publishing_rest_support_session_ref (self) : NULL;
-#line 1140 "YouTubePublishing.c"
+#line 1320 "YouTubePublishing.c"
}
-PublishingYouTubeYouTubeAuthorizer* publishing_you_tube_you_tube_authorizer_construct (GType object_type, PublishingRESTSupportGoogleSession* session, SpitPublishingAuthenticator* authenticator) {
+PublishingYouTubeYouTubeAuthorizer*
+publishing_you_tube_you_tube_authorizer_construct (GType object_type,
+ PublishingRESTSupportGoogleSession* session,
+ SpitPublishingAuthenticator* authenticator)
+{
PublishingYouTubeYouTubeAuthorizer * self = NULL;
PublishingRESTSupportGoogleSession* _tmp0_;
- PublishingRESTSupportGoogleSession* _tmp1_;
- SpitPublishingAuthenticator* _tmp2_;
- SpitPublishingAuthenticator* _tmp3_;
+ SpitPublishingAuthenticator* _tmp1_;
#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (session), NULL);
#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -1153,35 +1335,37 @@ PublishingYouTubeYouTubeAuthorizer* publishing_you_tube_you_tube_authorizer_cons
#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
self = (PublishingYouTubeYouTubeAuthorizer*) g_object_new (object_type, NULL);
#line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp0_ = session;
-#line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp1_ = _publishing_rest_support_session_ref0 (_tmp0_);
+ _tmp0_ = _publishing_rest_support_session_ref0 (session);
#line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_publishing_rest_support_session_unref0 (self->priv->session);
#line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- self->priv->session = _tmp1_;
-#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp2_ = authenticator;
+ self->priv->session = _tmp0_;
#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp3_ = _g_object_ref0 (_tmp2_);
+ _tmp1_ = _g_object_ref0 (authenticator);
#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_g_object_unref0 (self->priv->authenticator);
#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- self->priv->authenticator = _tmp3_;
+ self->priv->authenticator = _tmp1_;
#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return self;
-#line 1174 "YouTubePublishing.c"
+#line 1352 "YouTubePublishing.c"
}
-PublishingYouTubeYouTubeAuthorizer* publishing_you_tube_you_tube_authorizer_new (PublishingRESTSupportGoogleSession* session, SpitPublishingAuthenticator* authenticator) {
+PublishingYouTubeYouTubeAuthorizer*
+publishing_you_tube_you_tube_authorizer_new (PublishingRESTSupportGoogleSession* session,
+ SpitPublishingAuthenticator* authenticator)
+{
#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return publishing_you_tube_you_tube_authorizer_construct (PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_AUTHORIZER, session, authenticator);
-#line 1181 "YouTubePublishing.c"
+#line 1362 "YouTubePublishing.c"
}
-static gboolean publishing_you_tube_you_tube_authorizer_real_is_authorized_for_domain (GDataAuthorizer* base, GDataAuthorizationDomain* domain) {
+static gboolean
+publishing_you_tube_you_tube_authorizer_real_is_authorized_for_domain (GDataAuthorizer* base,
+ GDataAuthorizationDomain* domain)
+{
PublishingYouTubeYouTubeAuthorizer * self;
gboolean result = FALSE;
#line 101 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -1192,22 +1376,24 @@ static gboolean publishing_you_tube_you_tube_authorizer_real_is_authorized_for_d
result = TRUE;
#line 102 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return result;
-#line 1196 "YouTubePublishing.c"
+#line 1380 "YouTubePublishing.c"
}
-static void publishing_you_tube_you_tube_authorizer_real_process_request (GDataAuthorizer* base, GDataAuthorizationDomain* domain, SoupMessage* message) {
+static void
+publishing_you_tube_you_tube_authorizer_real_process_request (GDataAuthorizer* base,
+ GDataAuthorizationDomain* domain,
+ SoupMessage* message)
+{
PublishingYouTubeYouTubeAuthorizer * self;
- GDataAuthorizationDomain* _tmp0_;
gchar* header = NULL;
- PublishingRESTSupportGoogleSession* _tmp1_;
+ PublishingRESTSupportGoogleSession* _tmp0_;
+ gchar* _tmp1_;
gchar* _tmp2_;
gchar* _tmp3_;
gchar* _tmp4_;
- gchar* _tmp5_;
- SoupMessage* _tmp6_;
- SoupMessageHeaders* _tmp7_;
- const gchar* _tmp8_;
+ SoupMessageHeaders* _tmp5_;
+ const gchar* _tmp6_;
#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_AUTHORIZER, PublishingYouTubeYouTubeAuthorizer);
#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -1215,42 +1401,42 @@ static void publishing_you_tube_you_tube_authorizer_real_process_request (GDataA
#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
g_return_if_fail (SOUP_IS_MESSAGE (message));
#line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp0_ = domain;
-#line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- if (_tmp0_ == NULL) {
+ if (domain == NULL) {
#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return;
-#line 1224 "YouTubePublishing.c"
+#line 1408 "YouTubePublishing.c"
}
#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp1_ = self->priv->session;
+ _tmp0_ = self->priv->session;
#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp2_ = publishing_rest_support_google_session_get_access_token (_tmp1_);
+ _tmp1_ = publishing_rest_support_google_session_get_access_token (_tmp0_);
#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp3_ = _tmp2_;
+ _tmp2_ = _tmp1_;
#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp4_ = g_strdup_printf ("Bearer %s", _tmp3_);
+ _tmp3_ = g_strdup_printf ("Bearer %s", _tmp2_);
#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp5_ = _tmp4_;
+ _tmp4_ = _tmp3_;
#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _g_free0 (_tmp3_);
+ _g_free0 (_tmp2_);
#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- header = _tmp5_;
+ header = _tmp4_;
#line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp6_ = message;
+ _tmp5_ = message->request_headers;
#line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp7_ = _tmp6_->request_headers;
+ _tmp6_ = header;
#line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp8_ = header;
-#line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- soup_message_headers_replace (_tmp7_, "Authorization", _tmp8_);
+ soup_message_headers_replace (_tmp5_, "Authorization", _tmp6_);
#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_g_free0 (header);
-#line 1250 "YouTubePublishing.c"
+#line 1432 "YouTubePublishing.c"
}
-static gboolean publishing_you_tube_you_tube_authorizer_real_refresh_authorization (GDataAuthorizer* base, GCancellable* cancellable, GError** error) {
+static gboolean
+publishing_you_tube_you_tube_authorizer_real_refresh_authorization (GDataAuthorizer* base,
+ GCancellable* cancellable,
+ GError** error)
+{
PublishingYouTubeYouTubeAuthorizer * self;
gboolean result = FALSE;
SpitPublishingAuthenticator* _tmp0_;
@@ -1266,22 +1452,26 @@ static gboolean publishing_you_tube_you_tube_authorizer_real_refresh_authorizati
result = TRUE;
#line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return result;
-#line 1270 "YouTubePublishing.c"
+#line 1456 "YouTubePublishing.c"
}
-static void publishing_you_tube_you_tube_authorizer_class_init (PublishingYouTubeYouTubeAuthorizerClass * klass) {
+static void
+publishing_you_tube_you_tube_authorizer_class_init (PublishingYouTubeYouTubeAuthorizerClass * klass)
+{
#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
publishing_you_tube_you_tube_authorizer_parent_class = g_type_class_peek_parent (klass);
#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
g_type_class_add_private (klass, sizeof (PublishingYouTubeYouTubeAuthorizerPrivate));
#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
G_OBJECT_CLASS (klass)->finalize = publishing_you_tube_you_tube_authorizer_finalize;
-#line 1281 "YouTubePublishing.c"
+#line 1469 "YouTubePublishing.c"
}
-static void publishing_you_tube_you_tube_authorizer_gdata_authorizer_interface_init (GDataAuthorizerInterface * iface) {
+static void
+publishing_you_tube_you_tube_authorizer_gdata_authorizer_interface_init (GDataAuthorizerInterface * iface)
+{
#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
publishing_you_tube_you_tube_authorizer_gdata_authorizer_parent_iface = g_type_interface_peek_parent (iface);
#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -1290,18 +1480,22 @@ static void publishing_you_tube_you_tube_authorizer_gdata_authorizer_interface_i
iface->process_request = (void (*) (GDataAuthorizer *, GDataAuthorizationDomain*, SoupMessage*)) publishing_you_tube_you_tube_authorizer_real_process_request;
#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
iface->refresh_authorization = (gboolean (*) (GDataAuthorizer *, GCancellable*, GError**)) publishing_you_tube_you_tube_authorizer_real_refresh_authorization;
-#line 1294 "YouTubePublishing.c"
+#line 1484 "YouTubePublishing.c"
}
-static void publishing_you_tube_you_tube_authorizer_instance_init (PublishingYouTubeYouTubeAuthorizer * self) {
+static void
+publishing_you_tube_you_tube_authorizer_instance_init (PublishingYouTubeYouTubeAuthorizer * self)
+{
#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
self->priv = PUBLISHING_YOU_TUBE_YOU_TUBE_AUTHORIZER_GET_PRIVATE (self);
-#line 1301 "YouTubePublishing.c"
+#line 1493 "YouTubePublishing.c"
}
-static void publishing_you_tube_you_tube_authorizer_finalize (GObject * obj) {
+static void
+publishing_you_tube_you_tube_authorizer_finalize (GObject * obj)
+{
PublishingYouTubeYouTubeAuthorizer * self;
#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_AUTHORIZER, PublishingYouTubeYouTubeAuthorizer);
@@ -1311,11 +1505,13 @@ static void publishing_you_tube_you_tube_authorizer_finalize (GObject * obj) {
_g_object_unref0 (self->priv->authenticator);
#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
G_OBJECT_CLASS (publishing_you_tube_you_tube_authorizer_parent_class)->finalize (obj);
-#line 1315 "YouTubePublishing.c"
+#line 1509 "YouTubePublishing.c"
}
-GType publishing_you_tube_you_tube_authorizer_get_type (void) {
+GType
+publishing_you_tube_you_tube_authorizer_get_type (void)
+{
static volatile gsize publishing_you_tube_you_tube_authorizer_type_id__volatile = 0;
if (g_once_init_enter (&publishing_you_tube_you_tube_authorizer_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingYouTubeYouTubeAuthorizerClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_you_tube_you_tube_authorizer_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingYouTubeYouTubeAuthorizer), 0, (GInstanceInitFunc) publishing_you_tube_you_tube_authorizer_instance_init, NULL };
@@ -1329,29 +1525,27 @@ GType publishing_you_tube_you_tube_authorizer_get_type (void) {
}
-PublishingYouTubeYouTubePublisher* publishing_you_tube_you_tube_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host) {
+PublishingYouTubeYouTubePublisher*
+publishing_you_tube_you_tube_publisher_construct (GType object_type,
+ SpitPublishingService* service,
+ SpitPublishingPluginHost* host)
+{
PublishingYouTubeYouTubePublisher * self = NULL;
- SpitPublishingService* _tmp0_;
- SpitPublishingPluginHost* _tmp1_;
- PublishingYouTubePublishingParameters* _tmp2_;
+ PublishingYouTubePublishingParameters* _tmp0_;
#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
g_return_val_if_fail (SPIT_PUBLISHING_IS_SERVICE (service), NULL);
#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL);
#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp0_ = service;
-#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp1_ = host;
-#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- self = (PublishingYouTubeYouTubePublisher*) publishing_rest_support_google_publisher_construct (object_type, _tmp0_, _tmp1_, "https://gdata.youtube.com/");
+ self = (PublishingYouTubeYouTubePublisher*) publishing_rest_support_google_publisher_construct (object_type, service, host, "https://gdata.youtube.com/");
#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
self->priv->running = FALSE;
#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp2_ = publishing_you_tube_publishing_parameters_new ();
+ _tmp0_ = publishing_you_tube_publishing_parameters_new ();
#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_publishing_you_tube_publishing_parameters_unref0 (self->priv->publishing_parameters);
#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- self->priv->publishing_parameters = _tmp2_;
+ self->priv->publishing_parameters = _tmp0_;
#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
(self->priv->progress_reporter_target_destroy_notify == NULL) ? NULL : (self->priv->progress_reporter_target_destroy_notify (self->priv->progress_reporter_target), NULL);
#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -1368,18 +1562,23 @@ PublishingYouTubeYouTubePublisher* publishing_you_tube_you_tube_publisher_constr
self->priv->progress_reporter_target_destroy_notify = NULL;
#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return self;
-#line 1372 "YouTubePublishing.c"
+#line 1566 "YouTubePublishing.c"
}
-PublishingYouTubeYouTubePublisher* publishing_you_tube_you_tube_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host) {
+PublishingYouTubeYouTubePublisher*
+publishing_you_tube_you_tube_publisher_new (SpitPublishingService* service,
+ SpitPublishingPluginHost* host)
+{
#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return publishing_you_tube_you_tube_publisher_construct (PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_PUBLISHER, service, host);
-#line 1379 "YouTubePublishing.c"
+#line 1576 "YouTubePublishing.c"
}
-static gboolean publishing_you_tube_you_tube_publisher_real_is_running (PublishingRESTSupportGooglePublisher* base) {
+static gboolean
+publishing_you_tube_you_tube_publisher_real_is_running (PublishingRESTSupportGooglePublisher* base)
+{
PublishingYouTubeYouTubePublisher * self;
gboolean result = FALSE;
gboolean _tmp0_;
@@ -1391,37 +1590,38 @@ static gboolean publishing_you_tube_you_tube_publisher_real_is_running (Publishi
result = _tmp0_;
#line 137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return result;
-#line 1395 "YouTubePublishing.c"
+#line 1594 "YouTubePublishing.c"
}
-static void publishing_you_tube_you_tube_publisher_real_start (PublishingRESTSupportGooglePublisher* base) {
+static void
+publishing_you_tube_you_tube_publisher_real_start (PublishingRESTSupportGooglePublisher* base)
+{
PublishingYouTubeYouTubePublisher * self;
- gboolean _tmp0_;
- SpitPublishingAuthenticator* _tmp1_;
+ SpitPublishingAuthenticator* _tmp0_;
#line 140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_PUBLISHER, PublishingYouTubeYouTubePublisher);
#line 141 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
g_debug ("YouTubePublishing.vala:141: YouTubePublisher: started.");
#line 143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp0_ = publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- if (_tmp0_) {
+ if (publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher))) {
#line 144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return;
-#line 1413 "YouTubePublishing.c"
+#line 1611 "YouTubePublishing.c"
}
#line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
self->priv->running = TRUE;
#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp1_ = self->priv->authenticator;
+ _tmp0_ = self->priv->authenticator;
#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- spit_publishing_authenticator_authenticate (_tmp1_);
-#line 1421 "YouTubePublishing.c"
+ spit_publishing_authenticator_authenticate (_tmp0_);
+#line 1619 "YouTubePublishing.c"
}
-static void publishing_you_tube_you_tube_publisher_real_stop (PublishingRESTSupportGooglePublisher* base) {
+static void
+publishing_you_tube_you_tube_publisher_real_stop (PublishingRESTSupportGooglePublisher* base)
+{
PublishingYouTubeYouTubePublisher * self;
PublishingRESTSupportGoogleSession* _tmp0_;
PublishingRESTSupportGoogleSession* _tmp1_;
@@ -1439,11 +1639,13 @@ static void publishing_you_tube_you_tube_publisher_real_stop (PublishingRESTSupp
publishing_rest_support_session_stop_transactions (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
#line 156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_publishing_rest_support_session_unref0 (_tmp1_);
-#line 1443 "YouTubePublishing.c"
+#line 1643 "YouTubePublishing.c"
}
-static void publishing_you_tube_you_tube_publisher_real_on_login_flow_complete (PublishingRESTSupportGooglePublisher* base) {
+static void
+publishing_you_tube_you_tube_publisher_real_on_login_flow_complete (PublishingRESTSupportGooglePublisher* base)
+{
PublishingYouTubeYouTubePublisher * self;
PublishingYouTubePublishingParameters* _tmp0_;
PublishingRESTSupportGoogleSession* _tmp1_;
@@ -1498,218 +1700,205 @@ static void publishing_you_tube_you_tube_publisher_real_on_login_flow_complete (
_publishing_rest_support_session_unref0 (_tmp6_);
#line 166 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
publishing_you_tube_you_tube_publisher_do_show_publishing_options_pane (self);
-#line 1502 "YouTubePublishing.c"
+#line 1704 "YouTubePublishing.c"
}
-static void publishing_you_tube_you_tube_publisher_on_publishing_options_logout (PublishingYouTubeYouTubePublisher* self) {
- gboolean _tmp0_;
+static void
+publishing_you_tube_you_tube_publisher_on_publishing_options_logout (PublishingYouTubeYouTubePublisher* self)
+{
#line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
g_return_if_fail (PUBLISHING_YOU_TUBE_IS_YOU_TUBE_PUBLISHER (self));
#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
g_debug ("YouTubePublishing.vala:170: EVENT: user clicked 'Logout' in the publis" \
"hing options pane.");
#line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp0_ = publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- if (!_tmp0_) {
+ if (!publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher))) {
#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return;
-#line 1518 "YouTubePublishing.c"
+#line 1719 "YouTubePublishing.c"
}
#line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
publishing_rest_support_google_publisher_do_logout (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 1522 "YouTubePublishing.c"
+#line 1723 "YouTubePublishing.c"
}
-static void publishing_you_tube_you_tube_publisher_on_publishing_options_publish (PublishingYouTubeYouTubePublisher* self) {
- gboolean _tmp0_;
+static void
+publishing_you_tube_you_tube_publisher_on_publishing_options_publish (PublishingYouTubeYouTubePublisher* self)
+{
#line 178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
g_return_if_fail (PUBLISHING_YOU_TUBE_IS_YOU_TUBE_PUBLISHER (self));
#line 179 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
g_debug ("YouTubePublishing.vala:179: EVENT: user clicked 'Publish' in the publi" \
"shing options pane.");
#line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp0_ = publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- if (!_tmp0_) {
+ if (!publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher))) {
#line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return;
-#line 1538 "YouTubePublishing.c"
+#line 1738 "YouTubePublishing.c"
}
#line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
publishing_you_tube_you_tube_publisher_do_upload (self);
-#line 1542 "YouTubePublishing.c"
+#line 1742 "YouTubePublishing.c"
}
-static void publishing_you_tube_you_tube_publisher_on_upload_status_updated (PublishingYouTubeYouTubePublisher* self, gint file_number, gdouble completed_fraction) {
- gdouble _tmp0_;
+static void
+publishing_you_tube_you_tube_publisher_on_upload_status_updated (PublishingYouTubeYouTubePublisher* self,
+ gint file_number,
+ gdouble completed_fraction)
+{
+ SpitPublishingProgressCallback _tmp0_;
+ void* _tmp0__target;
SpitPublishingProgressCallback _tmp1_;
void* _tmp1__target;
- gboolean _tmp2_;
- SpitPublishingProgressCallback _tmp3_;
- void* _tmp3__target;
- gint _tmp4_;
- gdouble _tmp5_;
#line 187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
g_return_if_fail (PUBLISHING_YOU_TUBE_IS_YOU_TUBE_PUBLISHER (self));
#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp0_ = completed_fraction;
-#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
g_debug ("YouTubePublishing.vala:188: EVENT: uploader reports upload %.2f percen" \
-"t complete.", 100.0 * _tmp0_);
+"t complete.", 100.0 * completed_fraction);
#line 190 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp1_ = self->priv->progress_reporter;
+ _tmp0_ = self->priv->progress_reporter;
#line 190 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp1__target = self->priv->progress_reporter_target;
+ _tmp0__target = self->priv->progress_reporter_target;
#line 190 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _vala_assert (_tmp1_ != NULL, "progress_reporter != null");
-#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp2_ = publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
+ _vala_assert (_tmp0_ != NULL, "progress_reporter != null");
#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- if (!_tmp2_) {
+ if (!publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher))) {
#line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return;
-#line 1573 "YouTubePublishing.c"
+#line 1769 "YouTubePublishing.c"
}
#line 195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp3_ = self->priv->progress_reporter;
-#line 195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp3__target = self->priv->progress_reporter_target;
-#line 195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp4_ = file_number;
+ _tmp1_ = self->priv->progress_reporter;
#line 195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp5_ = completed_fraction;
+ _tmp1__target = self->priv->progress_reporter_target;
#line 195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp3_ (_tmp4_, _tmp5_, _tmp3__target);
-#line 1585 "YouTubePublishing.c"
+ _tmp1_ (file_number, completed_fraction, _tmp1__target);
+#line 1777 "YouTubePublishing.c"
}
-static void _publishing_you_tube_you_tube_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender, gint num_photos_published, gpointer self) {
+static void
+_publishing_you_tube_you_tube_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender,
+ gint num_photos_published,
+ gpointer self)
+{
#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
publishing_you_tube_you_tube_publisher_on_upload_complete ((PublishingYouTubeYouTubePublisher*) self, _sender, num_photos_published);
-#line 1592 "YouTubePublishing.c"
+#line 1788 "YouTubePublishing.c"
}
-static void _publishing_you_tube_you_tube_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender, GError* err, gpointer self) {
+static void
+_publishing_you_tube_you_tube_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender,
+ GError* err,
+ gpointer self)
+{
#line 201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
publishing_you_tube_you_tube_publisher_on_upload_error ((PublishingYouTubeYouTubePublisher*) self, _sender, err);
-#line 1599 "YouTubePublishing.c"
+#line 1799 "YouTubePublishing.c"
}
-static void publishing_you_tube_you_tube_publisher_on_upload_complete (PublishingYouTubeYouTubePublisher* self, PublishingRESTSupportBatchUploader* uploader, gint num_published) {
- PublishingRESTSupportBatchUploader* _tmp0_;
+static void
+publishing_you_tube_you_tube_publisher_on_upload_complete (PublishingYouTubeYouTubePublisher* self,
+ PublishingRESTSupportBatchUploader* uploader,
+ gint num_published)
+{
+ guint _tmp0_;
guint _tmp1_;
- PublishingRESTSupportBatchUploader* _tmp2_;
- guint _tmp3_;
- gint _tmp4_;
- gboolean _tmp5_;
#line 198 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
g_return_if_fail (PUBLISHING_YOU_TUBE_IS_YOU_TUBE_PUBLISHER (self));
#line 198 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (uploader));
#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp0_ = uploader;
-#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp1_, NULL, FALSE);
+ g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp0_, NULL, FALSE);
#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_you_tube_you_tube_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self);
-#line 201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp2_ = uploader;
+ g_signal_handlers_disconnect_matched (uploader, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_you_tube_you_tube_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self);
#line 201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp3_, NULL, FALSE);
+ g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp1_, NULL, FALSE);
#line 201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_you_tube_you_tube_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self);
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp4_ = num_published;
+ g_signal_handlers_disconnect_matched (uploader, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_you_tube_you_tube_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self);
#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
g_debug ("YouTubePublishing.vala:203: EVENT: uploader reports upload complete; %" \
-"d items published.", _tmp4_);
-#line 205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp5_ = publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
+"d items published.", num_published);
#line 205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- if (!_tmp5_) {
+ if (!publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher))) {
#line 206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return;
-#line 1636 "YouTubePublishing.c"
+#line 1828 "YouTubePublishing.c"
}
#line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
publishing_you_tube_you_tube_publisher_do_show_success_pane (self);
-#line 1640 "YouTubePublishing.c"
+#line 1832 "YouTubePublishing.c"
}
-static void publishing_you_tube_you_tube_publisher_on_upload_error (PublishingYouTubeYouTubePublisher* self, PublishingRESTSupportBatchUploader* uploader, GError* err) {
- PublishingRESTSupportBatchUploader* _tmp0_;
+static void
+publishing_you_tube_you_tube_publisher_on_upload_error (PublishingYouTubeYouTubePublisher* self,
+ PublishingRESTSupportBatchUploader* uploader,
+ GError* err)
+{
+ guint _tmp0_;
guint _tmp1_;
- PublishingRESTSupportBatchUploader* _tmp2_;
- guint _tmp3_;
- gboolean _tmp4_;
- GError* _tmp5_;
- const gchar* _tmp6_;
- SpitPublishingPluginHost* _tmp7_;
- GError* _tmp8_;
+ const gchar* _tmp2_;
+ SpitPublishingPluginHost* _tmp3_;
#line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
g_return_if_fail (PUBLISHING_YOU_TUBE_IS_YOU_TUBE_PUBLISHER (self));
#line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (uploader));
#line 213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp0_ = uploader;
-#line 213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp1_, NULL, FALSE);
+ g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp0_, NULL, FALSE);
#line 213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_you_tube_you_tube_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self);
+ g_signal_handlers_disconnect_matched (uploader, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_you_tube_you_tube_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self);
#line 214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp2_ = uploader;
+ g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp1_, NULL, FALSE);
#line 214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp3_, NULL, FALSE);
-#line 214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_you_tube_you_tube_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self);
-#line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp4_ = publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
+ g_signal_handlers_disconnect_matched (uploader, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_you_tube_you_tube_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self);
#line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- if (!_tmp4_) {
+ if (!publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher))) {
#line 217 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return;
-#line 1676 "YouTubePublishing.c"
+#line 1861 "YouTubePublishing.c"
}
#line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp5_ = err;
-#line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp6_ = _tmp5_->message;
+ _tmp2_ = err->message;
#line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
g_debug ("YouTubePublishing.vala:219: EVENT: uploader reports upload error = '%s" \
-"'.", _tmp6_);
+"'.", _tmp2_);
#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp7_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
+ _tmp3_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp8_ = err;
-#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- spit_publishing_plugin_host_post_error (_tmp7_, _tmp8_);
-#line 1690 "YouTubePublishing.c"
+ spit_publishing_plugin_host_post_error (_tmp3_, err);
+#line 1871 "YouTubePublishing.c"
}
-static void _publishing_you_tube_you_tube_publisher_on_publishing_options_publish_publishing_you_tube_publishing_options_pane_publish (PublishingYouTubePublishingOptionsPane* _sender, gpointer self) {
+static void
+_publishing_you_tube_you_tube_publisher_on_publishing_options_publish_publishing_you_tube_publishing_options_pane_publish (PublishingYouTubePublishingOptionsPane* _sender,
+ gpointer self)
+{
#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
publishing_you_tube_you_tube_publisher_on_publishing_options_publish ((PublishingYouTubeYouTubePublisher*) self);
-#line 1697 "YouTubePublishing.c"
+#line 1881 "YouTubePublishing.c"
}
-static void _publishing_you_tube_you_tube_publisher_on_publishing_options_logout_publishing_you_tube_publishing_options_pane_logout (PublishingYouTubePublishingOptionsPane* _sender, gpointer self) {
+static void
+_publishing_you_tube_you_tube_publisher_on_publishing_options_logout_publishing_you_tube_publishing_options_pane_logout (PublishingYouTubePublishingOptionsPane* _sender,
+ gpointer self)
+{
#line 242 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
publishing_you_tube_you_tube_publisher_on_publishing_options_logout ((PublishingYouTubeYouTubePublisher*) self);
-#line 1704 "YouTubePublishing.c"
+#line 1891 "YouTubePublishing.c"
}
-static void publishing_you_tube_you_tube_publisher_do_show_publishing_options_pane (PublishingYouTubeYouTubePublisher* self) {
+static void
+publishing_you_tube_you_tube_publisher_do_show_publishing_options_pane (PublishingYouTubeYouTubePublisher* self)
+{
GtkBuilder* builder = NULL;
GtkBuilder* _tmp0_;
PublishingYouTubePublishingOptionsPane* opts_pane = NULL;
@@ -1732,7 +1921,7 @@ static void publishing_you_tube_you_tube_publisher_do_show_publishing_options_pa
_tmp0_ = gtk_builder_new ();
#line 227 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
builder = _tmp0_;
-#line 1731 "YouTubePublishing.c"
+#line 1920 "YouTubePublishing.c"
{
GtkBuilder* _tmp1_;
#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -1741,7 +1930,7 @@ static void publishing_you_tube_you_tube_publisher_do_show_publishing_options_pa
gtk_builder_add_from_resource (_tmp1_, PLUGIN_RESOURCE_PATH "/youtube_publishing_options_pane.ui", &_inner_error_);
#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1740 "YouTubePublishing.c"
+#line 1929 "YouTubePublishing.c"
goto __catch25_g_error;
}
}
@@ -1781,7 +1970,7 @@ static void publishing_you_tube_you_tube_publisher_do_show_publishing_options_pa
_g_object_unref0 (builder);
#line 237 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return;
-#line 1779 "YouTubePublishing.c"
+#line 1968 "YouTubePublishing.c"
}
__finally25:
#line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -1794,7 +1983,7 @@ static void publishing_you_tube_you_tube_publisher_do_show_publishing_options_pa
g_clear_error (&_inner_error_);
#line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return;
-#line 1792 "YouTubePublishing.c"
+#line 1981 "YouTubePublishing.c"
}
#line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_tmp7_ = self->priv->authenticator;
@@ -1830,43 +2019,48 @@ static void publishing_you_tube_you_tube_publisher_do_show_publishing_options_pa
_g_object_unref0 (opts_pane);
#line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_g_object_unref0 (builder);
-#line 1828 "YouTubePublishing.c"
+#line 2017 "YouTubePublishing.c"
}
-static void _publishing_you_tube_you_tube_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self) {
+static void
+_publishing_you_tube_you_tube_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number,
+ gdouble fraction_complete,
+ gpointer self)
+{
#line 269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
publishing_you_tube_you_tube_publisher_on_upload_status_updated ((PublishingYouTubeYouTubePublisher*) self, file_number, fraction_complete);
-#line 1835 "YouTubePublishing.c"
+#line 2028 "YouTubePublishing.c"
}
-static void publishing_you_tube_you_tube_publisher_do_upload (PublishingYouTubeYouTubePublisher* self) {
+static void
+publishing_you_tube_you_tube_publisher_do_upload (PublishingYouTubeYouTubePublisher* self)
+{
SpitPublishingPluginHost* _tmp0_;
SpitPublishingPluginHost* _tmp1_;
SpitPublishingPluginHost* _tmp2_;
void* _tmp3_;
GDestroyNotify _tmp4_;
SpitPublishingProgressCallback _tmp5_;
- gboolean _tmp6_;
SpitPublishingPublishable** publishables = NULL;
- SpitPublishingPluginHost* _tmp7_;
- gint _tmp8_;
- SpitPublishingPublishable** _tmp9_;
+ SpitPublishingPluginHost* _tmp6_;
+ gint _tmp7_;
+ SpitPublishingPublishable** _tmp8_;
gint publishables_length1;
gint _publishables_size_;
PublishingYouTubeUploader* uploader = NULL;
- GDataYouTubeService* _tmp10_;
+ GDataYouTubeService* _tmp9_;
+ PublishingRESTSupportGoogleSession* _tmp10_;
PublishingRESTSupportGoogleSession* _tmp11_;
- PublishingRESTSupportGoogleSession* _tmp12_;
- SpitPublishingPublishable** _tmp13_;
- gint _tmp13__length1;
- PublishingYouTubePublishingParameters* _tmp14_;
+ SpitPublishingPublishable** _tmp12_;
+ gint _tmp12__length1;
+ PublishingYouTubePublishingParameters* _tmp13_;
+ PublishingYouTubeUploader* _tmp14_;
PublishingYouTubeUploader* _tmp15_;
PublishingYouTubeUploader* _tmp16_;
PublishingYouTubeUploader* _tmp17_;
PublishingYouTubeUploader* _tmp18_;
- PublishingYouTubeUploader* _tmp19_;
#line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
g_return_if_fail (PUBLISHING_YOU_TUBE_IS_YOU_TUBE_PUBLISHER (self));
#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -1899,64 +2093,64 @@ static void publishing_you_tube_you_tube_publisher_do_upload (PublishingYouTubeY
#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
self->priv->progress_reporter_target_destroy_notify = _tmp4_;
#line 260 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp6_ = publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 260 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- if (!_tmp6_) {
+ if (!publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher))) {
#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return;
-#line 1901 "YouTubePublishing.c"
+#line 2093 "YouTubePublishing.c"
}
#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp7_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
+ _tmp6_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp9_ = spit_publishing_plugin_host_get_publishables (_tmp7_, &_tmp8_);
+ _tmp8_ = spit_publishing_plugin_host_get_publishables (_tmp6_, &_tmp7_);
#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- publishables = _tmp9_;
+ publishables = _tmp8_;
#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- publishables_length1 = _tmp8_;
+ publishables_length1 = _tmp7_;
#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_publishables_size_ = publishables_length1;
#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp10_ = self->priv->youtube_service;
+ _tmp9_ = self->priv->youtube_service;
#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp11_ = publishing_rest_support_google_publisher_get_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
+ _tmp10_ = publishing_rest_support_google_publisher_get_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp12_ = _tmp11_;
+ _tmp11_ = _tmp10_;
#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp13_ = publishables;
+ _tmp12_ = publishables;
#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp13__length1 = publishables_length1;
+ _tmp12__length1 = publishables_length1;
#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp14_ = self->priv->publishing_parameters;
+ _tmp13_ = self->priv->publishing_parameters;
#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp15_ = publishing_you_tube_uploader_new (_tmp10_, _tmp12_, _tmp13_, _tmp13__length1, _tmp14_);
+ _tmp14_ = publishing_you_tube_uploader_new (_tmp9_, _tmp11_, _tmp12_, _tmp12__length1, _tmp13_);
#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp16_ = _tmp15_;
+ _tmp15_ = _tmp14_;
#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _publishing_rest_support_session_unref0 (_tmp12_);
+ _publishing_rest_support_session_unref0 (_tmp11_);
#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- uploader = _tmp16_;
+ uploader = _tmp15_;
#line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp17_ = uploader;
+ _tmp16_ = uploader;
#line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), "upload-complete", (GCallback) _publishing_you_tube_you_tube_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self, 0);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), "upload-complete", (GCallback) _publishing_you_tube_you_tube_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self, 0);
#line 267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp18_ = uploader;
+ _tmp17_ = uploader;
#line 267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), "upload-error", (GCallback) _publishing_you_tube_you_tube_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self, 0);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), "upload-error", (GCallback) _publishing_you_tube_you_tube_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self, 0);
#line 269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp19_ = uploader;
+ _tmp18_ = uploader;
#line 269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- publishing_rest_support_batch_uploader_upload (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), _publishing_you_tube_you_tube_publisher_on_upload_status_updated_spit_publishing_progress_callback, self);
+ publishing_rest_support_batch_uploader_upload (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), _publishing_you_tube_you_tube_publisher_on_upload_status_updated_spit_publishing_progress_callback, self);
#line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_publishing_rest_support_batch_uploader_unref0 (uploader);
#line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
publishables = (_vala_array_free (publishables, publishables_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 1949 "YouTubePublishing.c"
+#line 2141 "YouTubePublishing.c"
}
-static void publishing_you_tube_you_tube_publisher_do_show_success_pane (PublishingYouTubeYouTubePublisher* self) {
+static void
+publishing_you_tube_you_tube_publisher_do_show_success_pane (PublishingYouTubeYouTubePublisher* self)
+{
SpitPublishingPluginHost* _tmp0_;
SpitPublishingPluginHost* _tmp1_;
#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -1971,14 +2165,15 @@ static void publishing_you_tube_you_tube_publisher_do_show_success_pane (Publish
_tmp1_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
#line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
spit_publishing_plugin_host_install_success_pane (_tmp1_);
-#line 1968 "YouTubePublishing.c"
+#line 2162 "YouTubePublishing.c"
}
-static void publishing_you_tube_you_tube_publisher_real_do_logout (PublishingRESTSupportGooglePublisher* base) {
+static void
+publishing_you_tube_you_tube_publisher_real_do_logout (PublishingRESTSupportGooglePublisher* base)
+{
PublishingYouTubeYouTubePublisher * self;
SpitPublishingAuthenticator* _tmp0_;
- gboolean _tmp1_;
#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_PUBLISHER, PublishingYouTubeYouTubePublisher);
#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -1986,26 +2181,26 @@ static void publishing_you_tube_you_tube_publisher_real_do_logout (PublishingRES
#line 282 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_tmp0_ = self->priv->authenticator;
#line 282 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp1_ = spit_publishing_authenticator_can_logout (_tmp0_);
-#line 282 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- if (_tmp1_) {
-#line 1986 "YouTubePublishing.c"
+ if (spit_publishing_authenticator_can_logout (_tmp0_)) {
+#line 2179 "YouTubePublishing.c"
+ SpitPublishingAuthenticator* _tmp1_;
SpitPublishingAuthenticator* _tmp2_;
- SpitPublishingAuthenticator* _tmp3_;
#line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp2_ = self->priv->authenticator;
+ _tmp1_ = self->priv->authenticator;
#line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- spit_publishing_authenticator_logout (_tmp2_);
+ spit_publishing_authenticator_logout (_tmp1_);
#line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp3_ = self->priv->authenticator;
+ _tmp2_ = self->priv->authenticator;
#line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- spit_publishing_authenticator_authenticate (_tmp3_);
-#line 1997 "YouTubePublishing.c"
+ spit_publishing_authenticator_authenticate (_tmp2_);
+#line 2190 "YouTubePublishing.c"
}
}
-static SpitPublishingAuthenticator* publishing_you_tube_you_tube_publisher_real_get_authenticator (PublishingRESTSupportGooglePublisher* base) {
+static SpitPublishingAuthenticator*
+publishing_you_tube_you_tube_publisher_real_get_authenticator (PublishingRESTSupportGooglePublisher* base)
+{
PublishingYouTubeYouTubePublisher * self;
SpitPublishingAuthenticator* result = NULL;
SpitPublishingAuthenticator* _tmp0_;
@@ -2017,7 +2212,7 @@ static SpitPublishingAuthenticator* publishing_you_tube_you_tube_publisher_real_
_tmp0_ = self->priv->authenticator;
#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
if (_tmp0_ == NULL) {
-#line 2014 "YouTubePublishing.c"
+#line 2209 "YouTubePublishing.c"
PublishingAuthenticatorFactory* _tmp1_;
PublishingAuthenticatorFactory* _tmp2_;
SpitPublishingPluginHost* _tmp3_;
@@ -2036,7 +2231,7 @@ static SpitPublishingAuthenticator* publishing_you_tube_you_tube_publisher_real_
self->priv->authenticator = _tmp4_;
#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_g_object_unref0 (_tmp2_);
-#line 2033 "YouTubePublishing.c"
+#line 2228 "YouTubePublishing.c"
}
#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_tmp5_ = self->priv->authenticator;
@@ -2046,11 +2241,13 @@ static SpitPublishingAuthenticator* publishing_you_tube_you_tube_publisher_real_
result = _tmp6_;
#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return result;
-#line 2043 "YouTubePublishing.c"
+#line 2238 "YouTubePublishing.c"
}
-static void publishing_you_tube_you_tube_publisher_class_init (PublishingYouTubeYouTubePublisherClass * klass) {
+static void
+publishing_you_tube_you_tube_publisher_class_init (PublishingYouTubeYouTubePublisherClass * klass)
+{
#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
publishing_you_tube_you_tube_publisher_parent_class = g_type_class_peek_parent (klass);
#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -2069,18 +2266,22 @@ static void publishing_you_tube_you_tube_publisher_class_init (PublishingYouTube
((PublishingRESTSupportGooglePublisherClass *) klass)->get_authenticator = (SpitPublishingAuthenticator* (*) (PublishingRESTSupportGooglePublisher *)) publishing_you_tube_you_tube_publisher_real_get_authenticator;
#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
G_OBJECT_CLASS (klass)->finalize = publishing_you_tube_you_tube_publisher_finalize;
-#line 2066 "YouTubePublishing.c"
+#line 2263 "YouTubePublishing.c"
}
-static void publishing_you_tube_you_tube_publisher_instance_init (PublishingYouTubeYouTubePublisher * self) {
+static void
+publishing_you_tube_you_tube_publisher_instance_init (PublishingYouTubeYouTubePublisher * self)
+{
#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
self->priv = PUBLISHING_YOU_TUBE_YOU_TUBE_PUBLISHER_GET_PRIVATE (self);
-#line 2073 "YouTubePublishing.c"
+#line 2272 "YouTubePublishing.c"
}
-static void publishing_you_tube_you_tube_publisher_finalize (GObject * obj) {
+static void
+publishing_you_tube_you_tube_publisher_finalize (GObject * obj)
+{
PublishingYouTubeYouTubePublisher * self;
#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_PUBLISHER, PublishingYouTubeYouTubePublisher);
@@ -2100,11 +2301,13 @@ static void publishing_you_tube_you_tube_publisher_finalize (GObject * obj) {
_g_object_unref0 (self->priv->youtube_service);
#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
G_OBJECT_CLASS (publishing_you_tube_you_tube_publisher_parent_class)->finalize (obj);
-#line 2097 "YouTubePublishing.c"
+#line 2298 "YouTubePublishing.c"
}
-GType publishing_you_tube_you_tube_publisher_get_type (void) {
+GType
+publishing_you_tube_you_tube_publisher_get_type (void)
+{
static volatile gsize publishing_you_tube_you_tube_publisher_type_id__volatile = 0;
if (g_once_init_enter (&publishing_you_tube_you_tube_publisher_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingYouTubeYouTubePublisherClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_you_tube_you_tube_publisher_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingYouTubeYouTubePublisher), 0, (GInstanceInitFunc) publishing_you_tube_you_tube_publisher_instance_init, NULL };
@@ -2116,80 +2319,88 @@ GType publishing_you_tube_you_tube_publisher_get_type (void) {
}
-static gpointer _publishing_you_tube_publishing_parameters_ref0 (gpointer self) {
+static gpointer
+_publishing_you_tube_publishing_parameters_ref0 (gpointer self)
+{
#line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return self ? publishing_you_tube_publishing_parameters_ref (self) : NULL;
-#line 2116 "YouTubePublishing.c"
+#line 2321 "YouTubePublishing.c"
}
-static gpointer _publishing_you_tube_publishing_options_pane_privacy_description_ref0 (gpointer self) {
+static gpointer
+_publishing_you_tube_publishing_options_pane_privacy_description_ref0 (gpointer self)
+{
#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return self ? publishing_you_tube_publishing_options_pane_privacy_description_ref (self) : NULL;
-#line 2123 "YouTubePublishing.c"
+#line 2330 "YouTubePublishing.c"
}
-static void _publishing_you_tube_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+_publishing_you_tube_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender,
+ gpointer self)
+{
#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
publishing_you_tube_publishing_options_pane_on_logout_clicked ((PublishingYouTubePublishingOptionsPane*) self);
-#line 2130 "YouTubePublishing.c"
+#line 2340 "YouTubePublishing.c"
}
-static void _publishing_you_tube_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+_publishing_you_tube_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender,
+ gpointer self)
+{
#line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
publishing_you_tube_publishing_options_pane_on_publish_clicked ((PublishingYouTubePublishingOptionsPane*) self);
-#line 2137 "YouTubePublishing.c"
+#line 2350 "YouTubePublishing.c"
}
-PublishingYouTubePublishingOptionsPane* publishing_you_tube_publishing_options_pane_construct (GType object_type, SpitPublishingAuthenticator* authenticator, SpitPublishingPluginHost* host, GtkBuilder* builder, PublishingYouTubePublishingParameters* publishing_parameters) {
+PublishingYouTubePublishingOptionsPane*
+publishing_you_tube_publishing_options_pane_construct (GType object_type,
+ SpitPublishingAuthenticator* authenticator,
+ SpitPublishingPluginHost* host,
+ GtkBuilder* builder,
+ PublishingYouTubePublishingParameters* publishing_parameters)
+{
PublishingYouTubePublishingOptionsPane * self = NULL;
gint _tmp0_;
PublishingYouTubePublishingOptionsPanePrivacyDescription** _tmp1_;
PublishingYouTubePublishingParameters* _tmp2_;
- PublishingYouTubePublishingParameters* _tmp3_;
- GtkBuilder* _tmp4_;
- GtkBuilder* _tmp5_;
+ GtkBuilder* _tmp3_;
+ GSList* _tmp4_;
+ GSList* _tmp5_;
GtkBuilder* _tmp6_;
- GtkBuilder* _tmp7_;
- GSList* _tmp8_;
- GSList* _tmp9_;
- guint _tmp10_;
- GtkBuilder* _tmp11_;
- GObject* _tmp12_;
- GtkLabel* _tmp13_;
- GtkBuilder* _tmp14_;
- GObject* _tmp15_;
- GtkComboBoxText* _tmp16_;
- GtkBuilder* _tmp17_;
- GObject* _tmp18_;
- GtkButton* _tmp19_;
- GtkBuilder* _tmp20_;
- GObject* _tmp21_;
- GtkButton* _tmp22_;
- GtkBuilder* _tmp23_;
- GObject* _tmp24_;
- GtkBox* _tmp25_;
- GtkBuilder* _tmp26_;
- GObject* _tmp27_;
+ GObject* _tmp7_;
+ GtkLabel* _tmp8_;
+ GtkBuilder* _tmp9_;
+ GObject* _tmp10_;
+ GtkComboBoxText* _tmp11_;
+ GtkBuilder* _tmp12_;
+ GObject* _tmp13_;
+ GtkButton* _tmp14_;
+ GtkBuilder* _tmp15_;
+ GObject* _tmp16_;
+ GtkButton* _tmp17_;
+ GtkBuilder* _tmp18_;
+ GObject* _tmp19_;
+ GtkBox* _tmp20_;
+ GtkBuilder* _tmp21_;
+ GObject* _tmp22_;
+ GtkLabel* _tmp23_;
GtkLabel* _tmp28_;
- SpitPublishingAuthenticator* _tmp29_;
- gboolean _tmp30_;
- GtkLabel* _tmp35_;
- PublishingYouTubePublishingParameters* _tmp36_;
- gchar* _tmp37_;
- gchar* _tmp38_;
- gchar* _tmp39_;
- gchar* _tmp40_;
- PublishingYouTubePublishingOptionsPanePrivacyDescription** _tmp41_;
- gint _tmp41__length1;
- GtkComboBoxText* _tmp46_;
- GtkLabel* _tmp47_;
- GtkComboBoxText* _tmp48_;
- GtkButton* _tmp49_;
- GtkButton* _tmp50_;
+ gchar* _tmp29_;
+ gchar* _tmp30_;
+ gchar* _tmp31_;
+ gchar* _tmp32_;
+ PublishingYouTubePublishingOptionsPanePrivacyDescription** _tmp33_;
+ gint _tmp33__length1;
+ GtkComboBoxText* _tmp38_;
+ GtkLabel* _tmp39_;
+ GtkComboBoxText* _tmp40_;
+ GtkButton* _tmp41_;
+ GtkButton* _tmp42_;
#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
g_return_val_if_fail (SPIT_PUBLISHING_IS_AUTHENTICATOR (authenticator), NULL);
#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -2211,219 +2422,209 @@ PublishingYouTubePublishingOptionsPane* publishing_you_tube_publishing_options_p
#line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
self->priv->_privacy_descriptions_size_ = self->priv->privacy_descriptions_length1;
#line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp2_ = publishing_parameters;
-#line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp3_ = _publishing_you_tube_publishing_parameters_ref0 (_tmp2_);
+ _tmp2_ = _publishing_you_tube_publishing_parameters_ref0 (publishing_parameters);
#line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_publishing_you_tube_publishing_parameters_unref0 (self->priv->publishing_parameters);
#line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- self->priv->publishing_parameters = _tmp3_;
-#line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp4_ = builder;
+ self->priv->publishing_parameters = _tmp2_;
#line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp5_ = _g_object_ref0 (_tmp4_);
+ _tmp3_ = _g_object_ref0 (builder);
#line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_g_object_unref0 (self->priv->builder);
#line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- self->priv->builder = _tmp5_;
+ self->priv->builder = _tmp3_;
#line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp6_ = builder;
-#line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _vala_assert (_tmp6_ != NULL, "builder != null");
-#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp7_ = builder;
-#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp8_ = gtk_builder_get_objects (_tmp7_);
+ _vala_assert (builder != NULL, "builder != null");
#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp9_ = _tmp8_;
+ _tmp4_ = gtk_builder_get_objects (builder);
#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp10_ = g_slist_length (_tmp9_);
+ _tmp5_ = _tmp4_;
#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _vala_assert (_tmp10_ > ((guint) 0), "builder.get_objects().length() > 0");
+ _vala_assert (g_slist_length (_tmp5_) > ((guint) 0), "builder.get_objects().length() > 0");
#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _g_slist_free0 (_tmp9_);
+ _g_slist_free0 (_tmp5_);
#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp11_ = self->priv->builder;
+ _tmp6_ = self->priv->builder;
#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp12_ = gtk_builder_get_object (_tmp11_, "login_identity_label");
+ _tmp7_ = gtk_builder_get_object (_tmp6_, "login_identity_label");
#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp13_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp12_) : NULL);
+ _tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp7_) : NULL);
#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_g_object_unref0 (self->priv->login_identity_label);
#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- self->priv->login_identity_label = _tmp13_;
+ self->priv->login_identity_label = _tmp8_;
#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp14_ = self->priv->builder;
+ _tmp9_ = self->priv->builder;
#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp15_ = gtk_builder_get_object (_tmp14_, "privacy_combo");
+ _tmp10_ = gtk_builder_get_object (_tmp9_, "privacy_combo");
#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp16_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp15_, gtk_combo_box_text_get_type ()) ? ((GtkComboBoxText*) _tmp15_) : NULL);
+ _tmp11_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp10_, gtk_combo_box_text_get_type ()) ? ((GtkComboBoxText*) _tmp10_) : NULL);
#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_g_object_unref0 (self->priv->privacy_combo);
#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- self->priv->privacy_combo = _tmp16_;
+ self->priv->privacy_combo = _tmp11_;
#line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp17_ = self->priv->builder;
+ _tmp12_ = self->priv->builder;
#line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp18_ = gtk_builder_get_object (_tmp17_, "publish_button");
+ _tmp13_ = gtk_builder_get_object (_tmp12_, "publish_button");
#line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp19_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp18_, gtk_button_get_type ()) ? ((GtkButton*) _tmp18_) : NULL);
+ _tmp14_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, gtk_button_get_type ()) ? ((GtkButton*) _tmp13_) : NULL);
#line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_g_object_unref0 (self->priv->publish_button);
#line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- self->priv->publish_button = _tmp19_;
+ self->priv->publish_button = _tmp14_;
#line 336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp20_ = self->priv->builder;
+ _tmp15_ = self->priv->builder;
#line 336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp21_ = gtk_builder_get_object (_tmp20_, "logout_button");
+ _tmp16_ = gtk_builder_get_object (_tmp15_, "logout_button");
#line 336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp22_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp21_, gtk_button_get_type ()) ? ((GtkButton*) _tmp21_) : NULL);
+ _tmp17_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp16_, gtk_button_get_type ()) ? ((GtkButton*) _tmp16_) : NULL);
#line 336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_g_object_unref0 (self->priv->logout_button);
#line 336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- self->priv->logout_button = _tmp22_;
+ self->priv->logout_button = _tmp17_;
#line 337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp23_ = self->priv->builder;
+ _tmp18_ = self->priv->builder;
#line 337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp24_ = gtk_builder_get_object (_tmp23_, "youtube_pane_widget");
+ _tmp19_ = gtk_builder_get_object (_tmp18_, "youtube_pane_widget");
#line 337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp25_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp24_, gtk_box_get_type ()) ? ((GtkBox*) _tmp24_) : NULL);
+ _tmp20_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, gtk_box_get_type ()) ? ((GtkBox*) _tmp19_) : NULL);
#line 337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_g_object_unref0 (self->priv->pane_widget);
#line 337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- self->priv->pane_widget = _tmp25_;
+ self->priv->pane_widget = _tmp20_;
#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp26_ = self->priv->builder;
+ _tmp21_ = self->priv->builder;
#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp27_ = gtk_builder_get_object (_tmp26_, "privacy_label");
+ _tmp22_ = gtk_builder_get_object (_tmp21_, "privacy_label");
#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp28_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp27_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp27_) : NULL);
+ _tmp23_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp22_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp22_) : NULL);
#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_g_object_unref0 (self->priv->privacy_label);
#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- self->priv->privacy_label = _tmp28_;
-#line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp29_ = authenticator;
+ self->priv->privacy_label = _tmp23_;
#line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp30_ = spit_publishing_authenticator_can_logout (_tmp29_);
-#line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- if (!_tmp30_) {
-#line 2305 "YouTubePublishing.c"
- GtkButton* _tmp31_;
- GtkContainer* _tmp32_;
- GtkContainer* _tmp33_;
- GtkButton* _tmp34_;
+ if (!spit_publishing_authenticator_can_logout (authenticator)) {
+#line 2502 "YouTubePublishing.c"
+ GtkButton* _tmp24_;
+ GtkContainer* _tmp25_;
+ GtkContainer* _tmp26_;
+ GtkButton* _tmp27_;
#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp31_ = self->priv->logout_button;
+ _tmp24_ = self->priv->logout_button;
#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp32_ = gtk_widget_get_parent (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_widget_get_type (), GtkWidget));
+ _tmp25_ = gtk_widget_get_parent (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_widget_get_type (), GtkWidget));
#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp33_ = _tmp32_;
+ _tmp26_ = _tmp25_;
#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp34_ = self->priv->logout_button;
+ _tmp27_ = self->priv->logout_button;
#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- gtk_container_remove (_tmp33_, G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_widget_get_type (), GtkWidget));
-#line 2320 "YouTubePublishing.c"
+ gtk_container_remove (_tmp26_, G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_widget_get_type (), GtkWidget));
+#line 2517 "YouTubePublishing.c"
}
#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp35_ = self->priv->login_identity_label;
-#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp36_ = publishing_parameters;
+ _tmp28_ = self->priv->login_identity_label;
#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp37_ = publishing_you_tube_publishing_parameters_get_user_name (_tmp36_);
+ _tmp29_ = publishing_you_tube_publishing_parameters_get_user_name (publishing_parameters);
#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp38_ = _tmp37_;
+ _tmp30_ = _tmp29_;
#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp39_ = g_strdup_printf (_ ("You are logged into YouTube as %s."), _tmp38_);
+ _tmp31_ = g_strdup_printf (_ ("You are logged into YouTube as %s."), _tmp30_);
#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp40_ = _tmp39_;
+ _tmp32_ = _tmp31_;
#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- gtk_label_set_label (_tmp35_, _tmp40_);
+ gtk_label_set_label (_tmp28_, _tmp32_);
#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _g_free0 (_tmp40_);
+ _g_free0 (_tmp32_);
#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _g_free0 (_tmp38_);
+ _g_free0 (_tmp30_);
#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp41_ = self->priv->privacy_descriptions;
+ _tmp33_ = self->priv->privacy_descriptions;
#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp41__length1 = self->priv->privacy_descriptions_length1;
-#line 2344 "YouTubePublishing.c"
+ _tmp33__length1 = self->priv->privacy_descriptions_length1;
+#line 2539 "YouTubePublishing.c"
{
PublishingYouTubePublishingOptionsPanePrivacyDescription** desc_collection = NULL;
gint desc_collection_length1 = 0;
gint _desc_collection_size_ = 0;
gint desc_it = 0;
#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- desc_collection = _tmp41_;
+ desc_collection = _tmp33_;
#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- desc_collection_length1 = _tmp41__length1;
+ desc_collection_length1 = _tmp33__length1;
#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- for (desc_it = 0; desc_it < _tmp41__length1; desc_it = desc_it + 1) {
-#line 2356 "YouTubePublishing.c"
- PublishingYouTubePublishingOptionsPanePrivacyDescription* _tmp42_;
+ for (desc_it = 0; desc_it < _tmp33__length1; desc_it = desc_it + 1) {
+#line 2551 "YouTubePublishing.c"
+ PublishingYouTubePublishingOptionsPanePrivacyDescription* _tmp34_;
PublishingYouTubePublishingOptionsPanePrivacyDescription* desc = NULL;
#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp42_ = _publishing_you_tube_publishing_options_pane_privacy_description_ref0 (desc_collection[desc_it]);
+ _tmp34_ = _publishing_you_tube_publishing_options_pane_privacy_description_ref0 (desc_collection[desc_it]);
#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- desc = _tmp42_;
-#line 2363 "YouTubePublishing.c"
+ desc = _tmp34_;
+#line 2558 "YouTubePublishing.c"
{
- GtkComboBoxText* _tmp43_;
- PublishingYouTubePublishingOptionsPanePrivacyDescription* _tmp44_;
- const gchar* _tmp45_;
+ GtkComboBoxText* _tmp35_;
+ PublishingYouTubePublishingOptionsPanePrivacyDescription* _tmp36_;
+ const gchar* _tmp37_;
#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp43_ = self->priv->privacy_combo;
+ _tmp35_ = self->priv->privacy_combo;
#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp44_ = desc;
+ _tmp36_ = desc;
#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp45_ = _tmp44_->description;
+ _tmp37_ = _tmp36_->description;
#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- gtk_combo_box_text_append_text (_tmp43_, _tmp45_);
+ gtk_combo_box_text_append_text (_tmp35_, _tmp37_);
#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_publishing_you_tube_publishing_options_pane_privacy_description_unref0 (desc);
-#line 2378 "YouTubePublishing.c"
+#line 2573 "YouTubePublishing.c"
}
}
}
#line 351 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp46_ = self->priv->privacy_combo;
+ _tmp38_ = self->priv->privacy_combo;
#line 351 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_combo_box_get_type (), GtkComboBox), (gint) PUBLISHING_YOU_TUBE_PRIVACY_SETTING_PUBLIC);
+ gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_combo_box_get_type (), GtkComboBox), (gint) PUBLISHING_YOU_TUBE_PRIVACY_SETTING_PUBLIC);
#line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp47_ = self->priv->privacy_label;
+ _tmp39_ = self->priv->privacy_label;
#line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp48_ = self->priv->privacy_combo;
+ _tmp40_ = self->priv->privacy_combo;
#line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- gtk_label_set_mnemonic_widget (_tmp47_, G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_widget_get_type (), GtkWidget));
+ gtk_label_set_mnemonic_widget (_tmp39_, G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_widget_get_type (), GtkWidget));
#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp49_ = self->priv->logout_button;
+ _tmp41_ = self->priv->logout_button;
#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- g_signal_connect_object (_tmp49_, "clicked", (GCallback) _publishing_you_tube_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0);
+ g_signal_connect_object (_tmp41_, "clicked", (GCallback) _publishing_you_tube_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0);
#line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp50_ = self->priv->publish_button;
+ _tmp42_ = self->priv->publish_button;
#line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- g_signal_connect_object (_tmp50_, "clicked", (GCallback) _publishing_you_tube_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0);
+ g_signal_connect_object (_tmp42_, "clicked", (GCallback) _publishing_you_tube_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0);
#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return self;
-#line 2402 "YouTubePublishing.c"
+#line 2597 "YouTubePublishing.c"
}
-PublishingYouTubePublishingOptionsPane* publishing_you_tube_publishing_options_pane_new (SpitPublishingAuthenticator* authenticator, SpitPublishingPluginHost* host, GtkBuilder* builder, PublishingYouTubePublishingParameters* publishing_parameters) {
+PublishingYouTubePublishingOptionsPane*
+publishing_you_tube_publishing_options_pane_new (SpitPublishingAuthenticator* authenticator,
+ SpitPublishingPluginHost* host,
+ GtkBuilder* builder,
+ PublishingYouTubePublishingParameters* publishing_parameters)
+{
#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return publishing_you_tube_publishing_options_pane_construct (PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_OPTIONS_PANE, authenticator, host, builder, publishing_parameters);
-#line 2409 "YouTubePublishing.c"
+#line 2609 "YouTubePublishing.c"
}
-static void publishing_you_tube_publishing_options_pane_on_publish_clicked (PublishingYouTubePublishingOptionsPane* self) {
+static void
+publishing_you_tube_publishing_options_pane_on_publish_clicked (PublishingYouTubePublishingOptionsPane* self)
+{
PublishingYouTubePublishingParameters* _tmp0_;
PublishingYouTubePublishingOptionsPanePrivacyDescription** _tmp1_;
gint _tmp1__length1;
GtkComboBoxText* _tmp2_;
- gint _tmp3_;
- PublishingYouTubePublishingOptionsPanePrivacyDescription* _tmp4_;
- PublishingYouTubePrivacySetting _tmp5_;
+ PublishingYouTubePublishingOptionsPanePrivacyDescription* _tmp3_;
+ PublishingYouTubePrivacySetting _tmp4_;
#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
g_return_if_fail (PUBLISHING_YOU_TUBE_IS_PUBLISHING_OPTIONS_PANE (self));
#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -2435,29 +2636,31 @@ static void publishing_you_tube_publishing_options_pane_on_publish_clicked (Publ
#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_tmp2_ = self->priv->privacy_combo;
#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp3_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox));
+ _tmp3_ = _tmp1_[gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox))];
#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp4_ = _tmp1_[_tmp3_];
+ _tmp4_ = _tmp3_->privacy_setting;
#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp5_ = _tmp4_->privacy_setting;
-#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- publishing_you_tube_publishing_parameters_set_privacy (_tmp0_, _tmp5_);
+ publishing_you_tube_publishing_parameters_set_privacy (_tmp0_, _tmp4_);
#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
g_signal_emit (self, publishing_you_tube_publishing_options_pane_signals[PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0);
-#line 2441 "YouTubePublishing.c"
+#line 2640 "YouTubePublishing.c"
}
-static void publishing_you_tube_publishing_options_pane_on_logout_clicked (PublishingYouTubePublishingOptionsPane* self) {
+static void
+publishing_you_tube_publishing_options_pane_on_logout_clicked (PublishingYouTubePublishingOptionsPane* self)
+{
#line 365 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
g_return_if_fail (PUBLISHING_YOU_TUBE_IS_PUBLISHING_OPTIONS_PANE (self));
#line 366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
g_signal_emit (self, publishing_you_tube_publishing_options_pane_signals[PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL], 0);
-#line 2450 "YouTubePublishing.c"
+#line 2651 "YouTubePublishing.c"
}
-static void publishing_you_tube_publishing_options_pane_update_publish_button_sensitivity (PublishingYouTubePublishingOptionsPane* self) {
+static void
+publishing_you_tube_publishing_options_pane_update_publish_button_sensitivity (PublishingYouTubePublishingOptionsPane* self)
+{
GtkButton* _tmp0_;
#line 369 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
g_return_if_fail (PUBLISHING_YOU_TUBE_IS_PUBLISHING_OPTIONS_PANE (self));
@@ -2465,62 +2668,80 @@ static void publishing_you_tube_publishing_options_pane_update_publish_button_se
_tmp0_ = self->priv->publish_button;
#line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 2462 "YouTubePublishing.c"
+#line 2665 "YouTubePublishing.c"
}
-static void _vala_array_add35 (PublishingYouTubePublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingYouTubePublishingOptionsPanePrivacyDescription* value) {
+static void
+_vala_array_add35 (PublishingYouTubePublishingOptionsPanePrivacyDescription** * array,
+ int* length,
+ int* size,
+ PublishingYouTubePublishingOptionsPanePrivacyDescription* value)
+{
#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
if ((*length) == (*size)) {
#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
*array = g_renew (PublishingYouTubePublishingOptionsPanePrivacyDescription*, *array, (*size) + 1);
-#line 2473 "YouTubePublishing.c"
+#line 2681 "YouTubePublishing.c"
}
#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
(*array)[(*length)++] = value;
#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
(*array)[*length] = NULL;
-#line 2479 "YouTubePublishing.c"
+#line 2687 "YouTubePublishing.c"
}
-static void _vala_array_add36 (PublishingYouTubePublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingYouTubePublishingOptionsPanePrivacyDescription* value) {
+static void
+_vala_array_add36 (PublishingYouTubePublishingOptionsPanePrivacyDescription** * array,
+ int* length,
+ int* size,
+ PublishingYouTubePublishingOptionsPanePrivacyDescription* value)
+{
#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
if ((*length) == (*size)) {
#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
*array = g_renew (PublishingYouTubePublishingOptionsPanePrivacyDescription*, *array, (*size) + 1);
-#line 2490 "YouTubePublishing.c"
+#line 2703 "YouTubePublishing.c"
}
#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
(*array)[(*length)++] = value;
#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
(*array)[*length] = NULL;
-#line 2496 "YouTubePublishing.c"
+#line 2709 "YouTubePublishing.c"
}
-static void _vala_array_add37 (PublishingYouTubePublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingYouTubePublishingOptionsPanePrivacyDescription* value) {
+static void
+_vala_array_add37 (PublishingYouTubePublishingOptionsPanePrivacyDescription** * array,
+ int* length,
+ int* size,
+ PublishingYouTubePublishingOptionsPanePrivacyDescription* value)
+{
#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
if ((*length) == (*size)) {
#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
*array = g_renew (PublishingYouTubePublishingOptionsPanePrivacyDescription*, *array, (*size) + 1);
-#line 2507 "YouTubePublishing.c"
+#line 2725 "YouTubePublishing.c"
}
#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
(*array)[(*length)++] = value;
#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
(*array)[*length] = NULL;
-#line 2513 "YouTubePublishing.c"
+#line 2731 "YouTubePublishing.c"
}
-static PublishingYouTubePublishingOptionsPanePrivacyDescription** publishing_you_tube_publishing_options_pane_create_privacy_descriptions (PublishingYouTubePublishingOptionsPane* self, int* result_length1) {
+static PublishingYouTubePublishingOptionsPanePrivacyDescription**
+publishing_you_tube_publishing_options_pane_create_privacy_descriptions (PublishingYouTubePublishingOptionsPane* self,
+ int* result_length1)
+{
PublishingYouTubePublishingOptionsPanePrivacyDescription** result = NULL;
PublishingYouTubePublishingOptionsPanePrivacyDescription** _result_ = NULL;
PublishingYouTubePublishingOptionsPanePrivacyDescription** _tmp0_;
@@ -2579,17 +2800,19 @@ static PublishingYouTubePublishingOptionsPanePrivacyDescription** publishing_you
if (result_length1) {
#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
*result_length1 = _tmp7__length1;
-#line 2576 "YouTubePublishing.c"
+#line 2797 "YouTubePublishing.c"
}
#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
result = _tmp7_;
#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return result;
-#line 2582 "YouTubePublishing.c"
+#line 2803 "YouTubePublishing.c"
}
-static GtkWidget* publishing_you_tube_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base) {
+static GtkWidget*
+publishing_you_tube_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base)
+{
PublishingYouTubePublishingOptionsPane * self;
GtkWidget* result = NULL;
GtkBox* _tmp0_;
@@ -2609,11 +2832,13 @@ static GtkWidget* publishing_you_tube_publishing_options_pane_real_get_widget (S
result = _tmp2_;
#line 385 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return result;
-#line 2606 "YouTubePublishing.c"
+#line 2829 "YouTubePublishing.c"
}
-static SpitPublishingDialogPaneGeometryOptions publishing_you_tube_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) {
+static SpitPublishingDialogPaneGeometryOptions
+publishing_you_tube_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base)
+{
PublishingYouTubePublishingOptionsPane * self;
SpitPublishingDialogPaneGeometryOptions result = 0;
#line 388 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -2622,160 +2847,190 @@ static SpitPublishingDialogPaneGeometryOptions publishing_you_tube_publishing_op
result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
#line 389 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return result;
-#line 2619 "YouTubePublishing.c"
+#line 2844 "YouTubePublishing.c"
}
-static void publishing_you_tube_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base) {
+static void
+publishing_you_tube_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base)
+{
PublishingYouTubePublishingOptionsPane * self;
#line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_OPTIONS_PANE, PublishingYouTubePublishingOptionsPane);
#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
publishing_you_tube_publishing_options_pane_update_publish_button_sensitivity (self);
-#line 2629 "YouTubePublishing.c"
+#line 2856 "YouTubePublishing.c"
}
-static void publishing_you_tube_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) {
+static void
+publishing_you_tube_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base)
+{
PublishingYouTubePublishingOptionsPane * self;
#line 396 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_OPTIONS_PANE, PublishingYouTubePublishingOptionsPane);
-#line 2637 "YouTubePublishing.c"
+#line 2866 "YouTubePublishing.c"
}
-static PublishingYouTubePublishingOptionsPanePrivacyDescription* publishing_you_tube_publishing_options_pane_privacy_description_construct (GType object_type, const gchar* description, PublishingYouTubePrivacySetting privacy_setting) {
+static PublishingYouTubePublishingOptionsPanePrivacyDescription*
+publishing_you_tube_publishing_options_pane_privacy_description_construct (GType object_type,
+ const gchar* description,
+ PublishingYouTubePrivacySetting privacy_setting)
+{
PublishingYouTubePublishingOptionsPanePrivacyDescription* self = NULL;
- const gchar* _tmp0_;
- gchar* _tmp1_;
- PublishingYouTubePrivacySetting _tmp2_;
+ gchar* _tmp0_;
#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
g_return_val_if_fail (description != NULL, NULL);
#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
self = (PublishingYouTubePublishingOptionsPanePrivacyDescription*) g_type_create_instance (object_type);
#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp0_ = description;
-#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp1_ = g_strdup (_tmp0_);
+ _tmp0_ = g_strdup (description);
#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_g_free0 (self->description);
#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- self->description = _tmp1_;
-#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp2_ = privacy_setting;
+ self->description = _tmp0_;
#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- self->privacy_setting = _tmp2_;
+ self->privacy_setting = privacy_setting;
#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return self;
-#line 2664 "YouTubePublishing.c"
+#line 2891 "YouTubePublishing.c"
}
-static PublishingYouTubePublishingOptionsPanePrivacyDescription* publishing_you_tube_publishing_options_pane_privacy_description_new (const gchar* description, PublishingYouTubePrivacySetting privacy_setting) {
+static PublishingYouTubePublishingOptionsPanePrivacyDescription*
+publishing_you_tube_publishing_options_pane_privacy_description_new (const gchar* description,
+ PublishingYouTubePrivacySetting privacy_setting)
+{
#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return publishing_you_tube_publishing_options_pane_privacy_description_construct (PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_TYPE_PRIVACY_DESCRIPTION, description, privacy_setting);
-#line 2671 "YouTubePublishing.c"
+#line 2901 "YouTubePublishing.c"
}
-static void publishing_you_tube_publishing_options_pane_value_privacy_description_init (GValue* value) {
+static void
+publishing_you_tube_publishing_options_pane_value_privacy_description_init (GValue* value)
+{
#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
value->data[0].v_pointer = NULL;
-#line 2678 "YouTubePublishing.c"
+#line 2910 "YouTubePublishing.c"
}
-static void publishing_you_tube_publishing_options_pane_value_privacy_description_free_value (GValue* value) {
+static void
+publishing_you_tube_publishing_options_pane_value_privacy_description_free_value (GValue* value)
+{
#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
if (value->data[0].v_pointer) {
#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
publishing_you_tube_publishing_options_pane_privacy_description_unref (value->data[0].v_pointer);
-#line 2687 "YouTubePublishing.c"
+#line 2921 "YouTubePublishing.c"
}
}
-static void publishing_you_tube_publishing_options_pane_value_privacy_description_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+publishing_you_tube_publishing_options_pane_value_privacy_description_copy_value (const GValue* src_value,
+ GValue* dest_value)
+{
#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
if (src_value->data[0].v_pointer) {
#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
dest_value->data[0].v_pointer = publishing_you_tube_publishing_options_pane_privacy_description_ref (src_value->data[0].v_pointer);
-#line 2697 "YouTubePublishing.c"
+#line 2934 "YouTubePublishing.c"
} else {
#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
dest_value->data[0].v_pointer = NULL;
-#line 2701 "YouTubePublishing.c"
+#line 2938 "YouTubePublishing.c"
}
}
-static gpointer publishing_you_tube_publishing_options_pane_value_privacy_description_peek_pointer (const GValue* value) {
+static gpointer
+publishing_you_tube_publishing_options_pane_value_privacy_description_peek_pointer (const GValue* value)
+{
#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return value->data[0].v_pointer;
-#line 2709 "YouTubePublishing.c"
+#line 2948 "YouTubePublishing.c"
}
-static gchar* publishing_you_tube_publishing_options_pane_value_privacy_description_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_you_tube_publishing_options_pane_value_privacy_description_collect_value (GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
if (collect_values[0].v_pointer) {
-#line 2716 "YouTubePublishing.c"
+#line 2960 "YouTubePublishing.c"
PublishingYouTubePublishingOptionsPanePrivacyDescription * object;
object = collect_values[0].v_pointer;
#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
if (object->parent_instance.g_class == NULL) {
#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2723 "YouTubePublishing.c"
+#line 2967 "YouTubePublishing.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2727 "YouTubePublishing.c"
+#line 2971 "YouTubePublishing.c"
}
#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
value->data[0].v_pointer = publishing_you_tube_publishing_options_pane_privacy_description_ref (object);
-#line 2731 "YouTubePublishing.c"
+#line 2975 "YouTubePublishing.c"
} else {
#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
value->data[0].v_pointer = NULL;
-#line 2735 "YouTubePublishing.c"
+#line 2979 "YouTubePublishing.c"
}
#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return NULL;
-#line 2739 "YouTubePublishing.c"
+#line 2983 "YouTubePublishing.c"
}
-static gchar* publishing_you_tube_publishing_options_pane_value_privacy_description_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_you_tube_publishing_options_pane_value_privacy_description_lcopy_value (const GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
PublishingYouTubePublishingOptionsPanePrivacyDescription ** object_p;
object_p = collect_values[0].v_pointer;
#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
if (!object_p) {
#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 2750 "YouTubePublishing.c"
+#line 2999 "YouTubePublishing.c"
}
#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
if (!value->data[0].v_pointer) {
#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
*object_p = NULL;
-#line 2756 "YouTubePublishing.c"
+#line 3005 "YouTubePublishing.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
*object_p = value->data[0].v_pointer;
-#line 2760 "YouTubePublishing.c"
+#line 3009 "YouTubePublishing.c"
} else {
#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
*object_p = publishing_you_tube_publishing_options_pane_privacy_description_ref (value->data[0].v_pointer);
-#line 2764 "YouTubePublishing.c"
+#line 3013 "YouTubePublishing.c"
}
#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return NULL;
-#line 2768 "YouTubePublishing.c"
+#line 3017 "YouTubePublishing.c"
}
-static GParamSpec* publishing_you_tube_publishing_options_pane_param_spec_privacy_description (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+static GParamSpec*
+publishing_you_tube_publishing_options_pane_param_spec_privacy_description (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags)
+{
PublishingYouTubePublishingOptionsPaneParamSpecPrivacyDescription* spec;
#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_TYPE_PRIVACY_DESCRIPTION), NULL);
@@ -2785,20 +3040,25 @@ static GParamSpec* publishing_you_tube_publishing_options_pane_param_spec_privac
G_PARAM_SPEC (spec)->value_type = object_type;
#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return G_PARAM_SPEC (spec);
-#line 2782 "YouTubePublishing.c"
+#line 3037 "YouTubePublishing.c"
}
-static gpointer publishing_you_tube_publishing_options_pane_value_get_privacy_description (const GValue* value) {
+static gpointer
+publishing_you_tube_publishing_options_pane_value_get_privacy_description (const GValue* value)
+{
#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_TYPE_PRIVACY_DESCRIPTION), NULL);
#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return value->data[0].v_pointer;
-#line 2791 "YouTubePublishing.c"
+#line 3048 "YouTubePublishing.c"
}
-static void publishing_you_tube_publishing_options_pane_value_set_privacy_description (GValue* value, gpointer v_object) {
+static void
+publishing_you_tube_publishing_options_pane_value_set_privacy_description (GValue* value,
+ gpointer v_object)
+{
PublishingYouTubePublishingOptionsPanePrivacyDescription * old;
#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_TYPE_PRIVACY_DESCRIPTION));
@@ -2814,22 +3074,25 @@ static void publishing_you_tube_publishing_options_pane_value_set_privacy_descri
value->data[0].v_pointer = v_object;
#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
publishing_you_tube_publishing_options_pane_privacy_description_ref (value->data[0].v_pointer);
-#line 2811 "YouTubePublishing.c"
+#line 3071 "YouTubePublishing.c"
} else {
#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
value->data[0].v_pointer = NULL;
-#line 2815 "YouTubePublishing.c"
+#line 3075 "YouTubePublishing.c"
}
#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
if (old) {
#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
publishing_you_tube_publishing_options_pane_privacy_description_unref (old);
-#line 2821 "YouTubePublishing.c"
+#line 3081 "YouTubePublishing.c"
}
}
-static void publishing_you_tube_publishing_options_pane_value_take_privacy_description (GValue* value, gpointer v_object) {
+static void
+publishing_you_tube_publishing_options_pane_value_take_privacy_description (GValue* value,
+ gpointer v_object)
+{
PublishingYouTubePublishingOptionsPanePrivacyDescription * old;
#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_TYPE_PRIVACY_DESCRIPTION));
@@ -2843,38 +3106,44 @@ static void publishing_you_tube_publishing_options_pane_value_take_privacy_descr
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
value->data[0].v_pointer = v_object;
-#line 2840 "YouTubePublishing.c"
+#line 3103 "YouTubePublishing.c"
} else {
#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
value->data[0].v_pointer = NULL;
-#line 2844 "YouTubePublishing.c"
+#line 3107 "YouTubePublishing.c"
}
#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
if (old) {
#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
publishing_you_tube_publishing_options_pane_privacy_description_unref (old);
-#line 2850 "YouTubePublishing.c"
+#line 3113 "YouTubePublishing.c"
}
}
-static void publishing_you_tube_publishing_options_pane_privacy_description_class_init (PublishingYouTubePublishingOptionsPanePrivacyDescriptionClass * klass) {
+static void
+publishing_you_tube_publishing_options_pane_privacy_description_class_init (PublishingYouTubePublishingOptionsPanePrivacyDescriptionClass * klass)
+{
#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
publishing_you_tube_publishing_options_pane_privacy_description_parent_class = g_type_class_peek_parent (klass);
#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
((PublishingYouTubePublishingOptionsPanePrivacyDescriptionClass *) klass)->finalize = publishing_you_tube_publishing_options_pane_privacy_description_finalize;
-#line 2860 "YouTubePublishing.c"
+#line 3125 "YouTubePublishing.c"
}
-static void publishing_you_tube_publishing_options_pane_privacy_description_instance_init (PublishingYouTubePublishingOptionsPanePrivacyDescription * self) {
+static void
+publishing_you_tube_publishing_options_pane_privacy_description_instance_init (PublishingYouTubePublishingOptionsPanePrivacyDescription * self)
+{
#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
self->ref_count = 1;
-#line 2867 "YouTubePublishing.c"
+#line 3134 "YouTubePublishing.c"
}
-static void publishing_you_tube_publishing_options_pane_privacy_description_finalize (PublishingYouTubePublishingOptionsPanePrivacyDescription * obj) {
+static void
+publishing_you_tube_publishing_options_pane_privacy_description_finalize (PublishingYouTubePublishingOptionsPanePrivacyDescription * obj)
+{
PublishingYouTubePublishingOptionsPanePrivacyDescription * self;
#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_TYPE_PRIVACY_DESCRIPTION, PublishingYouTubePublishingOptionsPanePrivacyDescription);
@@ -2882,11 +3151,13 @@ static void publishing_you_tube_publishing_options_pane_privacy_description_fina
g_signal_handlers_destroy (self);
#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_g_free0 (self->description);
-#line 2879 "YouTubePublishing.c"
+#line 3148 "YouTubePublishing.c"
}
-static GType publishing_you_tube_publishing_options_pane_privacy_description_get_type (void) {
+static GType
+publishing_you_tube_publishing_options_pane_privacy_description_get_type (void)
+{
static volatile gsize publishing_you_tube_publishing_options_pane_privacy_description_type_id__volatile = 0;
if (g_once_init_enter (&publishing_you_tube_publishing_options_pane_privacy_description_type_id__volatile)) {
static const GTypeValueTable g_define_type_value_table = { publishing_you_tube_publishing_options_pane_value_privacy_description_init, publishing_you_tube_publishing_options_pane_value_privacy_description_free_value, publishing_you_tube_publishing_options_pane_value_privacy_description_copy_value, publishing_you_tube_publishing_options_pane_value_privacy_description_peek_pointer, "p", publishing_you_tube_publishing_options_pane_value_privacy_description_collect_value, "p", publishing_you_tube_publishing_options_pane_value_privacy_description_lcopy_value };
@@ -2900,18 +3171,22 @@ static GType publishing_you_tube_publishing_options_pane_privacy_description_get
}
-static gpointer publishing_you_tube_publishing_options_pane_privacy_description_ref (gpointer instance) {
+static gpointer
+publishing_you_tube_publishing_options_pane_privacy_description_ref (gpointer instance)
+{
PublishingYouTubePublishingOptionsPanePrivacyDescription * self;
self = instance;
#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
g_atomic_int_inc (&self->ref_count);
#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return instance;
-#line 2904 "YouTubePublishing.c"
+#line 3177 "YouTubePublishing.c"
}
-static void publishing_you_tube_publishing_options_pane_privacy_description_unref (gpointer instance) {
+static void
+publishing_you_tube_publishing_options_pane_privacy_description_unref (gpointer instance)
+{
PublishingYouTubePublishingOptionsPanePrivacyDescription * self;
self = instance;
#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -2920,12 +3195,14 @@ static void publishing_you_tube_publishing_options_pane_privacy_description_unre
PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_PRIVACY_DESCRIPTION_GET_CLASS (self)->finalize (self);
#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 2917 "YouTubePublishing.c"
+#line 3192 "YouTubePublishing.c"
}
}
-static void publishing_you_tube_publishing_options_pane_class_init (PublishingYouTubePublishingOptionsPaneClass * klass) {
+static void
+publishing_you_tube_publishing_options_pane_class_init (PublishingYouTubePublishingOptionsPaneClass * klass)
+{
#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
publishing_you_tube_publishing_options_pane_parent_class = g_type_class_peek_parent (klass);
#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -2936,11 +3213,13 @@ static void publishing_you_tube_publishing_options_pane_class_init (PublishingYo
publishing_you_tube_publishing_options_pane_signals[PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL] = g_signal_new ("publish", PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
publishing_you_tube_publishing_options_pane_signals[PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL] = g_signal_new ("logout", PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 2933 "YouTubePublishing.c"
+#line 3210 "YouTubePublishing.c"
}
-static void publishing_you_tube_publishing_options_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) {
+static void
+publishing_you_tube_publishing_options_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface)
+{
#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
publishing_you_tube_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -2951,11 +3230,13 @@ static void publishing_you_tube_publishing_options_pane_spit_publishing_dialog_p
iface->on_pane_installed = (void (*) (SpitPublishingDialogPane *)) publishing_you_tube_publishing_options_pane_real_on_pane_installed;
#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
iface->on_pane_uninstalled = (void (*) (SpitPublishingDialogPane *)) publishing_you_tube_publishing_options_pane_real_on_pane_uninstalled;
-#line 2948 "YouTubePublishing.c"
+#line 3227 "YouTubePublishing.c"
}
-static void publishing_you_tube_publishing_options_pane_instance_init (PublishingYouTubePublishingOptionsPane * self) {
+static void
+publishing_you_tube_publishing_options_pane_instance_init (PublishingYouTubePublishingOptionsPane * self)
+{
#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
self->priv = PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_GET_PRIVATE (self);
#line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -2972,11 +3253,13 @@ static void publishing_you_tube_publishing_options_pane_instance_init (Publishin
self->priv->builder = NULL;
#line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
self->priv->privacy_label = NULL;
-#line 2969 "YouTubePublishing.c"
+#line 3250 "YouTubePublishing.c"
}
-static void publishing_you_tube_publishing_options_pane_finalize (GObject * obj) {
+static void
+publishing_you_tube_publishing_options_pane_finalize (GObject * obj)
+{
PublishingYouTubePublishingOptionsPane * self;
#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_OPTIONS_PANE, PublishingYouTubePublishingOptionsPane);
@@ -3000,11 +3283,13 @@ static void publishing_you_tube_publishing_options_pane_finalize (GObject * obj)
_publishing_you_tube_publishing_parameters_unref0 (self->priv->publishing_parameters);
#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
G_OBJECT_CLASS (publishing_you_tube_publishing_options_pane_parent_class)->finalize (obj);
-#line 2997 "YouTubePublishing.c"
+#line 3280 "YouTubePublishing.c"
}
-GType publishing_you_tube_publishing_options_pane_get_type (void) {
+GType
+publishing_you_tube_publishing_options_pane_get_type (void)
+{
static volatile gsize publishing_you_tube_publishing_options_pane_type_id__volatile = 0;
if (g_once_init_enter (&publishing_you_tube_publishing_options_pane_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingYouTubePublishingOptionsPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_you_tube_publishing_options_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingYouTubePublishingOptionsPane), 0, (GInstanceInitFunc) publishing_you_tube_publishing_options_pane_instance_init, NULL };
@@ -3018,19 +3303,18 @@ GType publishing_you_tube_publishing_options_pane_get_type (void) {
}
-PublishingYouTubeUploadTransaction* publishing_you_tube_upload_transaction_construct (GType object_type, GDataYouTubeService* youtube_service, PublishingRESTSupportGoogleSession* session, PublishingYouTubePublishingParameters* parameters, SpitPublishingPublishable* publishable) {
+PublishingYouTubeUploadTransaction*
+publishing_you_tube_upload_transaction_construct (GType object_type,
+ GDataYouTubeService* youtube_service,
+ PublishingRESTSupportGoogleSession* session,
+ PublishingYouTubePublishingParameters* parameters,
+ SpitPublishingPublishable* publishable)
+{
PublishingYouTubeUploadTransaction* self = NULL;
PublishingRESTSupportGoogleSession* _tmp0_;
- PublishingRESTSupportGoogleSession* _tmp1_;
- gboolean _tmp2_;
- PublishingRESTSupportGoogleSession* _tmp3_;
- PublishingRESTSupportGoogleSession* _tmp4_;
- PublishingYouTubePublishingParameters* _tmp5_;
- PublishingYouTubePublishingParameters* _tmp6_;
- SpitPublishingPublishable* _tmp7_;
- SpitPublishingPublishable* _tmp8_;
- GDataYouTubeService* _tmp9_;
- GDataYouTubeService* _tmp10_;
+ PublishingYouTubePublishingParameters* _tmp1_;
+ SpitPublishingPublishable* _tmp2_;
+ GDataYouTubeService* _tmp3_;
#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
g_return_val_if_fail (GDATA_IS_YOUTUBE_SERVICE (youtube_service), NULL);
#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -3040,75 +3324,70 @@ PublishingYouTubeUploadTransaction* publishing_you_tube_upload_transaction_const
#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL);
#line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp0_ = session;
-#line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- self = (PublishingYouTubeUploadTransaction*) publishing_rest_support_google_publisher_authenticated_transaction_construct (object_type, _tmp0_, PUBLISHING_YOU_TUBE_UPLOAD_TRANSACTION_ENDPOINT_URL, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
+ self = (PublishingYouTubeUploadTransaction*) publishing_rest_support_google_publisher_authenticated_transaction_construct (object_type, session, PUBLISHING_YOU_TUBE_UPLOAD_TRANSACTION_ENDPOINT_URL, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
#line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp1_ = session;
-#line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp2_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _vala_assert (_tmp2_, "session.is_authenticated()");
-#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp3_ = session;
+ _vala_assert (publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession)), "session.is_authenticated()");
#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp4_ = _publishing_rest_support_session_ref0 (_tmp3_);
+ _tmp0_ = _publishing_rest_support_session_ref0 (session);
#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_publishing_rest_support_session_unref0 (self->priv->session);
#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- self->priv->session = _tmp4_;
+ self->priv->session = _tmp0_;
#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp5_ = parameters;
-#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp6_ = _publishing_you_tube_publishing_parameters_ref0 (_tmp5_);
+ _tmp1_ = _publishing_you_tube_publishing_parameters_ref0 (parameters);
#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_publishing_you_tube_publishing_parameters_unref0 (self->priv->parameters);
#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- self->priv->parameters = _tmp6_;
-#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp7_ = publishable;
+ self->priv->parameters = _tmp1_;
#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp8_ = _g_object_ref0 (_tmp7_);
+ _tmp2_ = _g_object_ref0 (publishable);
#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_g_object_unref0 (self->priv->publishable);
#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- self->priv->publishable = _tmp8_;
-#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp9_ = youtube_service;
+ self->priv->publishable = _tmp2_;
#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp10_ = _g_object_ref0 (_tmp9_);
+ _tmp3_ = _g_object_ref0 (youtube_service);
#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_g_object_unref0 (self->priv->youtube_service);
#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- self->priv->youtube_service = _tmp10_;
+ self->priv->youtube_service = _tmp3_;
#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return self;
-#line 3080 "YouTubePublishing.c"
+#line 3350 "YouTubePublishing.c"
}
-PublishingYouTubeUploadTransaction* publishing_you_tube_upload_transaction_new (GDataYouTubeService* youtube_service, PublishingRESTSupportGoogleSession* session, PublishingYouTubePublishingParameters* parameters, SpitPublishingPublishable* publishable) {
+PublishingYouTubeUploadTransaction*
+publishing_you_tube_upload_transaction_new (GDataYouTubeService* youtube_service,
+ PublishingRESTSupportGoogleSession* session,
+ PublishingYouTubePublishingParameters* parameters,
+ SpitPublishingPublishable* publishable)
+{
#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return publishing_you_tube_upload_transaction_construct (PUBLISHING_YOU_TUBE_TYPE_UPLOAD_TRANSACTION, youtube_service, session, parameters, publishable);
-#line 3087 "YouTubePublishing.c"
+#line 3362 "YouTubePublishing.c"
}
-static Block1Data* block1_data_ref (Block1Data* _data1_) {
+static Block1Data*
+block1_data_ref (Block1Data* _data1_)
+{
#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
g_atomic_int_inc (&_data1_->_ref_count_);
#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return _data1_;
-#line 3096 "YouTubePublishing.c"
+#line 3373 "YouTubePublishing.c"
}
-static void block1_data_unref (void * _userdata_) {
+static void
+block1_data_unref (void * _userdata_)
+{
Block1Data* _data1_;
_data1_ = (Block1Data*) _userdata_;
#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
if (g_atomic_int_dec_and_test (&_data1_->_ref_count_)) {
-#line 3105 "YouTubePublishing.c"
+#line 3384 "YouTubePublishing.c"
PublishingYouTubeUploadTransaction* self;
#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
self = _data1_->self;
@@ -3118,14 +3397,18 @@ static void block1_data_unref (void * _userdata_) {
_publishing_rest_support_transaction_unref0 (self);
#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
g_slice_free (Block1Data, _data1_);
-#line 3115 "YouTubePublishing.c"
+#line 3394 "YouTubePublishing.c"
}
}
-static void ___lambda4_ (Block1Data* _data1_, GObject* obj, GAsyncResult* res) {
+static void
+___lambda4_ (Block1Data* _data1_,
+ GObject* obj,
+ GAsyncResult* res)
+{
PublishingYouTubeUploadTransaction* self;
- GMainLoop* _tmp3_;
+ GMainLoop* _tmp2_;
GError * _inner_error_ = NULL;
#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
self = _data1_->self;
@@ -3133,16 +3416,13 @@ static void ___lambda4_ (Block1Data* _data1_, GObject* obj, GAsyncResult* res) {
g_return_if_fail ((obj == NULL) || G_IS_OBJECT (obj));
#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
g_return_if_fail (G_IS_ASYNC_RESULT (res));
-#line 3130 "YouTubePublishing.c"
+#line 3413 "YouTubePublishing.c"
{
- GAsyncResult* _tmp0_;
-#line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp0_ = res;
#line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- publishing_you_tube_upload_transaction_splice_with_progress_finish (self, _tmp0_, &_inner_error_);
+ publishing_you_tube_upload_transaction_splice_with_progress_finish (self, res, &_inner_error_);
#line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3139 "YouTubePublishing.c"
+#line 3419 "YouTubePublishing.c"
goto __catch27_g_error;
}
}
@@ -3150,21 +3430,21 @@ static void ___lambda4_ (Block1Data* _data1_, GObject* obj, GAsyncResult* res) {
__catch27_g_error:
{
GError* _error_ = NULL;
- GError* _tmp1_;
- const gchar* _tmp2_;
+ GError* _tmp0_;
+ const gchar* _tmp1_;
#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_error_ = _inner_error_;
#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_inner_error_ = NULL;
#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp1_ = _error_;
+ _tmp0_ = _error_;
#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp2_ = _tmp1_->message;
+ _tmp1_ = _tmp0_->message;
#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- g_critical ("YouTubePublishing.vala:451: Failed to upload: %s", _tmp2_);
+ g_critical ("YouTubePublishing.vala:451: Failed to upload: %s", _tmp1_);
#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_g_error_free0 (_error_);
-#line 3161 "YouTubePublishing.c"
+#line 3441 "YouTubePublishing.c"
}
__finally27:
#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -3175,26 +3455,33 @@ static void ___lambda4_ (Block1Data* _data1_, GObject* obj, GAsyncResult* res) {
g_clear_error (&_inner_error_);
#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return;
-#line 3172 "YouTubePublishing.c"
+#line 3452 "YouTubePublishing.c"
}
#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp3_ = _data1_->loop;
+ _tmp2_ = _data1_->loop;
#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- g_main_loop_quit (_tmp3_);
-#line 3178 "YouTubePublishing.c"
+ g_main_loop_quit (_tmp2_);
+#line 3458 "YouTubePublishing.c"
}
-static void ____lambda4__gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self) {
+static void
+____lambda4__gasync_ready_callback (GObject* source_object,
+ GAsyncResult* res,
+ gpointer self)
+{
#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
___lambda4_ (self, source_object, res);
#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
block1_data_unref (self);
-#line 3187 "YouTubePublishing.c"
+#line 3471 "YouTubePublishing.c"
}
-static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error) {
+static void
+publishing_you_tube_upload_transaction_real_execute (PublishingRESTSupportTransaction* base,
+ GError** error)
+{
PublishingYouTubeUploadTransaction * self;
GDataYouTubeVideo* video = NULL;
GDataYouTubeVideo* _tmp0_;
@@ -3209,12 +3496,10 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS
const gchar* _tmp9_;
GDataYouTubeVideo* _tmp10_;
PublishingYouTubePublishingParameters* _tmp11_;
- PublishingYouTubePrivacySetting _tmp12_;
- PublishingYouTubePublishingParameters* _tmp13_;
- PublishingYouTubePrivacySetting _tmp14_;
+ PublishingYouTubePublishingParameters* _tmp12_;
GFile* file = NULL;
- SpitPublishingPublishable* _tmp20_;
- GFile* _tmp21_;
+ SpitPublishingPublishable* _tmp18_;
+ GFile* _tmp19_;
GError * _inner_error_ = NULL;
#line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YOU_TUBE_TYPE_UPLOAD_TRANSACTION, PublishingYouTubeUploadTransaction);
@@ -3238,7 +3523,7 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS
_tmp5_ = title;
#line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
if (g_strcmp0 (_tmp5_, "") == 0) {
-#line 3235 "YouTubePublishing.c"
+#line 3520 "YouTubePublishing.c"
SpitPublishingPublishable* _tmp6_;
gchar* _tmp7_;
#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -3249,7 +3534,7 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS
_g_free0 (title);
#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
title = _tmp7_;
-#line 3246 "YouTubePublishing.c"
+#line 3531 "YouTubePublishing.c"
}
#line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_tmp8_ = video;
@@ -3262,75 +3547,71 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS
#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_tmp11_ = self->priv->parameters;
#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp12_ = publishing_you_tube_publishing_parameters_get_privacy (_tmp11_);
-#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- g_object_set (_tmp10_, "is-private", _tmp12_ == PUBLISHING_YOU_TUBE_PRIVACY_SETTING_PRIVATE, NULL);
-#line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp13_ = self->priv->parameters;
+ g_object_set (_tmp10_, "is-private", publishing_you_tube_publishing_parameters_get_privacy (_tmp11_) == PUBLISHING_YOU_TUBE_PRIVACY_SETTING_PRIVATE, NULL);
#line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp14_ = publishing_you_tube_publishing_parameters_get_privacy (_tmp13_);
+ _tmp12_ = self->priv->parameters;
#line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- if (_tmp14_ == PUBLISHING_YOU_TUBE_PRIVACY_SETTING_UNLISTED) {
-#line 3268 "YouTubePublishing.c"
- GDataYouTubeVideo* _tmp15_;
+ if (publishing_you_tube_publishing_parameters_get_privacy (_tmp12_) == PUBLISHING_YOU_TUBE_PRIVACY_SETTING_UNLISTED) {
+#line 3549 "YouTubePublishing.c"
+ GDataYouTubeVideo* _tmp13_;
#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp15_ = video;
+ _tmp13_ = video;
#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- gdata_youtube_video_set_access_control (_tmp15_, "list", GDATA_YOUTUBE_PERMISSION_DENIED);
-#line 3274 "YouTubePublishing.c"
+ gdata_youtube_video_set_access_control (_tmp13_, "list", GDATA_YOUTUBE_PERMISSION_DENIED);
+#line 3555 "YouTubePublishing.c"
} else {
- GDataYouTubeVideo* _tmp16_;
- gboolean _tmp17_;
- gboolean _tmp18_;
+ GDataYouTubeVideo* _tmp14_;
+ gboolean _tmp15_;
+ gboolean _tmp16_;
#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp16_ = video;
+ _tmp14_ = video;
#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- g_object_get (_tmp16_, "is-private", &_tmp17_, NULL);
+ g_object_get (_tmp14_, "is-private", &_tmp15_, NULL);
#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp18_ = _tmp17_;
+ _tmp16_ = _tmp15_;
#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- if (!_tmp18_) {
-#line 3287 "YouTubePublishing.c"
- GDataYouTubeVideo* _tmp19_;
+ if (!_tmp16_) {
+#line 3568 "YouTubePublishing.c"
+ GDataYouTubeVideo* _tmp17_;
#line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp19_ = video;
+ _tmp17_ = video;
#line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- gdata_youtube_video_set_access_control (_tmp19_, "list", GDATA_YOUTUBE_PERMISSION_ALLOWED);
-#line 3293 "YouTubePublishing.c"
+ gdata_youtube_video_set_access_control (_tmp17_, "list", GDATA_YOUTUBE_PERMISSION_ALLOWED);
+#line 3574 "YouTubePublishing.c"
}
}
#line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp20_ = self->priv->publishable;
+ _tmp18_ = self->priv->publishable;
#line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp21_ = spit_publishing_publishable_get_serialized_file (_tmp20_);
+ _tmp19_ = spit_publishing_publishable_get_serialized_file (_tmp18_);
#line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- file = _tmp21_;
-#line 3302 "YouTubePublishing.c"
+ file = _tmp19_;
+#line 3583 "YouTubePublishing.c"
{
Block1Data* _data1_;
GFileInfo* info = NULL;
- GFile* _tmp22_;
- GFileInfo* _tmp23_;
+ GFile* _tmp20_;
+ GFileInfo* _tmp21_;
GDataUploadStream* upload_stream = NULL;
- GDataYouTubeService* _tmp24_;
- GDataYouTubeVideo* _tmp25_;
+ GDataYouTubeService* _tmp22_;
+ GDataYouTubeVideo* _tmp23_;
+ const gchar* _tmp24_;
+ GFileInfo* _tmp25_;
const gchar* _tmp26_;
- GFileInfo* _tmp27_;
- const gchar* _tmp28_;
- GDataUploadStream* _tmp29_;
+ GDataUploadStream* _tmp27_;
GFileInputStream* input_stream = NULL;
- GFile* _tmp30_;
- GFileInputStream* _tmp31_;
- GMainLoop* _tmp32_;
- GFileInfo* _tmp33_;
- GFileInputStream* _tmp34_;
- GDataUploadStream* _tmp35_;
- GMainLoop* _tmp36_;
- GDataYouTubeVideo* _tmp37_ = NULL;
- GDataYouTubeService* _tmp38_;
- GDataUploadStream* _tmp39_;
- GDataYouTubeVideo* _tmp40_;
- GDataYouTubeVideo* _tmp41_;
+ GFile* _tmp28_;
+ GFileInputStream* _tmp29_;
+ GMainLoop* _tmp30_;
+ GFileInfo* _tmp31_;
+ GFileInputStream* _tmp32_;
+ GDataUploadStream* _tmp33_;
+ GMainLoop* _tmp34_;
+ GDataYouTubeVideo* _tmp35_ = NULL;
+ GDataYouTubeService* _tmp36_;
+ GDataUploadStream* _tmp37_;
+ GDataYouTubeVideo* _tmp38_;
+ GDataYouTubeVideo* _tmp39_;
#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_data1_ = g_slice_new0 (Block1Data);
#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -3338,34 +3619,34 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS
#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_data1_->self = publishing_rest_support_transaction_ref (self);
#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp22_ = file;
+ _tmp20_ = file;
#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp23_ = g_file_query_info (_tmp22_, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE "," G_FILE_ATTRIBUTE_STANDARD_SIZE, G_FILE_QUERY_INFO_NONE, NULL, &_inner_error_);
+ _tmp21_ = g_file_query_info (_tmp20_, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE "," G_FILE_ATTRIBUTE_STANDARD_SIZE, G_FILE_QUERY_INFO_NONE, NULL, &_inner_error_);
#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- info = _tmp23_;
+ info = _tmp21_;
#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
block1_data_unref (_data1_);
#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_data1_ = NULL;
-#line 3346 "YouTubePublishing.c"
+#line 3627 "YouTubePublishing.c"
goto __catch26_g_error;
}
#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp24_ = self->priv->youtube_service;
+ _tmp22_ = self->priv->youtube_service;
#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp25_ = video;
+ _tmp23_ = video;
#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp26_ = slug;
+ _tmp24_ = slug;
#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp27_ = info;
+ _tmp25_ = info;
#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp28_ = g_file_info_get_content_type (_tmp27_);
+ _tmp26_ = g_file_info_get_content_type (_tmp25_);
#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp29_ = gdata_youtube_service_upload_video (_tmp24_, _tmp25_, _tmp26_, _tmp28_, NULL, &_inner_error_);
+ _tmp27_ = gdata_youtube_service_upload_video (_tmp22_, _tmp23_, _tmp24_, _tmp26_, NULL, &_inner_error_);
#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- upload_stream = _tmp29_;
+ upload_stream = _tmp27_;
#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -3374,15 +3655,15 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS
block1_data_unref (_data1_);
#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_data1_ = NULL;
-#line 3371 "YouTubePublishing.c"
+#line 3652 "YouTubePublishing.c"
goto __catch26_g_error;
}
#line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp30_ = file;
+ _tmp28_ = file;
#line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp31_ = g_file_read (_tmp30_, NULL, &_inner_error_);
+ _tmp29_ = g_file_read (_tmp28_, NULL, &_inner_error_);
#line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- input_stream = _tmp31_;
+ input_stream = _tmp29_;
#line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -3393,33 +3674,33 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS
block1_data_unref (_data1_);
#line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_data1_ = NULL;
-#line 3390 "YouTubePublishing.c"
+#line 3671 "YouTubePublishing.c"
goto __catch26_g_error;
}
#line 446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp32_ = g_main_loop_new (NULL, FALSE);
+ _tmp30_ = g_main_loop_new (NULL, FALSE);
#line 446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _data1_->loop = _tmp32_;
+ _data1_->loop = _tmp30_;
#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp33_ = info;
+ _tmp31_ = info;
#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp34_ = input_stream;
+ _tmp32_ = input_stream;
#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp35_ = upload_stream;
+ _tmp33_ = upload_stream;
#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- publishing_you_tube_upload_transaction_splice_with_progress (self, _tmp33_, G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, g_input_stream_get_type (), GInputStream), G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, g_output_stream_get_type (), GOutputStream), ____lambda4__gasync_ready_callback, block1_data_ref (_data1_));
+ publishing_you_tube_upload_transaction_splice_with_progress (self, _tmp31_, G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, g_input_stream_get_type (), GInputStream), G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, g_output_stream_get_type (), GOutputStream), ____lambda4__gasync_ready_callback, block1_data_ref (_data1_));
#line 455 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp36_ = _data1_->loop;
+ _tmp34_ = _data1_->loop;
#line 455 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- g_main_loop_run (_tmp36_);
+ g_main_loop_run (_tmp34_);
#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp38_ = self->priv->youtube_service;
+ _tmp36_ = self->priv->youtube_service;
#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp39_ = upload_stream;
+ _tmp37_ = upload_stream;
#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp40_ = gdata_youtube_service_finish_video_upload (_tmp38_, _tmp39_, &_inner_error_);
+ _tmp38_ = gdata_youtube_service_finish_video_upload (_tmp36_, _tmp37_, &_inner_error_);
#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp37_ = _tmp40_;
+ _tmp35_ = _tmp38_;
#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -3432,19 +3713,19 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS
block1_data_unref (_data1_);
#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_data1_ = NULL;
-#line 3429 "YouTubePublishing.c"
+#line 3710 "YouTubePublishing.c"
goto __catch26_g_error;
}
#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp41_ = _tmp37_;
+ _tmp39_ = _tmp35_;
#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp37_ = NULL;
+ _tmp35_ = NULL;
#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_g_object_unref0 (video);
#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- video = _tmp41_;
+ video = _tmp39_;
#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _g_object_unref0 (_tmp37_);
+ _g_object_unref0 (_tmp35_);
#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_g_object_unref0 (input_stream);
#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -3455,27 +3736,27 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS
block1_data_unref (_data1_);
#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_data1_ = NULL;
-#line 3452 "YouTubePublishing.c"
+#line 3733 "YouTubePublishing.c"
}
goto __finally26;
__catch26_g_error:
{
GError* _error_ = NULL;
- GError* _tmp42_;
- const gchar* _tmp43_;
+ GError* _tmp40_;
+ const gchar* _tmp41_;
#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_error_ = _inner_error_;
#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_inner_error_ = NULL;
#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp42_ = _error_;
+ _tmp40_ = _error_;
#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp43_ = _tmp42_->message;
+ _tmp41_ = _tmp40_->message;
#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- g_critical ("YouTubePublishing.vala:458: Upload failed: %s", _tmp43_);
+ g_critical ("YouTubePublishing.vala:458: Upload failed: %s", _tmp41_);
#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_g_error_free0 (_error_);
-#line 3472 "YouTubePublishing.c"
+#line 3753 "YouTubePublishing.c"
}
__finally26:
#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -3494,7 +3775,7 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS
_g_object_unref0 (video);
#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return;
-#line 3491 "YouTubePublishing.c"
+#line 3772 "YouTubePublishing.c"
} else {
#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_g_object_unref0 (file);
@@ -3510,7 +3791,7 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS
g_clear_error (&_inner_error_);
#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return;
-#line 3507 "YouTubePublishing.c"
+#line 3788 "YouTubePublishing.c"
}
}
#line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -3521,11 +3802,13 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS
_g_free0 (slug);
#line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_g_object_unref0 (video);
-#line 3518 "YouTubePublishing.c"
+#line 3799 "YouTubePublishing.c"
}
-static void publishing_you_tube_upload_transaction_splice_with_progress_data_free (gpointer _data) {
+static void
+publishing_you_tube_upload_transaction_splice_with_progress_data_free (gpointer _data)
+{
PublishingYouTubeUploadTransactionSpliceWithProgressData* _data_;
_data_ = _data;
#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -3538,11 +3821,15 @@ static void publishing_you_tube_upload_transaction_splice_with_progress_data_fre
_publishing_rest_support_transaction_unref0 (_data_->self);
#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
g_slice_free (PublishingYouTubeUploadTransactionSpliceWithProgressData, _data_);
-#line 3535 "YouTubePublishing.c"
+#line 3818 "YouTubePublishing.c"
}
-static void publishing_you_tube_upload_transaction_splice_with_progress_async_ready_wrapper (GObject *source_object, GAsyncResult *res, void *user_data) {
+static void
+publishing_you_tube_upload_transaction_splice_with_progress_async_ready_wrapper (GObject *source_object,
+ GAsyncResult *res,
+ void *user_data)
+{
PublishingYouTubeUploadTransactionSpliceWithProgressData* _task_data_;
#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_task_data_ = g_task_get_task_data (G_TASK (res));
@@ -3550,30 +3837,36 @@ static void publishing_you_tube_upload_transaction_splice_with_progress_async_re
if (_task_data_->_callback_ != NULL) {
#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_task_data_->_callback_ (source_object, res, user_data);
-#line 3547 "YouTubePublishing.c"
+#line 3834 "YouTubePublishing.c"
}
#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_task_data_->_task_complete_ = TRUE;
-#line 3551 "YouTubePublishing.c"
+#line 3838 "YouTubePublishing.c"
}
-static gpointer _publishing_rest_support_transaction_ref0 (gpointer self) {
+static gpointer
+_publishing_rest_support_transaction_ref0 (gpointer self)
+{
#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return self ? publishing_rest_support_transaction_ref (self) : NULL;
-#line 3558 "YouTubePublishing.c"
+#line 3847 "YouTubePublishing.c"
}
-static void publishing_you_tube_upload_transaction_splice_with_progress (PublishingYouTubeUploadTransaction* self, GFileInfo* info, GInputStream* input, GOutputStream* output, GAsyncReadyCallback _callback_, gpointer _user_data_) {
+static void
+publishing_you_tube_upload_transaction_splice_with_progress (PublishingYouTubeUploadTransaction* self,
+ GFileInfo* info,
+ GInputStream* input,
+ GOutputStream* output,
+ GAsyncReadyCallback _callback_,
+ gpointer _user_data_)
+{
PublishingYouTubeUploadTransactionSpliceWithProgressData* _data_;
PublishingYouTubeUploadTransaction* _tmp0_;
GFileInfo* _tmp1_;
- GFileInfo* _tmp2_;
- GInputStream* _tmp3_;
- GInputStream* _tmp4_;
- GOutputStream* _tmp5_;
- GOutputStream* _tmp6_;
+ GInputStream* _tmp2_;
+ GOutputStream* _tmp3_;
#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_data_ = g_slice_new0 (PublishingYouTubeUploadTransactionSpliceWithProgressData);
#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -3584,7 +3877,7 @@ static void publishing_you_tube_upload_transaction_splice_with_progress (Publish
if (_callback_ == NULL) {
#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_data_->_task_complete_ = TRUE;
-#line 3581 "YouTubePublishing.c"
+#line 3874 "YouTubePublishing.c"
}
#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
g_task_set_task_data (_data_->_async_result, _data_, publishing_you_tube_upload_transaction_splice_with_progress_data_free);
@@ -3593,36 +3886,34 @@ static void publishing_you_tube_upload_transaction_splice_with_progress (Publish
#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_data_->self = _tmp0_;
#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp1_ = info;
-#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp2_ = _g_object_ref0 (_tmp1_);
+ _tmp1_ = _g_object_ref0 (info);
#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_g_object_unref0 (_data_->info);
#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _data_->info = _tmp2_;
-#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp3_ = input;
+ _data_->info = _tmp1_;
#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp4_ = _g_object_ref0 (_tmp3_);
+ _tmp2_ = _g_object_ref0 (input);
#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_g_object_unref0 (_data_->input);
#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _data_->input = _tmp4_;
+ _data_->input = _tmp2_;
#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp5_ = output;
-#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp6_ = _g_object_ref0 (_tmp5_);
+ _tmp3_ = _g_object_ref0 (output);
#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_g_object_unref0 (_data_->output);
#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _data_->output = _tmp6_;
+ _data_->output = _tmp3_;
#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
publishing_you_tube_upload_transaction_splice_with_progress_co (_data_);
-#line 3615 "YouTubePublishing.c"
+#line 3902 "YouTubePublishing.c"
}
-static void publishing_you_tube_upload_transaction_splice_with_progress_finish (PublishingYouTubeUploadTransaction* self, GAsyncResult* _res_, GError** error) {
+static void
+publishing_you_tube_upload_transaction_splice_with_progress_finish (PublishingYouTubeUploadTransaction* self,
+ GAsyncResult* _res_,
+ GError** error)
+{
PublishingYouTubeUploadTransactionSpliceWithProgressData* _data_;
#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_data_ = g_task_propagate_pointer (G_TASK (_res_), error);
@@ -3630,12 +3921,16 @@ static void publishing_you_tube_upload_transaction_splice_with_progress_finish (
if (NULL == _data_) {
#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return;
-#line 3627 "YouTubePublishing.c"
+#line 3918 "YouTubePublishing.c"
}
}
-static void publishing_you_tube_upload_transaction_splice_with_progress_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_) {
+static void
+publishing_you_tube_upload_transaction_splice_with_progress_ready (GObject* source_object,
+ GAsyncResult* _res_,
+ gpointer _user_data_)
+{
PublishingYouTubeUploadTransactionSpliceWithProgressData* _data_;
#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_data_ = _user_data_;
@@ -3647,73 +3942,67 @@ static void publishing_you_tube_upload_transaction_splice_with_progress_ready (G
_data_->_task_complete_ = TRUE;
#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
publishing_you_tube_upload_transaction_splice_with_progress_co (_data_);
-#line 3644 "YouTubePublishing.c"
+#line 3939 "YouTubePublishing.c"
}
-static gboolean publishing_you_tube_upload_transaction_splice_with_progress_co (PublishingYouTubeUploadTransactionSpliceWithProgressData* _data_) {
+static gboolean
+publishing_you_tube_upload_transaction_splice_with_progress_co (PublishingYouTubeUploadTransactionSpliceWithProgressData* _data_)
+{
#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
switch (_data_->_state_) {
#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
case 0:
-#line 3653 "YouTubePublishing.c"
+#line 3950 "YouTubePublishing.c"
goto _state_0;
#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
case 1:
-#line 3657 "YouTubePublishing.c"
+#line 3954 "YouTubePublishing.c"
goto _state_1;
#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
case 2:
-#line 3661 "YouTubePublishing.c"
+#line 3958 "YouTubePublishing.c"
goto _state_2;
#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
case 3:
-#line 3665 "YouTubePublishing.c"
+#line 3962 "YouTubePublishing.c"
goto _state_3;
#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
case 4:
-#line 3669 "YouTubePublishing.c"
+#line 3966 "YouTubePublishing.c"
goto _state_4;
default:
#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
g_assert_not_reached ();
-#line 3674 "YouTubePublishing.c"
+#line 3971 "YouTubePublishing.c"
}
_state_0:
#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _data_->_tmp0_ = _data_->info;
-#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _data_->_tmp1_ = g_file_info_get_size (_data_->_tmp0_);
-#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _data_->total_bytes = _data_->_tmp1_;
+ _data_->total_bytes = g_file_info_get_size (_data_->info);
#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _data_->_tmp2_ = _data_->total_bytes;
+ _data_->_tmp0_ = _data_->total_bytes;
#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _data_->bytes_to_write = _data_->_tmp2_;
+ _data_->bytes_to_write = _data_->_tmp0_;
#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
while (TRUE) {
#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _data_->_tmp3_ = _data_->bytes_to_write;
+ _data_->_tmp1_ = _data_->bytes_to_write;
#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- if (!(_data_->_tmp3_ > ((gint64) 0))) {
+ if (!(_data_->_tmp1_ > ((gint64) 0))) {
#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
break;
-#line 3695 "YouTubePublishing.c"
+#line 3988 "YouTubePublishing.c"
}
#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _data_->_tmp4_ = _data_->input;
-#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_data_->_state_ = 1;
#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- g_input_stream_read_async (_data_->_tmp4_, _data_->buffer, (gsize) 8192, G_PRIORITY_DEFAULT, NULL, publishing_you_tube_upload_transaction_splice_with_progress_ready, _data_);
+ g_input_stream_read_async (_data_->input, _data_->buffer, (gsize) 8192, G_PRIORITY_DEFAULT, NULL, publishing_you_tube_upload_transaction_splice_with_progress_ready, _data_);
#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return FALSE;
-#line 3705 "YouTubePublishing.c"
+#line 3996 "YouTubePublishing.c"
_state_1:
#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _data_->_tmp5_ = g_input_stream_read_finish (_data_->_tmp4_, _data_->_res_, &_data_->_inner_error_);
-#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _data_->bytes_read = _data_->_tmp5_;
+ _data_->bytes_read = g_input_stream_read_finish (_data_->input, _data_->_res_, &_data_->_inner_error_);
#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -3722,32 +4011,28 @@ static gboolean publishing_you_tube_upload_transaction_splice_with_progress_co (
g_object_unref (_data_->_async_result);
#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return FALSE;
-#line 3719 "YouTubePublishing.c"
+#line 4008 "YouTubePublishing.c"
}
#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _data_->_tmp6_ = _data_->bytes_read;
+ _data_->_tmp2_ = _data_->bytes_read;
#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- if (_data_->_tmp6_ == ((gssize) 0)) {
+ if (_data_->_tmp2_ == ((gssize) 0)) {
#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
break;
-#line 3727 "YouTubePublishing.c"
+#line 4016 "YouTubePublishing.c"
}
#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _data_->_tmp7_ = _data_->output;
-#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _data_->_tmp8_ = _data_->bytes_read;
+ _data_->_tmp3_ = _data_->bytes_read;
#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_data_->_state_ = 2;
#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- g_output_stream_write_async (_data_->_tmp7_, _data_->buffer + 0, (gsize) (((gint) _data_->_tmp8_) - 0), G_PRIORITY_DEFAULT, NULL, publishing_you_tube_upload_transaction_splice_with_progress_ready, _data_);
+ g_output_stream_write_async (_data_->output, _data_->buffer + 0, (gsize) (((gint) _data_->_tmp3_) - 0), G_PRIORITY_DEFAULT, NULL, publishing_you_tube_upload_transaction_splice_with_progress_ready, _data_);
#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return FALSE;
-#line 3739 "YouTubePublishing.c"
+#line 4026 "YouTubePublishing.c"
_state_2:
#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _data_->_tmp9_ = g_output_stream_write_finish (_data_->_tmp7_, _data_->_res_, &_data_->_inner_error_);
-#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _data_->bytes_written = _data_->_tmp9_;
+ _data_->bytes_written = g_output_stream_write_finish (_data_->output, _data_->_res_, &_data_->_inner_error_);
#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -3756,36 +4041,34 @@ static gboolean publishing_you_tube_upload_transaction_splice_with_progress_co (
g_object_unref (_data_->_async_result);
#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return FALSE;
-#line 3753 "YouTubePublishing.c"
+#line 4038 "YouTubePublishing.c"
}
#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _data_->_tmp10_ = _data_->bytes_to_write;
+ _data_->_tmp4_ = _data_->bytes_to_write;
#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _data_->_tmp11_ = _data_->bytes_written;
+ _data_->_tmp5_ = _data_->bytes_written;
#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _data_->bytes_to_write = _data_->_tmp10_ - _data_->_tmp11_;
+ _data_->bytes_to_write = _data_->_tmp4_ - _data_->_tmp5_;
#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _data_->_tmp12_ = _data_->total_bytes;
+ _data_->_tmp6_ = _data_->total_bytes;
#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _data_->_tmp13_ = _data_->bytes_to_write;
+ _data_->_tmp7_ = _data_->bytes_to_write;
#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _data_->_tmp14_ = _data_->total_bytes;
+ _data_->_tmp8_ = _data_->total_bytes;
#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_data_->self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "chunk-transmitted", (gint) (_data_->_tmp12_ - _data_->_tmp13_), (gint) _data_->_tmp14_);
-#line 3769 "YouTubePublishing.c"
+ g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_data_->self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "chunk-transmitted", (gint) (_data_->_tmp6_ - _data_->_tmp7_), (gint) _data_->_tmp8_);
+#line 4054 "YouTubePublishing.c"
}
#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _data_->_tmp15_ = _data_->output;
-#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_data_->_state_ = 3;
#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- g_output_stream_close_async (_data_->_tmp15_, G_PRIORITY_DEFAULT, NULL, publishing_you_tube_upload_transaction_splice_with_progress_ready, _data_);
+ g_output_stream_close_async (_data_->output, G_PRIORITY_DEFAULT, NULL, publishing_you_tube_upload_transaction_splice_with_progress_ready, _data_);
#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return FALSE;
-#line 3779 "YouTubePublishing.c"
+#line 4062 "YouTubePublishing.c"
_state_3:
#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- g_output_stream_close_finish (_data_->_tmp15_, _data_->_res_, &_data_->_inner_error_);
+ g_output_stream_close_finish (_data_->output, _data_->_res_, &_data_->_inner_error_);
#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -3794,20 +4077,18 @@ static gboolean publishing_you_tube_upload_transaction_splice_with_progress_co (
g_object_unref (_data_->_async_result);
#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return FALSE;
-#line 3791 "YouTubePublishing.c"
+#line 4074 "YouTubePublishing.c"
}
#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _data_->_tmp16_ = _data_->input;
-#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_data_->_state_ = 4;
#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- g_input_stream_close_async (_data_->_tmp16_, G_PRIORITY_DEFAULT, NULL, publishing_you_tube_upload_transaction_splice_with_progress_ready, _data_);
+ g_input_stream_close_async (_data_->input, G_PRIORITY_DEFAULT, NULL, publishing_you_tube_upload_transaction_splice_with_progress_ready, _data_);
#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return FALSE;
-#line 3801 "YouTubePublishing.c"
+#line 4082 "YouTubePublishing.c"
_state_4:
#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- g_input_stream_close_finish (_data_->_tmp16_, _data_->_res_, &_data_->_inner_error_);
+ g_input_stream_close_finish (_data_->input, _data_->_res_, &_data_->_inner_error_);
#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -3816,7 +4097,7 @@ static gboolean publishing_you_tube_upload_transaction_splice_with_progress_co (
g_object_unref (_data_->_async_result);
#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return FALSE;
-#line 3813 "YouTubePublishing.c"
+#line 4094 "YouTubePublishing.c"
}
#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
g_task_return_pointer (_data_->_async_result, _data_, NULL);
@@ -3826,18 +4107,20 @@ static gboolean publishing_you_tube_upload_transaction_splice_with_progress_co (
while (_data_->_task_complete_ != TRUE) {
#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
g_main_context_iteration (g_task_get_context (_data_->_async_result), TRUE);
-#line 3823 "YouTubePublishing.c"
+#line 4104 "YouTubePublishing.c"
}
}
#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
g_object_unref (_data_->_async_result);
#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return FALSE;
-#line 3830 "YouTubePublishing.c"
+#line 4111 "YouTubePublishing.c"
}
-static void publishing_you_tube_upload_transaction_class_init (PublishingYouTubeUploadTransactionClass * klass) {
+static void
+publishing_you_tube_upload_transaction_class_init (PublishingYouTubeUploadTransactionClass * klass)
+{
#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
publishing_you_tube_upload_transaction_parent_class = g_type_class_peek_parent (klass);
#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -3846,18 +4129,22 @@ static void publishing_you_tube_upload_transaction_class_init (PublishingYouTube
g_type_class_add_private (klass, sizeof (PublishingYouTubeUploadTransactionPrivate));
#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*) (PublishingRESTSupportTransaction *, GError**)) publishing_you_tube_upload_transaction_real_execute;
-#line 3843 "YouTubePublishing.c"
+#line 4126 "YouTubePublishing.c"
}
-static void publishing_you_tube_upload_transaction_instance_init (PublishingYouTubeUploadTransaction * self) {
+static void
+publishing_you_tube_upload_transaction_instance_init (PublishingYouTubeUploadTransaction * self)
+{
#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
self->priv = PUBLISHING_YOU_TUBE_UPLOAD_TRANSACTION_GET_PRIVATE (self);
-#line 3850 "YouTubePublishing.c"
+#line 4135 "YouTubePublishing.c"
}
-static void publishing_you_tube_upload_transaction_finalize (PublishingRESTSupportTransaction * obj) {
+static void
+publishing_you_tube_upload_transaction_finalize (PublishingRESTSupportTransaction * obj)
+{
PublishingYouTubeUploadTransaction * self;
#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YOU_TUBE_TYPE_UPLOAD_TRANSACTION, PublishingYouTubeUploadTransaction);
@@ -3871,11 +4158,13 @@ static void publishing_you_tube_upload_transaction_finalize (PublishingRESTSuppo
_g_object_unref0 (self->priv->youtube_service);
#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_you_tube_upload_transaction_parent_class)->finalize (obj);
-#line 3868 "YouTubePublishing.c"
+#line 4155 "YouTubePublishing.c"
}
-GType publishing_you_tube_upload_transaction_get_type (void) {
+GType
+publishing_you_tube_upload_transaction_get_type (void)
+{
static volatile gsize publishing_you_tube_upload_transaction_type_id__volatile = 0;
if (g_once_init_enter (&publishing_you_tube_upload_transaction_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingYouTubeUploadTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_you_tube_upload_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingYouTubeUploadTransaction), 0, (GInstanceInitFunc) publishing_you_tube_upload_transaction_instance_init, NULL };
@@ -3887,15 +4176,17 @@ GType publishing_you_tube_upload_transaction_get_type (void) {
}
-PublishingYouTubeUploader* publishing_you_tube_uploader_construct (GType object_type, GDataYouTubeService* youtube_service, PublishingRESTSupportGoogleSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingYouTubePublishingParameters* parameters) {
+PublishingYouTubeUploader*
+publishing_you_tube_uploader_construct (GType object_type,
+ GDataYouTubeService* youtube_service,
+ PublishingRESTSupportGoogleSession* session,
+ SpitPublishingPublishable** publishables,
+ int publishables_length1,
+ PublishingYouTubePublishingParameters* parameters)
+{
PublishingYouTubeUploader* self = NULL;
- PublishingRESTSupportGoogleSession* _tmp0_;
- SpitPublishingPublishable** _tmp1_;
- gint _tmp1__length1;
- PublishingYouTubePublishingParameters* _tmp2_;
- PublishingYouTubePublishingParameters* _tmp3_;
- GDataYouTubeService* _tmp4_;
- GDataYouTubeService* _tmp5_;
+ PublishingYouTubePublishingParameters* _tmp0_;
+ GDataYouTubeService* _tmp1_;
#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
g_return_val_if_fail (GDATA_IS_YOUTUBE_SERVICE (youtube_service), NULL);
#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -3903,43 +4194,42 @@ PublishingYouTubeUploader* publishing_you_tube_uploader_construct (GType object_
#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
g_return_val_if_fail (PUBLISHING_YOU_TUBE_IS_PUBLISHING_PARAMETERS (parameters), NULL);
#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp0_ = session;
-#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp1_ = publishables;
-#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp1__length1 = publishables_length1;
-#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- self = (PublishingYouTubeUploader*) publishing_rest_support_batch_uploader_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, _tmp1__length1);
-#line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp2_ = parameters;
+ self = (PublishingYouTubeUploader*) publishing_rest_support_batch_uploader_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), publishables, publishables_length1);
#line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp3_ = _publishing_you_tube_publishing_parameters_ref0 (_tmp2_);
+ _tmp0_ = _publishing_you_tube_publishing_parameters_ref0 (parameters);
#line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_publishing_you_tube_publishing_parameters_unref0 (self->priv->parameters);
#line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- self->priv->parameters = _tmp3_;
+ self->priv->parameters = _tmp0_;
#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp4_ = youtube_service;
-#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp5_ = _g_object_ref0 (_tmp4_);
+ _tmp1_ = _g_object_ref0 (youtube_service);
#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_g_object_unref0 (self->priv->youtube_service);
#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- self->priv->youtube_service = _tmp5_;
+ self->priv->youtube_service = _tmp1_;
#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return self;
-#line 3925 "YouTubePublishing.c"
+#line 4206 "YouTubePublishing.c"
}
-PublishingYouTubeUploader* publishing_you_tube_uploader_new (GDataYouTubeService* youtube_service, PublishingRESTSupportGoogleSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingYouTubePublishingParameters* parameters) {
+PublishingYouTubeUploader*
+publishing_you_tube_uploader_new (GDataYouTubeService* youtube_service,
+ PublishingRESTSupportGoogleSession* session,
+ SpitPublishingPublishable** publishables,
+ int publishables_length1,
+ PublishingYouTubePublishingParameters* parameters)
+{
#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return publishing_you_tube_uploader_construct (PUBLISHING_YOU_TUBE_TYPE_UPLOADER, youtube_service, session, publishables, publishables_length1, parameters);
-#line 3932 "YouTubePublishing.c"
+#line 4219 "YouTubePublishing.c"
}
-static PublishingRESTSupportTransaction* publishing_you_tube_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base, SpitPublishingPublishable* publishable) {
+static PublishingRESTSupportTransaction*
+publishing_you_tube_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base,
+ SpitPublishingPublishable* publishable)
+{
PublishingYouTubeUploader * self;
PublishingRESTSupportTransaction* result = NULL;
GDataYouTubeService* _tmp0_;
@@ -3978,11 +4268,13 @@ static PublishingRESTSupportTransaction* publishing_you_tube_uploader_real_creat
result = _tmp7_;
#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return result;
-#line 3975 "YouTubePublishing.c"
+#line 4265 "YouTubePublishing.c"
}
-static void publishing_you_tube_uploader_class_init (PublishingYouTubeUploaderClass * klass) {
+static void
+publishing_you_tube_uploader_class_init (PublishingYouTubeUploaderClass * klass)
+{
#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
publishing_you_tube_uploader_parent_class = g_type_class_peek_parent (klass);
#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -3991,18 +4283,22 @@ static void publishing_you_tube_uploader_class_init (PublishingYouTubeUploaderCl
g_type_class_add_private (klass, sizeof (PublishingYouTubeUploaderPrivate));
#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = (PublishingRESTSupportTransaction* (*) (PublishingRESTSupportBatchUploader *, SpitPublishingPublishable*)) publishing_you_tube_uploader_real_create_transaction;
-#line 3988 "YouTubePublishing.c"
+#line 4280 "YouTubePublishing.c"
}
-static void publishing_you_tube_uploader_instance_init (PublishingYouTubeUploader * self) {
+static void
+publishing_you_tube_uploader_instance_init (PublishingYouTubeUploader * self)
+{
#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
self->priv = PUBLISHING_YOU_TUBE_UPLOADER_GET_PRIVATE (self);
-#line 3995 "YouTubePublishing.c"
+#line 4289 "YouTubePublishing.c"
}
-static void publishing_you_tube_uploader_finalize (PublishingRESTSupportBatchUploader * obj) {
+static void
+publishing_you_tube_uploader_finalize (PublishingRESTSupportBatchUploader * obj)
+{
PublishingYouTubeUploader * self;
#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YOU_TUBE_TYPE_UPLOADER, PublishingYouTubeUploader);
@@ -4012,11 +4308,13 @@ static void publishing_you_tube_uploader_finalize (PublishingRESTSupportBatchUpl
_g_object_unref0 (self->priv->youtube_service);
#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_CLASS (publishing_you_tube_uploader_parent_class)->finalize (obj);
-#line 4009 "YouTubePublishing.c"
+#line 4305 "YouTubePublishing.c"
}
-GType publishing_you_tube_uploader_get_type (void) {
+GType
+publishing_you_tube_uploader_get_type (void)
+{
static volatile gsize publishing_you_tube_uploader_type_id__volatile = 0;
if (g_once_init_enter (&publishing_you_tube_uploader_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingYouTubeUploaderClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_you_tube_uploader_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingYouTubeUploader), 0, (GInstanceInitFunc) publishing_you_tube_uploader_instance_init, NULL };
@@ -4028,7 +4326,11 @@ GType publishing_you_tube_uploader_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) {
@@ -4040,7 +4342,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/plugins/shotwell-publishing/shotwell-publishing.c b/plugins/shotwell-publishing/shotwell-publishing.c
index 21056e4..0a2cf42 100644
--- a/plugins/shotwell-publishing/shotwell-publishing.c
+++ b/plugins/shotwell-publishing/shotwell-publishing.c
@@ -1,4 +1,4 @@
-/* shotwell-publishing.c generated by valac 0.36.6, the Vala compiler
+/* shotwell-publishing.c generated by valac 0.40.4, the Vala compiler
* generated from shotwell-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 <shotwell-plugin-dev-1.0.h>
@@ -28,6 +29,11 @@
typedef struct _ShotwellPublishingCoreServices ShotwellPublishingCoreServices;
typedef struct _ShotwellPublishingCoreServicesClass ShotwellPublishingCoreServicesClass;
typedef struct _ShotwellPublishingCoreServicesPrivate ShotwellPublishingCoreServicesPrivate;
+enum {
+ SHOTWELL_PUBLISHING_CORE_SERVICES_0_PROPERTY,
+ SHOTWELL_PUBLISHING_CORE_SERVICES_NUM_PROPERTIES
+};
+static GParamSpec* shotwell_publishing_core_services_properties[SHOTWELL_PUBLISHING_CORE_SERVICES_NUM_PROPERTIES];
#define _g_free0(var) (var = (g_free (var), NULL))
#define TYPE_FACEBOOK_SERVICE (facebook_service_get_type ())
@@ -112,337 +118,379 @@ static SpitModuleIface * shotwell_publishing_core_services_spit_module_parent_if
GType shotwell_publishing_core_services_get_type (void) G_GNUC_CONST;
#define SHOTWELL_PUBLISHING_CORE_SERVICES_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SHOTWELL_PUBLISHING_CORE_SERVICES, ShotwellPublishingCoreServicesPrivate))
-enum {
- SHOTWELL_PUBLISHING_CORE_SERVICES_DUMMY_PROPERTY
-};
ShotwellPublishingCoreServices* shotwell_publishing_core_services_new (GFile* module_file);
-ShotwellPublishingCoreServices* shotwell_publishing_core_services_construct (GType object_type, GFile* module_file);
+ShotwellPublishingCoreServices* shotwell_publishing_core_services_construct (GType object_type,
+ GFile* module_file);
FacebookService* facebook_service_new (GFile* resource_directory);
-FacebookService* facebook_service_construct (GType object_type, GFile* resource_directory);
+FacebookService* facebook_service_construct (GType object_type,
+ GFile* resource_directory);
GType facebook_service_get_type (void) G_GNUC_CONST;
-static void _vala_array_add1 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value);
+static void _vala_array_add1 (SpitPluggable** * array,
+ int* length,
+ int* size,
+ SpitPluggable* value);
PicasaService* picasa_service_new (GFile* resource_directory);
-PicasaService* picasa_service_construct (GType object_type, GFile* resource_directory);
+PicasaService* picasa_service_construct (GType object_type,
+ GFile* resource_directory);
GType picasa_service_get_type (void) G_GNUC_CONST;
-static void _vala_array_add2 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value);
+static void _vala_array_add2 (SpitPluggable** * array,
+ int* length,
+ int* size,
+ SpitPluggable* value);
FlickrService* flickr_service_new (GFile* resource_directory);
-FlickrService* flickr_service_construct (GType object_type, GFile* resource_directory);
+FlickrService* flickr_service_construct (GType object_type,
+ GFile* resource_directory);
GType flickr_service_get_type (void) G_GNUC_CONST;
-static void _vala_array_add3 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value);
+static void _vala_array_add3 (SpitPluggable** * array,
+ int* length,
+ int* size,
+ SpitPluggable* value);
YouTubeService* you_tube_service_new (GFile* resource_directory);
-YouTubeService* you_tube_service_construct (GType object_type, GFile* resource_directory);
+YouTubeService* you_tube_service_construct (GType object_type,
+ GFile* resource_directory);
GType you_tube_service_get_type (void) G_GNUC_CONST;
-static void _vala_array_add4 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value);
+static void _vala_array_add4 (SpitPluggable** * array,
+ int* length,
+ int* size,
+ SpitPluggable* value);
PiwigoService* piwigo_service_new (GFile* resource_directory);
-PiwigoService* piwigo_service_construct (GType object_type, GFile* resource_directory);
+PiwigoService* piwigo_service_construct (GType object_type,
+ GFile* resource_directory);
GType piwigo_service_get_type (void) G_GNUC_CONST;
-static void _vala_array_add5 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value);
+static void _vala_array_add5 (SpitPluggable** * array,
+ int* length,
+ int* size,
+ SpitPluggable* value);
TumblrService* tumblr_service_new (GFile* resource_directory);
-TumblrService* tumblr_service_construct (GType object_type, GFile* resource_directory);
+TumblrService* tumblr_service_construct (GType object_type,
+ GFile* resource_directory);
GType tumblr_service_get_type (void) G_GNUC_CONST;
-static void _vala_array_add6 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value);
+static void _vala_array_add6 (SpitPluggable** * array,
+ int* length,
+ int* size,
+ SpitPluggable* value);
static const gchar* shotwell_publishing_core_services_real_get_module_name (SpitModule* base);
static const gchar* shotwell_publishing_core_services_real_get_version (SpitModule* base);
static const gchar* shotwell_publishing_core_services_real_get_id (SpitModule* base);
-static SpitPluggable** shotwell_publishing_core_services_real_get_pluggables (SpitModule* base, int* result_length1);
+static SpitPluggable** shotwell_publishing_core_services_real_get_pluggables (SpitModule* base,
+ int* result_length1);
static void shotwell_publishing_core_services_finalize (GObject * obj);
SpitModule* spit_entry_point (SpitEntryPointParams* params);
-static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
-static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
-
-
-static void _vala_array_add1 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) {
+static void _vala_array_destroy (gpointer array,
+ gint array_length,
+ GDestroyNotify destroy_func);
+static void _vala_array_free (gpointer array,
+ gint array_length,
+ GDestroyNotify destroy_func);
+
+
+static void
+_vala_array_add1 (SpitPluggable** * array,
+ int* length,
+ int* size,
+ SpitPluggable* value)
+{
#line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
if ((*length) == (*size)) {
#line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
*array = g_renew (SpitPluggable*, *array, (*size) + 1);
-#line 162 "shotwell-publishing.c"
+#line 200 "shotwell-publishing.c"
}
#line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
(*array)[(*length)++] = value;
#line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
(*array)[*length] = NULL;
-#line 168 "shotwell-publishing.c"
+#line 206 "shotwell-publishing.c"
}
-static void _vala_array_add2 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) {
+static void
+_vala_array_add2 (SpitPluggable** * array,
+ int* length,
+ int* size,
+ SpitPluggable* value)
+{
#line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
if ((*length) == (*size)) {
#line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
*array = g_renew (SpitPluggable*, *array, (*size) + 1);
-#line 179 "shotwell-publishing.c"
+#line 222 "shotwell-publishing.c"
}
#line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
(*array)[(*length)++] = value;
#line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
(*array)[*length] = NULL;
-#line 185 "shotwell-publishing.c"
+#line 228 "shotwell-publishing.c"
}
-static void _vala_array_add3 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) {
+static void
+_vala_array_add3 (SpitPluggable** * array,
+ int* length,
+ int* size,
+ SpitPluggable* value)
+{
#line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
if ((*length) == (*size)) {
#line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
*array = g_renew (SpitPluggable*, *array, (*size) + 1);
-#line 196 "shotwell-publishing.c"
+#line 244 "shotwell-publishing.c"
}
#line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
(*array)[(*length)++] = value;
#line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
(*array)[*length] = NULL;
-#line 202 "shotwell-publishing.c"
+#line 250 "shotwell-publishing.c"
}
-static void _vala_array_add4 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) {
+static void
+_vala_array_add4 (SpitPluggable** * array,
+ int* length,
+ int* size,
+ SpitPluggable* value)
+{
#line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
if ((*length) == (*size)) {
#line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
*array = g_renew (SpitPluggable*, *array, (*size) + 1);
-#line 213 "shotwell-publishing.c"
+#line 266 "shotwell-publishing.c"
}
#line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
(*array)[(*length)++] = value;
#line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
(*array)[*length] = NULL;
-#line 219 "shotwell-publishing.c"
+#line 272 "shotwell-publishing.c"
}
-static void _vala_array_add5 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) {
+static void
+_vala_array_add5 (SpitPluggable** * array,
+ int* length,
+ int* size,
+ SpitPluggable* value)
+{
#line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
if ((*length) == (*size)) {
#line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
*array = g_renew (SpitPluggable*, *array, (*size) + 1);
-#line 230 "shotwell-publishing.c"
+#line 288 "shotwell-publishing.c"
}
#line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
(*array)[(*length)++] = value;
#line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
(*array)[*length] = NULL;
-#line 236 "shotwell-publishing.c"
+#line 294 "shotwell-publishing.c"
}
-static void _vala_array_add6 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) {
+static void
+_vala_array_add6 (SpitPluggable** * array,
+ int* length,
+ int* size,
+ SpitPluggable* value)
+{
#line 54 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
if ((*length) == (*size)) {
#line 54 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 54 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
*array = g_renew (SpitPluggable*, *array, (*size) + 1);
-#line 247 "shotwell-publishing.c"
+#line 310 "shotwell-publishing.c"
}
#line 54 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
(*array)[(*length)++] = value;
#line 54 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
(*array)[*length] = NULL;
-#line 253 "shotwell-publishing.c"
+#line 316 "shotwell-publishing.c"
}
-ShotwellPublishingCoreServices* shotwell_publishing_core_services_construct (GType object_type, GFile* module_file) {
+ShotwellPublishingCoreServices*
+shotwell_publishing_core_services_construct (GType object_type,
+ GFile* module_file)
+{
ShotwellPublishingCoreServices * self = NULL;
GFile* resource_directory = NULL;
GFile* _tmp0_;
- GFile* _tmp1_;
PublishingAuthenticatorFactory* factory = NULL;
- PublishingAuthenticatorFactory* _tmp2_;
+ PublishingAuthenticatorFactory* _tmp1_;
GeeList* authenicators = NULL;
- PublishingAuthenticatorFactory* _tmp3_;
- GeeList* _tmp4_;
- GFile* _tmp5_;
+ PublishingAuthenticatorFactory* _tmp2_;
+ GeeList* _tmp3_;
+ GFile* _tmp4_;
+ gchar* _tmp5_;
gchar* _tmp6_;
- gchar* _tmp7_;
- GeeList* _tmp8_;
+ GeeList* _tmp7_;
+ gint _tmp8_;
gint _tmp9_;
- gint _tmp10_;
- GeeList* _tmp11_;
- gboolean _tmp12_;
- GeeList* _tmp16_;
- gboolean _tmp17_;
- GeeList* _tmp21_;
- gboolean _tmp22_;
- GeeList* _tmp26_;
- gboolean _tmp27_;
- SpitPluggable** _tmp31_;
- gint _tmp31__length1;
- GFile* _tmp32_;
- PiwigoService* _tmp33_;
- SpitPluggable** _tmp34_;
- gint _tmp34__length1;
- GFile* _tmp35_;
- GFile* _tmp36_;
- GFile* _tmp37_;
- TumblrService* _tmp38_;
+ GeeList* _tmp10_;
+ GeeList* _tmp14_;
+ GeeList* _tmp18_;
+ GeeList* _tmp22_;
+ SpitPluggable** _tmp26_;
+ gint _tmp26__length1;
+ GFile* _tmp27_;
+ PiwigoService* _tmp28_;
+ SpitPluggable** _tmp29_;
+ gint _tmp29__length1;
+ GFile* _tmp30_;
+ GFile* _tmp31_;
+ TumblrService* _tmp32_;
#line 15 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
g_return_val_if_fail (G_IS_FILE (module_file), NULL);
#line 15 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
self = (ShotwellPublishingCoreServices*) g_object_new (object_type, NULL);
#line 16 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- _tmp0_ = module_file;
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- _tmp1_ = g_file_get_parent (_tmp0_);
+ _tmp0_ = g_file_get_parent (module_file);
#line 16 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- resource_directory = _tmp1_;
+ resource_directory = _tmp0_;
#line 17 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- _tmp2_ = publishing_authenticator_factory_get_instance ();
+ _tmp1_ = publishing_authenticator_factory_get_instance ();
#line 17 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- factory = _tmp2_;
+ factory = _tmp1_;
#line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- _tmp3_ = factory;
+ _tmp2_ = factory;
#line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- _tmp4_ = spit_publishing_authenticator_factory_get_available_authenticators (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, SPIT_PUBLISHING_TYPE_AUTHENTICATOR_FACTORY, SpitPublishingAuthenticatorFactory));
+ _tmp3_ = spit_publishing_authenticator_factory_get_available_authenticators (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SPIT_PUBLISHING_TYPE_AUTHENTICATOR_FACTORY, SpitPublishingAuthenticatorFactory));
#line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- authenicators = _tmp4_;
+ authenicators = _tmp3_;
#line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- _tmp5_ = resource_directory;
+ _tmp4_ = resource_directory;
#line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- _tmp6_ = g_file_get_path (_tmp5_);
+ _tmp5_ = g_file_get_path (_tmp4_);
#line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- _tmp7_ = _tmp6_;
+ _tmp6_ = _tmp5_;
#line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- g_debug ("shotwell-publishing.vala:22: Looking for resources in %s", _tmp7_);
+ g_debug ("shotwell-publishing.vala:22: Looking for resources in %s", _tmp6_);
#line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- _g_free0 (_tmp7_);
+ _g_free0 (_tmp6_);
#line 23 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- _tmp8_ = authenicators;
+ _tmp7_ = authenicators;
#line 23 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- _tmp9_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection));
+ _tmp8_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection));
#line 23 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- _tmp10_ = _tmp9_;
+ _tmp9_ = _tmp8_;
#line 23 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- g_debug ("shotwell-publishing.vala:23: Found %d authenicators", _tmp10_);
+ g_debug ("shotwell-publishing.vala:23: Found %d authenicators", _tmp9_);
#line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- _tmp11_ = authenicators;
+ _tmp10_ = authenicators;
#line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- _tmp12_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection), "facebook");
-#line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- if (_tmp12_) {
-#line 335 "shotwell-publishing.c"
- SpitPluggable** _tmp13_;
- gint _tmp13__length1;
- GFile* _tmp14_;
- FacebookService* _tmp15_;
+ if (gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_COLLECTION, GeeCollection), "facebook")) {
+#line 391 "shotwell-publishing.c"
+ SpitPluggable** _tmp11_;
+ gint _tmp11__length1;
+ GFile* _tmp12_;
+ FacebookService* _tmp13_;
#line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- _tmp13_ = self->priv->pluggables;
+ _tmp11_ = self->priv->pluggables;
#line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- _tmp13__length1 = self->priv->pluggables_length1;
+ _tmp11__length1 = self->priv->pluggables_length1;
#line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- _tmp14_ = resource_directory;
+ _tmp12_ = resource_directory;
#line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- _tmp15_ = facebook_service_new (_tmp14_);
+ _tmp13_ = facebook_service_new (_tmp12_);
#line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- _vala_array_add1 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 350 "shotwell-publishing.c"
+ _vala_array_add1 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+#line 406 "shotwell-publishing.c"
}
#line 32 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- _tmp16_ = authenicators;
-#line 32 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- _tmp17_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_COLLECTION, GeeCollection), "picasa");
+ _tmp14_ = authenicators;
#line 32 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- if (_tmp17_) {
-#line 358 "shotwell-publishing.c"
- SpitPluggable** _tmp18_;
- gint _tmp18__length1;
- GFile* _tmp19_;
- PicasaService* _tmp20_;
+ if (gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_COLLECTION, GeeCollection), "picasa")) {
+#line 412 "shotwell-publishing.c"
+ SpitPluggable** _tmp15_;
+ gint _tmp15__length1;
+ GFile* _tmp16_;
+ PicasaService* _tmp17_;
#line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- _tmp18_ = self->priv->pluggables;
+ _tmp15_ = self->priv->pluggables;
#line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- _tmp18__length1 = self->priv->pluggables_length1;
+ _tmp15__length1 = self->priv->pluggables_length1;
#line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- _tmp19_ = resource_directory;
+ _tmp16_ = resource_directory;
#line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- _tmp20_ = picasa_service_new (_tmp19_);
+ _tmp17_ = picasa_service_new (_tmp16_);
#line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- _vala_array_add2 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 373 "shotwell-publishing.c"
+ _vala_array_add2 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+#line 427 "shotwell-publishing.c"
}
#line 38 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- _tmp21_ = authenicators;
+ _tmp18_ = authenicators;
#line 38 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- _tmp22_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_COLLECTION, GeeCollection), "flickr");
-#line 38 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- if (_tmp22_) {
-#line 381 "shotwell-publishing.c"
- SpitPluggable** _tmp23_;
- gint _tmp23__length1;
- GFile* _tmp24_;
- FlickrService* _tmp25_;
+ if (gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection), "flickr")) {
+#line 433 "shotwell-publishing.c"
+ SpitPluggable** _tmp19_;
+ gint _tmp19__length1;
+ GFile* _tmp20_;
+ FlickrService* _tmp21_;
#line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- _tmp23_ = self->priv->pluggables;
+ _tmp19_ = self->priv->pluggables;
#line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- _tmp23__length1 = self->priv->pluggables_length1;
+ _tmp19__length1 = self->priv->pluggables_length1;
#line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- _tmp24_ = resource_directory;
+ _tmp20_ = resource_directory;
#line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- _tmp25_ = flickr_service_new (_tmp24_);
+ _tmp21_ = flickr_service_new (_tmp20_);
#line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- _vala_array_add3 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 396 "shotwell-publishing.c"
+ _vala_array_add3 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+#line 448 "shotwell-publishing.c"
}
#line 44 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- _tmp26_ = authenicators;
-#line 44 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- _tmp27_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_COLLECTION, GeeCollection), "youtube");
+ _tmp22_ = authenicators;
#line 44 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- if (_tmp27_) {
-#line 404 "shotwell-publishing.c"
- SpitPluggable** _tmp28_;
- gint _tmp28__length1;
- GFile* _tmp29_;
- YouTubeService* _tmp30_;
+ if (gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection), "youtube")) {
+#line 454 "shotwell-publishing.c"
+ SpitPluggable** _tmp23_;
+ gint _tmp23__length1;
+ GFile* _tmp24_;
+ YouTubeService* _tmp25_;
#line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- _tmp28_ = self->priv->pluggables;
+ _tmp23_ = self->priv->pluggables;
#line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- _tmp28__length1 = self->priv->pluggables_length1;
+ _tmp23__length1 = self->priv->pluggables_length1;
#line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- _tmp29_ = resource_directory;
+ _tmp24_ = resource_directory;
#line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- _tmp30_ = you_tube_service_new (_tmp29_);
+ _tmp25_ = you_tube_service_new (_tmp24_);
#line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- _vala_array_add4 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 419 "shotwell-publishing.c"
+ _vala_array_add4 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+#line 469 "shotwell-publishing.c"
}
#line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- _tmp31_ = self->priv->pluggables;
+ _tmp26_ = self->priv->pluggables;
#line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- _tmp31__length1 = self->priv->pluggables_length1;
+ _tmp26__length1 = self->priv->pluggables_length1;
#line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- _tmp32_ = resource_directory;
+ _tmp27_ = resource_directory;
#line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- _tmp33_ = piwigo_service_new (_tmp32_);
+ _tmp28_ = piwigo_service_new (_tmp27_);
#line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- _vala_array_add5 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+ _vala_array_add5 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
#line 54 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- _tmp34_ = self->priv->pluggables;
+ _tmp29_ = self->priv->pluggables;
#line 54 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- _tmp34__length1 = self->priv->pluggables_length1;
+ _tmp29__length1 = self->priv->pluggables_length1;
#line 54 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- _tmp35_ = module_file;
+ _tmp30_ = g_file_get_parent (module_file);
#line 54 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- _tmp36_ = g_file_get_parent (_tmp35_);
+ _tmp31_ = _tmp30_;
#line 54 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- _tmp37_ = _tmp36_;
+ _tmp32_ = tumblr_service_new (_tmp31_);
#line 54 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- _tmp38_ = tumblr_service_new (_tmp37_);
+ _vala_array_add6 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
#line 54 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- _vala_array_add6 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 54 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- _g_object_unref0 (_tmp37_);
+ _g_object_unref0 (_tmp31_);
#line 15 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
_g_object_unref0 (authenicators);
#line 15 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
@@ -451,18 +499,22 @@ ShotwellPublishingCoreServices* shotwell_publishing_core_services_construct (GTy
_g_object_unref0 (resource_directory);
#line 15 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
return self;
-#line 455 "shotwell-publishing.c"
+#line 503 "shotwell-publishing.c"
}
-ShotwellPublishingCoreServices* shotwell_publishing_core_services_new (GFile* module_file) {
+ShotwellPublishingCoreServices*
+shotwell_publishing_core_services_new (GFile* module_file)
+{
#line 15 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
return shotwell_publishing_core_services_construct (TYPE_SHOTWELL_PUBLISHING_CORE_SERVICES, module_file);
-#line 462 "shotwell-publishing.c"
+#line 512 "shotwell-publishing.c"
}
-static const gchar* shotwell_publishing_core_services_real_get_module_name (SpitModule* base) {
+static const gchar*
+shotwell_publishing_core_services_real_get_module_name (SpitModule* base)
+{
ShotwellPublishingCoreServices * self;
const gchar* result = NULL;
#line 58 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
@@ -471,11 +523,13 @@ static const gchar* shotwell_publishing_core_services_real_get_module_name (Spit
result = _ ("Core Publishing Services");
#line 59 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
return result;
-#line 475 "shotwell-publishing.c"
+#line 527 "shotwell-publishing.c"
}
-static const gchar* shotwell_publishing_core_services_real_get_version (SpitModule* base) {
+static const gchar*
+shotwell_publishing_core_services_real_get_version (SpitModule* base)
+{
ShotwellPublishingCoreServices * self;
const gchar* result = NULL;
#line 62 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
@@ -484,11 +538,13 @@ static const gchar* shotwell_publishing_core_services_real_get_version (SpitModu
result = _VERSION;
#line 63 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
return result;
-#line 488 "shotwell-publishing.c"
+#line 542 "shotwell-publishing.c"
}
-static const gchar* shotwell_publishing_core_services_real_get_id (SpitModule* base) {
+static const gchar*
+shotwell_publishing_core_services_real_get_id (SpitModule* base)
+{
ShotwellPublishingCoreServices * self;
const gchar* result = NULL;
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
@@ -497,11 +553,14 @@ static const gchar* shotwell_publishing_core_services_real_get_id (SpitModule* b
result = "org.yorba.shotwell.publishing.core_services";
#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
return result;
-#line 501 "shotwell-publishing.c"
+#line 557 "shotwell-publishing.c"
}
-static SpitPluggable** shotwell_publishing_core_services_real_get_pluggables (SpitModule* base, int* result_length1) {
+static SpitPluggable**
+shotwell_publishing_core_services_real_get_pluggables (SpitModule* base,
+ int* result_length1)
+{
ShotwellPublishingCoreServices * self;
SpitPluggable** result = NULL;
SpitPluggable** _tmp0_;
@@ -522,28 +581,32 @@ static SpitPluggable** shotwell_publishing_core_services_real_get_pluggables (Sp
if (result_length1) {
#line 71 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
*result_length1 = _tmp1__length1;
-#line 526 "shotwell-publishing.c"
+#line 585 "shotwell-publishing.c"
}
#line 71 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
result = _tmp1_;
#line 71 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
return result;
-#line 532 "shotwell-publishing.c"
+#line 591 "shotwell-publishing.c"
}
-static void shotwell_publishing_core_services_class_init (ShotwellPublishingCoreServicesClass * klass) {
+static void
+shotwell_publishing_core_services_class_init (ShotwellPublishingCoreServicesClass * klass)
+{
#line 10 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
shotwell_publishing_core_services_parent_class = g_type_class_peek_parent (klass);
#line 10 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
g_type_class_add_private (klass, sizeof (ShotwellPublishingCoreServicesPrivate));
#line 10 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
G_OBJECT_CLASS (klass)->finalize = shotwell_publishing_core_services_finalize;
-#line 543 "shotwell-publishing.c"
+#line 604 "shotwell-publishing.c"
}
-static void shotwell_publishing_core_services_spit_module_interface_init (SpitModuleIface * iface) {
+static void
+shotwell_publishing_core_services_spit_module_interface_init (SpitModuleIface * iface)
+{
#line 10 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
shotwell_publishing_core_services_spit_module_parent_iface = g_type_interface_peek_parent (iface);
#line 10 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
@@ -554,11 +617,13 @@ static void shotwell_publishing_core_services_spit_module_interface_init (SpitMo
iface->get_id = (const gchar* (*) (SpitModule *)) shotwell_publishing_core_services_real_get_id;
#line 10 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
iface->get_pluggables = (SpitPluggable** (*) (SpitModule *, int*)) shotwell_publishing_core_services_real_get_pluggables;
-#line 558 "shotwell-publishing.c"
+#line 621 "shotwell-publishing.c"
}
-static void shotwell_publishing_core_services_instance_init (ShotwellPublishingCoreServices * self) {
+static void
+shotwell_publishing_core_services_instance_init (ShotwellPublishingCoreServices * self)
+{
SpitPluggable** _tmp0_;
#line 10 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
self->priv = SHOTWELL_PUBLISHING_CORE_SERVICES_GET_PRIVATE (self);
@@ -570,11 +635,13 @@ static void shotwell_publishing_core_services_instance_init (ShotwellPublishingC
self->priv->pluggables_length1 = 0;
#line 11 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
self->priv->_pluggables_size_ = self->priv->pluggables_length1;
-#line 574 "shotwell-publishing.c"
+#line 639 "shotwell-publishing.c"
}
-static void shotwell_publishing_core_services_finalize (GObject * obj) {
+static void
+shotwell_publishing_core_services_finalize (GObject * obj)
+{
ShotwellPublishingCoreServices * self;
#line 10 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SHOTWELL_PUBLISHING_CORE_SERVICES, ShotwellPublishingCoreServices);
@@ -582,11 +649,13 @@ static void shotwell_publishing_core_services_finalize (GObject * obj) {
self->priv->pluggables = (_vala_array_free (self->priv->pluggables, self->priv->pluggables_length1, (GDestroyNotify) g_object_unref), NULL);
#line 10 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
G_OBJECT_CLASS (shotwell_publishing_core_services_parent_class)->finalize (obj);
-#line 586 "shotwell-publishing.c"
+#line 653 "shotwell-publishing.c"
}
-GType shotwell_publishing_core_services_get_type (void) {
+GType
+shotwell_publishing_core_services_get_type (void)
+{
static volatile gsize shotwell_publishing_core_services_type_id__volatile = 0;
if (g_once_init_enter (&shotwell_publishing_core_services_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (ShotwellPublishingCoreServicesClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) shotwell_publishing_core_services_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ShotwellPublishingCoreServices), 0, (GInstanceInitFunc) shotwell_publishing_core_services_instance_init, NULL };
@@ -600,65 +669,56 @@ GType shotwell_publishing_core_services_get_type (void) {
}
-SpitModule* spit_entry_point (SpitEntryPointParams* params) {
+SpitModule*
+spit_entry_point (SpitEntryPointParams* params)
+{
SpitModule* result = NULL;
- SpitEntryPointParams* _tmp0_;
+ gint _tmp0_;
gint _tmp1_;
- SpitEntryPointParams* _tmp2_;
+ ShotwellPublishingCoreServices* _tmp2_ = NULL;
gint _tmp3_;
- gint _tmp4_;
- ShotwellPublishingCoreServices* _tmp5_ = NULL;
- SpitEntryPointParams* _tmp6_;
- gint _tmp7_;
-#line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- _tmp0_ = params;
#line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- _tmp1_ = (*_tmp0_).host_min_spit_interface;
+ _tmp0_ = (*params).host_min_spit_interface;
#line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- _tmp2_ = params;
+ _tmp1_ = (*params).host_max_spit_interface;
#line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- _tmp3_ = (*_tmp2_).host_max_spit_interface;
-#line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- _tmp4_ = spit_negotiate_interfaces (_tmp1_, _tmp3_, SPIT_CURRENT_INTERFACE);
-#line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- (*params).module_spit_interface = _tmp4_;
+ (*params).module_spit_interface = spit_negotiate_interfaces (_tmp0_, _tmp1_, SPIT_CURRENT_INTERFACE);
#line 80 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- _tmp6_ = params;
+ _tmp3_ = (*params).module_spit_interface;
#line 80 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- _tmp7_ = (*_tmp6_).module_spit_interface;
-#line 80 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- if (_tmp7_ != SPIT_UNSUPPORTED_INTERFACE) {
-#line 632 "shotwell-publishing.c"
- SpitEntryPointParams* _tmp8_;
- GFile* _tmp9_;
- ShotwellPublishingCoreServices* _tmp10_;
-#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- _tmp8_ = params;
+ if (_tmp3_ != SPIT_UNSUPPORTED_INTERFACE) {
+#line 691 "shotwell-publishing.c"
+ GFile* _tmp4_;
+ ShotwellPublishingCoreServices* _tmp5_;
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- _tmp9_ = (*_tmp8_).module_file;
+ _tmp4_ = (*params).module_file;
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- _tmp10_ = shotwell_publishing_core_services_new (_tmp9_);
+ _tmp5_ = shotwell_publishing_core_services_new (_tmp4_);
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- _g_object_unref0 (_tmp5_);
+ _g_object_unref0 (_tmp2_);
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- _tmp5_ = _tmp10_;
-#line 646 "shotwell-publishing.c"
+ _tmp2_ = _tmp5_;
+#line 702 "shotwell-publishing.c"
} else {
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- _g_object_unref0 (_tmp5_);
+ _g_object_unref0 (_tmp2_);
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- _tmp5_ = NULL;
-#line 652 "shotwell-publishing.c"
+ _tmp2_ = NULL;
+#line 708 "shotwell-publishing.c"
}
#line 80 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
- result = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SPIT_TYPE_MODULE, SpitModule);
+ result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SPIT_TYPE_MODULE, SpitModule);
#line 80 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
return result;
-#line 658 "shotwell-publishing.c"
+#line 714 "shotwell-publishing.c"
}
-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) {
@@ -670,7 +730,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/plugins/shotwell-transitions/BlindsEffect.c b/plugins/shotwell-transitions/BlindsEffect.c
index 20733f9..ef1f15e 100644
--- a/plugins/shotwell-transitions/BlindsEffect.c
+++ b/plugins/shotwell-transitions/BlindsEffect.c
@@ -1,4 +1,4 @@
-/* BlindsEffect.c generated by valac 0.36.6, the Vala compiler
+/* BlindsEffect.c generated by valac 0.40.4, the Vala compiler
* generated from BlindsEffect.vala, do not modify */
/* Copyright 2013 Jens Bav
@@ -8,6 +8,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>
@@ -43,6 +44,11 @@ typedef struct _ShotwellTransitionDescriptorPrivate ShotwellTransitionDescriptor
typedef struct _BlindsEffectDescriptor BlindsEffectDescriptor;
typedef struct _BlindsEffectDescriptorClass BlindsEffectDescriptorClass;
typedef struct _BlindsEffectDescriptorPrivate BlindsEffectDescriptorPrivate;
+enum {
+ BLINDS_EFFECT_DESCRIPTOR_0_PROPERTY,
+ BLINDS_EFFECT_DESCRIPTOR_NUM_PROPERTIES
+};
+static GParamSpec* blinds_effect_descriptor_properties[BLINDS_EFFECT_DESCRIPTOR_NUM_PROPERTIES];
#define TYPE_BLINDS_EFFECT (blinds_effect_get_type ())
#define BLINDS_EFFECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_BLINDS_EFFECT, BlindsEffect))
@@ -54,6 +60,11 @@ typedef struct _BlindsEffectDescriptorPrivate BlindsEffectDescriptorPrivate;
typedef struct _BlindsEffect BlindsEffect;
typedef struct _BlindsEffectClass BlindsEffectClass;
typedef struct _BlindsEffectPrivate BlindsEffectPrivate;
+enum {
+ BLINDS_EFFECT_0_PROPERTY,
+ BLINDS_EFFECT_NUM_PROPERTIES
+};
+static GParamSpec* blinds_effect_properties[BLINDS_EFFECT_NUM_PROPERTIES];
#define _cairo_surface_destroy0(var) ((var == NULL) ? NULL : (var = (cairo_surface_destroy (var), NULL)))
#define _cairo_destroy0(var) ((var == NULL) ? NULL : (var = (cairo_destroy (var), NULL)))
@@ -102,59 +113,77 @@ static SpitTransitionsEffectIface * blinds_effect_spit_transitions_effect_parent
GType shotwell_transition_descriptor_get_type (void) G_GNUC_CONST;
GType blinds_effect_descriptor_get_type (void) G_GNUC_CONST;
-enum {
- BLINDS_EFFECT_DESCRIPTOR_DUMMY_PROPERTY
-};
BlindsEffectDescriptor* blinds_effect_descriptor_new (GFile* resource_directory);
-BlindsEffectDescriptor* blinds_effect_descriptor_construct (GType object_type, GFile* resource_directory);
-ShotwellTransitionDescriptor* shotwell_transition_descriptor_construct (GType object_type, GFile* resource_directory);
+BlindsEffectDescriptor* blinds_effect_descriptor_construct (GType object_type,
+ GFile* resource_directory);
+ShotwellTransitionDescriptor* shotwell_transition_descriptor_construct (GType object_type,
+ GFile* resource_directory);
static const gchar* blinds_effect_descriptor_real_get_id (ShotwellTransitionDescriptor* base);
static const gchar* blinds_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base);
-static SpitTransitionsEffect* blinds_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, SpitHostInterface* host);
+static SpitTransitionsEffect* blinds_effect_descriptor_real_create (ShotwellTransitionDescriptor* base,
+ SpitHostInterface* host);
BlindsEffect* blinds_effect_new (void);
BlindsEffect* blinds_effect_construct (GType object_type);
GType blinds_effect_get_type (void) G_GNUC_CONST;
#define BLINDS_EFFECT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_BLINDS_EFFECT, BlindsEffectPrivate))
-enum {
- BLINDS_EFFECT_DUMMY_PROPERTY
-};
#define BLINDS_EFFECT_DESIRED_FPS 30
#define BLINDS_EFFECT_MIN_FPS 15
#define BLINDS_EFFECT_BLIND_WIDTH 50
-static void blinds_effect_real_get_fps (SpitTransitionsEffect* base, gint* desired_fps, gint* min_fps);
+static void blinds_effect_real_get_fps (SpitTransitionsEffect* base,
+ gint* desired_fps,
+ gint* min_fps);
static gboolean blinds_effect_real_needs_clear_background (SpitTransitionsEffect* base);
-static void blinds_effect_real_start (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion);
-static void blinds_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number);
-static void blinds_effect_real_advance (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, gint frame_number);
+static void blinds_effect_real_start (SpitTransitionsEffect* base,
+ SpitTransitionsVisuals* visuals,
+ SpitTransitionsMotion* motion);
+static void blinds_effect_real_paint (SpitTransitionsEffect* base,
+ SpitTransitionsVisuals* visuals,
+ SpitTransitionsMotion* motion,
+ cairo_t* ctx,
+ gint width,
+ gint height,
+ gint frame_number);
+static void blinds_effect_real_advance (SpitTransitionsEffect* base,
+ SpitTransitionsVisuals* visuals,
+ SpitTransitionsMotion* motion,
+ gint frame_number);
static void blinds_effect_real_cancel (SpitTransitionsEffect* base);
static void blinds_effect_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);
-
-
-BlindsEffectDescriptor* blinds_effect_descriptor_construct (GType object_type, GFile* resource_directory) {
+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);
+
+
+BlindsEffectDescriptor*
+blinds_effect_descriptor_construct (GType object_type,
+ GFile* resource_directory)
+{
BlindsEffectDescriptor * self = NULL;
- GFile* _tmp0_;
#line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
g_return_val_if_fail (G_IS_FILE (resource_directory), NULL);
#line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp0_ = resource_directory;
-#line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- self = (BlindsEffectDescriptor*) shotwell_transition_descriptor_construct (object_type, _tmp0_);
+ self = (BlindsEffectDescriptor*) shotwell_transition_descriptor_construct (object_type, resource_directory);
#line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
return self;
-#line 147 "BlindsEffect.c"
+#line 172 "BlindsEffect.c"
}
-BlindsEffectDescriptor* blinds_effect_descriptor_new (GFile* resource_directory) {
+BlindsEffectDescriptor*
+blinds_effect_descriptor_new (GFile* resource_directory)
+{
#line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
return blinds_effect_descriptor_construct (TYPE_BLINDS_EFFECT_DESCRIPTOR, resource_directory);
-#line 154 "BlindsEffect.c"
+#line 181 "BlindsEffect.c"
}
-static const gchar* blinds_effect_descriptor_real_get_id (ShotwellTransitionDescriptor* base) {
+static const gchar*
+blinds_effect_descriptor_real_get_id (ShotwellTransitionDescriptor* base)
+{
BlindsEffectDescriptor * self;
const gchar* result = NULL;
#line 15 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
@@ -163,11 +192,13 @@ static const gchar* blinds_effect_descriptor_real_get_id (ShotwellTransitionDesc
result = "org.yorba.shotwell.transitions.blinds";
#line 16 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
return result;
-#line 167 "BlindsEffect.c"
+#line 196 "BlindsEffect.c"
}
-static const gchar* blinds_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base) {
+static const gchar*
+blinds_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base)
+{
BlindsEffectDescriptor * self;
const gchar* result = NULL;
#line 19 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
@@ -176,11 +207,14 @@ static const gchar* blinds_effect_descriptor_real_get_pluggable_name (ShotwellTr
result = _ ("Blinds");
#line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
return result;
-#line 180 "BlindsEffect.c"
+#line 211 "BlindsEffect.c"
}
-static SpitTransitionsEffect* blinds_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, SpitHostInterface* host) {
+static SpitTransitionsEffect*
+blinds_effect_descriptor_real_create (ShotwellTransitionDescriptor* base,
+ SpitHostInterface* host)
+{
BlindsEffectDescriptor * self;
SpitTransitionsEffect* result = NULL;
BlindsEffect* _tmp0_;
@@ -194,11 +228,13 @@ static SpitTransitionsEffect* blinds_effect_descriptor_real_create (ShotwellTran
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TRANSITIONS_TYPE_EFFECT, SpitTransitionsEffect);
#line 24 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
return result;
-#line 198 "BlindsEffect.c"
+#line 232 "BlindsEffect.c"
}
-static void blinds_effect_descriptor_class_init (BlindsEffectDescriptorClass * klass) {
+static void
+blinds_effect_descriptor_class_init (BlindsEffectDescriptorClass * klass)
+{
#line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
blinds_effect_descriptor_parent_class = g_type_class_peek_parent (klass);
#line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
@@ -207,15 +243,19 @@ static void blinds_effect_descriptor_class_init (BlindsEffectDescriptorClass * k
((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*) (ShotwellTransitionDescriptor *)) blinds_effect_descriptor_real_get_pluggable_name;
#line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*) (ShotwellTransitionDescriptor *, SpitHostInterface*)) blinds_effect_descriptor_real_create;
-#line 211 "BlindsEffect.c"
+#line 247 "BlindsEffect.c"
}
-static void blinds_effect_descriptor_instance_init (BlindsEffectDescriptor * self) {
+static void
+blinds_effect_descriptor_instance_init (BlindsEffectDescriptor * self)
+{
}
-GType blinds_effect_descriptor_get_type (void) {
+GType
+blinds_effect_descriptor_get_type (void)
+{
static volatile gsize blinds_effect_descriptor_type_id__volatile = 0;
if (g_once_init_enter (&blinds_effect_descriptor_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (BlindsEffectDescriptorClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) blinds_effect_descriptor_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (BlindsEffectDescriptor), 0, (GInstanceInitFunc) blinds_effect_descriptor_instance_init, NULL };
@@ -227,24 +267,32 @@ GType blinds_effect_descriptor_get_type (void) {
}
-BlindsEffect* blinds_effect_construct (GType object_type) {
+BlindsEffect*
+blinds_effect_construct (GType object_type)
+{
BlindsEffect * self = NULL;
#line 38 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
self = (BlindsEffect*) g_object_new (object_type, NULL);
#line 38 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
return self;
-#line 237 "BlindsEffect.c"
+#line 279 "BlindsEffect.c"
}
-BlindsEffect* blinds_effect_new (void) {
+BlindsEffect*
+blinds_effect_new (void)
+{
#line 38 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
return blinds_effect_construct (TYPE_BLINDS_EFFECT);
-#line 244 "BlindsEffect.c"
+#line 288 "BlindsEffect.c"
}
-static void blinds_effect_real_get_fps (SpitTransitionsEffect* base, gint* desired_fps, gint* min_fps) {
+static void
+blinds_effect_real_get_fps (SpitTransitionsEffect* base,
+ gint* desired_fps,
+ gint* min_fps)
+{
BlindsEffect * self;
gint _vala_desired_fps = 0;
gint _vala_min_fps = 0;
@@ -258,18 +306,20 @@ static void blinds_effect_real_get_fps (SpitTransitionsEffect* base, gint* desir
if (desired_fps) {
#line 41 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
*desired_fps = _vala_desired_fps;
-#line 262 "BlindsEffect.c"
+#line 310 "BlindsEffect.c"
}
#line 41 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
if (min_fps) {
#line 41 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
*min_fps = _vala_min_fps;
-#line 268 "BlindsEffect.c"
+#line 316 "BlindsEffect.c"
}
}
-static gboolean blinds_effect_real_needs_clear_background (SpitTransitionsEffect* base) {
+static gboolean
+blinds_effect_real_needs_clear_background (SpitTransitionsEffect* base)
+{
BlindsEffect * self;
gboolean result = FALSE;
#line 46 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
@@ -278,15 +328,18 @@ static gboolean blinds_effect_real_needs_clear_background (SpitTransitionsEffect
result = TRUE;
#line 47 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
return result;
-#line 282 "BlindsEffect.c"
+#line 332 "BlindsEffect.c"
}
-static void blinds_effect_real_start (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion) {
+static void
+blinds_effect_real_start (SpitTransitionsEffect* base,
+ SpitTransitionsVisuals* visuals,
+ SpitTransitionsMotion* motion)
+{
BlindsEffect * self;
- SpitTransitionsVisuals* _tmp0_;
+ GdkPixbuf* _tmp0_;
GdkPixbuf* _tmp1_;
- GdkPixbuf* _tmp2_;
#line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_BLINDS_EFFECT, BlindsEffect);
#line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
@@ -294,188 +347,171 @@ static void blinds_effect_real_start (SpitTransitionsEffect* base, SpitTransitio
#line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion));
#line 51 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp0_ = visuals;
+ _tmp0_ = spit_transitions_visuals_get_from_pixbuf (visuals);
#line 51 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp1_ = spit_transitions_visuals_get_from_pixbuf (_tmp0_);
+ _tmp1_ = _tmp0_;
#line 51 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp2_ = _tmp1_;
-#line 51 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- if (_tmp2_ != NULL) {
-#line 305 "BlindsEffect.c"
- SpitTransitionsVisuals* _tmp3_;
- GdkPixbuf* _tmp4_;
- GdkPixbuf* _tmp5_;
- gint _tmp6_;
- gint _tmp7_;
- SpitTransitionsVisuals* _tmp8_;
- GdkPixbuf* _tmp9_;
- GdkPixbuf* _tmp10_;
+ if (_tmp1_ != NULL) {
+#line 356 "BlindsEffect.c"
+ GdkPixbuf* _tmp2_;
+ GdkPixbuf* _tmp3_;
+ gint _tmp4_;
+ gint _tmp5_;
+ GdkPixbuf* _tmp6_;
+ GdkPixbuf* _tmp7_;
+ gint _tmp8_;
+ gint _tmp9_;
+ gint _tmp10_;
gint _tmp11_;
- gint _tmp12_;
- gint _tmp13_;
- gdouble _tmp14_;
- gint _tmp15_;
- cairo_surface_t** _tmp16_;
+ cairo_surface_t** _tmp12_;
#line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp3_ = visuals;
+ _tmp2_ = spit_transitions_visuals_get_to_pixbuf (visuals);
#line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp4_ = spit_transitions_visuals_get_to_pixbuf (_tmp3_);
+ _tmp3_ = _tmp2_;
#line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp5_ = _tmp4_;
-#line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp6_ = gdk_pixbuf_get_width (_tmp5_);
+ _tmp4_ = gdk_pixbuf_get_width (_tmp3_);
#line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp7_ = _tmp6_;
+ _tmp5_ = _tmp4_;
#line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- self->priv->blind_count = _tmp7_ / BLINDS_EFFECT_BLIND_WIDTH;
-#line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp8_ = visuals;
-#line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp9_ = spit_transitions_visuals_get_to_pixbuf (_tmp8_);
+ self->priv->blind_count = _tmp5_ / BLINDS_EFFECT_BLIND_WIDTH;
#line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp10_ = _tmp9_;
+ _tmp6_ = spit_transitions_visuals_get_to_pixbuf (visuals);
#line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp11_ = gdk_pixbuf_get_width (_tmp10_);
+ _tmp7_ = _tmp6_;
#line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp12_ = _tmp11_;
+ _tmp8_ = gdk_pixbuf_get_width (_tmp7_);
#line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp13_ = self->priv->blind_count;
+ _tmp9_ = _tmp8_;
#line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp14_ = ceil (((gdouble) _tmp12_) / ((gdouble) _tmp13_));
+ _tmp10_ = self->priv->blind_count;
#line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- self->priv->current_blind_width = (gint) _tmp14_;
+ self->priv->current_blind_width = (gint) ceil (((gdouble) _tmp9_) / ((gdouble) _tmp10_));
#line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp15_ = self->priv->blind_count;
+ _tmp11_ = self->priv->blind_count;
#line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp16_ = g_new0 (cairo_surface_t*, _tmp15_ + 1);
+ _tmp12_ = g_new0 (cairo_surface_t*, _tmp11_ + 1);
#line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
self->priv->to_blinds = (_vala_array_free (self->priv->to_blinds, self->priv->to_blinds_length1, (GDestroyNotify) cairo_surface_destroy), NULL);
#line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- self->priv->to_blinds = _tmp16_;
+ self->priv->to_blinds = _tmp12_;
#line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- self->priv->to_blinds_length1 = _tmp15_;
+ self->priv->to_blinds_length1 = _tmp11_;
#line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
self->priv->_to_blinds_size_ = self->priv->to_blinds_length1;
-#line 360 "BlindsEffect.c"
+#line 402 "BlindsEffect.c"
{
gint i = 0;
#line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
i = 0;
-#line 365 "BlindsEffect.c"
+#line 407 "BlindsEffect.c"
{
- gboolean _tmp17_ = FALSE;
+ gboolean _tmp13_ = FALSE;
#line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp17_ = TRUE;
+ _tmp13_ = TRUE;
#line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
while (TRUE) {
-#line 372 "BlindsEffect.c"
+#line 414 "BlindsEffect.c"
+ gint _tmp15_;
+ gint _tmp16_;
+ cairo_surface_t** _tmp17_;
+ gint _tmp17__length1;
+ gint _tmp18_;
gint _tmp19_;
- gint _tmp20_;
- cairo_surface_t** _tmp21_;
- gint _tmp21__length1;
+ GdkPixbuf* _tmp20_;
+ GdkPixbuf* _tmp21_;
gint _tmp22_;
gint _tmp23_;
- SpitTransitionsVisuals* _tmp24_;
- GdkPixbuf* _tmp25_;
- GdkPixbuf* _tmp26_;
- gint _tmp27_;
- gint _tmp28_;
- cairo_surface_t* _tmp29_;
- cairo_surface_t* _tmp30_;
+ cairo_surface_t* _tmp24_;
+ cairo_surface_t* _tmp25_;
cairo_t* ctx = NULL;
- cairo_surface_t** _tmp31_;
- gint _tmp31__length1;
- gint _tmp32_;
- cairo_surface_t* _tmp33_;
- cairo_t* _tmp34_;
+ cairo_surface_t** _tmp26_;
+ gint _tmp26__length1;
+ gint _tmp27_;
+ cairo_surface_t* _tmp28_;
+ cairo_t* _tmp29_;
+ cairo_t* _tmp30_;
+ GdkPixbuf* _tmp31_;
+ GdkPixbuf* _tmp32_;
+ gint _tmp33_;
+ gint _tmp34_;
cairo_t* _tmp35_;
- SpitTransitionsVisuals* _tmp36_;
- GdkPixbuf* _tmp37_;
- GdkPixbuf* _tmp38_;
- gint _tmp39_;
- gint _tmp40_;
- cairo_t* _tmp41_;
#line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- if (!_tmp17_) {
-#line 401 "BlindsEffect.c"
- gint _tmp18_;
+ if (!_tmp13_) {
+#line 441 "BlindsEffect.c"
+ gint _tmp14_;
#line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp18_ = i;
+ _tmp14_ = i;
#line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- i = _tmp18_ + 1;
-#line 407 "BlindsEffect.c"
+ i = _tmp14_ + 1;
+#line 447 "BlindsEffect.c"
}
#line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp17_ = FALSE;
+ _tmp13_ = FALSE;
#line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp19_ = i;
+ _tmp15_ = i;
#line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp20_ = self->priv->blind_count;
+ _tmp16_ = self->priv->blind_count;
#line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- if (!(_tmp19_ < _tmp20_)) {
+ if (!(_tmp15_ < _tmp16_)) {
#line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
break;
-#line 419 "BlindsEffect.c"
+#line 459 "BlindsEffect.c"
}
#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp21_ = self->priv->to_blinds;
+ _tmp17_ = self->priv->to_blinds;
#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp21__length1 = self->priv->to_blinds_length1;
+ _tmp17__length1 = self->priv->to_blinds_length1;
#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp22_ = i;
+ _tmp18_ = i;
#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp23_ = self->priv->current_blind_width;
+ _tmp19_ = self->priv->current_blind_width;
#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp24_ = visuals;
+ _tmp20_ = spit_transitions_visuals_get_to_pixbuf (visuals);
#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp25_ = spit_transitions_visuals_get_to_pixbuf (_tmp24_);
+ _tmp21_ = _tmp20_;
#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp26_ = _tmp25_;
+ _tmp22_ = gdk_pixbuf_get_height (_tmp21_);
#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp27_ = gdk_pixbuf_get_height (_tmp26_);
+ _tmp23_ = _tmp22_;
#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp28_ = _tmp27_;
+ _tmp24_ = cairo_image_surface_create (CAIRO_FORMAT_RGB24, _tmp19_, _tmp23_);
#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp29_ = cairo_image_surface_create (CAIRO_FORMAT_RGB24, _tmp23_, _tmp28_);
+ _cairo_surface_destroy0 (_tmp17_[_tmp18_]);
#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _cairo_surface_destroy0 (_tmp21_[_tmp22_]);
+ _tmp17_[_tmp18_] = _tmp24_;
#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp21_[_tmp22_] = _tmp29_;
-#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp30_ = _tmp21_[_tmp22_];
+ _tmp25_ = _tmp17_[_tmp18_];
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp31_ = self->priv->to_blinds;
+ _tmp26_ = self->priv->to_blinds;
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp31__length1 = self->priv->to_blinds_length1;
+ _tmp26__length1 = self->priv->to_blinds_length1;
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp32_ = i;
+ _tmp27_ = i;
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp33_ = _tmp31_[_tmp32_];
+ _tmp28_ = _tmp26_[_tmp27_];
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp34_ = cairo_create (_tmp33_);
+ _tmp29_ = cairo_create (_tmp28_);
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- ctx = _tmp34_;
+ ctx = _tmp29_;
#line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp35_ = ctx;
+ _tmp30_ = ctx;
#line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp36_ = visuals;
+ _tmp31_ = spit_transitions_visuals_get_to_pixbuf (visuals);
#line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp37_ = spit_transitions_visuals_get_to_pixbuf (_tmp36_);
+ _tmp32_ = _tmp31_;
#line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp38_ = _tmp37_;
+ _tmp33_ = i;
#line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp39_ = i;
+ _tmp34_ = self->priv->current_blind_width;
#line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp40_ = self->priv->current_blind_width;
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- gdk_cairo_set_source_pixbuf (_tmp35_, _tmp38_, (gdouble) ((-_tmp39_) * _tmp40_), (gdouble) 0);
+ gdk_cairo_set_source_pixbuf (_tmp30_, _tmp32_, (gdouble) ((-_tmp33_) * _tmp34_), (gdouble) 0);
#line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp41_ = ctx;
+ _tmp35_ = ctx;
#line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- cairo_paint (_tmp41_);
+ cairo_paint (_tmp35_);
#line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
_cairo_destroy0 (ctx);
-#line 479 "BlindsEffect.c"
+#line 515 "BlindsEffect.c"
}
}
}
@@ -483,27 +519,27 @@ static void blinds_effect_real_start (SpitTransitionsEffect* base, SpitTransitio
}
-static void blinds_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number) {
+static void
+blinds_effect_real_paint (SpitTransitionsEffect* base,
+ SpitTransitionsVisuals* visuals,
+ SpitTransitionsMotion* motion,
+ cairo_t* ctx,
+ gint width,
+ gint height,
+ gint frame_number)
+{
BlindsEffect * self;
gdouble alpha = 0.0;
- SpitTransitionsMotion* _tmp0_;
- gint _tmp1_;
- gdouble _tmp2_;
gint y = 0;
- SpitTransitionsVisuals* _tmp3_;
- GdkRectangle _tmp4_ = {0};
- GdkRectangle _tmp5_;
- gint _tmp6_;
+ GdkRectangle _tmp0_ = {0};
+ GdkRectangle _tmp1_;
+ gint _tmp2_;
gint x = 0;
- SpitTransitionsVisuals* _tmp7_;
- GdkRectangle _tmp8_ = {0};
- GdkRectangle _tmp9_;
- gint _tmp10_;
- SpitTransitionsVisuals* _tmp11_;
- GdkPixbuf* _tmp12_;
- GdkPixbuf* _tmp13_;
- cairo_t* _tmp53_;
- cairo_t* _tmp54_;
+ GdkRectangle _tmp3_ = {0};
+ GdkRectangle _tmp4_;
+ gint _tmp5_;
+ GdkPixbuf* _tmp6_;
+ GdkPixbuf* _tmp7_;
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_BLINDS_EFFECT, BlindsEffect);
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
@@ -513,215 +549,177 @@ static void blinds_effect_real_paint (SpitTransitionsEffect* base, SpitTransitio
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
g_return_if_fail (ctx != NULL);
#line 70 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp0_ = motion;
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp1_ = frame_number;
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp2_ = spit_transitions_motion_get_alpha (_tmp0_, _tmp1_);
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- alpha = _tmp2_;
-#line 71 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp3_ = visuals;
+ alpha = spit_transitions_motion_get_alpha (motion, frame_number);
#line 71 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- spit_transitions_visuals_get_to_pos (_tmp3_, &_tmp4_);
+ spit_transitions_visuals_get_to_pos (visuals, &_tmp0_);
#line 71 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp5_ = _tmp4_;
+ _tmp1_ = _tmp0_;
#line 71 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp6_ = _tmp5_.y;
+ _tmp2_ = _tmp1_.y;
#line 71 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- y = _tmp6_;
+ y = _tmp2_;
#line 72 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp7_ = visuals;
+ spit_transitions_visuals_get_to_pos (visuals, &_tmp3_);
#line 72 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- spit_transitions_visuals_get_to_pos (_tmp7_, &_tmp8_);
+ _tmp4_ = _tmp3_;
#line 72 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp9_ = _tmp8_;
+ _tmp5_ = _tmp4_.x;
#line 72 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp10_ = _tmp9_.x;
-#line 72 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- x = _tmp10_;
-#line 74 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp11_ = visuals;
+ x = _tmp5_;
#line 74 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp12_ = spit_transitions_visuals_get_from_pixbuf (_tmp11_);
+ _tmp6_ = spit_transitions_visuals_get_from_pixbuf (visuals);
#line 74 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp13_ = _tmp12_;
+ _tmp7_ = _tmp6_;
#line 74 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- if (_tmp13_ != NULL) {
-#line 552 "BlindsEffect.c"
- cairo_t* _tmp14_;
- SpitTransitionsVisuals* _tmp15_;
- GdkPixbuf* _tmp16_;
- GdkPixbuf* _tmp17_;
- SpitTransitionsVisuals* _tmp18_;
- GdkRectangle _tmp19_ = {0};
- GdkRectangle _tmp20_;
- gint _tmp21_;
- SpitTransitionsVisuals* _tmp22_;
- GdkRectangle _tmp23_ = {0};
- GdkRectangle _tmp24_;
- gint _tmp25_;
- cairo_t* _tmp26_;
- gdouble _tmp27_;
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp14_ = ctx;
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp15_ = visuals;
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp16_ = spit_transitions_visuals_get_from_pixbuf (_tmp15_);
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp17_ = _tmp16_;
+ if (_tmp7_ != NULL) {
+#line 576 "BlindsEffect.c"
+ GdkPixbuf* _tmp8_;
+ GdkPixbuf* _tmp9_;
+ GdkRectangle _tmp10_ = {0};
+ GdkRectangle _tmp11_;
+ gint _tmp12_;
+ GdkRectangle _tmp13_ = {0};
+ GdkRectangle _tmp14_;
+ gint _tmp15_;
+ gdouble _tmp16_;
#line 75 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp18_ = visuals;
+ _tmp8_ = spit_transitions_visuals_get_from_pixbuf (visuals);
#line 75 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- spit_transitions_visuals_get_from_pos (_tmp18_, &_tmp19_);
+ _tmp9_ = _tmp8_;
#line 75 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp20_ = _tmp19_;
+ spit_transitions_visuals_get_from_pos (visuals, &_tmp10_);
#line 75 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp21_ = _tmp20_.x;
+ _tmp11_ = _tmp10_;
#line 75 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp22_ = visuals;
+ _tmp12_ = _tmp11_.x;
#line 75 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- spit_transitions_visuals_get_from_pos (_tmp22_, &_tmp23_);
+ spit_transitions_visuals_get_from_pos (visuals, &_tmp13_);
#line 75 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp24_ = _tmp23_;
+ _tmp14_ = _tmp13_;
#line 75 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp25_ = _tmp24_.y;
+ _tmp15_ = _tmp14_.y;
#line 75 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- gdk_cairo_set_source_pixbuf (_tmp14_, _tmp17_, (gdouble) _tmp21_, (gdouble) _tmp25_);
-#line 77 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp26_ = ctx;
+ gdk_cairo_set_source_pixbuf (ctx, _tmp9_, (gdouble) _tmp12_, (gdouble) _tmp15_);
#line 77 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp27_ = alpha;
+ _tmp16_ = alpha;
#line 77 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- cairo_paint_with_alpha (_tmp26_, 1 - (_tmp27_ * 2));
-#line 599 "BlindsEffect.c"
+ cairo_paint_with_alpha (ctx, 1 - (_tmp16_ * 2));
+#line 608 "BlindsEffect.c"
}
{
gint i = 0;
#line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
i = 0;
-#line 605 "BlindsEffect.c"
+#line 614 "BlindsEffect.c"
{
- gboolean _tmp28_ = FALSE;
+ gboolean _tmp17_ = FALSE;
#line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp28_ = TRUE;
+ _tmp17_ = TRUE;
#line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
while (TRUE) {
-#line 612 "BlindsEffect.c"
+#line 621 "BlindsEffect.c"
+ gint _tmp19_;
+ gint _tmp20_;
+ cairo_surface_t** _tmp21_;
+ gint _tmp21__length1;
+ gint _tmp22_;
+ cairo_surface_t* _tmp23_;
+ gint _tmp24_;
+ gint _tmp25_;
+ gint _tmp26_;
+ gint _tmp27_;
+ gint _tmp28_;
+ gint _tmp29_;
gint _tmp30_;
gint _tmp31_;
- cairo_t* _tmp32_;
- cairo_surface_t** _tmp33_;
- gint _tmp33__length1;
- gint _tmp34_;
- cairo_surface_t* _tmp35_;
+ gint _tmp32_;
+ gdouble _tmp33_;
+ GdkPixbuf* _tmp34_;
+ GdkPixbuf* _tmp35_;
gint _tmp36_;
gint _tmp37_;
- gint _tmp38_;
- gint _tmp39_;
- cairo_t* _tmp40_;
- gint _tmp41_;
- gint _tmp42_;
- gint _tmp43_;
- gint _tmp44_;
- gint _tmp45_;
- gdouble _tmp46_;
- SpitTransitionsVisuals* _tmp47_;
- GdkPixbuf* _tmp48_;
- GdkPixbuf* _tmp49_;
- gint _tmp50_;
- gint _tmp51_;
- cairo_t* _tmp52_;
#line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- if (!_tmp28_) {
-#line 639 "BlindsEffect.c"
- gint _tmp29_;
+ if (!_tmp17_) {
+#line 644 "BlindsEffect.c"
+ gint _tmp18_;
#line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp29_ = i;
+ _tmp18_ = i;
#line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- i = _tmp29_ + 1;
-#line 645 "BlindsEffect.c"
+ i = _tmp18_ + 1;
+#line 650 "BlindsEffect.c"
}
#line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp28_ = FALSE;
+ _tmp17_ = FALSE;
#line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp30_ = i;
+ _tmp19_ = i;
#line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp31_ = self->priv->blind_count;
+ _tmp20_ = self->priv->blind_count;
#line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- if (!(_tmp30_ < _tmp31_)) {
+ if (!(_tmp19_ < _tmp20_)) {
#line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
break;
-#line 657 "BlindsEffect.c"
+#line 662 "BlindsEffect.c"
}
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp32_ = ctx;
+ _tmp21_ = self->priv->to_blinds;
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp33_ = self->priv->to_blinds;
+ _tmp21__length1 = self->priv->to_blinds_length1;
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp33__length1 = self->priv->to_blinds_length1;
+ _tmp22_ = i;
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp34_ = i;
+ _tmp23_ = _tmp21_[_tmp22_];
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp35_ = _tmp33_[_tmp34_];
+ _tmp24_ = x;
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp36_ = x;
+ _tmp25_ = i;
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp37_ = i;
+ _tmp26_ = self->priv->current_blind_width;
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp38_ = self->priv->current_blind_width;
+ _tmp27_ = y;
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp39_ = y;
-#line 81 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- cairo_set_source_surface (_tmp32_, _tmp35_, (gdouble) (_tmp36_ + (_tmp37_ * _tmp38_)), (gdouble) _tmp39_);
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp40_ = ctx;
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp41_ = x;
+ cairo_set_source_surface (ctx, _tmp23_, (gdouble) (_tmp24_ + (_tmp25_ * _tmp26_)), (gdouble) _tmp27_);
#line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp42_ = i;
+ _tmp28_ = x;
#line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp43_ = self->priv->current_blind_width;
+ _tmp29_ = i;
#line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp44_ = y;
+ _tmp30_ = self->priv->current_blind_width;
#line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp45_ = self->priv->current_blind_width;
+ _tmp31_ = y;
#line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp46_ = alpha;
+ _tmp32_ = self->priv->current_blind_width;
#line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp47_ = visuals;
+ _tmp33_ = alpha;
#line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp48_ = spit_transitions_visuals_get_to_pixbuf (_tmp47_);
+ _tmp34_ = spit_transitions_visuals_get_to_pixbuf (visuals);
#line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp49_ = _tmp48_;
+ _tmp35_ = _tmp34_;
#line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp50_ = gdk_pixbuf_get_height (_tmp49_);
+ _tmp36_ = gdk_pixbuf_get_height (_tmp35_);
#line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp51_ = _tmp50_;
+ _tmp37_ = _tmp36_;
#line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- cairo_rectangle (_tmp40_, (gdouble) (_tmp41_ + (_tmp42_ * _tmp43_)), (gdouble) _tmp44_, _tmp45_ * (_tmp46_ + 0.5), (gdouble) _tmp51_);
+ cairo_rectangle (ctx, (gdouble) (_tmp28_ + (_tmp29_ * _tmp30_)), (gdouble) _tmp31_, _tmp32_ * (_tmp33_ + 0.5), (gdouble) _tmp37_);
#line 84 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp52_ = ctx;
-#line 84 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- cairo_fill (_tmp52_);
-#line 709 "BlindsEffect.c"
+ cairo_fill (ctx);
+#line 706 "BlindsEffect.c"
}
}
}
#line 87 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp53_ = ctx;
-#line 87 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- cairo_clip (_tmp53_);
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- _tmp54_ = ctx;
+ cairo_clip (ctx);
#line 88 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
- cairo_paint (_tmp54_);
-#line 721 "BlindsEffect.c"
+ cairo_paint (ctx);
+#line 714 "BlindsEffect.c"
}
-static void blinds_effect_real_advance (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, gint frame_number) {
+static void
+blinds_effect_real_advance (SpitTransitionsEffect* base,
+ SpitTransitionsVisuals* visuals,
+ SpitTransitionsMotion* motion,
+ gint frame_number)
+{
BlindsEffect * self;
#line 91 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_BLINDS_EFFECT, BlindsEffect);
@@ -729,11 +727,13 @@ static void blinds_effect_real_advance (SpitTransitionsEffect* base, SpitTransit
g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals));
#line 91 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion));
-#line 733 "BlindsEffect.c"
+#line 731 "BlindsEffect.c"
}
-static void blinds_effect_real_cancel (SpitTransitionsEffect* base) {
+static void
+blinds_effect_real_cancel (SpitTransitionsEffect* base)
+{
BlindsEffect * self;
#line 94 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_BLINDS_EFFECT, BlindsEffect);
@@ -741,18 +741,22 @@ static void blinds_effect_real_cancel (SpitTransitionsEffect* base) {
}
-static void blinds_effect_class_init (BlindsEffectClass * klass) {
+static void
+blinds_effect_class_init (BlindsEffectClass * klass)
+{
#line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
blinds_effect_parent_class = g_type_class_peek_parent (klass);
#line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
g_type_class_add_private (klass, sizeof (BlindsEffectPrivate));
#line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
G_OBJECT_CLASS (klass)->finalize = blinds_effect_finalize;
-#line 752 "BlindsEffect.c"
+#line 754 "BlindsEffect.c"
}
-static void blinds_effect_spit_transitions_effect_interface_init (SpitTransitionsEffectIface * iface) {
+static void
+blinds_effect_spit_transitions_effect_interface_init (SpitTransitionsEffectIface * iface)
+{
#line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
blinds_effect_spit_transitions_effect_parent_iface = g_type_interface_peek_parent (iface);
#line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
@@ -767,18 +771,22 @@ static void blinds_effect_spit_transitions_effect_interface_init (SpitTransition
iface->advance = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*, gint)) blinds_effect_real_advance;
#line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
iface->cancel = (void (*) (SpitTransitionsEffect *)) blinds_effect_real_cancel;
-#line 771 "BlindsEffect.c"
+#line 775 "BlindsEffect.c"
}
-static void blinds_effect_instance_init (BlindsEffect * self) {
+static void
+blinds_effect_instance_init (BlindsEffect * self)
+{
#line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
self->priv = BLINDS_EFFECT_GET_PRIVATE (self);
-#line 778 "BlindsEffect.c"
+#line 784 "BlindsEffect.c"
}
-static void blinds_effect_finalize (GObject * obj) {
+static void
+blinds_effect_finalize (GObject * obj)
+{
BlindsEffect * self;
#line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_BLINDS_EFFECT, BlindsEffect);
@@ -786,11 +794,13 @@ static void blinds_effect_finalize (GObject * obj) {
self->priv->to_blinds = (_vala_array_free (self->priv->to_blinds, self->priv->to_blinds_length1, (GDestroyNotify) cairo_surface_destroy), NULL);
#line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
G_OBJECT_CLASS (blinds_effect_parent_class)->finalize (obj);
-#line 790 "BlindsEffect.c"
+#line 798 "BlindsEffect.c"
}
-GType blinds_effect_get_type (void) {
+GType
+blinds_effect_get_type (void)
+{
static volatile gsize blinds_effect_type_id__volatile = 0;
if (g_once_init_enter (&blinds_effect_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (BlindsEffectClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) blinds_effect_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (BlindsEffect), 0, (GInstanceInitFunc) blinds_effect_instance_init, NULL };
@@ -804,7 +814,11 @@ GType blinds_effect_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) {
@@ -816,7 +830,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/plugins/shotwell-transitions/ChessEffect.c b/plugins/shotwell-transitions/ChessEffect.c
index e0e3b30..103eeb0 100644
--- a/plugins/shotwell-transitions/ChessEffect.c
+++ b/plugins/shotwell-transitions/ChessEffect.c
@@ -1,4 +1,4 @@
-/* ChessEffect.c generated by valac 0.36.6, the Vala compiler
+/* ChessEffect.c generated by valac 0.40.4, the Vala compiler
* generated from ChessEffect.vala, do not modify */
/* Copyright 2013 Jens Bav
@@ -8,6 +8,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>
@@ -42,6 +43,11 @@ typedef struct _ShotwellTransitionDescriptorPrivate ShotwellTransitionDescriptor
typedef struct _ChessEffectDescriptor ChessEffectDescriptor;
typedef struct _ChessEffectDescriptorClass ChessEffectDescriptorClass;
typedef struct _ChessEffectDescriptorPrivate ChessEffectDescriptorPrivate;
+enum {
+ CHESS_EFFECT_DESCRIPTOR_0_PROPERTY,
+ CHESS_EFFECT_DESCRIPTOR_NUM_PROPERTIES
+};
+static GParamSpec* chess_effect_descriptor_properties[CHESS_EFFECT_DESCRIPTOR_NUM_PROPERTIES];
#define TYPE_CHESS_EFFECT (chess_effect_get_type ())
#define CHESS_EFFECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CHESS_EFFECT, ChessEffect))
@@ -53,6 +59,11 @@ typedef struct _ChessEffectDescriptorPrivate ChessEffectDescriptorPrivate;
typedef struct _ChessEffect ChessEffect;
typedef struct _ChessEffectClass ChessEffectClass;
typedef struct _ChessEffectPrivate ChessEffectPrivate;
+enum {
+ CHESS_EFFECT_0_PROPERTY,
+ CHESS_EFFECT_NUM_PROPERTIES
+};
+static GParamSpec* chess_effect_properties[CHESS_EFFECT_NUM_PROPERTIES];
struct _ShotwellTransitionDescriptor {
GObject parent_instance;
@@ -96,57 +107,71 @@ static SpitTransitionsEffectIface * chess_effect_spit_transitions_effect_parent_
GType shotwell_transition_descriptor_get_type (void) G_GNUC_CONST;
GType chess_effect_descriptor_get_type (void) G_GNUC_CONST;
-enum {
- CHESS_EFFECT_DESCRIPTOR_DUMMY_PROPERTY
-};
ChessEffectDescriptor* chess_effect_descriptor_new (GFile* resource_directory);
-ChessEffectDescriptor* chess_effect_descriptor_construct (GType object_type, GFile* resource_directory);
-ShotwellTransitionDescriptor* shotwell_transition_descriptor_construct (GType object_type, GFile* resource_directory);
+ChessEffectDescriptor* chess_effect_descriptor_construct (GType object_type,
+ GFile* resource_directory);
+ShotwellTransitionDescriptor* shotwell_transition_descriptor_construct (GType object_type,
+ GFile* resource_directory);
static const gchar* chess_effect_descriptor_real_get_id (ShotwellTransitionDescriptor* base);
static const gchar* chess_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base);
-static SpitTransitionsEffect* chess_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, SpitHostInterface* host);
+static SpitTransitionsEffect* chess_effect_descriptor_real_create (ShotwellTransitionDescriptor* base,
+ SpitHostInterface* host);
ChessEffect* chess_effect_new (void);
ChessEffect* chess_effect_construct (GType object_type);
GType chess_effect_get_type (void) G_GNUC_CONST;
#define CHESS_EFFECT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_CHESS_EFFECT, ChessEffectPrivate))
-enum {
- CHESS_EFFECT_DUMMY_PROPERTY
-};
#define CHESS_EFFECT_DESIRED_FPS 25
#define CHESS_EFFECT_MIN_FPS 10
#define CHESS_EFFECT_SQUARE_SIZE 100
-static void chess_effect_real_get_fps (SpitTransitionsEffect* base, gint* desired_fps, gint* min_fps);
-static void chess_effect_real_start (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion);
+static void chess_effect_real_get_fps (SpitTransitionsEffect* base,
+ gint* desired_fps,
+ gint* min_fps);
+static void chess_effect_real_start (SpitTransitionsEffect* base,
+ SpitTransitionsVisuals* visuals,
+ SpitTransitionsMotion* motion);
static gboolean chess_effect_real_needs_clear_background (SpitTransitionsEffect* base);
-static void chess_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number);
-static void chess_effect_real_advance (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, gint frame_number);
+static void chess_effect_real_paint (SpitTransitionsEffect* base,
+ SpitTransitionsVisuals* visuals,
+ SpitTransitionsMotion* motion,
+ cairo_t* ctx,
+ gint width,
+ gint height,
+ gint frame_number);
+static void chess_effect_real_advance (SpitTransitionsEffect* base,
+ SpitTransitionsVisuals* visuals,
+ SpitTransitionsMotion* motion,
+ gint frame_number);
static void chess_effect_real_cancel (SpitTransitionsEffect* base);
static void chess_effect_finalize (GObject * obj);
-ChessEffectDescriptor* chess_effect_descriptor_construct (GType object_type, GFile* resource_directory) {
+ChessEffectDescriptor*
+chess_effect_descriptor_construct (GType object_type,
+ GFile* resource_directory)
+{
ChessEffectDescriptor * self = NULL;
- GFile* _tmp0_;
#line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
g_return_val_if_fail (G_IS_FILE (resource_directory), NULL);
#line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp0_ = resource_directory;
-#line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- self = (ChessEffectDescriptor*) shotwell_transition_descriptor_construct (object_type, _tmp0_);
+ self = (ChessEffectDescriptor*) shotwell_transition_descriptor_construct (object_type, resource_directory);
#line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
return self;
-#line 139 "ChessEffect.c"
+#line 160 "ChessEffect.c"
}
-ChessEffectDescriptor* chess_effect_descriptor_new (GFile* resource_directory) {
+ChessEffectDescriptor*
+chess_effect_descriptor_new (GFile* resource_directory)
+{
#line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
return chess_effect_descriptor_construct (TYPE_CHESS_EFFECT_DESCRIPTOR, resource_directory);
-#line 146 "ChessEffect.c"
+#line 169 "ChessEffect.c"
}
-static const gchar* chess_effect_descriptor_real_get_id (ShotwellTransitionDescriptor* base) {
+static const gchar*
+chess_effect_descriptor_real_get_id (ShotwellTransitionDescriptor* base)
+{
ChessEffectDescriptor * self;
const gchar* result = NULL;
#line 15 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
@@ -155,11 +180,13 @@ static const gchar* chess_effect_descriptor_real_get_id (ShotwellTransitionDescr
result = "org.yorba.shotwell.transitions.chess";
#line 16 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
return result;
-#line 159 "ChessEffect.c"
+#line 184 "ChessEffect.c"
}
-static const gchar* chess_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base) {
+static const gchar*
+chess_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base)
+{
ChessEffectDescriptor * self;
const gchar* result = NULL;
#line 19 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
@@ -168,11 +195,14 @@ static const gchar* chess_effect_descriptor_real_get_pluggable_name (ShotwellTra
result = _ ("Chess");
#line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
return result;
-#line 172 "ChessEffect.c"
+#line 199 "ChessEffect.c"
}
-static SpitTransitionsEffect* chess_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, SpitHostInterface* host) {
+static SpitTransitionsEffect*
+chess_effect_descriptor_real_create (ShotwellTransitionDescriptor* base,
+ SpitHostInterface* host)
+{
ChessEffectDescriptor * self;
SpitTransitionsEffect* result = NULL;
ChessEffect* _tmp0_;
@@ -186,11 +216,13 @@ static SpitTransitionsEffect* chess_effect_descriptor_real_create (ShotwellTrans
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TRANSITIONS_TYPE_EFFECT, SpitTransitionsEffect);
#line 24 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
return result;
-#line 190 "ChessEffect.c"
+#line 220 "ChessEffect.c"
}
-static void chess_effect_descriptor_class_init (ChessEffectDescriptorClass * klass) {
+static void
+chess_effect_descriptor_class_init (ChessEffectDescriptorClass * klass)
+{
#line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
chess_effect_descriptor_parent_class = g_type_class_peek_parent (klass);
#line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
@@ -199,15 +231,19 @@ static void chess_effect_descriptor_class_init (ChessEffectDescriptorClass * kla
((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*) (ShotwellTransitionDescriptor *)) chess_effect_descriptor_real_get_pluggable_name;
#line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*) (ShotwellTransitionDescriptor *, SpitHostInterface*)) chess_effect_descriptor_real_create;
-#line 203 "ChessEffect.c"
+#line 235 "ChessEffect.c"
}
-static void chess_effect_descriptor_instance_init (ChessEffectDescriptor * self) {
+static void
+chess_effect_descriptor_instance_init (ChessEffectDescriptor * self)
+{
}
-GType chess_effect_descriptor_get_type (void) {
+GType
+chess_effect_descriptor_get_type (void)
+{
static volatile gsize chess_effect_descriptor_type_id__volatile = 0;
if (g_once_init_enter (&chess_effect_descriptor_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (ChessEffectDescriptorClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) chess_effect_descriptor_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ChessEffectDescriptor), 0, (GInstanceInitFunc) chess_effect_descriptor_instance_init, NULL };
@@ -219,24 +255,32 @@ GType chess_effect_descriptor_get_type (void) {
}
-ChessEffect* chess_effect_construct (GType object_type) {
+ChessEffect*
+chess_effect_construct (GType object_type)
+{
ChessEffect * self = NULL;
#line 35 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
self = (ChessEffect*) g_object_new (object_type, NULL);
#line 35 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
return self;
-#line 229 "ChessEffect.c"
+#line 267 "ChessEffect.c"
}
-ChessEffect* chess_effect_new (void) {
+ChessEffect*
+chess_effect_new (void)
+{
#line 35 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
return chess_effect_construct (TYPE_CHESS_EFFECT);
-#line 236 "ChessEffect.c"
+#line 276 "ChessEffect.c"
}
-static void chess_effect_real_get_fps (SpitTransitionsEffect* base, gint* desired_fps, gint* min_fps) {
+static void
+chess_effect_real_get_fps (SpitTransitionsEffect* base,
+ gint* desired_fps,
+ gint* min_fps)
+{
ChessEffect * self;
gint _vala_desired_fps = 0;
gint _vala_min_fps = 0;
@@ -250,27 +294,29 @@ static void chess_effect_real_get_fps (SpitTransitionsEffect* base, gint* desire
if (desired_fps) {
#line 38 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
*desired_fps = _vala_desired_fps;
-#line 254 "ChessEffect.c"
+#line 298 "ChessEffect.c"
}
#line 38 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
if (min_fps) {
#line 38 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
*min_fps = _vala_min_fps;
-#line 260 "ChessEffect.c"
+#line 304 "ChessEffect.c"
}
}
-static void chess_effect_real_start (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion) {
+static void
+chess_effect_real_start (SpitTransitionsEffect* base,
+ SpitTransitionsVisuals* visuals,
+ SpitTransitionsMotion* motion)
+{
ChessEffect * self;
- SpitTransitionsVisuals* _tmp0_;
- GdkRectangle _tmp1_ = {0};
- GdkRectangle _tmp2_;
- gint _tmp3_;
- SpitTransitionsVisuals* _tmp4_;
- GdkRectangle _tmp5_ = {0};
- GdkRectangle _tmp6_;
- gint _tmp7_;
+ GdkRectangle _tmp0_ = {0};
+ GdkRectangle _tmp1_;
+ gint _tmp2_;
+ GdkRectangle _tmp3_ = {0};
+ GdkRectangle _tmp4_;
+ gint _tmp5_;
#line 43 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHESS_EFFECT, ChessEffect);
#line 43 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
@@ -278,30 +324,28 @@ static void chess_effect_real_start (SpitTransitionsEffect* base, SpitTransition
#line 43 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion));
#line 44 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp0_ = visuals;
+ spit_transitions_visuals_get_to_pos (visuals, &_tmp0_);
#line 44 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- spit_transitions_visuals_get_to_pos (_tmp0_, &_tmp1_);
+ _tmp1_ = _tmp0_;
#line 44 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp2_ = _tmp1_;
-#line 44 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp3_ = _tmp2_.height;
+ _tmp2_ = _tmp1_.height;
#line 44 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- self->priv->square_count_y = (gdouble) ((_tmp3_ / CHESS_EFFECT_SQUARE_SIZE) + 2);
-#line 45 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp4_ = visuals;
+ self->priv->square_count_y = (gdouble) ((_tmp2_ / CHESS_EFFECT_SQUARE_SIZE) + 2);
#line 45 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- spit_transitions_visuals_get_to_pos (_tmp4_, &_tmp5_);
+ spit_transitions_visuals_get_to_pos (visuals, &_tmp3_);
#line 45 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp6_ = _tmp5_;
+ _tmp4_ = _tmp3_;
#line 45 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp7_ = _tmp6_.width;
+ _tmp5_ = _tmp4_.width;
#line 45 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- self->priv->square_count_x = (gdouble) ((_tmp7_ / CHESS_EFFECT_SQUARE_SIZE) + 2);
-#line 301 "ChessEffect.c"
+ self->priv->square_count_x = (gdouble) ((_tmp5_ / CHESS_EFFECT_SQUARE_SIZE) + 2);
+#line 343 "ChessEffect.c"
}
-static gboolean chess_effect_real_needs_clear_background (SpitTransitionsEffect* base) {
+static gboolean
+chess_effect_real_needs_clear_background (SpitTransitionsEffect* base)
+{
ChessEffect * self;
gboolean result = FALSE;
#line 48 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
@@ -310,24 +354,27 @@ static gboolean chess_effect_real_needs_clear_background (SpitTransitionsEffect*
result = TRUE;
#line 49 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
return result;
-#line 314 "ChessEffect.c"
+#line 358 "ChessEffect.c"
}
-static void chess_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number) {
+static void
+chess_effect_real_paint (SpitTransitionsEffect* base,
+ SpitTransitionsVisuals* visuals,
+ SpitTransitionsMotion* motion,
+ cairo_t* ctx,
+ gint width,
+ gint height,
+ gint frame_number)
+{
ChessEffect * self;
gdouble alpha = 0.0;
- SpitTransitionsMotion* _tmp0_;
- gint _tmp1_;
- gdouble _tmp2_;
gdouble size = 0.0;
- gdouble _tmp3_;
- SpitTransitionsVisuals* _tmp4_;
- GdkPixbuf* _tmp5_;
- GdkPixbuf* _tmp6_;
- SpitTransitionsVisuals* _tmp21_;
- GdkPixbuf* _tmp22_;
- GdkPixbuf* _tmp23_;
+ gdouble _tmp0_;
+ GdkPixbuf* _tmp1_;
+ GdkPixbuf* _tmp2_;
+ GdkPixbuf* _tmp12_;
+ GdkPixbuf* _tmp13_;
#line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHESS_EFFECT, ChessEffect);
#line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
@@ -337,329 +384,266 @@ static void chess_effect_real_paint (SpitTransitionsEffect* base, SpitTransition
#line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
g_return_if_fail (ctx != NULL);
#line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp0_ = motion;
-#line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp1_ = frame_number;
-#line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp2_ = spit_transitions_motion_get_alpha (_tmp0_, _tmp1_);
-#line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- alpha = _tmp2_;
+ alpha = spit_transitions_motion_get_alpha (motion, frame_number);
#line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp3_ = alpha;
+ _tmp0_ = alpha;
#line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- size = (2 * _tmp3_) * CHESS_EFFECT_SQUARE_SIZE;
+ size = (2 * _tmp0_) * CHESS_EFFECT_SQUARE_SIZE;
#line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp4_ = visuals;
+ _tmp1_ = spit_transitions_visuals_get_from_pixbuf (visuals);
#line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp5_ = spit_transitions_visuals_get_from_pixbuf (_tmp4_);
-#line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp6_ = _tmp5_;
+ _tmp2_ = _tmp1_;
#line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- if (_tmp6_ != NULL) {
-#line 360 "ChessEffect.c"
- cairo_t* _tmp7_;
- SpitTransitionsVisuals* _tmp8_;
- GdkPixbuf* _tmp9_;
- GdkPixbuf* _tmp10_;
- SpitTransitionsVisuals* _tmp11_;
- GdkRectangle _tmp12_ = {0};
- GdkRectangle _tmp13_;
- gint _tmp14_;
- SpitTransitionsVisuals* _tmp15_;
- GdkRectangle _tmp16_ = {0};
- GdkRectangle _tmp17_;
- gint _tmp18_;
- cairo_t* _tmp19_;
- gdouble _tmp20_;
-#line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp7_ = ctx;
-#line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp8_ = visuals;
-#line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp9_ = spit_transitions_visuals_get_from_pixbuf (_tmp8_);
-#line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp10_ = _tmp9_;
+ if (_tmp2_ != NULL) {
+#line 399 "ChessEffect.c"
+ GdkPixbuf* _tmp3_;
+ GdkPixbuf* _tmp4_;
+ GdkRectangle _tmp5_ = {0};
+ GdkRectangle _tmp6_;
+ gint _tmp7_;
+ GdkRectangle _tmp8_ = {0};
+ GdkRectangle _tmp9_;
+ gint _tmp10_;
+ gdouble _tmp11_;
#line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp11_ = visuals;
+ _tmp3_ = spit_transitions_visuals_get_from_pixbuf (visuals);
#line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- spit_transitions_visuals_get_from_pos (_tmp11_, &_tmp12_);
+ _tmp4_ = _tmp3_;
#line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp13_ = _tmp12_;
+ spit_transitions_visuals_get_from_pos (visuals, &_tmp5_);
#line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp14_ = _tmp13_.x;
+ _tmp6_ = _tmp5_;
#line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp15_ = visuals;
+ _tmp7_ = _tmp6_.x;
#line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- spit_transitions_visuals_get_from_pos (_tmp15_, &_tmp16_);
+ spit_transitions_visuals_get_from_pos (visuals, &_tmp8_);
#line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp17_ = _tmp16_;
+ _tmp9_ = _tmp8_;
#line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp18_ = _tmp17_.y;
+ _tmp10_ = _tmp9_.y;
#line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- gdk_cairo_set_source_pixbuf (_tmp7_, _tmp10_, (gdouble) _tmp14_, (gdouble) _tmp18_);
-#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp19_ = ctx;
+ gdk_cairo_set_source_pixbuf (ctx, _tmp4_, (gdouble) _tmp7_, (gdouble) _tmp10_);
#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp20_ = alpha;
+ _tmp11_ = alpha;
#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- cairo_paint_with_alpha (_tmp19_, 1 - _tmp20_);
-#line 407 "ChessEffect.c"
+ cairo_paint_with_alpha (ctx, 1 - _tmp11_);
+#line 431 "ChessEffect.c"
}
#line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp21_ = visuals;
+ _tmp12_ = spit_transitions_visuals_get_to_pixbuf (visuals);
#line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp22_ = spit_transitions_visuals_get_to_pixbuf (_tmp21_);
+ _tmp13_ = _tmp12_;
#line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp23_ = _tmp22_;
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- if (_tmp23_ != NULL) {
-#line 417 "ChessEffect.c"
- cairo_t* _tmp24_;
- SpitTransitionsVisuals* _tmp25_;
- GdkPixbuf* _tmp26_;
- GdkPixbuf* _tmp27_;
- SpitTransitionsVisuals* _tmp28_;
- GdkRectangle _tmp29_ = {0};
- GdkRectangle _tmp30_;
- gint _tmp31_;
- SpitTransitionsVisuals* _tmp32_;
- GdkRectangle _tmp33_ = {0};
- GdkRectangle _tmp34_;
- gint _tmp35_;
- cairo_t* _tmp81_;
- cairo_t* _tmp82_;
- gdouble _tmp83_;
-#line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp24_ = ctx;
-#line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp25_ = visuals;
-#line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp26_ = spit_transitions_visuals_get_to_pixbuf (_tmp25_);
-#line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp27_ = _tmp26_;
+ if (_tmp13_ != NULL) {
+#line 439 "ChessEffect.c"
+ GdkPixbuf* _tmp14_;
+ GdkPixbuf* _tmp15_;
+ GdkRectangle _tmp16_ = {0};
+ GdkRectangle _tmp17_;
+ gint _tmp18_;
+ GdkRectangle _tmp19_ = {0};
+ GdkRectangle _tmp20_;
+ gint _tmp21_;
+ gdouble _tmp59_;
#line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp28_ = visuals;
+ _tmp14_ = spit_transitions_visuals_get_to_pixbuf (visuals);
#line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- spit_transitions_visuals_get_to_pos (_tmp28_, &_tmp29_);
+ _tmp15_ = _tmp14_;
#line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp30_ = _tmp29_;
+ spit_transitions_visuals_get_to_pos (visuals, &_tmp16_);
#line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp31_ = _tmp30_.x;
+ _tmp17_ = _tmp16_;
#line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp32_ = visuals;
+ _tmp18_ = _tmp17_.x;
#line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- spit_transitions_visuals_get_to_pos (_tmp32_, &_tmp33_);
+ spit_transitions_visuals_get_to_pos (visuals, &_tmp19_);
#line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp34_ = _tmp33_;
+ _tmp20_ = _tmp19_;
#line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp35_ = _tmp34_.y;
+ _tmp21_ = _tmp20_.y;
#line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- gdk_cairo_set_source_pixbuf (_tmp24_, _tmp27_, (gdouble) _tmp31_, (gdouble) _tmp35_);
-#line 459 "ChessEffect.c"
+ gdk_cairo_set_source_pixbuf (ctx, _tmp15_, (gdouble) _tmp18_, (gdouble) _tmp21_);
+#line 467 "ChessEffect.c"
{
gdouble y = 0.0;
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
y = (gdouble) 0;
-#line 464 "ChessEffect.c"
+#line 472 "ChessEffect.c"
{
- gboolean _tmp36_ = FALSE;
+ gboolean _tmp22_ = FALSE;
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp36_ = TRUE;
+ _tmp22_ = TRUE;
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
while (TRUE) {
-#line 471 "ChessEffect.c"
- gdouble _tmp38_;
- gdouble _tmp39_;
+#line 479 "ChessEffect.c"
+ gdouble _tmp24_;
+ gdouble _tmp25_;
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- if (!_tmp36_) {
-#line 476 "ChessEffect.c"
- gdouble _tmp37_;
+ if (!_tmp22_) {
+#line 484 "ChessEffect.c"
+ gdouble _tmp23_;
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp37_ = y;
+ _tmp23_ = y;
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- y = _tmp37_ + 1;
-#line 482 "ChessEffect.c"
+ y = _tmp23_ + 1;
+#line 490 "ChessEffect.c"
}
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp36_ = FALSE;
+ _tmp22_ = FALSE;
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp38_ = y;
+ _tmp24_ = y;
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp39_ = self->priv->square_count_y;
+ _tmp25_ = self->priv->square_count_y;
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- if (!(_tmp38_ <= _tmp39_)) {
+ if (!(_tmp24_ <= _tmp25_)) {
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
break;
-#line 494 "ChessEffect.c"
+#line 502 "ChessEffect.c"
}
{
gdouble x = 0.0;
#line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
x = (gdouble) 0;
-#line 500 "ChessEffect.c"
+#line 508 "ChessEffect.c"
{
- gboolean _tmp40_ = FALSE;
+ gboolean _tmp26_ = FALSE;
#line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp40_ = TRUE;
+ _tmp26_ = TRUE;
#line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
while (TRUE) {
-#line 507 "ChessEffect.c"
- gdouble _tmp42_;
- gdouble _tmp43_;
- gdouble _tmp44_ = 0.0;
- gdouble _tmp45_;
- gdouble _tmp46_;
+#line 515 "ChessEffect.c"
+ gdouble _tmp28_;
+ gdouble _tmp29_;
+ gdouble _tmp30_ = 0.0;
+ gdouble _tmp31_;
+ gdouble _tmp32_;
gdouble translation = 0.0;
- SpitTransitionsMotion* _tmp47_;
- SpitTransitionsDirection _tmp48_;
- SpitTransitionsDirection _tmp49_;
+ SpitTransitionsDirection _tmp33_;
+ SpitTransitionsDirection _tmp34_;
#line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- if (!_tmp40_) {
-#line 519 "ChessEffect.c"
- gdouble _tmp41_;
+ if (!_tmp26_) {
+#line 526 "ChessEffect.c"
+ gdouble _tmp27_;
#line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp41_ = x;
+ _tmp27_ = x;
#line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- x = _tmp41_ + 1;
-#line 525 "ChessEffect.c"
+ x = _tmp27_ + 1;
+#line 532 "ChessEffect.c"
}
#line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp40_ = FALSE;
+ _tmp26_ = FALSE;
#line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp42_ = x;
+ _tmp28_ = x;
#line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp43_ = self->priv->square_count_x;
+ _tmp29_ = self->priv->square_count_x;
#line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- if (!(_tmp42_ <= _tmp43_)) {
+ if (!(_tmp28_ <= _tmp29_)) {
#line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
break;
-#line 537 "ChessEffect.c"
+#line 544 "ChessEffect.c"
}
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp45_ = x;
+ _tmp31_ = x;
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp46_ = y;
+ _tmp32_ = y;
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- if (fmod (_tmp45_ + _tmp46_, 2) == ((gdouble) 0)) {
+ if (fmod (_tmp31_ + _tmp32_, 2) == ((gdouble) 0)) {
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp44_ = (-1.5) * CHESS_EFFECT_SQUARE_SIZE;
-#line 547 "ChessEffect.c"
+ _tmp30_ = (-1.5) * CHESS_EFFECT_SQUARE_SIZE;
+#line 554 "ChessEffect.c"
} else {
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp44_ = 1.5 * CHESS_EFFECT_SQUARE_SIZE;
-#line 551 "ChessEffect.c"
+ _tmp30_ = 1.5 * CHESS_EFFECT_SQUARE_SIZE;
+#line 558 "ChessEffect.c"
}
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- translation = _tmp44_;
-#line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp47_ = motion;
+ translation = _tmp30_;
#line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp48_ = spit_transitions_motion_get_direction (_tmp47_);
+ _tmp33_ = spit_transitions_motion_get_direction (motion);
#line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp49_ = _tmp48_;
+ _tmp34_ = _tmp33_;
#line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- if (_tmp49_ == SPIT_TRANSITIONS_DIRECTION_FORWARD) {
-#line 563 "ChessEffect.c"
- cairo_t* _tmp50_;
- SpitTransitionsVisuals* _tmp51_;
- GdkRectangle _tmp52_ = {0};
- GdkRectangle _tmp53_;
- gint _tmp54_;
- gdouble _tmp55_;
- gdouble _tmp56_;
- SpitTransitionsVisuals* _tmp57_;
- GdkRectangle _tmp58_ = {0};
- GdkRectangle _tmp59_;
- gint _tmp60_;
- gdouble _tmp61_;
- gdouble _tmp62_;
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp50_ = ctx;
+ if (_tmp34_ == SPIT_TRANSITIONS_DIRECTION_FORWARD) {
+#line 568 "ChessEffect.c"
+ GdkRectangle _tmp35_ = {0};
+ GdkRectangle _tmp36_;
+ gint _tmp37_;
+ gdouble _tmp38_;
+ gdouble _tmp39_;
+ GdkRectangle _tmp40_ = {0};
+ GdkRectangle _tmp41_;
+ gint _tmp42_;
+ gdouble _tmp43_;
+ gdouble _tmp44_;
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp51_ = visuals;
+ spit_transitions_visuals_get_to_pos (visuals, &_tmp35_);
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- spit_transitions_visuals_get_to_pos (_tmp51_, &_tmp52_);
+ _tmp36_ = _tmp35_;
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp53_ = _tmp52_;
+ _tmp37_ = _tmp36_.x;
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp54_ = _tmp53_.x;
+ _tmp38_ = translation;
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp55_ = translation;
+ _tmp39_ = x;
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp56_ = x;
+ spit_transitions_visuals_get_to_pos (visuals, &_tmp40_);
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp57_ = visuals;
+ _tmp41_ = _tmp40_;
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- spit_transitions_visuals_get_to_pos (_tmp57_, &_tmp58_);
+ _tmp42_ = _tmp41_.y;
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp59_ = _tmp58_;
+ _tmp43_ = y;
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp60_ = _tmp59_.y;
+ _tmp44_ = size;
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp61_ = y;
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp62_ = size;
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- cairo_rectangle (_tmp50_, (_tmp54_ + _tmp55_) + (_tmp56_ * CHESS_EFFECT_SQUARE_SIZE), _tmp60_ + (_tmp61_ * CHESS_EFFECT_SQUARE_SIZE), _tmp62_, (gdouble) CHESS_EFFECT_SQUARE_SIZE);
-#line 605 "ChessEffect.c"
+ cairo_rectangle (ctx, (_tmp37_ + _tmp38_) + (_tmp39_ * CHESS_EFFECT_SQUARE_SIZE), _tmp42_ + (_tmp43_ * CHESS_EFFECT_SQUARE_SIZE), _tmp44_, (gdouble) CHESS_EFFECT_SQUARE_SIZE);
+#line 601 "ChessEffect.c"
} else {
- cairo_t* _tmp63_;
- SpitTransitionsVisuals* _tmp64_;
- GdkRectangle _tmp65_ = {0};
- GdkRectangle _tmp66_;
- gint _tmp67_;
- SpitTransitionsVisuals* _tmp68_;
- GdkRectangle _tmp69_ = {0};
- GdkRectangle _tmp70_;
- gint _tmp71_;
- gdouble _tmp72_;
- gdouble _tmp73_;
- gdouble _tmp74_;
- SpitTransitionsVisuals* _tmp75_;
- GdkRectangle _tmp76_ = {0};
- GdkRectangle _tmp77_;
- gint _tmp78_;
- gdouble _tmp79_;
- gdouble _tmp80_;
-#line 71 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp63_ = ctx;
-#line 71 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp64_ = visuals;
-#line 71 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- spit_transitions_visuals_get_to_pos (_tmp64_, &_tmp65_);
-#line 71 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp66_ = _tmp65_;
+ GdkRectangle _tmp45_ = {0};
+ GdkRectangle _tmp46_;
+ gint _tmp47_;
+ GdkRectangle _tmp48_ = {0};
+ GdkRectangle _tmp49_;
+ gint _tmp50_;
+ gdouble _tmp51_;
+ gdouble _tmp52_;
+ gdouble _tmp53_;
+ GdkRectangle _tmp54_ = {0};
+ GdkRectangle _tmp55_;
+ gint _tmp56_;
+ gdouble _tmp57_;
+ gdouble _tmp58_;
#line 71 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp67_ = _tmp66_.x;
+ spit_transitions_visuals_get_to_pos (visuals, &_tmp45_);
#line 71 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp68_ = visuals;
+ _tmp46_ = _tmp45_;
#line 71 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- spit_transitions_visuals_get_to_pos (_tmp68_, &_tmp69_);
+ _tmp47_ = _tmp46_.x;
#line 71 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp70_ = _tmp69_;
+ spit_transitions_visuals_get_to_pos (visuals, &_tmp48_);
#line 71 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp71_ = _tmp70_.width;
+ _tmp49_ = _tmp48_;
#line 71 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp72_ = translation;
+ _tmp50_ = _tmp49_.width;
#line 71 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp73_ = x;
+ _tmp51_ = translation;
#line 71 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp74_ = size;
+ _tmp52_ = x;
#line 71 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp75_ = visuals;
+ _tmp53_ = size;
#line 71 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- spit_transitions_visuals_get_to_pos (_tmp75_, &_tmp76_);
+ spit_transitions_visuals_get_to_pos (visuals, &_tmp54_);
#line 71 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp77_ = _tmp76_;
+ _tmp55_ = _tmp54_;
#line 71 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp78_ = _tmp77_.y;
+ _tmp56_ = _tmp55_.y;
#line 71 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp79_ = y;
+ _tmp57_ = y;
#line 71 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp80_ = size;
+ _tmp58_ = size;
#line 71 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- cairo_rectangle (_tmp63_, (((_tmp67_ + _tmp71_) + _tmp72_) - (_tmp73_ * CHESS_EFFECT_SQUARE_SIZE)) - _tmp74_, _tmp78_ + (_tmp79_ * CHESS_EFFECT_SQUARE_SIZE), _tmp80_, (gdouble) CHESS_EFFECT_SQUARE_SIZE);
-#line 663 "ChessEffect.c"
+ cairo_rectangle (ctx, (((_tmp47_ + _tmp50_) + _tmp51_) - (_tmp52_ * CHESS_EFFECT_SQUARE_SIZE)) - _tmp53_, _tmp56_ + (_tmp57_ * CHESS_EFFECT_SQUARE_SIZE), _tmp58_, (gdouble) CHESS_EFFECT_SQUARE_SIZE);
+#line 647 "ChessEffect.c"
}
}
}
@@ -668,21 +652,22 @@ static void chess_effect_real_paint (SpitTransitionsEffect* base, SpitTransition
}
}
#line 78 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp81_ = ctx;
-#line 78 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- cairo_clip (_tmp81_);
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp82_ = ctx;
+ cairo_clip (ctx);
#line 79 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- _tmp83_ = alpha;
+ _tmp59_ = alpha;
#line 79 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
- cairo_paint_with_alpha (_tmp82_, _tmp83_);
-#line 681 "ChessEffect.c"
+ cairo_paint_with_alpha (ctx, _tmp59_);
+#line 661 "ChessEffect.c"
}
}
-static void chess_effect_real_advance (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, gint frame_number) {
+static void
+chess_effect_real_advance (SpitTransitionsEffect* base,
+ SpitTransitionsVisuals* visuals,
+ SpitTransitionsMotion* motion,
+ gint frame_number)
+{
ChessEffect * self;
#line 83 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHESS_EFFECT, ChessEffect);
@@ -690,30 +675,36 @@ static void chess_effect_real_advance (SpitTransitionsEffect* base, SpitTransiti
g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals));
#line 83 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion));
-#line 694 "ChessEffect.c"
+#line 679 "ChessEffect.c"
}
-static void chess_effect_real_cancel (SpitTransitionsEffect* base) {
+static void
+chess_effect_real_cancel (SpitTransitionsEffect* base)
+{
ChessEffect * self;
#line 86 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHESS_EFFECT, ChessEffect);
-#line 702 "ChessEffect.c"
+#line 689 "ChessEffect.c"
}
-static void chess_effect_class_init (ChessEffectClass * klass) {
+static void
+chess_effect_class_init (ChessEffectClass * klass)
+{
#line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
chess_effect_parent_class = g_type_class_peek_parent (klass);
#line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
g_type_class_add_private (klass, sizeof (ChessEffectPrivate));
#line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
G_OBJECT_CLASS (klass)->finalize = chess_effect_finalize;
-#line 713 "ChessEffect.c"
+#line 702 "ChessEffect.c"
}
-static void chess_effect_spit_transitions_effect_interface_init (SpitTransitionsEffectIface * iface) {
+static void
+chess_effect_spit_transitions_effect_interface_init (SpitTransitionsEffectIface * iface)
+{
#line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
chess_effect_spit_transitions_effect_parent_iface = g_type_interface_peek_parent (iface);
#line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
@@ -728,28 +719,34 @@ static void chess_effect_spit_transitions_effect_interface_init (SpitTransitions
iface->advance = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*, gint)) chess_effect_real_advance;
#line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
iface->cancel = (void (*) (SpitTransitionsEffect *)) chess_effect_real_cancel;
-#line 732 "ChessEffect.c"
+#line 723 "ChessEffect.c"
}
-static void chess_effect_instance_init (ChessEffect * self) {
+static void
+chess_effect_instance_init (ChessEffect * self)
+{
#line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
self->priv = CHESS_EFFECT_GET_PRIVATE (self);
-#line 739 "ChessEffect.c"
+#line 732 "ChessEffect.c"
}
-static void chess_effect_finalize (GObject * obj) {
+static void
+chess_effect_finalize (GObject * obj)
+{
ChessEffect * self;
#line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_CHESS_EFFECT, ChessEffect);
#line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
G_OBJECT_CLASS (chess_effect_parent_class)->finalize (obj);
-#line 749 "ChessEffect.c"
+#line 744 "ChessEffect.c"
}
-GType chess_effect_get_type (void) {
+GType
+chess_effect_get_type (void)
+{
static volatile gsize chess_effect_type_id__volatile = 0;
if (g_once_init_enter (&chess_effect_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (ChessEffectClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) chess_effect_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ChessEffect), 0, (GInstanceInitFunc) chess_effect_instance_init, NULL };
diff --git a/plugins/shotwell-transitions/CircleEffect.c b/plugins/shotwell-transitions/CircleEffect.c
index 97680cb..cb2b660 100644
--- a/plugins/shotwell-transitions/CircleEffect.c
+++ b/plugins/shotwell-transitions/CircleEffect.c
@@ -1,4 +1,4 @@
-/* CircleEffect.c generated by valac 0.36.6, the Vala compiler
+/* CircleEffect.c generated by valac 0.40.4, the Vala compiler
* generated from CircleEffect.vala, do not modify */
/* Copyright 2013 Jens Bav
@@ -8,6 +8,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>
@@ -42,6 +43,11 @@ typedef struct _ShotwellTransitionDescriptorPrivate ShotwellTransitionDescriptor
typedef struct _CircleEffectDescriptor CircleEffectDescriptor;
typedef struct _CircleEffectDescriptorClass CircleEffectDescriptorClass;
typedef struct _CircleEffectDescriptorPrivate CircleEffectDescriptorPrivate;
+enum {
+ CIRCLE_EFFECT_DESCRIPTOR_0_PROPERTY,
+ CIRCLE_EFFECT_DESCRIPTOR_NUM_PROPERTIES
+};
+static GParamSpec* circle_effect_descriptor_properties[CIRCLE_EFFECT_DESCRIPTOR_NUM_PROPERTIES];
#define TYPE_CIRCLE_EFFECT (circle_effect_get_type ())
#define CIRCLE_EFFECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CIRCLE_EFFECT, CircleEffect))
@@ -53,6 +59,11 @@ typedef struct _CircleEffectDescriptorPrivate CircleEffectDescriptorPrivate;
typedef struct _CircleEffect CircleEffect;
typedef struct _CircleEffectClass CircleEffectClass;
typedef struct _CircleEffectPrivate CircleEffectPrivate;
+enum {
+ CIRCLE_EFFECT_0_PROPERTY,
+ CIRCLE_EFFECT_NUM_PROPERTIES
+};
+static GParamSpec* circle_effect_properties[CIRCLE_EFFECT_NUM_PROPERTIES];
struct _ShotwellTransitionDescriptor {
GObject parent_instance;
@@ -91,54 +102,68 @@ static SpitTransitionsEffectIface * circle_effect_spit_transitions_effect_parent
GType shotwell_transition_descriptor_get_type (void) G_GNUC_CONST;
GType circle_effect_descriptor_get_type (void) G_GNUC_CONST;
-enum {
- CIRCLE_EFFECT_DESCRIPTOR_DUMMY_PROPERTY
-};
CircleEffectDescriptor* circle_effect_descriptor_new (GFile* resource_directory);
-CircleEffectDescriptor* circle_effect_descriptor_construct (GType object_type, GFile* resource_directory);
-ShotwellTransitionDescriptor* shotwell_transition_descriptor_construct (GType object_type, GFile* resource_directory);
+CircleEffectDescriptor* circle_effect_descriptor_construct (GType object_type,
+ GFile* resource_directory);
+ShotwellTransitionDescriptor* shotwell_transition_descriptor_construct (GType object_type,
+ GFile* resource_directory);
static const gchar* circle_effect_descriptor_real_get_id (ShotwellTransitionDescriptor* base);
static const gchar* circle_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base);
-static SpitTransitionsEffect* circle_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, SpitHostInterface* host);
+static SpitTransitionsEffect* circle_effect_descriptor_real_create (ShotwellTransitionDescriptor* base,
+ SpitHostInterface* host);
CircleEffect* circle_effect_new (void);
CircleEffect* circle_effect_construct (GType object_type);
GType circle_effect_get_type (void) G_GNUC_CONST;
-enum {
- CIRCLE_EFFECT_DUMMY_PROPERTY
-};
#define CIRCLE_EFFECT_DESIRED_FPS 25
#define CIRCLE_EFFECT_MIN_FPS 15
-static void circle_effect_real_get_fps (SpitTransitionsEffect* base, gint* desired_fps, gint* min_fps);
-static void circle_effect_real_start (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion);
+static void circle_effect_real_get_fps (SpitTransitionsEffect* base,
+ gint* desired_fps,
+ gint* min_fps);
+static void circle_effect_real_start (SpitTransitionsEffect* base,
+ SpitTransitionsVisuals* visuals,
+ SpitTransitionsMotion* motion);
static gboolean circle_effect_real_needs_clear_background (SpitTransitionsEffect* base);
-static void circle_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number);
-static void circle_effect_real_advance (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, gint frame_number);
+static void circle_effect_real_paint (SpitTransitionsEffect* base,
+ SpitTransitionsVisuals* visuals,
+ SpitTransitionsMotion* motion,
+ cairo_t* ctx,
+ gint width,
+ gint height,
+ gint frame_number);
+static void circle_effect_real_advance (SpitTransitionsEffect* base,
+ SpitTransitionsVisuals* visuals,
+ SpitTransitionsMotion* motion,
+ gint frame_number);
static void circle_effect_real_cancel (SpitTransitionsEffect* base);
-CircleEffectDescriptor* circle_effect_descriptor_construct (GType object_type, GFile* resource_directory) {
+CircleEffectDescriptor*
+circle_effect_descriptor_construct (GType object_type,
+ GFile* resource_directory)
+{
CircleEffectDescriptor * self = NULL;
- GFile* _tmp0_;
#line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
g_return_val_if_fail (G_IS_FILE (resource_directory), NULL);
#line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
- _tmp0_ = resource_directory;
-#line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
- self = (CircleEffectDescriptor*) shotwell_transition_descriptor_construct (object_type, _tmp0_);
+ self = (CircleEffectDescriptor*) shotwell_transition_descriptor_construct (object_type, resource_directory);
#line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
return self;
-#line 131 "CircleEffect.c"
+#line 152 "CircleEffect.c"
}
-CircleEffectDescriptor* circle_effect_descriptor_new (GFile* resource_directory) {
+CircleEffectDescriptor*
+circle_effect_descriptor_new (GFile* resource_directory)
+{
#line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
return circle_effect_descriptor_construct (TYPE_CIRCLE_EFFECT_DESCRIPTOR, resource_directory);
-#line 138 "CircleEffect.c"
+#line 161 "CircleEffect.c"
}
-static const gchar* circle_effect_descriptor_real_get_id (ShotwellTransitionDescriptor* base) {
+static const gchar*
+circle_effect_descriptor_real_get_id (ShotwellTransitionDescriptor* base)
+{
CircleEffectDescriptor * self;
const gchar* result = NULL;
#line 15 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
@@ -147,11 +172,13 @@ static const gchar* circle_effect_descriptor_real_get_id (ShotwellTransitionDesc
result = "org.yorba.shotwell.transitions.circle";
#line 16 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
return result;
-#line 151 "CircleEffect.c"
+#line 176 "CircleEffect.c"
}
-static const gchar* circle_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base) {
+static const gchar*
+circle_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base)
+{
CircleEffectDescriptor * self;
const gchar* result = NULL;
#line 19 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
@@ -160,11 +187,14 @@ static const gchar* circle_effect_descriptor_real_get_pluggable_name (ShotwellTr
result = _ ("Circle");
#line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
return result;
-#line 164 "CircleEffect.c"
+#line 191 "CircleEffect.c"
}
-static SpitTransitionsEffect* circle_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, SpitHostInterface* host) {
+static SpitTransitionsEffect*
+circle_effect_descriptor_real_create (ShotwellTransitionDescriptor* base,
+ SpitHostInterface* host)
+{
CircleEffectDescriptor * self;
SpitTransitionsEffect* result = NULL;
CircleEffect* _tmp0_;
@@ -178,11 +208,13 @@ static SpitTransitionsEffect* circle_effect_descriptor_real_create (ShotwellTran
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TRANSITIONS_TYPE_EFFECT, SpitTransitionsEffect);
#line 24 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
return result;
-#line 182 "CircleEffect.c"
+#line 212 "CircleEffect.c"
}
-static void circle_effect_descriptor_class_init (CircleEffectDescriptorClass * klass) {
+static void
+circle_effect_descriptor_class_init (CircleEffectDescriptorClass * klass)
+{
#line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
circle_effect_descriptor_parent_class = g_type_class_peek_parent (klass);
#line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
@@ -191,15 +223,19 @@ static void circle_effect_descriptor_class_init (CircleEffectDescriptorClass * k
((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*) (ShotwellTransitionDescriptor *)) circle_effect_descriptor_real_get_pluggable_name;
#line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*) (ShotwellTransitionDescriptor *, SpitHostInterface*)) circle_effect_descriptor_real_create;
-#line 195 "CircleEffect.c"
+#line 227 "CircleEffect.c"
}
-static void circle_effect_descriptor_instance_init (CircleEffectDescriptor * self) {
+static void
+circle_effect_descriptor_instance_init (CircleEffectDescriptor * self)
+{
}
-GType circle_effect_descriptor_get_type (void) {
+GType
+circle_effect_descriptor_get_type (void)
+{
static volatile gsize circle_effect_descriptor_type_id__volatile = 0;
if (g_once_init_enter (&circle_effect_descriptor_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (CircleEffectDescriptorClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) circle_effect_descriptor_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (CircleEffectDescriptor), 0, (GInstanceInitFunc) circle_effect_descriptor_instance_init, NULL };
@@ -211,24 +247,32 @@ GType circle_effect_descriptor_get_type (void) {
}
-CircleEffect* circle_effect_construct (GType object_type) {
+CircleEffect*
+circle_effect_construct (GType object_type)
+{
CircleEffect * self = NULL;
#line 32 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
self = (CircleEffect*) g_object_new (object_type, NULL);
#line 32 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
return self;
-#line 221 "CircleEffect.c"
+#line 259 "CircleEffect.c"
}
-CircleEffect* circle_effect_new (void) {
+CircleEffect*
+circle_effect_new (void)
+{
#line 32 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
return circle_effect_construct (TYPE_CIRCLE_EFFECT);
-#line 228 "CircleEffect.c"
+#line 268 "CircleEffect.c"
}
-static void circle_effect_real_get_fps (SpitTransitionsEffect* base, gint* desired_fps, gint* min_fps) {
+static void
+circle_effect_real_get_fps (SpitTransitionsEffect* base,
+ gint* desired_fps,
+ gint* min_fps)
+{
CircleEffect * self;
gint _vala_desired_fps = 0;
gint _vala_min_fps = 0;
@@ -242,18 +286,22 @@ static void circle_effect_real_get_fps (SpitTransitionsEffect* base, gint* desir
if (desired_fps) {
#line 35 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
*desired_fps = _vala_desired_fps;
-#line 246 "CircleEffect.c"
+#line 290 "CircleEffect.c"
}
#line 35 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
if (min_fps) {
#line 35 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
*min_fps = _vala_min_fps;
-#line 252 "CircleEffect.c"
+#line 296 "CircleEffect.c"
}
}
-static void circle_effect_real_start (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion) {
+static void
+circle_effect_real_start (SpitTransitionsEffect* base,
+ SpitTransitionsVisuals* visuals,
+ SpitTransitionsMotion* motion)
+{
CircleEffect * self;
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CIRCLE_EFFECT, CircleEffect);
@@ -261,11 +309,13 @@ static void circle_effect_real_start (SpitTransitionsEffect* base, SpitTransitio
g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals));
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion));
-#line 265 "CircleEffect.c"
+#line 313 "CircleEffect.c"
}
-static gboolean circle_effect_real_needs_clear_background (SpitTransitionsEffect* base) {
+static gboolean
+circle_effect_real_needs_clear_background (SpitTransitionsEffect* base)
+{
CircleEffect * self;
gboolean result = FALSE;
#line 43 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
@@ -274,27 +324,27 @@ static gboolean circle_effect_real_needs_clear_background (SpitTransitionsEffect
result = TRUE;
#line 44 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
return result;
-#line 278 "CircleEffect.c"
+#line 328 "CircleEffect.c"
}
-static void circle_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number) {
+static void
+circle_effect_real_paint (SpitTransitionsEffect* base,
+ SpitTransitionsVisuals* visuals,
+ SpitTransitionsMotion* motion,
+ cairo_t* ctx,
+ gint width,
+ gint height,
+ gint frame_number)
+{
CircleEffect * self;
gdouble alpha = 0.0;
- SpitTransitionsMotion* _tmp0_;
- gint _tmp1_;
- gdouble _tmp2_;
gint radius = 0;
- gdouble _tmp3_;
- gint _tmp4_;
- gint _tmp5_;
- gdouble _tmp6_;
- SpitTransitionsVisuals* _tmp7_;
- GdkPixbuf* _tmp8_;
- GdkPixbuf* _tmp9_;
- SpitTransitionsVisuals* _tmp24_;
- GdkPixbuf* _tmp25_;
- GdkPixbuf* _tmp26_;
+ gdouble _tmp0_;
+ GdkPixbuf* _tmp1_;
+ GdkPixbuf* _tmp2_;
+ GdkPixbuf* _tmp12_;
+ GdkPixbuf* _tmp13_;
#line 47 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CIRCLE_EFFECT, CircleEffect);
#line 47 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
@@ -304,157 +354,104 @@ static void circle_effect_real_paint (SpitTransitionsEffect* base, SpitTransitio
#line 47 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
g_return_if_fail (ctx != NULL);
#line 49 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
- _tmp0_ = motion;
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
- _tmp1_ = frame_number;
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
- _tmp2_ = spit_transitions_motion_get_alpha (_tmp0_, _tmp1_);
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
- alpha = _tmp2_;
-#line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
- _tmp3_ = alpha;
-#line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
- _tmp4_ = width;
-#line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
- _tmp5_ = height;
+ alpha = spit_transitions_motion_get_alpha (motion, frame_number);
#line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
- _tmp6_ = fmax ((gdouble) _tmp4_, (gdouble) _tmp5_);
+ _tmp0_ = alpha;
#line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
- radius = (gint) (_tmp3_ * _tmp6_);
+ radius = (gint) (_tmp0_ * fmax ((gdouble) width, (gdouble) height));
#line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
- _tmp7_ = visuals;
+ _tmp1_ = spit_transitions_visuals_get_from_pixbuf (visuals);
#line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
- _tmp8_ = spit_transitions_visuals_get_from_pixbuf (_tmp7_);
+ _tmp2_ = _tmp1_;
#line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
- _tmp9_ = _tmp8_;
-#line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
- if (_tmp9_ != NULL) {
-#line 333 "CircleEffect.c"
- cairo_t* _tmp10_;
- SpitTransitionsVisuals* _tmp11_;
- GdkPixbuf* _tmp12_;
- GdkPixbuf* _tmp13_;
- SpitTransitionsVisuals* _tmp14_;
- GdkRectangle _tmp15_ = {0};
- GdkRectangle _tmp16_;
- gint _tmp17_;
- SpitTransitionsVisuals* _tmp18_;
- GdkRectangle _tmp19_ = {0};
- GdkRectangle _tmp20_;
- gint _tmp21_;
- cairo_t* _tmp22_;
- gdouble _tmp23_;
-#line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
- _tmp10_ = ctx;
+ if (_tmp2_ != NULL) {
+#line 369 "CircleEffect.c"
+ GdkPixbuf* _tmp3_;
+ GdkPixbuf* _tmp4_;
+ GdkRectangle _tmp5_ = {0};
+ GdkRectangle _tmp6_;
+ gint _tmp7_;
+ GdkRectangle _tmp8_ = {0};
+ GdkRectangle _tmp9_;
+ gint _tmp10_;
+ gdouble _tmp11_;
#line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
- _tmp11_ = visuals;
+ _tmp3_ = spit_transitions_visuals_get_from_pixbuf (visuals);
#line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
- _tmp12_ = spit_transitions_visuals_get_from_pixbuf (_tmp11_);
+ _tmp4_ = _tmp3_;
#line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
- _tmp13_ = _tmp12_;
+ spit_transitions_visuals_get_from_pos (visuals, &_tmp5_);
#line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
- _tmp14_ = visuals;
+ _tmp6_ = _tmp5_;
#line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
- spit_transitions_visuals_get_from_pos (_tmp14_, &_tmp15_);
+ _tmp7_ = _tmp6_.x;
#line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
- _tmp16_ = _tmp15_;
+ spit_transitions_visuals_get_from_pos (visuals, &_tmp8_);
#line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
- _tmp17_ = _tmp16_.x;
+ _tmp9_ = _tmp8_;
#line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
- _tmp18_ = visuals;
+ _tmp10_ = _tmp9_.y;
#line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
- spit_transitions_visuals_get_from_pos (_tmp18_, &_tmp19_);
-#line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
- _tmp20_ = _tmp19_;
-#line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
- _tmp21_ = _tmp20_.y;
-#line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
- gdk_cairo_set_source_pixbuf (_tmp10_, _tmp13_, (gdouble) _tmp17_, (gdouble) _tmp21_);
-#line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
- _tmp22_ = ctx;
+ gdk_cairo_set_source_pixbuf (ctx, _tmp4_, (gdouble) _tmp7_, (gdouble) _tmp10_);
#line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
- _tmp23_ = alpha;
+ _tmp11_ = alpha;
#line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
- cairo_paint_with_alpha (_tmp22_, 1 - _tmp23_);
-#line 380 "CircleEffect.c"
+ cairo_paint_with_alpha (ctx, 1 - _tmp11_);
+#line 401 "CircleEffect.c"
}
#line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
- _tmp24_ = visuals;
+ _tmp12_ = spit_transitions_visuals_get_to_pixbuf (visuals);
#line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
- _tmp25_ = spit_transitions_visuals_get_to_pixbuf (_tmp24_);
+ _tmp13_ = _tmp12_;
#line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
- _tmp26_ = _tmp25_;
-#line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
- if (_tmp26_ != NULL) {
-#line 390 "CircleEffect.c"
- cairo_t* _tmp27_;
- SpitTransitionsVisuals* _tmp28_;
- GdkPixbuf* _tmp29_;
- GdkPixbuf* _tmp30_;
- SpitTransitionsVisuals* _tmp31_;
- GdkRectangle _tmp32_ = {0};
- GdkRectangle _tmp33_;
- gint _tmp34_;
- SpitTransitionsVisuals* _tmp35_;
- GdkRectangle _tmp36_ = {0};
- GdkRectangle _tmp37_;
- gint _tmp38_;
- cairo_t* _tmp39_;
- gint _tmp40_;
- gint _tmp41_;
- gint _tmp42_;
- cairo_t* _tmp43_;
- cairo_t* _tmp44_;
-#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
- _tmp27_ = ctx;
-#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
- _tmp28_ = visuals;
-#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
- _tmp29_ = spit_transitions_visuals_get_to_pixbuf (_tmp28_);
-#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
- _tmp30_ = _tmp29_;
+ if (_tmp13_ != NULL) {
+#line 409 "CircleEffect.c"
+ GdkPixbuf* _tmp14_;
+ GdkPixbuf* _tmp15_;
+ GdkRectangle _tmp16_ = {0};
+ GdkRectangle _tmp17_;
+ gint _tmp18_;
+ GdkRectangle _tmp19_ = {0};
+ GdkRectangle _tmp20_;
+ gint _tmp21_;
+ gint _tmp22_;
#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
- _tmp31_ = visuals;
+ _tmp14_ = spit_transitions_visuals_get_to_pixbuf (visuals);
#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
- spit_transitions_visuals_get_to_pos (_tmp31_, &_tmp32_);
+ _tmp15_ = _tmp14_;
#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
- _tmp33_ = _tmp32_;
+ spit_transitions_visuals_get_to_pos (visuals, &_tmp16_);
#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
- _tmp34_ = _tmp33_.x;
+ _tmp17_ = _tmp16_;
#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
- _tmp35_ = visuals;
+ _tmp18_ = _tmp17_.x;
#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
- spit_transitions_visuals_get_to_pos (_tmp35_, &_tmp36_);
+ spit_transitions_visuals_get_to_pos (visuals, &_tmp19_);
#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
- _tmp37_ = _tmp36_;
+ _tmp20_ = _tmp19_;
#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
- _tmp38_ = _tmp37_.y;
+ _tmp21_ = _tmp20_.y;
#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
- gdk_cairo_set_source_pixbuf (_tmp27_, _tmp30_, (gdouble) _tmp34_, (gdouble) _tmp38_);
+ gdk_cairo_set_source_pixbuf (ctx, _tmp15_, (gdouble) _tmp18_, (gdouble) _tmp21_);
#line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
- _tmp39_ = ctx;
+ _tmp22_ = radius;
#line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
- _tmp40_ = width;
-#line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
- _tmp41_ = height;
-#line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
- _tmp42_ = radius;
-#line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
- cairo_arc (_tmp39_, (gdouble) (((gint) _tmp40_) / 2), (gdouble) (((gint) _tmp41_) / 2), (gdouble) _tmp42_, (gdouble) 0, 2 * G_PI);
+ cairo_arc (ctx, (gdouble) (((gint) width) / 2), (gdouble) (((gint) height) / 2), (gdouble) _tmp22_, (gdouble) 0, 2 * G_PI);
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
- _tmp43_ = ctx;
-#line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
- cairo_clip (_tmp43_);
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
- _tmp44_ = ctx;
+ cairo_clip (ctx);
#line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
- cairo_paint (_tmp44_);
-#line 453 "CircleEffect.c"
+ cairo_paint (ctx);
+#line 445 "CircleEffect.c"
}
}
-static void circle_effect_real_advance (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, gint frame_number) {
+static void
+circle_effect_real_advance (SpitTransitionsEffect* base,
+ SpitTransitionsVisuals* visuals,
+ SpitTransitionsMotion* motion,
+ gint frame_number)
+{
CircleEffect * self;
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CIRCLE_EFFECT, CircleEffect);
@@ -462,26 +459,32 @@ static void circle_effect_real_advance (SpitTransitionsEffect* base, SpitTransit
g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals));
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion));
-#line 466 "CircleEffect.c"
+#line 463 "CircleEffect.c"
}
-static void circle_effect_real_cancel (SpitTransitionsEffect* base) {
+static void
+circle_effect_real_cancel (SpitTransitionsEffect* base)
+{
CircleEffect * self;
#line 69 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CIRCLE_EFFECT, CircleEffect);
-#line 474 "CircleEffect.c"
+#line 473 "CircleEffect.c"
}
-static void circle_effect_class_init (CircleEffectClass * klass) {
+static void
+circle_effect_class_init (CircleEffectClass * klass)
+{
#line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
circle_effect_parent_class = g_type_class_peek_parent (klass);
-#line 481 "CircleEffect.c"
+#line 482 "CircleEffect.c"
}
-static void circle_effect_spit_transitions_effect_interface_init (SpitTransitionsEffectIface * iface) {
+static void
+circle_effect_spit_transitions_effect_interface_init (SpitTransitionsEffectIface * iface)
+{
#line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
circle_effect_spit_transitions_effect_parent_iface = g_type_interface_peek_parent (iface);
#line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
@@ -496,15 +499,19 @@ static void circle_effect_spit_transitions_effect_interface_init (SpitTransition
iface->advance = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*, gint)) circle_effect_real_advance;
#line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
iface->cancel = (void (*) (SpitTransitionsEffect *)) circle_effect_real_cancel;
-#line 500 "CircleEffect.c"
+#line 503 "CircleEffect.c"
}
-static void circle_effect_instance_init (CircleEffect * self) {
+static void
+circle_effect_instance_init (CircleEffect * self)
+{
}
-GType circle_effect_get_type (void) {
+GType
+circle_effect_get_type (void)
+{
static volatile gsize circle_effect_type_id__volatile = 0;
if (g_once_init_enter (&circle_effect_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (CircleEffectClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) circle_effect_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (CircleEffect), 0, (GInstanceInitFunc) circle_effect_instance_init, NULL };
diff --git a/plugins/shotwell-transitions/CirclesEffect.c b/plugins/shotwell-transitions/CirclesEffect.c
index 2ae59b7..410dc93 100644
--- a/plugins/shotwell-transitions/CirclesEffect.c
+++ b/plugins/shotwell-transitions/CirclesEffect.c
@@ -1,4 +1,4 @@
-/* CirclesEffect.c generated by valac 0.36.6, the Vala compiler
+/* CirclesEffect.c generated by valac 0.40.4, the Vala compiler
* generated from CirclesEffect.vala, do not modify */
/* Copyright 2013 Jens Bav
@@ -8,6 +8,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>
@@ -42,6 +43,11 @@ typedef struct _ShotwellTransitionDescriptorPrivate ShotwellTransitionDescriptor
typedef struct _CirclesEffectDescriptor CirclesEffectDescriptor;
typedef struct _CirclesEffectDescriptorClass CirclesEffectDescriptorClass;
typedef struct _CirclesEffectDescriptorPrivate CirclesEffectDescriptorPrivate;
+enum {
+ CIRCLES_EFFECT_DESCRIPTOR_0_PROPERTY,
+ CIRCLES_EFFECT_DESCRIPTOR_NUM_PROPERTIES
+};
+static GParamSpec* circles_effect_descriptor_properties[CIRCLES_EFFECT_DESCRIPTOR_NUM_PROPERTIES];
#define TYPE_CIRCLES_EFFECT (circles_effect_get_type ())
#define CIRCLES_EFFECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CIRCLES_EFFECT, CirclesEffect))
@@ -53,6 +59,11 @@ typedef struct _CirclesEffectDescriptorPrivate CirclesEffectDescriptorPrivate;
typedef struct _CirclesEffect CirclesEffect;
typedef struct _CirclesEffectClass CirclesEffectClass;
typedef struct _CirclesEffectPrivate CirclesEffectPrivate;
+enum {
+ CIRCLES_EFFECT_0_PROPERTY,
+ CIRCLES_EFFECT_NUM_PROPERTIES
+};
+static GParamSpec* circles_effect_properties[CIRCLES_EFFECT_NUM_PROPERTIES];
struct _ShotwellTransitionDescriptor {
GObject parent_instance;
@@ -91,55 +102,69 @@ static SpitTransitionsEffectIface * circles_effect_spit_transitions_effect_paren
GType shotwell_transition_descriptor_get_type (void) G_GNUC_CONST;
GType circles_effect_descriptor_get_type (void) G_GNUC_CONST;
-enum {
- CIRCLES_EFFECT_DESCRIPTOR_DUMMY_PROPERTY
-};
CirclesEffectDescriptor* circles_effect_descriptor_new (GFile* resource_directory);
-CirclesEffectDescriptor* circles_effect_descriptor_construct (GType object_type, GFile* resource_directory);
-ShotwellTransitionDescriptor* shotwell_transition_descriptor_construct (GType object_type, GFile* resource_directory);
+CirclesEffectDescriptor* circles_effect_descriptor_construct (GType object_type,
+ GFile* resource_directory);
+ShotwellTransitionDescriptor* shotwell_transition_descriptor_construct (GType object_type,
+ GFile* resource_directory);
static const gchar* circles_effect_descriptor_real_get_id (ShotwellTransitionDescriptor* base);
static const gchar* circles_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base);
-static SpitTransitionsEffect* circles_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, SpitHostInterface* host);
+static SpitTransitionsEffect* circles_effect_descriptor_real_create (ShotwellTransitionDescriptor* base,
+ SpitHostInterface* host);
CirclesEffect* circles_effect_new (void);
CirclesEffect* circles_effect_construct (GType object_type);
GType circles_effect_get_type (void) G_GNUC_CONST;
-enum {
- CIRCLES_EFFECT_DUMMY_PROPERTY
-};
#define CIRCLES_EFFECT_DESIRED_FPS 25
#define CIRCLES_EFFECT_MIN_FPS 15
#define CIRCLES_EFFECT_SPEED 2.5
-static void circles_effect_real_get_fps (SpitTransitionsEffect* base, gint* desired_fps, gint* min_fps);
-static void circles_effect_real_start (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion);
+static void circles_effect_real_get_fps (SpitTransitionsEffect* base,
+ gint* desired_fps,
+ gint* min_fps);
+static void circles_effect_real_start (SpitTransitionsEffect* base,
+ SpitTransitionsVisuals* visuals,
+ SpitTransitionsMotion* motion);
static gboolean circles_effect_real_needs_clear_background (SpitTransitionsEffect* base);
-static void circles_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number);
-static void circles_effect_real_advance (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, gint frame_number);
+static void circles_effect_real_paint (SpitTransitionsEffect* base,
+ SpitTransitionsVisuals* visuals,
+ SpitTransitionsMotion* motion,
+ cairo_t* ctx,
+ gint width,
+ gint height,
+ gint frame_number);
+static void circles_effect_real_advance (SpitTransitionsEffect* base,
+ SpitTransitionsVisuals* visuals,
+ SpitTransitionsMotion* motion,
+ gint frame_number);
static void circles_effect_real_cancel (SpitTransitionsEffect* base);
-CirclesEffectDescriptor* circles_effect_descriptor_construct (GType object_type, GFile* resource_directory) {
+CirclesEffectDescriptor*
+circles_effect_descriptor_construct (GType object_type,
+ GFile* resource_directory)
+{
CirclesEffectDescriptor * self = NULL;
- GFile* _tmp0_;
#line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
g_return_val_if_fail (G_IS_FILE (resource_directory), NULL);
#line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- _tmp0_ = resource_directory;
-#line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- self = (CirclesEffectDescriptor*) shotwell_transition_descriptor_construct (object_type, _tmp0_);
+ self = (CirclesEffectDescriptor*) shotwell_transition_descriptor_construct (object_type, resource_directory);
#line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
return self;
-#line 132 "CirclesEffect.c"
+#line 153 "CirclesEffect.c"
}
-CirclesEffectDescriptor* circles_effect_descriptor_new (GFile* resource_directory) {
+CirclesEffectDescriptor*
+circles_effect_descriptor_new (GFile* resource_directory)
+{
#line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
return circles_effect_descriptor_construct (TYPE_CIRCLES_EFFECT_DESCRIPTOR, resource_directory);
-#line 139 "CirclesEffect.c"
+#line 162 "CirclesEffect.c"
}
-static const gchar* circles_effect_descriptor_real_get_id (ShotwellTransitionDescriptor* base) {
+static const gchar*
+circles_effect_descriptor_real_get_id (ShotwellTransitionDescriptor* base)
+{
CirclesEffectDescriptor * self;
const gchar* result = NULL;
#line 15 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
@@ -148,11 +173,13 @@ static const gchar* circles_effect_descriptor_real_get_id (ShotwellTransitionDes
result = "org.yorba.shotwell.transitions.circles";
#line 16 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
return result;
-#line 152 "CirclesEffect.c"
+#line 177 "CirclesEffect.c"
}
-static const gchar* circles_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base) {
+static const gchar*
+circles_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base)
+{
CirclesEffectDescriptor * self;
const gchar* result = NULL;
#line 19 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
@@ -161,11 +188,14 @@ static const gchar* circles_effect_descriptor_real_get_pluggable_name (ShotwellT
result = _ ("Circles");
#line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
return result;
-#line 165 "CirclesEffect.c"
+#line 192 "CirclesEffect.c"
}
-static SpitTransitionsEffect* circles_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, SpitHostInterface* host) {
+static SpitTransitionsEffect*
+circles_effect_descriptor_real_create (ShotwellTransitionDescriptor* base,
+ SpitHostInterface* host)
+{
CirclesEffectDescriptor * self;
SpitTransitionsEffect* result = NULL;
CirclesEffect* _tmp0_;
@@ -179,11 +209,13 @@ static SpitTransitionsEffect* circles_effect_descriptor_real_create (ShotwellTra
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TRANSITIONS_TYPE_EFFECT, SpitTransitionsEffect);
#line 24 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
return result;
-#line 183 "CirclesEffect.c"
+#line 213 "CirclesEffect.c"
}
-static void circles_effect_descriptor_class_init (CirclesEffectDescriptorClass * klass) {
+static void
+circles_effect_descriptor_class_init (CirclesEffectDescriptorClass * klass)
+{
#line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
circles_effect_descriptor_parent_class = g_type_class_peek_parent (klass);
#line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
@@ -192,15 +224,19 @@ static void circles_effect_descriptor_class_init (CirclesEffectDescriptorClass *
((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*) (ShotwellTransitionDescriptor *)) circles_effect_descriptor_real_get_pluggable_name;
#line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*) (ShotwellTransitionDescriptor *, SpitHostInterface*)) circles_effect_descriptor_real_create;
-#line 196 "CirclesEffect.c"
+#line 228 "CirclesEffect.c"
}
-static void circles_effect_descriptor_instance_init (CirclesEffectDescriptor * self) {
+static void
+circles_effect_descriptor_instance_init (CirclesEffectDescriptor * self)
+{
}
-GType circles_effect_descriptor_get_type (void) {
+GType
+circles_effect_descriptor_get_type (void)
+{
static volatile gsize circles_effect_descriptor_type_id__volatile = 0;
if (g_once_init_enter (&circles_effect_descriptor_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (CirclesEffectDescriptorClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) circles_effect_descriptor_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (CirclesEffectDescriptor), 0, (GInstanceInitFunc) circles_effect_descriptor_instance_init, NULL };
@@ -212,24 +248,32 @@ GType circles_effect_descriptor_get_type (void) {
}
-CirclesEffect* circles_effect_construct (GType object_type) {
+CirclesEffect*
+circles_effect_construct (GType object_type)
+{
CirclesEffect * self = NULL;
#line 33 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
self = (CirclesEffect*) g_object_new (object_type, NULL);
#line 33 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
return self;
-#line 222 "CirclesEffect.c"
+#line 260 "CirclesEffect.c"
}
-CirclesEffect* circles_effect_new (void) {
+CirclesEffect*
+circles_effect_new (void)
+{
#line 33 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
return circles_effect_construct (TYPE_CIRCLES_EFFECT);
-#line 229 "CirclesEffect.c"
+#line 269 "CirclesEffect.c"
}
-static void circles_effect_real_get_fps (SpitTransitionsEffect* base, gint* desired_fps, gint* min_fps) {
+static void
+circles_effect_real_get_fps (SpitTransitionsEffect* base,
+ gint* desired_fps,
+ gint* min_fps)
+{
CirclesEffect * self;
gint _vala_desired_fps = 0;
gint _vala_min_fps = 0;
@@ -243,18 +287,22 @@ static void circles_effect_real_get_fps (SpitTransitionsEffect* base, gint* desi
if (desired_fps) {
#line 36 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
*desired_fps = _vala_desired_fps;
-#line 247 "CirclesEffect.c"
+#line 291 "CirclesEffect.c"
}
#line 36 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
if (min_fps) {
#line 36 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
*min_fps = _vala_min_fps;
-#line 253 "CirclesEffect.c"
+#line 297 "CirclesEffect.c"
}
}
-static void circles_effect_real_start (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion) {
+static void
+circles_effect_real_start (SpitTransitionsEffect* base,
+ SpitTransitionsVisuals* visuals,
+ SpitTransitionsMotion* motion)
+{
CirclesEffect * self;
#line 41 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CIRCLES_EFFECT, CirclesEffect);
@@ -262,11 +310,13 @@ static void circles_effect_real_start (SpitTransitionsEffect* base, SpitTransiti
g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals));
#line 41 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion));
-#line 266 "CirclesEffect.c"
+#line 314 "CirclesEffect.c"
}
-static gboolean circles_effect_real_needs_clear_background (SpitTransitionsEffect* base) {
+static gboolean
+circles_effect_real_needs_clear_background (SpitTransitionsEffect* base)
+{
CirclesEffect * self;
gboolean result = FALSE;
#line 44 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
@@ -275,32 +325,33 @@ static gboolean circles_effect_real_needs_clear_background (SpitTransitionsEffec
result = TRUE;
#line 45 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
return result;
-#line 279 "CirclesEffect.c"
+#line 329 "CirclesEffect.c"
}
-static void circles_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number) {
+static void
+circles_effect_real_paint (SpitTransitionsEffect* base,
+ SpitTransitionsVisuals* visuals,
+ SpitTransitionsMotion* motion,
+ cairo_t* ctx,
+ gint width,
+ gint height,
+ gint frame_number)
+{
CirclesEffect * self;
gdouble alpha = 0.0;
- SpitTransitionsMotion* _tmp0_;
- gint _tmp1_;
- gdouble _tmp2_;
gint distance = 0;
gint radius = 0;
gint circleCountX = 0;
- gint _tmp3_;
- gint _tmp4_;
+ gint _tmp0_;
gint circleCountY = 0;
- gint _tmp5_;
- gint _tmp6_;
+ gint _tmp1_;
gdouble maxRadius = 0.0;
- gint _tmp7_;
- SpitTransitionsVisuals* _tmp8_;
- GdkPixbuf* _tmp9_;
- GdkPixbuf* _tmp10_;
- SpitTransitionsVisuals* _tmp25_;
- GdkPixbuf* _tmp26_;
- GdkPixbuf* _tmp27_;
+ gint _tmp2_;
+ GdkPixbuf* _tmp3_;
+ GdkPixbuf* _tmp4_;
+ GdkPixbuf* _tmp14_;
+ GdkPixbuf* _tmp15_;
#line 48 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CIRCLES_EFFECT, CirclesEffect);
#line 48 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
@@ -310,263 +361,208 @@ static void circles_effect_real_paint (SpitTransitionsEffect* base, SpitTransiti
#line 48 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
g_return_if_fail (ctx != NULL);
#line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- _tmp0_ = motion;
-#line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- _tmp1_ = frame_number;
-#line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- _tmp2_ = spit_transitions_motion_get_alpha (_tmp0_, _tmp1_);
-#line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- alpha = _tmp2_;
+ alpha = spit_transitions_motion_get_alpha (motion, frame_number);
#line 51 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
distance = 60;
#line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- _tmp3_ = width;
-#line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- _tmp4_ = distance;
+ _tmp0_ = distance;
#line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- circleCountX = _tmp3_ / (2 * _tmp4_);
+ circleCountX = width / (2 * _tmp0_);
#line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- _tmp5_ = height;
+ _tmp1_ = distance;
#line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- _tmp6_ = distance;
-#line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- circleCountY = _tmp5_ / _tmp6_;
+ circleCountY = height / _tmp1_;
#line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- _tmp7_ = distance;
+ _tmp2_ = distance;
#line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- maxRadius = CIRCLES_EFFECT_SPEED * _tmp7_;
-#line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- _tmp8_ = visuals;
+ maxRadius = CIRCLES_EFFECT_SPEED * _tmp2_;
#line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- _tmp9_ = spit_transitions_visuals_get_from_pixbuf (_tmp8_);
+ _tmp3_ = spit_transitions_visuals_get_from_pixbuf (visuals);
#line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- _tmp10_ = _tmp9_;
+ _tmp4_ = _tmp3_;
#line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- if (_tmp10_ != NULL) {
-#line 347 "CirclesEffect.c"
- cairo_t* _tmp11_;
- SpitTransitionsVisuals* _tmp12_;
- GdkPixbuf* _tmp13_;
- GdkPixbuf* _tmp14_;
- SpitTransitionsVisuals* _tmp15_;
- GdkRectangle _tmp16_ = {0};
- GdkRectangle _tmp17_;
- gint _tmp18_;
- SpitTransitionsVisuals* _tmp19_;
- GdkRectangle _tmp20_ = {0};
- GdkRectangle _tmp21_;
- gint _tmp22_;
- cairo_t* _tmp23_;
- gdouble _tmp24_;
+ if (_tmp4_ != NULL) {
+#line 386 "CirclesEffect.c"
+ GdkPixbuf* _tmp5_;
+ GdkPixbuf* _tmp6_;
+ GdkRectangle _tmp7_ = {0};
+ GdkRectangle _tmp8_;
+ gint _tmp9_;
+ GdkRectangle _tmp10_ = {0};
+ GdkRectangle _tmp11_;
+ gint _tmp12_;
+ gdouble _tmp13_;
#line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- _tmp11_ = ctx;
+ _tmp5_ = spit_transitions_visuals_get_from_pixbuf (visuals);
#line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- _tmp12_ = visuals;
+ _tmp6_ = _tmp5_;
#line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- _tmp13_ = spit_transitions_visuals_get_from_pixbuf (_tmp12_);
+ spit_transitions_visuals_get_from_pos (visuals, &_tmp7_);
#line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- _tmp14_ = _tmp13_;
+ _tmp8_ = _tmp7_;
#line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- _tmp15_ = visuals;
+ _tmp9_ = _tmp8_.x;
#line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- spit_transitions_visuals_get_from_pos (_tmp15_, &_tmp16_);
+ spit_transitions_visuals_get_from_pos (visuals, &_tmp10_);
#line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- _tmp17_ = _tmp16_;
-#line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- _tmp18_ = _tmp17_.x;
-#line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- _tmp19_ = visuals;
-#line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- spit_transitions_visuals_get_from_pos (_tmp19_, &_tmp20_);
-#line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- _tmp21_ = _tmp20_;
+ _tmp11_ = _tmp10_;
#line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- _tmp22_ = _tmp21_.y;
+ _tmp12_ = _tmp11_.y;
#line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- gdk_cairo_set_source_pixbuf (_tmp11_, _tmp14_, (gdouble) _tmp18_, (gdouble) _tmp22_);
+ gdk_cairo_set_source_pixbuf (ctx, _tmp6_, (gdouble) _tmp9_, (gdouble) _tmp12_);
#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- _tmp23_ = ctx;
+ _tmp13_ = alpha;
#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- _tmp24_ = alpha;
-#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- cairo_paint_with_alpha (_tmp23_, 1 - _tmp24_);
-#line 394 "CirclesEffect.c"
+ cairo_paint_with_alpha (ctx, 1 - _tmp13_);
+#line 418 "CirclesEffect.c"
}
#line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- _tmp25_ = visuals;
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- _tmp26_ = spit_transitions_visuals_get_to_pixbuf (_tmp25_);
+ _tmp14_ = spit_transitions_visuals_get_to_pixbuf (visuals);
#line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- _tmp27_ = _tmp26_;
+ _tmp15_ = _tmp14_;
#line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- if (_tmp27_ != NULL) {
-#line 404 "CirclesEffect.c"
- cairo_t* _tmp28_;
- SpitTransitionsVisuals* _tmp29_;
- GdkPixbuf* _tmp30_;
- GdkPixbuf* _tmp31_;
- SpitTransitionsVisuals* _tmp32_;
- GdkRectangle _tmp33_ = {0};
- GdkRectangle _tmp34_;
- gint _tmp35_;
- SpitTransitionsVisuals* _tmp36_;
- GdkRectangle _tmp37_ = {0};
- GdkRectangle _tmp38_;
- gint _tmp39_;
- cairo_t* _tmp63_;
- cairo_t* _tmp64_;
- gdouble _tmp65_;
-#line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- _tmp28_ = ctx;
-#line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- _tmp29_ = visuals;
+ if (_tmp15_ != NULL) {
+#line 426 "CirclesEffect.c"
+ GdkPixbuf* _tmp16_;
+ GdkPixbuf* _tmp17_;
+ GdkRectangle _tmp18_ = {0};
+ GdkRectangle _tmp19_;
+ gint _tmp20_;
+ GdkRectangle _tmp21_ = {0};
+ GdkRectangle _tmp22_;
+ gint _tmp23_;
+ gdouble _tmp43_;
#line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- _tmp30_ = spit_transitions_visuals_get_to_pixbuf (_tmp29_);
+ _tmp16_ = spit_transitions_visuals_get_to_pixbuf (visuals);
#line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- _tmp31_ = _tmp30_;
-#line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- _tmp32_ = visuals;
-#line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- spit_transitions_visuals_get_to_pos (_tmp32_, &_tmp33_);
+ _tmp17_ = _tmp16_;
#line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- _tmp34_ = _tmp33_;
+ spit_transitions_visuals_get_to_pos (visuals, &_tmp18_);
#line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- _tmp35_ = _tmp34_.x;
+ _tmp19_ = _tmp18_;
#line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- _tmp36_ = visuals;
+ _tmp20_ = _tmp19_.x;
#line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- spit_transitions_visuals_get_to_pos (_tmp36_, &_tmp37_);
+ spit_transitions_visuals_get_to_pos (visuals, &_tmp21_);
#line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- _tmp38_ = _tmp37_;
+ _tmp22_ = _tmp21_;
#line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- _tmp39_ = _tmp38_.y;
+ _tmp23_ = _tmp22_.y;
#line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- gdk_cairo_set_source_pixbuf (_tmp28_, _tmp31_, (gdouble) _tmp35_, (gdouble) _tmp39_);
-#line 446 "CirclesEffect.c"
+ gdk_cairo_set_source_pixbuf (ctx, _tmp17_, (gdouble) _tmp20_, (gdouble) _tmp23_);
+#line 454 "CirclesEffect.c"
{
gint y = 0;
#line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
y = 0;
-#line 451 "CirclesEffect.c"
+#line 459 "CirclesEffect.c"
{
- gboolean _tmp40_ = FALSE;
+ gboolean _tmp24_ = FALSE;
#line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- _tmp40_ = TRUE;
+ _tmp24_ = TRUE;
#line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
while (TRUE) {
-#line 458 "CirclesEffect.c"
- gint _tmp42_;
- gint _tmp43_;
+#line 466 "CirclesEffect.c"
+ gint _tmp26_;
+ gint _tmp27_;
#line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- if (!_tmp40_) {
-#line 463 "CirclesEffect.c"
- gint _tmp41_;
+ if (!_tmp24_) {
+#line 471 "CirclesEffect.c"
+ gint _tmp25_;
#line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- _tmp41_ = y;
+ _tmp25_ = y;
#line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- y = _tmp41_ + 1;
-#line 469 "CirclesEffect.c"
+ y = _tmp25_ + 1;
+#line 477 "CirclesEffect.c"
}
#line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- _tmp40_ = FALSE;
+ _tmp24_ = FALSE;
#line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- _tmp42_ = y;
+ _tmp26_ = y;
#line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- _tmp43_ = circleCountY;
+ _tmp27_ = circleCountY;
#line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- if (!(_tmp42_ <= _tmp43_)) {
+ if (!(_tmp26_ <= _tmp27_)) {
#line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
break;
-#line 481 "CirclesEffect.c"
+#line 489 "CirclesEffect.c"
}
{
gint x = 0;
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
x = 0;
-#line 487 "CirclesEffect.c"
+#line 495 "CirclesEffect.c"
{
- gboolean _tmp44_ = FALSE;
+ gboolean _tmp28_ = FALSE;
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- _tmp44_ = TRUE;
+ _tmp28_ = TRUE;
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
while (TRUE) {
-#line 494 "CirclesEffect.c"
- gint _tmp46_;
- gint _tmp47_;
- gdouble _tmp48_;
- gint _tmp49_;
- gint _tmp50_;
- gint _tmp51_;
- gint _tmp52_;
- gdouble _tmp53_;
- gdouble _tmp54_;
- gdouble _tmp55_;
- cairo_t* _tmp56_;
- gint _tmp57_;
- gint _tmp58_;
- gint _tmp59_;
- gint _tmp60_;
- gint _tmp61_;
- cairo_t* _tmp62_;
+#line 502 "CirclesEffect.c"
+ gint _tmp30_;
+ gint _tmp31_;
+ gdouble _tmp32_;
+ gint _tmp33_;
+ gint _tmp34_;
+ gint _tmp35_;
+ gint _tmp36_;
+ gdouble _tmp37_;
+ gint _tmp38_;
+ gint _tmp39_;
+ gint _tmp40_;
+ gint _tmp41_;
+ gint _tmp42_;
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- if (!_tmp44_) {
-#line 514 "CirclesEffect.c"
- gint _tmp45_;
+ if (!_tmp28_) {
+#line 518 "CirclesEffect.c"
+ gint _tmp29_;
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- _tmp45_ = x;
+ _tmp29_ = x;
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- x = _tmp45_ + 1;
-#line 520 "CirclesEffect.c"
+ x = _tmp29_ + 1;
+#line 524 "CirclesEffect.c"
}
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- _tmp44_ = FALSE;
+ _tmp28_ = FALSE;
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- _tmp46_ = x;
+ _tmp30_ = x;
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- _tmp47_ = circleCountX;
+ _tmp31_ = circleCountX;
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- if (!(_tmp46_ <= _tmp47_)) {
+ if (!(_tmp30_ <= _tmp31_)) {
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
break;
-#line 532 "CirclesEffect.c"
+#line 536 "CirclesEffect.c"
}
#line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- _tmp48_ = alpha;
-#line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- _tmp49_ = x;
-#line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- _tmp50_ = y;
+ _tmp32_ = alpha;
#line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- _tmp51_ = circleCountY;
+ _tmp33_ = x;
#line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- _tmp52_ = circleCountX;
+ _tmp34_ = y;
#line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- _tmp53_ = fmin ((gdouble) 1, _tmp48_ - (((gdouble) (_tmp49_ + _tmp50_)) / ((gdouble) ((_tmp51_ + _tmp52_) * CIRCLES_EFFECT_SPEED))));
+ _tmp35_ = circleCountY;
#line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- _tmp54_ = fmax ((gdouble) 0, _tmp53_);
+ _tmp36_ = circleCountX;
#line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- _tmp55_ = maxRadius;
+ _tmp37_ = maxRadius;
#line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- radius = (gint) (_tmp54_ * _tmp55_);
+ radius = (gint) (fmax ((gdouble) 0, fmin ((gdouble) 1, _tmp32_ - (((gdouble) (_tmp33_ + _tmp34_)) / ((gdouble) ((_tmp35_ + _tmp36_) * CIRCLES_EFFECT_SPEED))))) * _tmp37_);
#line 69 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- _tmp56_ = ctx;
+ _tmp38_ = distance;
#line 69 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- _tmp57_ = distance;
+ _tmp39_ = x;
#line 69 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- _tmp58_ = x;
+ _tmp40_ = distance;
#line 69 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- _tmp59_ = distance;
+ _tmp41_ = y;
#line 69 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- _tmp60_ = y;
+ _tmp42_ = radius;
#line 69 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- _tmp61_ = radius;
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- cairo_arc (_tmp56_, (gdouble) ((2 * _tmp57_) * _tmp58_), (gdouble) ((2 * _tmp59_) * _tmp60_), (gdouble) _tmp61_, (gdouble) 0, 2 * G_PI);
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- _tmp62_ = ctx;
+ cairo_arc (ctx, (gdouble) ((2 * _tmp38_) * _tmp39_), (gdouble) ((2 * _tmp40_) * _tmp41_), (gdouble) _tmp42_, (gdouble) 0, 2 * G_PI);
#line 70 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- cairo_fill (_tmp62_);
-#line 570 "CirclesEffect.c"
+ cairo_fill (ctx);
+#line 566 "CirclesEffect.c"
}
}
}
@@ -574,21 +570,22 @@ static void circles_effect_real_paint (SpitTransitionsEffect* base, SpitTransiti
}
}
#line 74 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- _tmp63_ = ctx;
-#line 74 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- cairo_clip (_tmp63_);
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- _tmp64_ = ctx;
+ cairo_clip (ctx);
#line 75 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- _tmp65_ = alpha;
+ _tmp43_ = alpha;
#line 75 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
- cairo_paint_with_alpha (_tmp64_, _tmp65_);
-#line 587 "CirclesEffect.c"
+ cairo_paint_with_alpha (ctx, _tmp43_);
+#line 579 "CirclesEffect.c"
}
}
-static void circles_effect_real_advance (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, gint frame_number) {
+static void
+circles_effect_real_advance (SpitTransitionsEffect* base,
+ SpitTransitionsVisuals* visuals,
+ SpitTransitionsMotion* motion,
+ gint frame_number)
+{
CirclesEffect * self;
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CIRCLES_EFFECT, CirclesEffect);
@@ -596,26 +593,32 @@ static void circles_effect_real_advance (SpitTransitionsEffect* base, SpitTransi
g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals));
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion));
-#line 600 "CirclesEffect.c"
+#line 597 "CirclesEffect.c"
}
-static void circles_effect_real_cancel (SpitTransitionsEffect* base) {
+static void
+circles_effect_real_cancel (SpitTransitionsEffect* base)
+{
CirclesEffect * self;
#line 84 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CIRCLES_EFFECT, CirclesEffect);
-#line 608 "CirclesEffect.c"
+#line 607 "CirclesEffect.c"
}
-static void circles_effect_class_init (CirclesEffectClass * klass) {
+static void
+circles_effect_class_init (CirclesEffectClass * klass)
+{
#line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
circles_effect_parent_class = g_type_class_peek_parent (klass);
-#line 615 "CirclesEffect.c"
+#line 616 "CirclesEffect.c"
}
-static void circles_effect_spit_transitions_effect_interface_init (SpitTransitionsEffectIface * iface) {
+static void
+circles_effect_spit_transitions_effect_interface_init (SpitTransitionsEffectIface * iface)
+{
#line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
circles_effect_spit_transitions_effect_parent_iface = g_type_interface_peek_parent (iface);
#line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
@@ -630,15 +633,19 @@ static void circles_effect_spit_transitions_effect_interface_init (SpitTransitio
iface->advance = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*, gint)) circles_effect_real_advance;
#line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
iface->cancel = (void (*) (SpitTransitionsEffect *)) circles_effect_real_cancel;
-#line 634 "CirclesEffect.c"
+#line 637 "CirclesEffect.c"
}
-static void circles_effect_instance_init (CirclesEffect * self) {
+static void
+circles_effect_instance_init (CirclesEffect * self)
+{
}
-GType circles_effect_get_type (void) {
+GType
+circles_effect_get_type (void)
+{
static volatile gsize circles_effect_type_id__volatile = 0;
if (g_once_init_enter (&circles_effect_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (CirclesEffectClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) circles_effect_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (CirclesEffect), 0, (GInstanceInitFunc) circles_effect_instance_init, NULL };
diff --git a/plugins/shotwell-transitions/ClockEffect.c b/plugins/shotwell-transitions/ClockEffect.c
index c1f5257..f8f3748 100644
--- a/plugins/shotwell-transitions/ClockEffect.c
+++ b/plugins/shotwell-transitions/ClockEffect.c
@@ -1,4 +1,4 @@
-/* ClockEffect.c generated by valac 0.36.6, the Vala compiler
+/* ClockEffect.c generated by valac 0.40.4, the Vala compiler
* generated from ClockEffect.vala, do not modify */
/* Copyright 2013 Jens Bav
@@ -8,6 +8,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>
@@ -42,6 +43,11 @@ typedef struct _ShotwellTransitionDescriptorPrivate ShotwellTransitionDescriptor
typedef struct _ClockEffectDescriptor ClockEffectDescriptor;
typedef struct _ClockEffectDescriptorClass ClockEffectDescriptorClass;
typedef struct _ClockEffectDescriptorPrivate ClockEffectDescriptorPrivate;
+enum {
+ CLOCK_EFFECT_DESCRIPTOR_0_PROPERTY,
+ CLOCK_EFFECT_DESCRIPTOR_NUM_PROPERTIES
+};
+static GParamSpec* clock_effect_descriptor_properties[CLOCK_EFFECT_DESCRIPTOR_NUM_PROPERTIES];
#define TYPE_CLOCK_EFFECT (clock_effect_get_type ())
#define CLOCK_EFFECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CLOCK_EFFECT, ClockEffect))
@@ -53,6 +59,11 @@ typedef struct _ClockEffectDescriptorPrivate ClockEffectDescriptorPrivate;
typedef struct _ClockEffect ClockEffect;
typedef struct _ClockEffectClass ClockEffectClass;
typedef struct _ClockEffectPrivate ClockEffectPrivate;
+enum {
+ CLOCK_EFFECT_0_PROPERTY,
+ CLOCK_EFFECT_NUM_PROPERTIES
+};
+static GParamSpec* clock_effect_properties[CLOCK_EFFECT_NUM_PROPERTIES];
struct _ShotwellTransitionDescriptor {
GObject parent_instance;
@@ -91,55 +102,69 @@ static SpitTransitionsEffectIface * clock_effect_spit_transitions_effect_parent_
GType shotwell_transition_descriptor_get_type (void) G_GNUC_CONST;
GType clock_effect_descriptor_get_type (void) G_GNUC_CONST;
-enum {
- CLOCK_EFFECT_DESCRIPTOR_DUMMY_PROPERTY
-};
ClockEffectDescriptor* clock_effect_descriptor_new (GFile* resource_directory);
-ClockEffectDescriptor* clock_effect_descriptor_construct (GType object_type, GFile* resource_directory);
-ShotwellTransitionDescriptor* shotwell_transition_descriptor_construct (GType object_type, GFile* resource_directory);
+ClockEffectDescriptor* clock_effect_descriptor_construct (GType object_type,
+ GFile* resource_directory);
+ShotwellTransitionDescriptor* shotwell_transition_descriptor_construct (GType object_type,
+ GFile* resource_directory);
static const gchar* clock_effect_descriptor_real_get_id (ShotwellTransitionDescriptor* base);
static const gchar* clock_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base);
-static SpitTransitionsEffect* clock_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, SpitHostInterface* host);
+static SpitTransitionsEffect* clock_effect_descriptor_real_create (ShotwellTransitionDescriptor* base,
+ SpitHostInterface* host);
ClockEffect* clock_effect_new (void);
ClockEffect* clock_effect_construct (GType object_type);
GType clock_effect_get_type (void) G_GNUC_CONST;
-enum {
- CLOCK_EFFECT_DUMMY_PROPERTY
-};
#define CLOCK_EFFECT_DESIRED_FPS 25
#define CLOCK_EFFECT_MIN_FPS 15
#define CLOCK_EFFECT_TOP_RADIANT (0.5 * G_PI)
-static void clock_effect_real_get_fps (SpitTransitionsEffect* base, gint* desired_fps, gint* min_fps);
-static void clock_effect_real_start (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion);
+static void clock_effect_real_get_fps (SpitTransitionsEffect* base,
+ gint* desired_fps,
+ gint* min_fps);
+static void clock_effect_real_start (SpitTransitionsEffect* base,
+ SpitTransitionsVisuals* visuals,
+ SpitTransitionsMotion* motion);
static gboolean clock_effect_real_needs_clear_background (SpitTransitionsEffect* base);
-static void clock_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number);
-static void clock_effect_real_advance (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, gint frame_number);
+static void clock_effect_real_paint (SpitTransitionsEffect* base,
+ SpitTransitionsVisuals* visuals,
+ SpitTransitionsMotion* motion,
+ cairo_t* ctx,
+ gint width,
+ gint height,
+ gint frame_number);
+static void clock_effect_real_advance (SpitTransitionsEffect* base,
+ SpitTransitionsVisuals* visuals,
+ SpitTransitionsMotion* motion,
+ gint frame_number);
static void clock_effect_real_cancel (SpitTransitionsEffect* base);
-ClockEffectDescriptor* clock_effect_descriptor_construct (GType object_type, GFile* resource_directory) {
+ClockEffectDescriptor*
+clock_effect_descriptor_construct (GType object_type,
+ GFile* resource_directory)
+{
ClockEffectDescriptor * self = NULL;
- GFile* _tmp0_;
#line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
g_return_val_if_fail (G_IS_FILE (resource_directory), NULL);
#line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- _tmp0_ = resource_directory;
-#line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- self = (ClockEffectDescriptor*) shotwell_transition_descriptor_construct (object_type, _tmp0_);
+ self = (ClockEffectDescriptor*) shotwell_transition_descriptor_construct (object_type, resource_directory);
#line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
return self;
-#line 132 "ClockEffect.c"
+#line 153 "ClockEffect.c"
}
-ClockEffectDescriptor* clock_effect_descriptor_new (GFile* resource_directory) {
+ClockEffectDescriptor*
+clock_effect_descriptor_new (GFile* resource_directory)
+{
#line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
return clock_effect_descriptor_construct (TYPE_CLOCK_EFFECT_DESCRIPTOR, resource_directory);
-#line 139 "ClockEffect.c"
+#line 162 "ClockEffect.c"
}
-static const gchar* clock_effect_descriptor_real_get_id (ShotwellTransitionDescriptor* base) {
+static const gchar*
+clock_effect_descriptor_real_get_id (ShotwellTransitionDescriptor* base)
+{
ClockEffectDescriptor * self;
const gchar* result = NULL;
#line 15 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
@@ -148,11 +173,13 @@ static const gchar* clock_effect_descriptor_real_get_id (ShotwellTransitionDescr
result = "org.yorba.shotwell.transitions.clock";
#line 16 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
return result;
-#line 152 "ClockEffect.c"
+#line 177 "ClockEffect.c"
}
-static const gchar* clock_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base) {
+static const gchar*
+clock_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base)
+{
ClockEffectDescriptor * self;
const gchar* result = NULL;
#line 19 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
@@ -161,11 +188,14 @@ static const gchar* clock_effect_descriptor_real_get_pluggable_name (ShotwellTra
result = _ ("Clock");
#line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
return result;
-#line 165 "ClockEffect.c"
+#line 192 "ClockEffect.c"
}
-static SpitTransitionsEffect* clock_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, SpitHostInterface* host) {
+static SpitTransitionsEffect*
+clock_effect_descriptor_real_create (ShotwellTransitionDescriptor* base,
+ SpitHostInterface* host)
+{
ClockEffectDescriptor * self;
SpitTransitionsEffect* result = NULL;
ClockEffect* _tmp0_;
@@ -179,11 +209,13 @@ static SpitTransitionsEffect* clock_effect_descriptor_real_create (ShotwellTrans
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TRANSITIONS_TYPE_EFFECT, SpitTransitionsEffect);
#line 24 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
return result;
-#line 183 "ClockEffect.c"
+#line 213 "ClockEffect.c"
}
-static void clock_effect_descriptor_class_init (ClockEffectDescriptorClass * klass) {
+static void
+clock_effect_descriptor_class_init (ClockEffectDescriptorClass * klass)
+{
#line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
clock_effect_descriptor_parent_class = g_type_class_peek_parent (klass);
#line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
@@ -192,15 +224,19 @@ static void clock_effect_descriptor_class_init (ClockEffectDescriptorClass * kla
((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*) (ShotwellTransitionDescriptor *)) clock_effect_descriptor_real_get_pluggable_name;
#line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*) (ShotwellTransitionDescriptor *, SpitHostInterface*)) clock_effect_descriptor_real_create;
-#line 196 "ClockEffect.c"
+#line 228 "ClockEffect.c"
}
-static void clock_effect_descriptor_instance_init (ClockEffectDescriptor * self) {
+static void
+clock_effect_descriptor_instance_init (ClockEffectDescriptor * self)
+{
}
-GType clock_effect_descriptor_get_type (void) {
+GType
+clock_effect_descriptor_get_type (void)
+{
static volatile gsize clock_effect_descriptor_type_id__volatile = 0;
if (g_once_init_enter (&clock_effect_descriptor_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (ClockEffectDescriptorClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) clock_effect_descriptor_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ClockEffectDescriptor), 0, (GInstanceInitFunc) clock_effect_descriptor_instance_init, NULL };
@@ -212,24 +248,32 @@ GType clock_effect_descriptor_get_type (void) {
}
-ClockEffect* clock_effect_construct (GType object_type) {
+ClockEffect*
+clock_effect_construct (GType object_type)
+{
ClockEffect * self = NULL;
#line 33 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
self = (ClockEffect*) g_object_new (object_type, NULL);
#line 33 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
return self;
-#line 222 "ClockEffect.c"
+#line 260 "ClockEffect.c"
}
-ClockEffect* clock_effect_new (void) {
+ClockEffect*
+clock_effect_new (void)
+{
#line 33 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
return clock_effect_construct (TYPE_CLOCK_EFFECT);
-#line 229 "ClockEffect.c"
+#line 269 "ClockEffect.c"
}
-static void clock_effect_real_get_fps (SpitTransitionsEffect* base, gint* desired_fps, gint* min_fps) {
+static void
+clock_effect_real_get_fps (SpitTransitionsEffect* base,
+ gint* desired_fps,
+ gint* min_fps)
+{
ClockEffect * self;
gint _vala_desired_fps = 0;
gint _vala_min_fps = 0;
@@ -243,18 +287,22 @@ static void clock_effect_real_get_fps (SpitTransitionsEffect* base, gint* desire
if (desired_fps) {
#line 36 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
*desired_fps = _vala_desired_fps;
-#line 247 "ClockEffect.c"
+#line 291 "ClockEffect.c"
}
#line 36 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
if (min_fps) {
#line 36 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
*min_fps = _vala_min_fps;
-#line 253 "ClockEffect.c"
+#line 297 "ClockEffect.c"
}
}
-static void clock_effect_real_start (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion) {
+static void
+clock_effect_real_start (SpitTransitionsEffect* base,
+ SpitTransitionsVisuals* visuals,
+ SpitTransitionsMotion* motion)
+{
ClockEffect * self;
#line 41 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CLOCK_EFFECT, ClockEffect);
@@ -262,11 +310,13 @@ static void clock_effect_real_start (SpitTransitionsEffect* base, SpitTransition
g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals));
#line 41 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion));
-#line 266 "ClockEffect.c"
+#line 314 "ClockEffect.c"
}
-static gboolean clock_effect_real_needs_clear_background (SpitTransitionsEffect* base) {
+static gboolean
+clock_effect_real_needs_clear_background (SpitTransitionsEffect* base)
+{
ClockEffect * self;
gboolean result = FALSE;
#line 44 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
@@ -275,37 +325,36 @@ static gboolean clock_effect_real_needs_clear_background (SpitTransitionsEffect*
result = TRUE;
#line 45 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
return result;
-#line 279 "ClockEffect.c"
+#line 329 "ClockEffect.c"
}
-static void clock_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number) {
+static void
+clock_effect_real_paint (SpitTransitionsEffect* base,
+ SpitTransitionsVisuals* visuals,
+ SpitTransitionsMotion* motion,
+ cairo_t* ctx,
+ gint width,
+ gint height,
+ gint frame_number)
+{
ClockEffect * self;
gdouble alpha = 0.0;
- SpitTransitionsMotion* _tmp0_;
- gint _tmp1_;
- gdouble _tmp2_;
gdouble start_angle = 0.0;
gdouble stop_angle = 0.0;
- SpitTransitionsMotion* _tmp3_;
- SpitTransitionsDirection _tmp4_;
- SpitTransitionsDirection _tmp5_;
+ SpitTransitionsDirection _tmp0_;
+ SpitTransitionsDirection _tmp1_;
gint radius = 0;
- SpitTransitionsVisuals* _tmp8_;
- GdkRectangle _tmp9_ = {0};
- GdkRectangle _tmp10_;
- gint _tmp11_;
- SpitTransitionsVisuals* _tmp12_;
- GdkRectangle _tmp13_ = {0};
- GdkRectangle _tmp14_;
- gint _tmp15_;
- gdouble _tmp16_;
- SpitTransitionsVisuals* _tmp17_;
- GdkPixbuf* _tmp18_;
- GdkPixbuf* _tmp19_;
- SpitTransitionsVisuals* _tmp34_;
- GdkPixbuf* _tmp35_;
- GdkPixbuf* _tmp36_;
+ GdkRectangle _tmp4_ = {0};
+ GdkRectangle _tmp5_;
+ gint _tmp6_;
+ GdkRectangle _tmp7_ = {0};
+ GdkRectangle _tmp8_;
+ gint _tmp9_;
+ GdkPixbuf* _tmp10_;
+ GdkPixbuf* _tmp11_;
+ GdkPixbuf* _tmp21_;
+ GdkPixbuf* _tmp22_;
#line 48 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CLOCK_EFFECT, ClockEffect);
#line 48 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
@@ -315,260 +364,199 @@ static void clock_effect_real_paint (SpitTransitionsEffect* base, SpitTransition
#line 48 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
g_return_if_fail (ctx != NULL);
#line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- _tmp0_ = motion;
-#line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- _tmp1_ = frame_number;
-#line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- _tmp2_ = spit_transitions_motion_get_alpha (_tmp0_, _tmp1_);
-#line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- alpha = _tmp2_;
+ alpha = spit_transitions_motion_get_alpha (motion, frame_number);
#line 51 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
start_angle = -CLOCK_EFFECT_TOP_RADIANT;
#line 51 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
stop_angle = -CLOCK_EFFECT_TOP_RADIANT;
#line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- _tmp3_ = motion;
+ _tmp0_ = spit_transitions_motion_get_direction (motion);
#line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- _tmp4_ = spit_transitions_motion_get_direction (_tmp3_);
+ _tmp1_ = _tmp0_;
#line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- _tmp5_ = _tmp4_;
-#line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- if (_tmp5_ == SPIT_TRANSITIONS_DIRECTION_FORWARD) {
-#line 338 "ClockEffect.c"
- gdouble _tmp6_;
+ if (_tmp1_ == SPIT_TRANSITIONS_DIRECTION_FORWARD) {
+#line 379 "ClockEffect.c"
+ gdouble _tmp2_;
#line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- _tmp6_ = alpha;
+ _tmp2_ = alpha;
#line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- stop_angle = ((_tmp6_ * G_PI) * 2) - CLOCK_EFFECT_TOP_RADIANT;
-#line 344 "ClockEffect.c"
+ stop_angle = ((_tmp2_ * G_PI) * 2) - CLOCK_EFFECT_TOP_RADIANT;
+#line 385 "ClockEffect.c"
} else {
- gdouble _tmp7_;
+ gdouble _tmp3_;
#line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- _tmp7_ = alpha;
+ _tmp3_ = alpha;
#line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- start_angle = ((2 * (1 - _tmp7_)) * G_PI) - CLOCK_EFFECT_TOP_RADIANT;
-#line 351 "ClockEffect.c"
+ start_angle = ((2 * (1 - _tmp3_)) * G_PI) - CLOCK_EFFECT_TOP_RADIANT;
+#line 392 "ClockEffect.c"
}
#line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- _tmp8_ = visuals;
-#line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- spit_transitions_visuals_get_to_pos (_tmp8_, &_tmp9_);
-#line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- _tmp10_ = _tmp9_;
+ spit_transitions_visuals_get_to_pos (visuals, &_tmp4_);
#line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- _tmp11_ = _tmp10_.width;
-#line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- _tmp12_ = visuals;
+ _tmp5_ = _tmp4_;
#line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- spit_transitions_visuals_get_to_pos (_tmp12_, &_tmp13_);
+ _tmp6_ = _tmp5_.width;
#line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- _tmp14_ = _tmp13_;
+ spit_transitions_visuals_get_to_pos (visuals, &_tmp7_);
#line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- _tmp15_ = _tmp14_.height;
+ _tmp8_ = _tmp7_;
#line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- _tmp16_ = fmax ((gdouble) _tmp11_, (gdouble) _tmp15_);
+ _tmp9_ = _tmp8_.height;
#line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- radius = (gint) _tmp16_;
-#line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- _tmp17_ = visuals;
+ radius = (gint) fmax ((gdouble) _tmp6_, (gdouble) _tmp9_);
#line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- _tmp18_ = spit_transitions_visuals_get_from_pixbuf (_tmp17_);
+ _tmp10_ = spit_transitions_visuals_get_from_pixbuf (visuals);
#line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- _tmp19_ = _tmp18_;
+ _tmp11_ = _tmp10_;
#line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- if (_tmp19_ != NULL) {
-#line 381 "ClockEffect.c"
- cairo_t* _tmp20_;
- SpitTransitionsVisuals* _tmp21_;
- GdkPixbuf* _tmp22_;
- GdkPixbuf* _tmp23_;
- SpitTransitionsVisuals* _tmp24_;
- GdkRectangle _tmp25_ = {0};
- GdkRectangle _tmp26_;
- gint _tmp27_;
- SpitTransitionsVisuals* _tmp28_;
- GdkRectangle _tmp29_ = {0};
- GdkRectangle _tmp30_;
- gint _tmp31_;
- cairo_t* _tmp32_;
- gdouble _tmp33_;
+ if (_tmp11_ != NULL) {
+#line 414 "ClockEffect.c"
+ GdkPixbuf* _tmp12_;
+ GdkPixbuf* _tmp13_;
+ GdkRectangle _tmp14_ = {0};
+ GdkRectangle _tmp15_;
+ gint _tmp16_;
+ GdkRectangle _tmp17_ = {0};
+ GdkRectangle _tmp18_;
+ gint _tmp19_;
+ gdouble _tmp20_;
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- _tmp20_ = ctx;
+ _tmp12_ = spit_transitions_visuals_get_from_pixbuf (visuals);
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- _tmp21_ = visuals;
+ _tmp13_ = _tmp12_;
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- _tmp22_ = spit_transitions_visuals_get_from_pixbuf (_tmp21_);
+ spit_transitions_visuals_get_from_pos (visuals, &_tmp14_);
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- _tmp23_ = _tmp22_;
+ _tmp15_ = _tmp14_;
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- _tmp24_ = visuals;
+ _tmp16_ = _tmp15_.x;
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- spit_transitions_visuals_get_from_pos (_tmp24_, &_tmp25_);
+ spit_transitions_visuals_get_from_pos (visuals, &_tmp17_);
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- _tmp26_ = _tmp25_;
+ _tmp18_ = _tmp17_;
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- _tmp27_ = _tmp26_.x;
+ _tmp19_ = _tmp18_.y;
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- _tmp28_ = visuals;
-#line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- spit_transitions_visuals_get_from_pos (_tmp28_, &_tmp29_);
-#line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- _tmp30_ = _tmp29_;
-#line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- _tmp31_ = _tmp30_.y;
-#line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- gdk_cairo_set_source_pixbuf (_tmp20_, _tmp23_, (gdouble) _tmp27_, (gdouble) _tmp31_);
+ gdk_cairo_set_source_pixbuf (ctx, _tmp13_, (gdouble) _tmp16_, (gdouble) _tmp19_);
#line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- _tmp32_ = ctx;
+ _tmp20_ = alpha;
#line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- _tmp33_ = alpha;
-#line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- cairo_paint_with_alpha (_tmp32_, 1 - _tmp33_);
-#line 428 "ClockEffect.c"
+ cairo_paint_with_alpha (ctx, 1 - _tmp20_);
+#line 446 "ClockEffect.c"
}
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- _tmp34_ = visuals;
-#line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- _tmp35_ = spit_transitions_visuals_get_to_pixbuf (_tmp34_);
+ _tmp21_ = spit_transitions_visuals_get_to_pixbuf (visuals);
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- _tmp36_ = _tmp35_;
+ _tmp22_ = _tmp21_;
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- if (_tmp36_ != NULL) {
-#line 438 "ClockEffect.c"
- cairo_t* _tmp37_;
- SpitTransitionsVisuals* _tmp38_;
- GdkPixbuf* _tmp39_;
- GdkPixbuf* _tmp40_;
- SpitTransitionsVisuals* _tmp41_;
- GdkRectangle _tmp42_ = {0};
- GdkRectangle _tmp43_;
- gint _tmp44_;
- SpitTransitionsVisuals* _tmp45_;
- GdkRectangle _tmp46_ = {0};
- GdkRectangle _tmp47_;
- gint _tmp48_;
+ if (_tmp22_ != NULL) {
+#line 454 "ClockEffect.c"
+ GdkPixbuf* _tmp23_;
+ GdkPixbuf* _tmp24_;
+ GdkRectangle _tmp25_ = {0};
+ GdkRectangle _tmp26_;
+ gint _tmp27_;
+ GdkRectangle _tmp28_ = {0};
+ GdkRectangle _tmp29_;
+ gint _tmp30_;
gint x = 0;
- SpitTransitionsVisuals* _tmp49_;
- GdkRectangle _tmp50_ = {0};
- GdkRectangle _tmp51_;
- gint _tmp52_;
- SpitTransitionsVisuals* _tmp53_;
- GdkRectangle _tmp54_ = {0};
- GdkRectangle _tmp55_;
- gint _tmp56_;
+ GdkRectangle _tmp31_ = {0};
+ GdkRectangle _tmp32_;
+ gint _tmp33_;
+ GdkRectangle _tmp34_ = {0};
+ GdkRectangle _tmp35_;
+ gint _tmp36_;
gint y = 0;
- SpitTransitionsVisuals* _tmp57_;
- GdkRectangle _tmp58_ = {0};
- GdkRectangle _tmp59_;
- gint _tmp60_;
- SpitTransitionsVisuals* _tmp61_;
- GdkRectangle _tmp62_ = {0};
- GdkRectangle _tmp63_;
- gint _tmp64_;
- cairo_t* _tmp65_;
- gint _tmp66_;
- gint _tmp67_;
- cairo_t* _tmp68_;
- gint _tmp69_;
- gint _tmp70_;
- gint _tmp71_;
- gdouble _tmp72_;
- gdouble _tmp73_;
- cairo_t* _tmp74_;
-#line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- _tmp37_ = ctx;
-#line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- _tmp38_ = visuals;
-#line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- _tmp39_ = spit_transitions_visuals_get_to_pixbuf (_tmp38_);
-#line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- _tmp40_ = _tmp39_;
+ GdkRectangle _tmp37_ = {0};
+ GdkRectangle _tmp38_;
+ gint _tmp39_;
+ GdkRectangle _tmp40_ = {0};
+ GdkRectangle _tmp41_;
+ gint _tmp42_;
+ gint _tmp43_;
+ gint _tmp44_;
+ gint _tmp45_;
+ gint _tmp46_;
+ gint _tmp47_;
+ gdouble _tmp48_;
+ gdouble _tmp49_;
#line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- _tmp41_ = visuals;
+ _tmp23_ = spit_transitions_visuals_get_to_pixbuf (visuals);
#line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- spit_transitions_visuals_get_to_pos (_tmp41_, &_tmp42_);
+ _tmp24_ = _tmp23_;
#line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- _tmp43_ = _tmp42_;
+ spit_transitions_visuals_get_to_pos (visuals, &_tmp25_);
#line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- _tmp44_ = _tmp43_.x;
+ _tmp26_ = _tmp25_;
#line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- _tmp45_ = visuals;
+ _tmp27_ = _tmp26_.x;
#line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- spit_transitions_visuals_get_to_pos (_tmp45_, &_tmp46_);
+ spit_transitions_visuals_get_to_pos (visuals, &_tmp28_);
#line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- _tmp47_ = _tmp46_;
+ _tmp29_ = _tmp28_;
#line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- _tmp48_ = _tmp47_.y;
+ _tmp30_ = _tmp29_.y;
#line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- gdk_cairo_set_source_pixbuf (_tmp37_, _tmp40_, (gdouble) _tmp44_, (gdouble) _tmp48_);
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- _tmp49_ = visuals;
+ gdk_cairo_set_source_pixbuf (ctx, _tmp24_, (gdouble) _tmp27_, (gdouble) _tmp30_);
#line 69 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- spit_transitions_visuals_get_to_pos (_tmp49_, &_tmp50_);
+ spit_transitions_visuals_get_to_pos (visuals, &_tmp31_);
#line 69 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- _tmp51_ = _tmp50_;
+ _tmp32_ = _tmp31_;
#line 69 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- _tmp52_ = _tmp51_.x;
+ _tmp33_ = _tmp32_.x;
#line 69 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- _tmp53_ = visuals;
+ spit_transitions_visuals_get_to_pos (visuals, &_tmp34_);
#line 69 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- spit_transitions_visuals_get_to_pos (_tmp53_, &_tmp54_);
+ _tmp35_ = _tmp34_;
#line 69 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- _tmp55_ = _tmp54_;
+ _tmp36_ = _tmp35_.width;
#line 69 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- _tmp56_ = _tmp55_.width;
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- x = _tmp52_ + (((gint) _tmp56_) / 2);
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- _tmp57_ = visuals;
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- spit_transitions_visuals_get_to_pos (_tmp57_, &_tmp58_);
+ x = _tmp33_ + (((gint) _tmp36_) / 2);
#line 70 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- _tmp59_ = _tmp58_;
+ spit_transitions_visuals_get_to_pos (visuals, &_tmp37_);
#line 70 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- _tmp60_ = _tmp59_.y;
+ _tmp38_ = _tmp37_;
#line 70 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- _tmp61_ = visuals;
+ _tmp39_ = _tmp38_.y;
#line 70 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- spit_transitions_visuals_get_to_pos (_tmp61_, &_tmp62_);
+ spit_transitions_visuals_get_to_pos (visuals, &_tmp40_);
#line 70 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- _tmp63_ = _tmp62_;
+ _tmp41_ = _tmp40_;
#line 70 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- _tmp64_ = _tmp63_.height;
+ _tmp42_ = _tmp41_.height;
#line 70 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- y = _tmp60_ + (((gint) _tmp64_) / 2);
+ y = _tmp39_ + (((gint) _tmp42_) / 2);
#line 72 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- _tmp65_ = ctx;
+ _tmp43_ = x;
#line 72 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- _tmp66_ = x;
+ _tmp44_ = y;
#line 72 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- _tmp67_ = y;
-#line 72 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- cairo_move_to (_tmp65_, (gdouble) _tmp66_, (gdouble) _tmp67_);
-#line 73 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- _tmp68_ = ctx;
+ cairo_move_to (ctx, (gdouble) _tmp43_, (gdouble) _tmp44_);
#line 73 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- _tmp69_ = x;
+ _tmp45_ = x;
#line 73 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- _tmp70_ = y;
+ _tmp46_ = y;
#line 73 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- _tmp71_ = radius;
+ _tmp47_ = radius;
#line 73 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- _tmp72_ = start_angle;
+ _tmp48_ = start_angle;
#line 73 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- _tmp73_ = stop_angle;
+ _tmp49_ = stop_angle;
#line 73 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- cairo_arc (_tmp68_, (gdouble) _tmp69_, (gdouble) _tmp70_, (gdouble) _tmp71_, _tmp72_, _tmp73_);
-#line 74 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- _tmp74_ = ctx;
+ cairo_arc (ctx, (gdouble) _tmp45_, (gdouble) _tmp46_, (gdouble) _tmp47_, _tmp48_, _tmp49_);
#line 74 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
- cairo_fill_preserve (_tmp74_);
-#line 567 "ClockEffect.c"
+ cairo_fill_preserve (ctx);
+#line 550 "ClockEffect.c"
}
}
-static void clock_effect_real_advance (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, gint frame_number) {
+static void
+clock_effect_real_advance (SpitTransitionsEffect* base,
+ SpitTransitionsVisuals* visuals,
+ SpitTransitionsMotion* motion,
+ gint frame_number)
+{
ClockEffect * self;
#line 78 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CLOCK_EFFECT, ClockEffect);
@@ -576,26 +564,32 @@ static void clock_effect_real_advance (SpitTransitionsEffect* base, SpitTransiti
g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals));
#line 78 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion));
-#line 580 "ClockEffect.c"
+#line 568 "ClockEffect.c"
}
-static void clock_effect_real_cancel (SpitTransitionsEffect* base) {
+static void
+clock_effect_real_cancel (SpitTransitionsEffect* base)
+{
ClockEffect * self;
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CLOCK_EFFECT, ClockEffect);
-#line 588 "ClockEffect.c"
+#line 578 "ClockEffect.c"
}
-static void clock_effect_class_init (ClockEffectClass * klass) {
+static void
+clock_effect_class_init (ClockEffectClass * klass)
+{
#line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
clock_effect_parent_class = g_type_class_peek_parent (klass);
-#line 595 "ClockEffect.c"
+#line 587 "ClockEffect.c"
}
-static void clock_effect_spit_transitions_effect_interface_init (SpitTransitionsEffectIface * iface) {
+static void
+clock_effect_spit_transitions_effect_interface_init (SpitTransitionsEffectIface * iface)
+{
#line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
clock_effect_spit_transitions_effect_parent_iface = g_type_interface_peek_parent (iface);
#line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
@@ -610,15 +604,19 @@ static void clock_effect_spit_transitions_effect_interface_init (SpitTransitions
iface->advance = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*, gint)) clock_effect_real_advance;
#line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
iface->cancel = (void (*) (SpitTransitionsEffect *)) clock_effect_real_cancel;
-#line 614 "ClockEffect.c"
+#line 608 "ClockEffect.c"
}
-static void clock_effect_instance_init (ClockEffect * self) {
+static void
+clock_effect_instance_init (ClockEffect * self)
+{
}
-GType clock_effect_get_type (void) {
+GType
+clock_effect_get_type (void)
+{
static volatile gsize clock_effect_type_id__volatile = 0;
if (g_once_init_enter (&clock_effect_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (ClockEffectClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) clock_effect_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ClockEffect), 0, (GInstanceInitFunc) clock_effect_instance_init, NULL };
diff --git a/plugins/shotwell-transitions/CrumbleEffect.c b/plugins/shotwell-transitions/CrumbleEffect.c
index 56f3667..62b4c5e 100644
--- a/plugins/shotwell-transitions/CrumbleEffect.c
+++ b/plugins/shotwell-transitions/CrumbleEffect.c
@@ -1,4 +1,4 @@
-/* CrumbleEffect.c generated by valac 0.36.6, the Vala compiler
+/* CrumbleEffect.c generated by valac 0.40.4, the Vala compiler
* generated from CrumbleEffect.vala, do not modify */
/* Copyright 2010 Maxim Kartashev
@@ -8,6 +8,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>
@@ -43,6 +44,11 @@ typedef struct _ShotwellTransitionDescriptorPrivate ShotwellTransitionDescriptor
typedef struct _CrumbleEffectDescriptor CrumbleEffectDescriptor;
typedef struct _CrumbleEffectDescriptorClass CrumbleEffectDescriptorClass;
typedef struct _CrumbleEffectDescriptorPrivate CrumbleEffectDescriptorPrivate;
+enum {
+ CRUMBLE_EFFECT_DESCRIPTOR_0_PROPERTY,
+ CRUMBLE_EFFECT_DESCRIPTOR_NUM_PROPERTIES
+};
+static GParamSpec* crumble_effect_descriptor_properties[CRUMBLE_EFFECT_DESCRIPTOR_NUM_PROPERTIES];
#define TYPE_CRUMBLE_EFFECT (crumble_effect_get_type ())
#define CRUMBLE_EFFECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CRUMBLE_EFFECT, CrumbleEffect))
@@ -54,6 +60,11 @@ typedef struct _CrumbleEffectDescriptorPrivate CrumbleEffectDescriptorPrivate;
typedef struct _CrumbleEffect CrumbleEffect;
typedef struct _CrumbleEffectClass CrumbleEffectClass;
typedef struct _CrumbleEffectPrivate CrumbleEffectPrivate;
+enum {
+ CRUMBLE_EFFECT_0_PROPERTY,
+ CRUMBLE_EFFECT_NUM_PROPERTIES
+};
+static GParamSpec* crumble_effect_properties[CRUMBLE_EFFECT_NUM_PROPERTIES];
#define _cairo_surface_destroy0(var) ((var == NULL) ? NULL : (var = (cairo_surface_destroy (var), NULL)))
#define _cairo_destroy0(var) ((var == NULL) ? NULL : (var = (cairo_destroy (var), NULL)))
#define _g_rand_free0(var) ((var == NULL) ? NULL : (var = (g_rand_free (var), NULL)))
@@ -105,59 +116,77 @@ static SpitTransitionsEffectIface * crumble_effect_spit_transitions_effect_paren
GType shotwell_transition_descriptor_get_type (void) G_GNUC_CONST;
GType crumble_effect_descriptor_get_type (void) G_GNUC_CONST;
-enum {
- CRUMBLE_EFFECT_DESCRIPTOR_DUMMY_PROPERTY
-};
CrumbleEffectDescriptor* crumble_effect_descriptor_new (GFile* resource_directory);
-CrumbleEffectDescriptor* crumble_effect_descriptor_construct (GType object_type, GFile* resource_directory);
-ShotwellTransitionDescriptor* shotwell_transition_descriptor_construct (GType object_type, GFile* resource_directory);
+CrumbleEffectDescriptor* crumble_effect_descriptor_construct (GType object_type,
+ GFile* resource_directory);
+ShotwellTransitionDescriptor* shotwell_transition_descriptor_construct (GType object_type,
+ GFile* resource_directory);
static const gchar* crumble_effect_descriptor_real_get_id (ShotwellTransitionDescriptor* base);
static const gchar* crumble_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base);
-static SpitTransitionsEffect* crumble_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, SpitHostInterface* host);
+static SpitTransitionsEffect* crumble_effect_descriptor_real_create (ShotwellTransitionDescriptor* base,
+ SpitHostInterface* host);
CrumbleEffect* crumble_effect_new (void);
CrumbleEffect* crumble_effect_construct (GType object_type);
GType crumble_effect_get_type (void) G_GNUC_CONST;
#define CRUMBLE_EFFECT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_CRUMBLE_EFFECT, CrumbleEffectPrivate))
-enum {
- CRUMBLE_EFFECT_DUMMY_PROPERTY
-};
#define CRUMBLE_EFFECT_DESIRED_FPS 25
#define CRUMBLE_EFFECT_MIN_FPS 15
#define CRUMBLE_EFFECT_STRIPE_WIDTH 10
-static void crumble_effect_real_get_fps (SpitTransitionsEffect* base, gint* desired_fps, gint* min_fps);
+static void crumble_effect_real_get_fps (SpitTransitionsEffect* base,
+ gint* desired_fps,
+ gint* min_fps);
static gboolean crumble_effect_real_needs_clear_background (SpitTransitionsEffect* base);
-static void crumble_effect_real_start (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion);
-static void crumble_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number);
-static void crumble_effect_real_advance (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, gint frame_number);
+static void crumble_effect_real_start (SpitTransitionsEffect* base,
+ SpitTransitionsVisuals* visuals,
+ SpitTransitionsMotion* motion);
+static void crumble_effect_real_paint (SpitTransitionsEffect* base,
+ SpitTransitionsVisuals* visuals,
+ SpitTransitionsMotion* motion,
+ cairo_t* ctx,
+ gint width,
+ gint height,
+ gint frame_number);
+static void crumble_effect_real_advance (SpitTransitionsEffect* base,
+ SpitTransitionsVisuals* visuals,
+ SpitTransitionsMotion* motion,
+ gint frame_number);
static void crumble_effect_real_cancel (SpitTransitionsEffect* base);
static void crumble_effect_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);
-
-
-CrumbleEffectDescriptor* crumble_effect_descriptor_construct (GType object_type, GFile* resource_directory) {
+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);
+
+
+CrumbleEffectDescriptor*
+crumble_effect_descriptor_construct (GType object_type,
+ GFile* resource_directory)
+{
CrumbleEffectDescriptor * self = NULL;
- GFile* _tmp0_;
#line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
g_return_val_if_fail (G_IS_FILE (resource_directory), NULL);
#line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp0_ = resource_directory;
-#line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- self = (CrumbleEffectDescriptor*) shotwell_transition_descriptor_construct (object_type, _tmp0_);
+ self = (CrumbleEffectDescriptor*) shotwell_transition_descriptor_construct (object_type, resource_directory);
#line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
return self;
-#line 150 "CrumbleEffect.c"
+#line 175 "CrumbleEffect.c"
}
-CrumbleEffectDescriptor* crumble_effect_descriptor_new (GFile* resource_directory) {
+CrumbleEffectDescriptor*
+crumble_effect_descriptor_new (GFile* resource_directory)
+{
#line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
return crumble_effect_descriptor_construct (TYPE_CRUMBLE_EFFECT_DESCRIPTOR, resource_directory);
-#line 157 "CrumbleEffect.c"
+#line 184 "CrumbleEffect.c"
}
-static const gchar* crumble_effect_descriptor_real_get_id (ShotwellTransitionDescriptor* base) {
+static const gchar*
+crumble_effect_descriptor_real_get_id (ShotwellTransitionDescriptor* base)
+{
CrumbleEffectDescriptor * self;
const gchar* result = NULL;
#line 15 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
@@ -166,11 +195,13 @@ static const gchar* crumble_effect_descriptor_real_get_id (ShotwellTransitionDes
result = "org.yorba.shotwell.transitions.crumble";
#line 16 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
return result;
-#line 170 "CrumbleEffect.c"
+#line 199 "CrumbleEffect.c"
}
-static const gchar* crumble_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base) {
+static const gchar*
+crumble_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base)
+{
CrumbleEffectDescriptor * self;
const gchar* result = NULL;
#line 19 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
@@ -179,11 +210,14 @@ static const gchar* crumble_effect_descriptor_real_get_pluggable_name (ShotwellT
result = _ ("Crumble");
#line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
return result;
-#line 183 "CrumbleEffect.c"
+#line 214 "CrumbleEffect.c"
}
-static SpitTransitionsEffect* crumble_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, SpitHostInterface* host) {
+static SpitTransitionsEffect*
+crumble_effect_descriptor_real_create (ShotwellTransitionDescriptor* base,
+ SpitHostInterface* host)
+{
CrumbleEffectDescriptor * self;
SpitTransitionsEffect* result = NULL;
CrumbleEffect* _tmp0_;
@@ -197,11 +231,13 @@ static SpitTransitionsEffect* crumble_effect_descriptor_real_create (ShotwellTra
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TRANSITIONS_TYPE_EFFECT, SpitTransitionsEffect);
#line 24 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
return result;
-#line 201 "CrumbleEffect.c"
+#line 235 "CrumbleEffect.c"
}
-static void crumble_effect_descriptor_class_init (CrumbleEffectDescriptorClass * klass) {
+static void
+crumble_effect_descriptor_class_init (CrumbleEffectDescriptorClass * klass)
+{
#line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
crumble_effect_descriptor_parent_class = g_type_class_peek_parent (klass);
#line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
@@ -210,15 +246,19 @@ static void crumble_effect_descriptor_class_init (CrumbleEffectDescriptorClass *
((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*) (ShotwellTransitionDescriptor *)) crumble_effect_descriptor_real_get_pluggable_name;
#line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*) (ShotwellTransitionDescriptor *, SpitHostInterface*)) crumble_effect_descriptor_real_create;
-#line 214 "CrumbleEffect.c"
+#line 250 "CrumbleEffect.c"
}
-static void crumble_effect_descriptor_instance_init (CrumbleEffectDescriptor * self) {
+static void
+crumble_effect_descriptor_instance_init (CrumbleEffectDescriptor * self)
+{
}
-GType crumble_effect_descriptor_get_type (void) {
+GType
+crumble_effect_descriptor_get_type (void)
+{
static volatile gsize crumble_effect_descriptor_type_id__volatile = 0;
if (g_once_init_enter (&crumble_effect_descriptor_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (CrumbleEffectDescriptorClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) crumble_effect_descriptor_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (CrumbleEffectDescriptor), 0, (GInstanceInitFunc) crumble_effect_descriptor_instance_init, NULL };
@@ -230,24 +270,32 @@ GType crumble_effect_descriptor_get_type (void) {
}
-CrumbleEffect* crumble_effect_construct (GType object_type) {
+CrumbleEffect*
+crumble_effect_construct (GType object_type)
+{
CrumbleEffect * self = NULL;
#line 38 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
self = (CrumbleEffect*) g_object_new (object_type, NULL);
#line 38 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
return self;
-#line 240 "CrumbleEffect.c"
+#line 282 "CrumbleEffect.c"
}
-CrumbleEffect* crumble_effect_new (void) {
+CrumbleEffect*
+crumble_effect_new (void)
+{
#line 38 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
return crumble_effect_construct (TYPE_CRUMBLE_EFFECT);
-#line 247 "CrumbleEffect.c"
+#line 291 "CrumbleEffect.c"
}
-static void crumble_effect_real_get_fps (SpitTransitionsEffect* base, gint* desired_fps, gint* min_fps) {
+static void
+crumble_effect_real_get_fps (SpitTransitionsEffect* base,
+ gint* desired_fps,
+ gint* min_fps)
+{
CrumbleEffect * self;
gint _vala_desired_fps = 0;
gint _vala_min_fps = 0;
@@ -261,18 +309,20 @@ static void crumble_effect_real_get_fps (SpitTransitionsEffect* base, gint* desi
if (desired_fps) {
#line 41 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
*desired_fps = _vala_desired_fps;
-#line 265 "CrumbleEffect.c"
+#line 313 "CrumbleEffect.c"
}
#line 41 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
if (min_fps) {
#line 41 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
*min_fps = _vala_min_fps;
-#line 271 "CrumbleEffect.c"
+#line 319 "CrumbleEffect.c"
}
}
-static gboolean crumble_effect_real_needs_clear_background (SpitTransitionsEffect* base) {
+static gboolean
+crumble_effect_real_needs_clear_background (SpitTransitionsEffect* base)
+{
CrumbleEffect * self;
gboolean result = FALSE;
#line 46 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
@@ -281,17 +331,20 @@ static gboolean crumble_effect_real_needs_clear_background (SpitTransitionsEffec
result = TRUE;
#line 47 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
return result;
-#line 285 "CrumbleEffect.c"
+#line 335 "CrumbleEffect.c"
}
-static void crumble_effect_real_start (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion) {
+static void
+crumble_effect_real_start (SpitTransitionsEffect* base,
+ SpitTransitionsVisuals* visuals,
+ SpitTransitionsMotion* motion)
+{
CrumbleEffect * self;
GRand* rand = NULL;
GRand* _tmp0_;
- SpitTransitionsVisuals* _tmp1_;
+ GdkPixbuf* _tmp1_;
GdkPixbuf* _tmp2_;
- GdkPixbuf* _tmp3_;
#line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CRUMBLE_EFFECT, CrumbleEffect);
#line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
@@ -303,210 +356,201 @@ static void crumble_effect_real_start (SpitTransitionsEffect* base, SpitTransiti
#line 51 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
rand = _tmp0_;
#line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp1_ = visuals;
-#line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp2_ = spit_transitions_visuals_get_from_pixbuf (_tmp1_);
+ _tmp1_ = spit_transitions_visuals_get_from_pixbuf (visuals);
#line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp3_ = _tmp2_;
+ _tmp2_ = _tmp1_;
#line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- if (_tmp3_ != NULL) {
-#line 314 "CrumbleEffect.c"
- SpitTransitionsVisuals* _tmp4_;
- GdkPixbuf* _tmp5_;
- GdkPixbuf* _tmp6_;
+ if (_tmp2_ != NULL) {
+#line 365 "CrumbleEffect.c"
+ GdkPixbuf* _tmp3_;
+ GdkPixbuf* _tmp4_;
+ gint _tmp5_;
+ gint _tmp6_;
gint _tmp7_;
- gint _tmp8_;
+ cairo_surface_t** _tmp8_;
gint _tmp9_;
- cairo_surface_t** _tmp10_;
- gint _tmp11_;
- gdouble* _tmp12_;
-#line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp4_ = visuals;
+ gdouble* _tmp10_;
#line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp5_ = spit_transitions_visuals_get_from_pixbuf (_tmp4_);
+ _tmp3_ = spit_transitions_visuals_get_from_pixbuf (visuals);
#line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp6_ = _tmp5_;
+ _tmp4_ = _tmp3_;
#line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp7_ = gdk_pixbuf_get_width (_tmp6_);
+ _tmp5_ = gdk_pixbuf_get_width (_tmp4_);
#line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp8_ = _tmp7_;
+ _tmp6_ = _tmp5_;
#line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- self->priv->stripes_count = _tmp8_ / CRUMBLE_EFFECT_STRIPE_WIDTH;
+ self->priv->stripes_count = _tmp6_ / CRUMBLE_EFFECT_STRIPE_WIDTH;
#line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp9_ = self->priv->stripes_count;
+ _tmp7_ = self->priv->stripes_count;
#line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp10_ = g_new0 (cairo_surface_t*, _tmp9_ + 1);
+ _tmp8_ = g_new0 (cairo_surface_t*, _tmp7_ + 1);
#line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
self->priv->from_stripes = (_vala_array_free (self->priv->from_stripes, self->priv->from_stripes_length1, (GDestroyNotify) cairo_surface_destroy), NULL);
#line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- self->priv->from_stripes = _tmp10_;
+ self->priv->from_stripes = _tmp8_;
#line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- self->priv->from_stripes_length1 = _tmp9_;
+ self->priv->from_stripes_length1 = _tmp7_;
#line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
self->priv->_from_stripes_size_ = self->priv->from_stripes_length1;
#line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp11_ = self->priv->stripes_count;
+ _tmp9_ = self->priv->stripes_count;
#line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp12_ = g_new0 (gdouble, _tmp11_);
+ _tmp10_ = g_new0 (gdouble, _tmp9_);
#line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
self->priv->accelerations = (g_free (self->priv->accelerations), NULL);
#line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- self->priv->accelerations = _tmp12_;
+ self->priv->accelerations = _tmp10_;
#line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- self->priv->accelerations_length1 = _tmp11_;
+ self->priv->accelerations_length1 = _tmp9_;
#line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
self->priv->_accelerations_size_ = self->priv->accelerations_length1;
-#line 360 "CrumbleEffect.c"
+#line 408 "CrumbleEffect.c"
{
gint i = 0;
#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
i = 0;
-#line 365 "CrumbleEffect.c"
+#line 413 "CrumbleEffect.c"
{
- gboolean _tmp13_ = FALSE;
+ gboolean _tmp11_ = FALSE;
#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp13_ = TRUE;
+ _tmp11_ = TRUE;
#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
while (TRUE) {
-#line 372 "CrumbleEffect.c"
- gint _tmp15_;
+#line 420 "CrumbleEffect.c"
+ gint _tmp13_;
+ gint _tmp14_;
+ cairo_surface_t** _tmp15_;
+ gint _tmp15__length1;
gint _tmp16_;
- cairo_surface_t** _tmp17_;
- gint _tmp17__length1;
- gint _tmp18_;
- SpitTransitionsVisuals* _tmp19_;
- GdkPixbuf* _tmp20_;
- GdkPixbuf* _tmp21_;
- gint _tmp22_;
- gint _tmp23_;
- cairo_surface_t* _tmp24_;
- cairo_surface_t* _tmp25_;
+ GdkPixbuf* _tmp17_;
+ GdkPixbuf* _tmp18_;
+ gint _tmp19_;
+ gint _tmp20_;
+ cairo_surface_t* _tmp21_;
+ cairo_surface_t* _tmp22_;
cairo_t* ctx = NULL;
- cairo_surface_t** _tmp26_;
- gint _tmp26__length1;
- gint _tmp27_;
- cairo_surface_t* _tmp28_;
- cairo_t* _tmp29_;
- cairo_t* _tmp30_;
- SpitTransitionsVisuals* _tmp31_;
- GdkPixbuf* _tmp32_;
- GdkPixbuf* _tmp33_;
- gint _tmp34_;
- cairo_t* _tmp35_;
- gdouble* _tmp36_;
- gint _tmp36__length1;
- gint _tmp37_;
- GRand* _tmp38_;
- gdouble _tmp39_;
- gdouble _tmp40_;
+ cairo_surface_t** _tmp23_;
+ gint _tmp23__length1;
+ gint _tmp24_;
+ cairo_surface_t* _tmp25_;
+ cairo_t* _tmp26_;
+ cairo_t* _tmp27_;
+ GdkPixbuf* _tmp28_;
+ GdkPixbuf* _tmp29_;
+ gint _tmp30_;
+ cairo_t* _tmp31_;
+ gdouble* _tmp32_;
+ gint _tmp32__length1;
+ gint _tmp33_;
+ GRand* _tmp34_;
+ gdouble _tmp35_;
#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- if (!_tmp13_) {
-#line 405 "CrumbleEffect.c"
- gint _tmp14_;
+ if (!_tmp11_) {
+#line 450 "CrumbleEffect.c"
+ gint _tmp12_;
#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp14_ = i;
+ _tmp12_ = i;
#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- i = _tmp14_ + 1;
-#line 411 "CrumbleEffect.c"
+ i = _tmp12_ + 1;
+#line 456 "CrumbleEffect.c"
}
#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp13_ = FALSE;
+ _tmp11_ = FALSE;
#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp15_ = i;
+ _tmp13_ = i;
#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp16_ = self->priv->stripes_count;
+ _tmp14_ = self->priv->stripes_count;
#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- if (!(_tmp15_ < _tmp16_)) {
+ if (!(_tmp13_ < _tmp14_)) {
#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
break;
-#line 423 "CrumbleEffect.c"
+#line 468 "CrumbleEffect.c"
}
#line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp17_ = self->priv->from_stripes;
+ _tmp15_ = self->priv->from_stripes;
#line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp17__length1 = self->priv->from_stripes_length1;
+ _tmp15__length1 = self->priv->from_stripes_length1;
#line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp18_ = i;
+ _tmp16_ = i;
#line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp19_ = visuals;
+ _tmp17_ = spit_transitions_visuals_get_from_pixbuf (visuals);
#line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp20_ = spit_transitions_visuals_get_from_pixbuf (_tmp19_);
+ _tmp18_ = _tmp17_;
#line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp21_ = _tmp20_;
-#line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp22_ = gdk_pixbuf_get_height (_tmp21_);
+ _tmp19_ = gdk_pixbuf_get_height (_tmp18_);
#line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp23_ = _tmp22_;
+ _tmp20_ = _tmp19_;
#line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp24_ = cairo_image_surface_create (CAIRO_FORMAT_RGB24, CRUMBLE_EFFECT_STRIPE_WIDTH, _tmp23_);
+ _tmp21_ = cairo_image_surface_create (CAIRO_FORMAT_RGB24, CRUMBLE_EFFECT_STRIPE_WIDTH, _tmp20_);
#line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _cairo_surface_destroy0 (_tmp17_[_tmp18_]);
+ _cairo_surface_destroy0 (_tmp15_[_tmp16_]);
#line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp17_[_tmp18_] = _tmp24_;
+ _tmp15_[_tmp16_] = _tmp21_;
#line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp25_ = _tmp17_[_tmp18_];
+ _tmp22_ = _tmp15_[_tmp16_];
#line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp26_ = self->priv->from_stripes;
+ _tmp23_ = self->priv->from_stripes;
#line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp26__length1 = self->priv->from_stripes_length1;
+ _tmp23__length1 = self->priv->from_stripes_length1;
#line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp27_ = i;
+ _tmp24_ = i;
#line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp28_ = _tmp26_[_tmp27_];
+ _tmp25_ = _tmp23_[_tmp24_];
#line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp29_ = cairo_create (_tmp28_);
+ _tmp26_ = cairo_create (_tmp25_);
#line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- ctx = _tmp29_;
-#line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp30_ = ctx;
+ ctx = _tmp26_;
#line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp31_ = visuals;
+ _tmp27_ = ctx;
#line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp32_ = spit_transitions_visuals_get_from_pixbuf (_tmp31_);
+ _tmp28_ = spit_transitions_visuals_get_from_pixbuf (visuals);
#line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp33_ = _tmp32_;
+ _tmp29_ = _tmp28_;
#line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp34_ = i;
+ _tmp30_ = i;
#line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- gdk_cairo_set_source_pixbuf (_tmp30_, _tmp33_, (gdouble) ((-_tmp34_) * CRUMBLE_EFFECT_STRIPE_WIDTH), (gdouble) 0);
+ gdk_cairo_set_source_pixbuf (_tmp27_, _tmp29_, (gdouble) ((-_tmp30_) * CRUMBLE_EFFECT_STRIPE_WIDTH), (gdouble) 0);
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp35_ = ctx;
+ _tmp31_ = ctx;
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- cairo_paint (_tmp35_);
+ cairo_paint (_tmp31_);
#line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp36_ = self->priv->accelerations;
+ _tmp32_ = self->priv->accelerations;
#line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp36__length1 = self->priv->accelerations_length1;
+ _tmp32__length1 = self->priv->accelerations_length1;
#line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp37_ = i;
+ _tmp33_ = i;
#line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp38_ = rand;
+ _tmp34_ = rand;
#line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp39_ = g_rand_double (_tmp38_);
+ _tmp32_[_tmp33_] = g_rand_double (_tmp34_);
#line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp36_[_tmp37_] = _tmp39_;
-#line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp40_ = _tmp36_[_tmp37_];
+ _tmp35_ = _tmp32_[_tmp33_];
#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
_cairo_destroy0 (ctx);
-#line 493 "CrumbleEffect.c"
+#line 532 "CrumbleEffect.c"
}
}
}
}
#line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
_g_rand_free0 (rand);
-#line 500 "CrumbleEffect.c"
+#line 539 "CrumbleEffect.c"
}
-static void crumble_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number) {
+static void
+crumble_effect_real_paint (SpitTransitionsEffect* base,
+ SpitTransitionsVisuals* visuals,
+ SpitTransitionsMotion* motion,
+ cairo_t* ctx,
+ gint width,
+ gint height,
+ gint frame_number)
+{
CrumbleEffect * self;
gdouble alpha = 0.0;
- SpitTransitionsMotion* _tmp0_;
- gint _tmp1_;
- gdouble _tmp2_;
- gdouble _tmp3_;
+ gdouble _tmp0_;
#line 70 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CRUMBLE_EFFECT, CrumbleEffect);
#line 70 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
@@ -516,239 +560,205 @@ static void crumble_effect_real_paint (SpitTransitionsEffect* base, SpitTransiti
#line 70 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
g_return_if_fail (ctx != NULL);
#line 72 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp0_ = motion;
-#line 72 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp1_ = frame_number;
-#line 72 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp2_ = spit_transitions_motion_get_alpha (_tmp0_, _tmp1_);
-#line 72 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- alpha = _tmp2_;
+ alpha = spit_transitions_motion_get_alpha (motion, frame_number);
#line 74 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp3_ = alpha;
+ _tmp0_ = alpha;
#line 74 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- if (_tmp3_ < 0.5) {
-#line 531 "CrumbleEffect.c"
- gdouble _tmp4_;
+ if (_tmp0_ < 0.5) {
+#line 569 "CrumbleEffect.c"
+ gdouble _tmp1_;
#line 76 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp4_ = alpha;
+ _tmp1_ = alpha;
#line 76 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- alpha = _tmp4_ * 2;
-#line 537 "CrumbleEffect.c"
+ alpha = _tmp1_ * 2;
+#line 575 "CrumbleEffect.c"
{
gint i = 0;
#line 79 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
i = 0;
-#line 542 "CrumbleEffect.c"
+#line 580 "CrumbleEffect.c"
{
- gboolean _tmp5_ = FALSE;
+ gboolean _tmp2_ = FALSE;
#line 79 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp5_ = TRUE;
+ _tmp2_ = TRUE;
#line 79 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
while (TRUE) {
-#line 549 "CrumbleEffect.c"
- gint _tmp7_;
- gint _tmp8_;
+#line 587 "CrumbleEffect.c"
+ gint _tmp4_;
+ gint _tmp5_;
gint x = 0;
- SpitTransitionsVisuals* _tmp9_;
- GdkRectangle _tmp10_ = {0};
- GdkRectangle _tmp11_;
- gint _tmp12_;
- gint _tmp13_;
+ GdkRectangle _tmp6_ = {0};
+ GdkRectangle _tmp7_;
+ gint _tmp8_;
+ gint _tmp9_;
gdouble a = 0.0;
+ gdouble _tmp10_;
+ gdouble _tmp11_;
+ gdouble* _tmp12_;
+ gint _tmp12__length1;
+ gint _tmp13_;
gdouble _tmp14_;
- gdouble _tmp15_;
- gdouble* _tmp16_;
- gint _tmp16__length1;
- gint _tmp17_;
- gdouble _tmp18_;
gint y = 0;
- SpitTransitionsVisuals* _tmp19_;
- GdkRectangle _tmp20_ = {0};
- GdkRectangle _tmp21_;
- gint _tmp22_;
- SpitTransitionsVisuals* _tmp23_;
- GdkPixbuf* _tmp24_;
- GdkPixbuf* _tmp25_;
- gint _tmp26_;
+ GdkRectangle _tmp15_ = {0};
+ GdkRectangle _tmp16_;
+ gint _tmp17_;
+ GdkPixbuf* _tmp18_;
+ GdkPixbuf* _tmp19_;
+ gint _tmp20_;
+ gint _tmp21_;
+ gdouble _tmp22_;
+ gdouble _tmp23_;
+ cairo_surface_t** _tmp24_;
+ gint _tmp24__length1;
+ gint _tmp25_;
+ cairo_surface_t* _tmp26_;
gint _tmp27_;
- gdouble _tmp28_;
- gdouble _tmp29_;
- cairo_t* _tmp30_;
- cairo_surface_t** _tmp31_;
- gint _tmp31__length1;
- gint _tmp32_;
- cairo_surface_t* _tmp33_;
- gint _tmp34_;
- gint _tmp35_;
- cairo_t* _tmp36_;
+ gint _tmp28_;
#line 79 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- if (!_tmp5_) {
-#line 587 "CrumbleEffect.c"
- gint _tmp6_;
+ if (!_tmp2_) {
+#line 620 "CrumbleEffect.c"
+ gint _tmp3_;
#line 79 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp6_ = i;
+ _tmp3_ = i;
#line 79 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- i = _tmp6_ + 1;
-#line 593 "CrumbleEffect.c"
+ i = _tmp3_ + 1;
+#line 626 "CrumbleEffect.c"
}
#line 79 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp5_ = FALSE;
+ _tmp2_ = FALSE;
#line 79 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp7_ = i;
+ _tmp4_ = i;
#line 79 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp8_ = self->priv->stripes_count;
+ _tmp5_ = self->priv->stripes_count;
#line 79 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- if (!(_tmp7_ < _tmp8_)) {
+ if (!(_tmp4_ < _tmp5_)) {
#line 79 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
break;
-#line 605 "CrumbleEffect.c"
+#line 638 "CrumbleEffect.c"
}
#line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp9_ = visuals;
+ spit_transitions_visuals_get_from_pos (visuals, &_tmp6_);
#line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- spit_transitions_visuals_get_from_pos (_tmp9_, &_tmp10_);
+ _tmp7_ = _tmp6_;
#line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp11_ = _tmp10_;
+ _tmp8_ = _tmp7_.x;
#line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp12_ = _tmp11_.x;
+ _tmp9_ = i;
#line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp13_ = i;
-#line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- x = _tmp12_ + (_tmp13_ * CRUMBLE_EFFECT_STRIPE_WIDTH);
+ x = _tmp8_ + (_tmp9_ * CRUMBLE_EFFECT_STRIPE_WIDTH);
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp14_ = alpha;
+ _tmp10_ = alpha;
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp15_ = alpha;
+ _tmp11_ = alpha;
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp16_ = self->priv->accelerations;
+ _tmp12_ = self->priv->accelerations;
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp16__length1 = self->priv->accelerations_length1;
+ _tmp12__length1 = self->priv->accelerations_length1;
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp17_ = i;
+ _tmp13_ = i;
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp18_ = _tmp16_[_tmp17_];
+ _tmp14_ = _tmp12_[_tmp13_];
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- a = _tmp14_ + (_tmp15_ * _tmp18_);
+ a = _tmp10_ + (_tmp11_ * _tmp14_);
#line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp19_ = visuals;
+ spit_transitions_visuals_get_from_pos (visuals, &_tmp15_);
#line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- spit_transitions_visuals_get_from_pos (_tmp19_, &_tmp20_);
+ _tmp16_ = _tmp15_;
#line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp21_ = _tmp20_;
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp22_ = _tmp21_.y;
+ _tmp17_ = _tmp16_.y;
#line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp23_ = visuals;
+ _tmp18_ = spit_transitions_visuals_get_from_pixbuf (visuals);
#line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp24_ = spit_transitions_visuals_get_from_pixbuf (_tmp23_);
+ _tmp19_ = _tmp18_;
#line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp25_ = _tmp24_;
+ _tmp20_ = gdk_pixbuf_get_height (_tmp19_);
#line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp26_ = gdk_pixbuf_get_height (_tmp25_);
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp27_ = _tmp26_;
+ _tmp21_ = _tmp20_;
#line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp28_ = a;
+ _tmp22_ = a;
#line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp29_ = a;
+ _tmp23_ = a;
#line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- y = _tmp22_ + ((gint) ((_tmp27_ * _tmp28_) * _tmp29_));
+ y = _tmp17_ + ((gint) ((_tmp21_ * _tmp22_) * _tmp23_));
#line 84 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp30_ = ctx;
+ _tmp24_ = self->priv->from_stripes;
#line 84 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp31_ = self->priv->from_stripes;
+ _tmp24__length1 = self->priv->from_stripes_length1;
#line 84 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp31__length1 = self->priv->from_stripes_length1;
+ _tmp25_ = i;
#line 84 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp32_ = i;
+ _tmp26_ = _tmp24_[_tmp25_];
#line 84 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp33_ = _tmp31_[_tmp32_];
+ _tmp27_ = x;
#line 84 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp34_ = x;
+ _tmp28_ = y;
#line 84 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp35_ = y;
-#line 84 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- cairo_set_source_surface (_tmp30_, _tmp33_, (gdouble) _tmp34_, (gdouble) _tmp35_);
-#line 85 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp36_ = ctx;
+ cairo_set_source_surface (ctx, _tmp26_, (gdouble) _tmp27_, (gdouble) _tmp28_);
#line 85 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- cairo_paint (_tmp36_);
-#line 677 "CrumbleEffect.c"
+ cairo_paint (ctx);
+#line 700 "CrumbleEffect.c"
}
}
}
} else {
- SpitTransitionsVisuals* _tmp37_;
- GdkPixbuf* _tmp38_;
- GdkPixbuf* _tmp39_;
-#line 87 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp37_ = visuals;
+ GdkPixbuf* _tmp29_;
+ GdkPixbuf* _tmp30_;
#line 87 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp38_ = spit_transitions_visuals_get_to_pixbuf (_tmp37_);
+ _tmp29_ = spit_transitions_visuals_get_to_pixbuf (visuals);
#line 87 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp39_ = _tmp38_;
+ _tmp30_ = _tmp29_;
#line 87 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- if (_tmp39_ != NULL) {
-#line 693 "CrumbleEffect.c"
+ if (_tmp30_ != NULL) {
+#line 713 "CrumbleEffect.c"
+ gdouble _tmp31_;
+ GdkPixbuf* _tmp32_;
+ GdkPixbuf* _tmp33_;
+ GdkRectangle _tmp34_ = {0};
+ GdkRectangle _tmp35_;
+ gint _tmp36_;
+ GdkRectangle _tmp37_ = {0};
+ GdkRectangle _tmp38_;
+ gint _tmp39_;
gdouble _tmp40_;
- cairo_t* _tmp41_;
- SpitTransitionsVisuals* _tmp42_;
- GdkPixbuf* _tmp43_;
- GdkPixbuf* _tmp44_;
- SpitTransitionsVisuals* _tmp45_;
- GdkRectangle _tmp46_ = {0};
- GdkRectangle _tmp47_;
- gint _tmp48_;
- SpitTransitionsVisuals* _tmp49_;
- GdkRectangle _tmp50_ = {0};
- GdkRectangle _tmp51_;
- gint _tmp52_;
- cairo_t* _tmp53_;
- gdouble _tmp54_;
#line 89 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp40_ = alpha;
+ _tmp31_ = alpha;
#line 89 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- alpha = (_tmp40_ - 0.5) * 2;
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp41_ = ctx;
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp42_ = visuals;
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp43_ = spit_transitions_visuals_get_to_pixbuf (_tmp42_);
+ alpha = (_tmp31_ - 0.5) * 2;
#line 90 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp44_ = _tmp43_;
+ _tmp32_ = spit_transitions_visuals_get_to_pixbuf (visuals);
#line 90 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp45_ = visuals;
+ _tmp33_ = _tmp32_;
#line 90 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- spit_transitions_visuals_get_to_pos (_tmp45_, &_tmp46_);
+ spit_transitions_visuals_get_to_pos (visuals, &_tmp34_);
#line 90 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp47_ = _tmp46_;
+ _tmp35_ = _tmp34_;
#line 90 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp48_ = _tmp47_.x;
+ _tmp36_ = _tmp35_.x;
#line 90 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp49_ = visuals;
+ spit_transitions_visuals_get_to_pos (visuals, &_tmp37_);
#line 90 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- spit_transitions_visuals_get_to_pos (_tmp49_, &_tmp50_);
+ _tmp38_ = _tmp37_;
#line 90 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp51_ = _tmp50_;
+ _tmp39_ = _tmp38_.y;
#line 90 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp52_ = _tmp51_.y;
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- gdk_cairo_set_source_pixbuf (_tmp41_, _tmp44_, (gdouble) _tmp48_, (gdouble) _tmp52_);
-#line 91 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp53_ = ctx;
+ gdk_cairo_set_source_pixbuf (ctx, _tmp33_, (gdouble) _tmp36_, (gdouble) _tmp39_);
#line 91 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- _tmp54_ = alpha;
+ _tmp40_ = alpha;
#line 91 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
- cairo_paint_with_alpha (_tmp53_, _tmp54_);
-#line 745 "CrumbleEffect.c"
+ cairo_paint_with_alpha (ctx, _tmp40_);
+#line 750 "CrumbleEffect.c"
} else {
}
}
}
-static void crumble_effect_real_advance (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, gint frame_number) {
+static void
+crumble_effect_real_advance (SpitTransitionsEffect* base,
+ SpitTransitionsVisuals* visuals,
+ SpitTransitionsMotion* motion,
+ gint frame_number)
+{
CrumbleEffect * self;
#line 97 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CRUMBLE_EFFECT, CrumbleEffect);
@@ -756,30 +766,36 @@ static void crumble_effect_real_advance (SpitTransitionsEffect* base, SpitTransi
g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals));
#line 97 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion));
-#line 760 "CrumbleEffect.c"
+#line 770 "CrumbleEffect.c"
}
-static void crumble_effect_real_cancel (SpitTransitionsEffect* base) {
+static void
+crumble_effect_real_cancel (SpitTransitionsEffect* base)
+{
CrumbleEffect * self;
#line 100 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CRUMBLE_EFFECT, CrumbleEffect);
-#line 768 "CrumbleEffect.c"
+#line 780 "CrumbleEffect.c"
}
-static void crumble_effect_class_init (CrumbleEffectClass * klass) {
+static void
+crumble_effect_class_init (CrumbleEffectClass * klass)
+{
#line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
crumble_effect_parent_class = g_type_class_peek_parent (klass);
#line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
g_type_class_add_private (klass, sizeof (CrumbleEffectPrivate));
#line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
G_OBJECT_CLASS (klass)->finalize = crumble_effect_finalize;
-#line 779 "CrumbleEffect.c"
+#line 793 "CrumbleEffect.c"
}
-static void crumble_effect_spit_transitions_effect_interface_init (SpitTransitionsEffectIface * iface) {
+static void
+crumble_effect_spit_transitions_effect_interface_init (SpitTransitionsEffectIface * iface)
+{
#line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
crumble_effect_spit_transitions_effect_parent_iface = g_type_interface_peek_parent (iface);
#line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
@@ -794,18 +810,22 @@ static void crumble_effect_spit_transitions_effect_interface_init (SpitTransitio
iface->advance = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*, gint)) crumble_effect_real_advance;
#line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
iface->cancel = (void (*) (SpitTransitionsEffect *)) crumble_effect_real_cancel;
-#line 798 "CrumbleEffect.c"
+#line 814 "CrumbleEffect.c"
}
-static void crumble_effect_instance_init (CrumbleEffect * self) {
+static void
+crumble_effect_instance_init (CrumbleEffect * self)
+{
#line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
self->priv = CRUMBLE_EFFECT_GET_PRIVATE (self);
-#line 805 "CrumbleEffect.c"
+#line 823 "CrumbleEffect.c"
}
-static void crumble_effect_finalize (GObject * obj) {
+static void
+crumble_effect_finalize (GObject * obj)
+{
CrumbleEffect * self;
#line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_CRUMBLE_EFFECT, CrumbleEffect);
@@ -815,11 +835,13 @@ static void crumble_effect_finalize (GObject * obj) {
self->priv->accelerations = (g_free (self->priv->accelerations), NULL);
#line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
G_OBJECT_CLASS (crumble_effect_parent_class)->finalize (obj);
-#line 819 "CrumbleEffect.c"
+#line 839 "CrumbleEffect.c"
}
-GType crumble_effect_get_type (void) {
+GType
+crumble_effect_get_type (void)
+{
static volatile gsize crumble_effect_type_id__volatile = 0;
if (g_once_init_enter (&crumble_effect_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (CrumbleEffectClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) crumble_effect_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (CrumbleEffect), 0, (GInstanceInitFunc) crumble_effect_instance_init, NULL };
@@ -833,7 +855,11 @@ GType crumble_effect_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) {
@@ -845,7 +871,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/plugins/shotwell-transitions/FadeEffect.c b/plugins/shotwell-transitions/FadeEffect.c
index 8234972..25551e2 100644
--- a/plugins/shotwell-transitions/FadeEffect.c
+++ b/plugins/shotwell-transitions/FadeEffect.c
@@ -1,4 +1,4 @@
-/* FadeEffect.c generated by valac 0.36.6, the Vala compiler
+/* FadeEffect.c generated by valac 0.40.4, the Vala compiler
* generated from FadeEffect.vala, do not modify */
/* Copyright 2010 Maxim Kartashev
@@ -8,6 +8,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>
@@ -42,6 +43,11 @@ typedef struct _ShotwellTransitionDescriptorPrivate ShotwellTransitionDescriptor
typedef struct _FadeEffectDescriptor FadeEffectDescriptor;
typedef struct _FadeEffectDescriptorClass FadeEffectDescriptorClass;
typedef struct _FadeEffectDescriptorPrivate FadeEffectDescriptorPrivate;
+enum {
+ FADE_EFFECT_DESCRIPTOR_0_PROPERTY,
+ FADE_EFFECT_DESCRIPTOR_NUM_PROPERTIES
+};
+static GParamSpec* fade_effect_descriptor_properties[FADE_EFFECT_DESCRIPTOR_NUM_PROPERTIES];
#define TYPE_FADE_EFFECT (fade_effect_get_type ())
#define FADE_EFFECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_FADE_EFFECT, FadeEffect))
@@ -53,6 +59,11 @@ typedef struct _FadeEffectDescriptorPrivate FadeEffectDescriptorPrivate;
typedef struct _FadeEffect FadeEffect;
typedef struct _FadeEffectClass FadeEffectClass;
typedef struct _FadeEffectPrivate FadeEffectPrivate;
+enum {
+ FADE_EFFECT_0_PROPERTY,
+ FADE_EFFECT_NUM_PROPERTIES
+};
+static GParamSpec* fade_effect_properties[FADE_EFFECT_NUM_PROPERTIES];
struct _ShotwellTransitionDescriptor {
GObject parent_instance;
@@ -91,54 +102,68 @@ static SpitTransitionsEffectIface * fade_effect_spit_transitions_effect_parent_i
GType shotwell_transition_descriptor_get_type (void) G_GNUC_CONST;
GType fade_effect_descriptor_get_type (void) G_GNUC_CONST;
-enum {
- FADE_EFFECT_DESCRIPTOR_DUMMY_PROPERTY
-};
FadeEffectDescriptor* fade_effect_descriptor_new (GFile* resource_directory);
-FadeEffectDescriptor* fade_effect_descriptor_construct (GType object_type, GFile* resource_directory);
-ShotwellTransitionDescriptor* shotwell_transition_descriptor_construct (GType object_type, GFile* resource_directory);
+FadeEffectDescriptor* fade_effect_descriptor_construct (GType object_type,
+ GFile* resource_directory);
+ShotwellTransitionDescriptor* shotwell_transition_descriptor_construct (GType object_type,
+ GFile* resource_directory);
static const gchar* fade_effect_descriptor_real_get_id (ShotwellTransitionDescriptor* base);
static const gchar* fade_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base);
-static SpitTransitionsEffect* fade_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, SpitHostInterface* host);
+static SpitTransitionsEffect* fade_effect_descriptor_real_create (ShotwellTransitionDescriptor* base,
+ SpitHostInterface* host);
FadeEffect* fade_effect_new (void);
FadeEffect* fade_effect_construct (GType object_type);
GType fade_effect_get_type (void) G_GNUC_CONST;
-enum {
- FADE_EFFECT_DUMMY_PROPERTY
-};
#define FADE_EFFECT_DESIRED_FPS 30
#define FADE_EFFECT_MIN_FPS 20
-static void fade_effect_real_get_fps (SpitTransitionsEffect* base, gint* desired_fps, gint* min_fps);
-static void fade_effect_real_start (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion);
+static void fade_effect_real_get_fps (SpitTransitionsEffect* base,
+ gint* desired_fps,
+ gint* min_fps);
+static void fade_effect_real_start (SpitTransitionsEffect* base,
+ SpitTransitionsVisuals* visuals,
+ SpitTransitionsMotion* motion);
static gboolean fade_effect_real_needs_clear_background (SpitTransitionsEffect* base);
-static void fade_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number);
-static void fade_effect_real_advance (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, gint frame_number);
+static void fade_effect_real_paint (SpitTransitionsEffect* base,
+ SpitTransitionsVisuals* visuals,
+ SpitTransitionsMotion* motion,
+ cairo_t* ctx,
+ gint width,
+ gint height,
+ gint frame_number);
+static void fade_effect_real_advance (SpitTransitionsEffect* base,
+ SpitTransitionsVisuals* visuals,
+ SpitTransitionsMotion* motion,
+ gint frame_number);
static void fade_effect_real_cancel (SpitTransitionsEffect* base);
-FadeEffectDescriptor* fade_effect_descriptor_construct (GType object_type, GFile* resource_directory) {
+FadeEffectDescriptor*
+fade_effect_descriptor_construct (GType object_type,
+ GFile* resource_directory)
+{
FadeEffectDescriptor * self = NULL;
- GFile* _tmp0_;
#line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
g_return_val_if_fail (G_IS_FILE (resource_directory), NULL);
#line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
- _tmp0_ = resource_directory;
-#line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
- self = (FadeEffectDescriptor*) shotwell_transition_descriptor_construct (object_type, _tmp0_);
+ self = (FadeEffectDescriptor*) shotwell_transition_descriptor_construct (object_type, resource_directory);
#line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
return self;
-#line 131 "FadeEffect.c"
+#line 152 "FadeEffect.c"
}
-FadeEffectDescriptor* fade_effect_descriptor_new (GFile* resource_directory) {
+FadeEffectDescriptor*
+fade_effect_descriptor_new (GFile* resource_directory)
+{
#line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
return fade_effect_descriptor_construct (TYPE_FADE_EFFECT_DESCRIPTOR, resource_directory);
-#line 138 "FadeEffect.c"
+#line 161 "FadeEffect.c"
}
-static const gchar* fade_effect_descriptor_real_get_id (ShotwellTransitionDescriptor* base) {
+static const gchar*
+fade_effect_descriptor_real_get_id (ShotwellTransitionDescriptor* base)
+{
FadeEffectDescriptor * self;
const gchar* result = NULL;
#line 15 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
@@ -147,11 +172,13 @@ static const gchar* fade_effect_descriptor_real_get_id (ShotwellTransitionDescri
result = "org.yorba.shotwell.transitions.fade";
#line 16 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
return result;
-#line 151 "FadeEffect.c"
+#line 176 "FadeEffect.c"
}
-static const gchar* fade_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base) {
+static const gchar*
+fade_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base)
+{
FadeEffectDescriptor * self;
const gchar* result = NULL;
#line 19 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
@@ -160,11 +187,14 @@ static const gchar* fade_effect_descriptor_real_get_pluggable_name (ShotwellTran
result = _ ("Fade");
#line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
return result;
-#line 164 "FadeEffect.c"
+#line 191 "FadeEffect.c"
}
-static SpitTransitionsEffect* fade_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, SpitHostInterface* host) {
+static SpitTransitionsEffect*
+fade_effect_descriptor_real_create (ShotwellTransitionDescriptor* base,
+ SpitHostInterface* host)
+{
FadeEffectDescriptor * self;
SpitTransitionsEffect* result = NULL;
FadeEffect* _tmp0_;
@@ -178,11 +208,13 @@ static SpitTransitionsEffect* fade_effect_descriptor_real_create (ShotwellTransi
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TRANSITIONS_TYPE_EFFECT, SpitTransitionsEffect);
#line 24 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
return result;
-#line 182 "FadeEffect.c"
+#line 212 "FadeEffect.c"
}
-static void fade_effect_descriptor_class_init (FadeEffectDescriptorClass * klass) {
+static void
+fade_effect_descriptor_class_init (FadeEffectDescriptorClass * klass)
+{
#line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
fade_effect_descriptor_parent_class = g_type_class_peek_parent (klass);
#line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
@@ -191,15 +223,19 @@ static void fade_effect_descriptor_class_init (FadeEffectDescriptorClass * klass
((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*) (ShotwellTransitionDescriptor *)) fade_effect_descriptor_real_get_pluggable_name;
#line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*) (ShotwellTransitionDescriptor *, SpitHostInterface*)) fade_effect_descriptor_real_create;
-#line 195 "FadeEffect.c"
+#line 227 "FadeEffect.c"
}
-static void fade_effect_descriptor_instance_init (FadeEffectDescriptor * self) {
+static void
+fade_effect_descriptor_instance_init (FadeEffectDescriptor * self)
+{
}
-GType fade_effect_descriptor_get_type (void) {
+GType
+fade_effect_descriptor_get_type (void)
+{
static volatile gsize fade_effect_descriptor_type_id__volatile = 0;
if (g_once_init_enter (&fade_effect_descriptor_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (FadeEffectDescriptorClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) fade_effect_descriptor_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (FadeEffectDescriptor), 0, (GInstanceInitFunc) fade_effect_descriptor_instance_init, NULL };
@@ -211,24 +247,32 @@ GType fade_effect_descriptor_get_type (void) {
}
-FadeEffect* fade_effect_construct (GType object_type) {
+FadeEffect*
+fade_effect_construct (GType object_type)
+{
FadeEffect * self = NULL;
#line 32 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
self = (FadeEffect*) g_object_new (object_type, NULL);
#line 32 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
return self;
-#line 221 "FadeEffect.c"
+#line 259 "FadeEffect.c"
}
-FadeEffect* fade_effect_new (void) {
+FadeEffect*
+fade_effect_new (void)
+{
#line 32 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
return fade_effect_construct (TYPE_FADE_EFFECT);
-#line 228 "FadeEffect.c"
+#line 268 "FadeEffect.c"
}
-static void fade_effect_real_get_fps (SpitTransitionsEffect* base, gint* desired_fps, gint* min_fps) {
+static void
+fade_effect_real_get_fps (SpitTransitionsEffect* base,
+ gint* desired_fps,
+ gint* min_fps)
+{
FadeEffect * self;
gint _vala_desired_fps = 0;
gint _vala_min_fps = 0;
@@ -242,18 +286,22 @@ static void fade_effect_real_get_fps (SpitTransitionsEffect* base, gint* desired
if (desired_fps) {
#line 35 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
*desired_fps = _vala_desired_fps;
-#line 246 "FadeEffect.c"
+#line 290 "FadeEffect.c"
}
#line 35 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
if (min_fps) {
#line 35 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
*min_fps = _vala_min_fps;
-#line 252 "FadeEffect.c"
+#line 296 "FadeEffect.c"
}
}
-static void fade_effect_real_start (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion) {
+static void
+fade_effect_real_start (SpitTransitionsEffect* base,
+ SpitTransitionsVisuals* visuals,
+ SpitTransitionsMotion* motion)
+{
FadeEffect * self;
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FADE_EFFECT, FadeEffect);
@@ -261,11 +309,13 @@ static void fade_effect_real_start (SpitTransitionsEffect* base, SpitTransitions
g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals));
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion));
-#line 265 "FadeEffect.c"
+#line 313 "FadeEffect.c"
}
-static gboolean fade_effect_real_needs_clear_background (SpitTransitionsEffect* base) {
+static gboolean
+fade_effect_real_needs_clear_background (SpitTransitionsEffect* base)
+{
FadeEffect * self;
gboolean result = FALSE;
#line 43 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
@@ -274,22 +324,25 @@ static gboolean fade_effect_real_needs_clear_background (SpitTransitionsEffect*
result = TRUE;
#line 44 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
return result;
-#line 278 "FadeEffect.c"
+#line 328 "FadeEffect.c"
}
-static void fade_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number) {
+static void
+fade_effect_real_paint (SpitTransitionsEffect* base,
+ SpitTransitionsVisuals* visuals,
+ SpitTransitionsMotion* motion,
+ cairo_t* ctx,
+ gint width,
+ gint height,
+ gint frame_number)
+{
FadeEffect * self;
gdouble alpha = 0.0;
- SpitTransitionsMotion* _tmp0_;
- gint _tmp1_;
- gdouble _tmp2_;
- SpitTransitionsVisuals* _tmp3_;
- GdkPixbuf* _tmp4_;
- GdkPixbuf* _tmp5_;
- SpitTransitionsVisuals* _tmp20_;
- GdkPixbuf* _tmp21_;
- GdkPixbuf* _tmp22_;
+ GdkPixbuf* _tmp0_;
+ GdkPixbuf* _tmp1_;
+ GdkPixbuf* _tmp11_;
+ GdkPixbuf* _tmp12_;
#line 47 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FADE_EFFECT, FadeEffect);
#line 47 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
@@ -299,131 +352,96 @@ static void fade_effect_real_paint (SpitTransitionsEffect* base, SpitTransitions
#line 47 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
g_return_if_fail (ctx != NULL);
#line 49 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
- _tmp0_ = motion;
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
- _tmp1_ = frame_number;
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
- _tmp2_ = spit_transitions_motion_get_alpha (_tmp0_, _tmp1_);
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
- alpha = _tmp2_;
-#line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
- _tmp3_ = visuals;
+ alpha = spit_transitions_motion_get_alpha (motion, frame_number);
#line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
- _tmp4_ = spit_transitions_visuals_get_from_pixbuf (_tmp3_);
+ _tmp0_ = spit_transitions_visuals_get_from_pixbuf (visuals);
#line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
- _tmp5_ = _tmp4_;
+ _tmp1_ = _tmp0_;
#line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
- if (_tmp5_ != NULL) {
-#line 318 "FadeEffect.c"
- cairo_t* _tmp6_;
- SpitTransitionsVisuals* _tmp7_;
- GdkPixbuf* _tmp8_;
- GdkPixbuf* _tmp9_;
- SpitTransitionsVisuals* _tmp10_;
- GdkRectangle _tmp11_ = {0};
- GdkRectangle _tmp12_;
- gint _tmp13_;
- SpitTransitionsVisuals* _tmp14_;
- GdkRectangle _tmp15_ = {0};
- GdkRectangle _tmp16_;
- gint _tmp17_;
- cairo_t* _tmp18_;
- gdouble _tmp19_;
-#line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
- _tmp6_ = ctx;
+ if (_tmp1_ != NULL) {
+#line 363 "FadeEffect.c"
+ GdkPixbuf* _tmp2_;
+ GdkPixbuf* _tmp3_;
+ GdkRectangle _tmp4_ = {0};
+ GdkRectangle _tmp5_;
+ gint _tmp6_;
+ GdkRectangle _tmp7_ = {0};
+ GdkRectangle _tmp8_;
+ gint _tmp9_;
+ gdouble _tmp10_;
#line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
- _tmp7_ = visuals;
+ _tmp2_ = spit_transitions_visuals_get_from_pixbuf (visuals);
#line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
- _tmp8_ = spit_transitions_visuals_get_from_pixbuf (_tmp7_);
+ _tmp3_ = _tmp2_;
#line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
- _tmp9_ = _tmp8_;
+ spit_transitions_visuals_get_from_pos (visuals, &_tmp4_);
#line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
- _tmp10_ = visuals;
+ _tmp5_ = _tmp4_;
#line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
- spit_transitions_visuals_get_from_pos (_tmp10_, &_tmp11_);
+ _tmp6_ = _tmp5_.x;
#line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
- _tmp12_ = _tmp11_;
+ spit_transitions_visuals_get_from_pos (visuals, &_tmp7_);
#line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
- _tmp13_ = _tmp12_.x;
+ _tmp8_ = _tmp7_;
#line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
- _tmp14_ = visuals;
+ _tmp9_ = _tmp8_.y;
#line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
- spit_transitions_visuals_get_from_pos (_tmp14_, &_tmp15_);
-#line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
- _tmp16_ = _tmp15_;
-#line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
- _tmp17_ = _tmp16_.y;
-#line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
- gdk_cairo_set_source_pixbuf (_tmp6_, _tmp9_, (gdouble) _tmp13_, (gdouble) _tmp17_);
-#line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
- _tmp18_ = ctx;
+ gdk_cairo_set_source_pixbuf (ctx, _tmp3_, (gdouble) _tmp6_, (gdouble) _tmp9_);
#line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
- _tmp19_ = alpha;
+ _tmp10_ = alpha;
#line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
- cairo_paint_with_alpha (_tmp18_, 1.0 - _tmp19_);
-#line 365 "FadeEffect.c"
+ cairo_paint_with_alpha (ctx, 1.0 - _tmp10_);
+#line 395 "FadeEffect.c"
}
#line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
- _tmp20_ = visuals;
+ _tmp11_ = spit_transitions_visuals_get_to_pixbuf (visuals);
#line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
- _tmp21_ = spit_transitions_visuals_get_to_pixbuf (_tmp20_);
+ _tmp12_ = _tmp11_;
#line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
- _tmp22_ = _tmp21_;
-#line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
- if (_tmp22_ != NULL) {
-#line 375 "FadeEffect.c"
- cairo_t* _tmp23_;
- SpitTransitionsVisuals* _tmp24_;
- GdkPixbuf* _tmp25_;
- GdkPixbuf* _tmp26_;
- SpitTransitionsVisuals* _tmp27_;
- GdkRectangle _tmp28_ = {0};
- GdkRectangle _tmp29_;
- gint _tmp30_;
- SpitTransitionsVisuals* _tmp31_;
- GdkRectangle _tmp32_ = {0};
- GdkRectangle _tmp33_;
- gint _tmp34_;
- cairo_t* _tmp35_;
- gdouble _tmp36_;
-#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
- _tmp23_ = ctx;
-#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
- _tmp24_ = visuals;
-#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
- _tmp25_ = spit_transitions_visuals_get_to_pixbuf (_tmp24_);
-#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
- _tmp26_ = _tmp25_;
+ if (_tmp12_ != NULL) {
+#line 403 "FadeEffect.c"
+ GdkPixbuf* _tmp13_;
+ GdkPixbuf* _tmp14_;
+ GdkRectangle _tmp15_ = {0};
+ GdkRectangle _tmp16_;
+ gint _tmp17_;
+ GdkRectangle _tmp18_ = {0};
+ GdkRectangle _tmp19_;
+ gint _tmp20_;
+ gdouble _tmp21_;
#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
- _tmp27_ = visuals;
+ _tmp13_ = spit_transitions_visuals_get_to_pixbuf (visuals);
#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
- spit_transitions_visuals_get_to_pos (_tmp27_, &_tmp28_);
+ _tmp14_ = _tmp13_;
#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
- _tmp29_ = _tmp28_;
+ spit_transitions_visuals_get_to_pos (visuals, &_tmp15_);
#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
- _tmp30_ = _tmp29_.x;
+ _tmp16_ = _tmp15_;
#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
- _tmp31_ = visuals;
+ _tmp17_ = _tmp16_.x;
#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
- spit_transitions_visuals_get_to_pos (_tmp31_, &_tmp32_);
+ spit_transitions_visuals_get_to_pos (visuals, &_tmp18_);
#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
- _tmp33_ = _tmp32_;
+ _tmp19_ = _tmp18_;
#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
- _tmp34_ = _tmp33_.y;
+ _tmp20_ = _tmp19_.y;
#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
- gdk_cairo_set_source_pixbuf (_tmp23_, _tmp26_, (gdouble) _tmp30_, (gdouble) _tmp34_);
-#line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
- _tmp35_ = ctx;
+ gdk_cairo_set_source_pixbuf (ctx, _tmp14_, (gdouble) _tmp17_, (gdouble) _tmp20_);
#line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
- _tmp36_ = alpha;
+ _tmp21_ = alpha;
#line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
- cairo_paint_with_alpha (_tmp35_, _tmp36_);
-#line 422 "FadeEffect.c"
+ cairo_paint_with_alpha (ctx, _tmp21_);
+#line 435 "FadeEffect.c"
}
}
-static void fade_effect_real_advance (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, gint frame_number) {
+static void
+fade_effect_real_advance (SpitTransitionsEffect* base,
+ SpitTransitionsVisuals* visuals,
+ SpitTransitionsMotion* motion,
+ gint frame_number)
+{
FadeEffect * self;
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FADE_EFFECT, FadeEffect);
@@ -431,26 +449,32 @@ static void fade_effect_real_advance (SpitTransitionsEffect* base, SpitTransitio
g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals));
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion));
-#line 435 "FadeEffect.c"
+#line 453 "FadeEffect.c"
}
-static void fade_effect_real_cancel (SpitTransitionsEffect* base) {
+static void
+fade_effect_real_cancel (SpitTransitionsEffect* base)
+{
FadeEffect * self;
#line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FADE_EFFECT, FadeEffect);
-#line 443 "FadeEffect.c"
+#line 463 "FadeEffect.c"
}
-static void fade_effect_class_init (FadeEffectClass * klass) {
+static void
+fade_effect_class_init (FadeEffectClass * klass)
+{
#line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
fade_effect_parent_class = g_type_class_peek_parent (klass);
-#line 450 "FadeEffect.c"
+#line 472 "FadeEffect.c"
}
-static void fade_effect_spit_transitions_effect_interface_init (SpitTransitionsEffectIface * iface) {
+static void
+fade_effect_spit_transitions_effect_interface_init (SpitTransitionsEffectIface * iface)
+{
#line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
fade_effect_spit_transitions_effect_parent_iface = g_type_interface_peek_parent (iface);
#line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
@@ -465,15 +489,19 @@ static void fade_effect_spit_transitions_effect_interface_init (SpitTransitionsE
iface->advance = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*, gint)) fade_effect_real_advance;
#line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
iface->cancel = (void (*) (SpitTransitionsEffect *)) fade_effect_real_cancel;
-#line 469 "FadeEffect.c"
+#line 493 "FadeEffect.c"
}
-static void fade_effect_instance_init (FadeEffect * self) {
+static void
+fade_effect_instance_init (FadeEffect * self)
+{
}
-GType fade_effect_get_type (void) {
+GType
+fade_effect_get_type (void)
+{
static volatile gsize fade_effect_type_id__volatile = 0;
if (g_once_init_enter (&fade_effect_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (FadeEffectClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) fade_effect_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (FadeEffect), 0, (GInstanceInitFunc) fade_effect_instance_init, NULL };
diff --git a/plugins/shotwell-transitions/SlideEffect.c b/plugins/shotwell-transitions/SlideEffect.c
index 7cc87e7..f516265 100644
--- a/plugins/shotwell-transitions/SlideEffect.c
+++ b/plugins/shotwell-transitions/SlideEffect.c
@@ -1,4 +1,4 @@
-/* SlideEffect.c generated by valac 0.36.6, the Vala compiler
+/* SlideEffect.c generated by valac 0.40.4, the Vala compiler
* generated from SlideEffect.vala, do not modify */
/* Copyright 2010 Maxim Kartashev
@@ -8,6 +8,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>
@@ -43,6 +44,11 @@ typedef struct _ShotwellTransitionDescriptorPrivate ShotwellTransitionDescriptor
typedef struct _SlideEffectDescriptor SlideEffectDescriptor;
typedef struct _SlideEffectDescriptorClass SlideEffectDescriptorClass;
typedef struct _SlideEffectDescriptorPrivate SlideEffectDescriptorPrivate;
+enum {
+ SLIDE_EFFECT_DESCRIPTOR_0_PROPERTY,
+ SLIDE_EFFECT_DESCRIPTOR_NUM_PROPERTIES
+};
+static GParamSpec* slide_effect_descriptor_properties[SLIDE_EFFECT_DESCRIPTOR_NUM_PROPERTIES];
#define TYPE_SLIDE_EFFECT (slide_effect_get_type ())
#define SLIDE_EFFECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SLIDE_EFFECT, SlideEffect))
@@ -54,6 +60,11 @@ typedef struct _SlideEffectDescriptorPrivate SlideEffectDescriptorPrivate;
typedef struct _SlideEffect SlideEffect;
typedef struct _SlideEffectClass SlideEffectClass;
typedef struct _SlideEffectPrivate SlideEffectPrivate;
+enum {
+ SLIDE_EFFECT_0_PROPERTY,
+ SLIDE_EFFECT_NUM_PROPERTIES
+};
+static GParamSpec* slide_effect_properties[SLIDE_EFFECT_NUM_PROPERTIES];
struct _ShotwellTransitionDescriptor {
GObject parent_instance;
@@ -92,54 +103,68 @@ static SpitTransitionsEffectIface * slide_effect_spit_transitions_effect_parent_
GType shotwell_transition_descriptor_get_type (void) G_GNUC_CONST;
GType slide_effect_descriptor_get_type (void) G_GNUC_CONST;
-enum {
- SLIDE_EFFECT_DESCRIPTOR_DUMMY_PROPERTY
-};
SlideEffectDescriptor* slide_effect_descriptor_new (GFile* resource_directory);
-SlideEffectDescriptor* slide_effect_descriptor_construct (GType object_type, GFile* resource_directory);
-ShotwellTransitionDescriptor* shotwell_transition_descriptor_construct (GType object_type, GFile* resource_directory);
+SlideEffectDescriptor* slide_effect_descriptor_construct (GType object_type,
+ GFile* resource_directory);
+ShotwellTransitionDescriptor* shotwell_transition_descriptor_construct (GType object_type,
+ GFile* resource_directory);
static const gchar* slide_effect_descriptor_real_get_id (ShotwellTransitionDescriptor* base);
static const gchar* slide_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base);
-static SpitTransitionsEffect* slide_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, SpitHostInterface* host);
+static SpitTransitionsEffect* slide_effect_descriptor_real_create (ShotwellTransitionDescriptor* base,
+ SpitHostInterface* host);
SlideEffect* slide_effect_new (void);
SlideEffect* slide_effect_construct (GType object_type);
GType slide_effect_get_type (void) G_GNUC_CONST;
-enum {
- SLIDE_EFFECT_DUMMY_PROPERTY
-};
#define SLIDE_EFFECT_DESIRED_FPS 25
#define SLIDE_EFFECT_MIN_FPS 15
-static void slide_effect_real_get_fps (SpitTransitionsEffect* base, gint* desired_fps, gint* min_fps);
-static void slide_effect_real_start (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion);
+static void slide_effect_real_get_fps (SpitTransitionsEffect* base,
+ gint* desired_fps,
+ gint* min_fps);
+static void slide_effect_real_start (SpitTransitionsEffect* base,
+ SpitTransitionsVisuals* visuals,
+ SpitTransitionsMotion* motion);
static gboolean slide_effect_real_needs_clear_background (SpitTransitionsEffect* base);
-static void slide_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number);
-static void slide_effect_real_advance (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, gint frame_number);
+static void slide_effect_real_paint (SpitTransitionsEffect* base,
+ SpitTransitionsVisuals* visuals,
+ SpitTransitionsMotion* motion,
+ cairo_t* ctx,
+ gint width,
+ gint height,
+ gint frame_number);
+static void slide_effect_real_advance (SpitTransitionsEffect* base,
+ SpitTransitionsVisuals* visuals,
+ SpitTransitionsMotion* motion,
+ gint frame_number);
static void slide_effect_real_cancel (SpitTransitionsEffect* base);
-SlideEffectDescriptor* slide_effect_descriptor_construct (GType object_type, GFile* resource_directory) {
+SlideEffectDescriptor*
+slide_effect_descriptor_construct (GType object_type,
+ GFile* resource_directory)
+{
SlideEffectDescriptor * self = NULL;
- GFile* _tmp0_;
#line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
g_return_val_if_fail (G_IS_FILE (resource_directory), NULL);
#line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- _tmp0_ = resource_directory;
-#line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- self = (SlideEffectDescriptor*) shotwell_transition_descriptor_construct (object_type, _tmp0_);
+ self = (SlideEffectDescriptor*) shotwell_transition_descriptor_construct (object_type, resource_directory);
#line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
return self;
-#line 132 "SlideEffect.c"
+#line 153 "SlideEffect.c"
}
-SlideEffectDescriptor* slide_effect_descriptor_new (GFile* resource_directory) {
+SlideEffectDescriptor*
+slide_effect_descriptor_new (GFile* resource_directory)
+{
#line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
return slide_effect_descriptor_construct (TYPE_SLIDE_EFFECT_DESCRIPTOR, resource_directory);
-#line 139 "SlideEffect.c"
+#line 162 "SlideEffect.c"
}
-static const gchar* slide_effect_descriptor_real_get_id (ShotwellTransitionDescriptor* base) {
+static const gchar*
+slide_effect_descriptor_real_get_id (ShotwellTransitionDescriptor* base)
+{
SlideEffectDescriptor * self;
const gchar* result = NULL;
#line 15 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
@@ -148,11 +173,13 @@ static const gchar* slide_effect_descriptor_real_get_id (ShotwellTransitionDescr
result = "org.yorba.shotwell.transitions.slide";
#line 16 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
return result;
-#line 152 "SlideEffect.c"
+#line 177 "SlideEffect.c"
}
-static const gchar* slide_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base) {
+static const gchar*
+slide_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base)
+{
SlideEffectDescriptor * self;
const gchar* result = NULL;
#line 19 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
@@ -161,11 +188,14 @@ static const gchar* slide_effect_descriptor_real_get_pluggable_name (ShotwellTra
result = _ ("Slide");
#line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
return result;
-#line 165 "SlideEffect.c"
+#line 192 "SlideEffect.c"
}
-static SpitTransitionsEffect* slide_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, SpitHostInterface* host) {
+static SpitTransitionsEffect*
+slide_effect_descriptor_real_create (ShotwellTransitionDescriptor* base,
+ SpitHostInterface* host)
+{
SlideEffectDescriptor * self;
SpitTransitionsEffect* result = NULL;
SlideEffect* _tmp0_;
@@ -179,11 +209,13 @@ static SpitTransitionsEffect* slide_effect_descriptor_real_create (ShotwellTrans
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TRANSITIONS_TYPE_EFFECT, SpitTransitionsEffect);
#line 24 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
return result;
-#line 183 "SlideEffect.c"
+#line 213 "SlideEffect.c"
}
-static void slide_effect_descriptor_class_init (SlideEffectDescriptorClass * klass) {
+static void
+slide_effect_descriptor_class_init (SlideEffectDescriptorClass * klass)
+{
#line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
slide_effect_descriptor_parent_class = g_type_class_peek_parent (klass);
#line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
@@ -192,15 +224,19 @@ static void slide_effect_descriptor_class_init (SlideEffectDescriptorClass * kla
((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*) (ShotwellTransitionDescriptor *)) slide_effect_descriptor_real_get_pluggable_name;
#line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*) (ShotwellTransitionDescriptor *, SpitHostInterface*)) slide_effect_descriptor_real_create;
-#line 196 "SlideEffect.c"
+#line 228 "SlideEffect.c"
}
-static void slide_effect_descriptor_instance_init (SlideEffectDescriptor * self) {
+static void
+slide_effect_descriptor_instance_init (SlideEffectDescriptor * self)
+{
}
-GType slide_effect_descriptor_get_type (void) {
+GType
+slide_effect_descriptor_get_type (void)
+{
static volatile gsize slide_effect_descriptor_type_id__volatile = 0;
if (g_once_init_enter (&slide_effect_descriptor_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (SlideEffectDescriptorClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) slide_effect_descriptor_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SlideEffectDescriptor), 0, (GInstanceInitFunc) slide_effect_descriptor_instance_init, NULL };
@@ -212,24 +248,32 @@ GType slide_effect_descriptor_get_type (void) {
}
-SlideEffect* slide_effect_construct (GType object_type) {
+SlideEffect*
+slide_effect_construct (GType object_type)
+{
SlideEffect * self = NULL;
#line 32 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
self = (SlideEffect*) g_object_new (object_type, NULL);
#line 32 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
return self;
-#line 222 "SlideEffect.c"
+#line 260 "SlideEffect.c"
}
-SlideEffect* slide_effect_new (void) {
+SlideEffect*
+slide_effect_new (void)
+{
#line 32 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
return slide_effect_construct (TYPE_SLIDE_EFFECT);
-#line 229 "SlideEffect.c"
+#line 269 "SlideEffect.c"
}
-static void slide_effect_real_get_fps (SpitTransitionsEffect* base, gint* desired_fps, gint* min_fps) {
+static void
+slide_effect_real_get_fps (SpitTransitionsEffect* base,
+ gint* desired_fps,
+ gint* min_fps)
+{
SlideEffect * self;
gint _vala_desired_fps = 0;
gint _vala_min_fps = 0;
@@ -243,18 +287,22 @@ static void slide_effect_real_get_fps (SpitTransitionsEffect* base, gint* desire
if (desired_fps) {
#line 35 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
*desired_fps = _vala_desired_fps;
-#line 247 "SlideEffect.c"
+#line 291 "SlideEffect.c"
}
#line 35 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
if (min_fps) {
#line 35 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
*min_fps = _vala_min_fps;
-#line 253 "SlideEffect.c"
+#line 297 "SlideEffect.c"
}
}
-static void slide_effect_real_start (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion) {
+static void
+slide_effect_real_start (SpitTransitionsEffect* base,
+ SpitTransitionsVisuals* visuals,
+ SpitTransitionsMotion* motion)
+{
SlideEffect * self;
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SLIDE_EFFECT, SlideEffect);
@@ -262,11 +310,13 @@ static void slide_effect_real_start (SpitTransitionsEffect* base, SpitTransition
g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals));
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion));
-#line 266 "SlideEffect.c"
+#line 314 "SlideEffect.c"
}
-static gboolean slide_effect_real_needs_clear_background (SpitTransitionsEffect* base) {
+static gboolean
+slide_effect_real_needs_clear_background (SpitTransitionsEffect* base)
+{
SlideEffect * self;
gboolean result = FALSE;
#line 43 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
@@ -275,22 +325,25 @@ static gboolean slide_effect_real_needs_clear_background (SpitTransitionsEffect*
result = TRUE;
#line 44 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
return result;
-#line 279 "SlideEffect.c"
+#line 329 "SlideEffect.c"
}
-static void slide_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number) {
+static void
+slide_effect_real_paint (SpitTransitionsEffect* base,
+ SpitTransitionsVisuals* visuals,
+ SpitTransitionsMotion* motion,
+ cairo_t* ctx,
+ gint width,
+ gint height,
+ gint frame_number)
+{
SlideEffect * self;
gdouble alpha = 0.0;
- SpitTransitionsMotion* _tmp0_;
- gint _tmp1_;
- gdouble _tmp2_;
- SpitTransitionsVisuals* _tmp3_;
- GdkPixbuf* _tmp4_;
- GdkPixbuf* _tmp5_;
- SpitTransitionsVisuals* _tmp33_;
- GdkPixbuf* _tmp34_;
- GdkPixbuf* _tmp35_;
+ GdkPixbuf* _tmp0_;
+ GdkPixbuf* _tmp1_;
+ GdkPixbuf* _tmp21_;
+ GdkPixbuf* _tmp22_;
#line 47 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SLIDE_EFFECT, SlideEffect);
#line 47 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
@@ -300,251 +353,194 @@ static void slide_effect_real_paint (SpitTransitionsEffect* base, SpitTransition
#line 47 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
g_return_if_fail (ctx != NULL);
#line 49 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- _tmp0_ = motion;
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- _tmp1_ = frame_number;
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- _tmp2_ = spit_transitions_motion_get_alpha (_tmp0_, _tmp1_);
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- alpha = _tmp2_;
+ alpha = spit_transitions_motion_get_alpha (motion, frame_number);
#line 51 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- _tmp3_ = visuals;
+ _tmp0_ = spit_transitions_visuals_get_from_pixbuf (visuals);
#line 51 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- _tmp4_ = spit_transitions_visuals_get_from_pixbuf (_tmp3_);
+ _tmp1_ = _tmp0_;
#line 51 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- _tmp5_ = _tmp4_;
-#line 51 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- if (_tmp5_ != NULL) {
-#line 319 "SlideEffect.c"
- gint _tmp6_ = 0;
- SpitTransitionsMotion* _tmp7_;
- SpitTransitionsDirection _tmp8_;
- SpitTransitionsDirection _tmp9_;
+ if (_tmp1_ != NULL) {
+#line 364 "SlideEffect.c"
+ gint _tmp2_ = 0;
+ SpitTransitionsDirection _tmp3_;
+ SpitTransitionsDirection _tmp4_;
gint from_target_x = 0;
gint from_current_x = 0;
- SpitTransitionsVisuals* _tmp16_;
- GdkRectangle _tmp17_ = {0};
- GdkRectangle _tmp18_;
- gint _tmp19_;
- gdouble _tmp20_;
- gint _tmp21_;
- gdouble _tmp22_;
- cairo_t* _tmp23_;
- SpitTransitionsVisuals* _tmp24_;
- GdkPixbuf* _tmp25_;
- GdkPixbuf* _tmp26_;
- gint _tmp27_;
- SpitTransitionsVisuals* _tmp28_;
- GdkRectangle _tmp29_ = {0};
- GdkRectangle _tmp30_;
- gint _tmp31_;
- cairo_t* _tmp32_;
-#line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- _tmp7_ = motion;
+ GdkRectangle _tmp9_ = {0};
+ GdkRectangle _tmp10_;
+ gint _tmp11_;
+ gdouble _tmp12_;
+ gint _tmp13_;
+ gdouble _tmp14_;
+ GdkPixbuf* _tmp15_;
+ GdkPixbuf* _tmp16_;
+ gint _tmp17_;
+ GdkRectangle _tmp18_ = {0};
+ GdkRectangle _tmp19_;
+ gint _tmp20_;
#line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- _tmp8_ = spit_transitions_motion_get_direction (_tmp7_);
+ _tmp3_ = spit_transitions_motion_get_direction (motion);
#line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- _tmp9_ = _tmp8_;
+ _tmp4_ = _tmp3_;
#line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- if (_tmp9_ == SPIT_TRANSITIONS_DIRECTION_FORWARD) {
-#line 351 "SlideEffect.c"
- SpitTransitionsVisuals* _tmp10_;
- GdkPixbuf* _tmp11_;
- GdkPixbuf* _tmp12_;
- gint _tmp13_;
- gint _tmp14_;
+ if (_tmp4_ == SPIT_TRANSITIONS_DIRECTION_FORWARD) {
+#line 388 "SlideEffect.c"
+ GdkPixbuf* _tmp5_;
+ GdkPixbuf* _tmp6_;
+ gint _tmp7_;
+ gint _tmp8_;
#line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- _tmp10_ = visuals;
+ _tmp5_ = spit_transitions_visuals_get_from_pixbuf (visuals);
#line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- _tmp11_ = spit_transitions_visuals_get_from_pixbuf (_tmp10_);
+ _tmp6_ = _tmp5_;
#line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- _tmp12_ = _tmp11_;
+ _tmp7_ = gdk_pixbuf_get_width (_tmp6_);
#line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- _tmp13_ = gdk_pixbuf_get_width (_tmp12_);
+ _tmp8_ = _tmp7_;
#line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- _tmp14_ = _tmp13_;
-#line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- _tmp6_ = -_tmp14_;
-#line 369 "SlideEffect.c"
+ _tmp2_ = -_tmp8_;
+#line 403 "SlideEffect.c"
} else {
- gint _tmp15_;
-#line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- _tmp15_ = width;
#line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- _tmp6_ = _tmp15_;
-#line 376 "SlideEffect.c"
+ _tmp2_ = width;
+#line 407 "SlideEffect.c"
}
#line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- from_target_x = _tmp6_;
-#line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- _tmp16_ = visuals;
+ from_target_x = _tmp2_;
#line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- spit_transitions_visuals_get_from_pos (_tmp16_, &_tmp17_);
+ spit_transitions_visuals_get_from_pos (visuals, &_tmp9_);
#line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- _tmp18_ = _tmp17_;
+ _tmp10_ = _tmp9_;
#line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- _tmp19_ = _tmp18_.x;
+ _tmp11_ = _tmp10_.x;
#line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- _tmp20_ = alpha;
+ _tmp12_ = alpha;
#line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- _tmp21_ = from_target_x;
+ _tmp13_ = from_target_x;
#line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- _tmp22_ = alpha;
+ _tmp14_ = alpha;
#line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- from_current_x = (gint) ((_tmp19_ * (1 - _tmp20_)) + (_tmp21_ * _tmp22_));
-#line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- _tmp23_ = ctx;
-#line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- _tmp24_ = visuals;
+ from_current_x = (gint) ((_tmp11_ * (1 - _tmp12_)) + (_tmp13_ * _tmp14_));
#line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- _tmp25_ = spit_transitions_visuals_get_from_pixbuf (_tmp24_);
+ _tmp15_ = spit_transitions_visuals_get_from_pixbuf (visuals);
#line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- _tmp26_ = _tmp25_;
-#line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- _tmp27_ = from_current_x;
+ _tmp16_ = _tmp15_;
#line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- _tmp28_ = visuals;
+ _tmp17_ = from_current_x;
#line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- spit_transitions_visuals_get_from_pos (_tmp28_, &_tmp29_);
+ spit_transitions_visuals_get_from_pos (visuals, &_tmp18_);
#line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- _tmp30_ = _tmp29_;
+ _tmp19_ = _tmp18_;
#line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- _tmp31_ = _tmp30_.y;
+ _tmp20_ = _tmp19_.y;
#line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- gdk_cairo_set_source_pixbuf (_tmp23_, _tmp26_, (gdouble) _tmp27_, (gdouble) _tmp31_);
-#line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- _tmp32_ = ctx;
+ gdk_cairo_set_source_pixbuf (ctx, _tmp16_, (gdouble) _tmp17_, (gdouble) _tmp20_);
#line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- cairo_paint (_tmp32_);
-#line 420 "SlideEffect.c"
+ cairo_paint (ctx);
+#line 441 "SlideEffect.c"
}
#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- _tmp33_ = visuals;
+ _tmp21_ = spit_transitions_visuals_get_to_pixbuf (visuals);
#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- _tmp34_ = spit_transitions_visuals_get_to_pixbuf (_tmp33_);
+ _tmp22_ = _tmp21_;
#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- _tmp35_ = _tmp34_;
-#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- if (_tmp35_ != NULL) {
-#line 430 "SlideEffect.c"
+ if (_tmp22_ != NULL) {
+#line 449 "SlideEffect.c"
gint to_target_x = 0;
+ GdkPixbuf* _tmp23_;
+ GdkPixbuf* _tmp24_;
+ gint _tmp25_;
+ gint _tmp26_;
+ gint _tmp27_ = 0;
+ SpitTransitionsDirection _tmp28_;
+ SpitTransitionsDirection _tmp29_;
+ gint from_x = 0;
+ gint to_current_x = 0;
+ gint _tmp34_;
+ gdouble _tmp35_;
gint _tmp36_;
- SpitTransitionsVisuals* _tmp37_;
+ gdouble _tmp37_;
GdkPixbuf* _tmp38_;
GdkPixbuf* _tmp39_;
gint _tmp40_;
- gint _tmp41_;
- gint _tmp42_ = 0;
- SpitTransitionsMotion* _tmp43_;
- SpitTransitionsDirection _tmp44_;
- SpitTransitionsDirection _tmp45_;
- gint from_x = 0;
- gint to_current_x = 0;
- gint _tmp52_;
- gdouble _tmp53_;
- gint _tmp54_;
- gdouble _tmp55_;
- cairo_t* _tmp56_;
- SpitTransitionsVisuals* _tmp57_;
- GdkPixbuf* _tmp58_;
- GdkPixbuf* _tmp59_;
- gint _tmp60_;
- SpitTransitionsVisuals* _tmp61_;
- GdkRectangle _tmp62_ = {0};
- GdkRectangle _tmp63_;
- gint _tmp64_;
- cairo_t* _tmp65_;
-#line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- _tmp36_ = width;
-#line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- _tmp37_ = visuals;
+ GdkRectangle _tmp41_ = {0};
+ GdkRectangle _tmp42_;
+ gint _tmp43_;
#line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- _tmp38_ = spit_transitions_visuals_get_to_pixbuf (_tmp37_);
+ _tmp23_ = spit_transitions_visuals_get_to_pixbuf (visuals);
#line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- _tmp39_ = _tmp38_;
+ _tmp24_ = _tmp23_;
#line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- _tmp40_ = gdk_pixbuf_get_width (_tmp39_);
+ _tmp25_ = gdk_pixbuf_get_width (_tmp24_);
#line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- _tmp41_ = _tmp40_;
+ _tmp26_ = _tmp25_;
#line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- to_target_x = (_tmp36_ - _tmp41_) / 2;
-#line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- _tmp43_ = motion;
+ to_target_x = (width - _tmp26_) / 2;
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- _tmp44_ = spit_transitions_motion_get_direction (_tmp43_);
+ _tmp28_ = spit_transitions_motion_get_direction (motion);
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- _tmp45_ = _tmp44_;
+ _tmp29_ = _tmp28_;
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- if (_tmp45_ == SPIT_TRANSITIONS_DIRECTION_FORWARD) {
-#line 480 "SlideEffect.c"
- gint _tmp46_;
+ if (_tmp29_ == SPIT_TRANSITIONS_DIRECTION_FORWARD) {
#line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- _tmp46_ = width;
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- _tmp42_ = _tmp46_;
-#line 486 "SlideEffect.c"
+ _tmp27_ = width;
+#line 488 "SlideEffect.c"
} else {
- SpitTransitionsVisuals* _tmp47_;
- GdkPixbuf* _tmp48_;
- GdkPixbuf* _tmp49_;
- gint _tmp50_;
- gint _tmp51_;
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- _tmp47_ = visuals;
+ GdkPixbuf* _tmp30_;
+ GdkPixbuf* _tmp31_;
+ gint _tmp32_;
+ gint _tmp33_;
#line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- _tmp48_ = spit_transitions_visuals_get_to_pixbuf (_tmp47_);
+ _tmp30_ = spit_transitions_visuals_get_to_pixbuf (visuals);
#line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- _tmp49_ = _tmp48_;
+ _tmp31_ = _tmp30_;
#line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- _tmp50_ = gdk_pixbuf_get_width (_tmp49_);
+ _tmp32_ = gdk_pixbuf_get_width (_tmp31_);
#line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- _tmp51_ = _tmp50_;
+ _tmp33_ = _tmp32_;
#line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- _tmp42_ = -_tmp51_;
-#line 505 "SlideEffect.c"
+ _tmp27_ = -_tmp33_;
+#line 504 "SlideEffect.c"
}
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- from_x = _tmp42_;
+ from_x = _tmp27_;
#line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- _tmp52_ = from_x;
+ _tmp34_ = from_x;
#line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- _tmp53_ = alpha;
+ _tmp35_ = alpha;
#line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- _tmp54_ = to_target_x;
+ _tmp36_ = to_target_x;
#line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- _tmp55_ = alpha;
+ _tmp37_ = alpha;
#line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- to_current_x = (gint) ((_tmp52_ * (1 - _tmp53_)) + (_tmp54_ * _tmp55_));
+ to_current_x = (gint) ((_tmp34_ * (1 - _tmp35_)) + (_tmp36_ * _tmp37_));
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- _tmp56_ = ctx;
+ _tmp38_ = spit_transitions_visuals_get_to_pixbuf (visuals);
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- _tmp57_ = visuals;
-#line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- _tmp58_ = spit_transitions_visuals_get_to_pixbuf (_tmp57_);
-#line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- _tmp59_ = _tmp58_;
-#line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- _tmp60_ = to_current_x;
+ _tmp39_ = _tmp38_;
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- _tmp61_ = visuals;
+ _tmp40_ = to_current_x;
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- spit_transitions_visuals_get_to_pos (_tmp61_, &_tmp62_);
+ spit_transitions_visuals_get_to_pos (visuals, &_tmp41_);
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- _tmp63_ = _tmp62_;
+ _tmp42_ = _tmp41_;
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- _tmp64_ = _tmp63_.y;
+ _tmp43_ = _tmp42_.y;
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- gdk_cairo_set_source_pixbuf (_tmp56_, _tmp59_, (gdouble) _tmp60_, (gdouble) _tmp64_);
-#line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- _tmp65_ = ctx;
+ gdk_cairo_set_source_pixbuf (ctx, _tmp39_, (gdouble) _tmp40_, (gdouble) _tmp43_);
#line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
- cairo_paint (_tmp65_);
-#line 543 "SlideEffect.c"
+ cairo_paint (ctx);
+#line 534 "SlideEffect.c"
}
}
-static void slide_effect_real_advance (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, gint frame_number) {
+static void
+slide_effect_real_advance (SpitTransitionsEffect* base,
+ SpitTransitionsVisuals* visuals,
+ SpitTransitionsMotion* motion,
+ gint frame_number)
+{
SlideEffect * self;
#line 69 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SLIDE_EFFECT, SlideEffect);
@@ -552,26 +548,32 @@ static void slide_effect_real_advance (SpitTransitionsEffect* base, SpitTransiti
g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals));
#line 69 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion));
-#line 556 "SlideEffect.c"
+#line 552 "SlideEffect.c"
}
-static void slide_effect_real_cancel (SpitTransitionsEffect* base) {
+static void
+slide_effect_real_cancel (SpitTransitionsEffect* base)
+{
SlideEffect * self;
#line 72 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SLIDE_EFFECT, SlideEffect);
-#line 564 "SlideEffect.c"
+#line 562 "SlideEffect.c"
}
-static void slide_effect_class_init (SlideEffectClass * klass) {
+static void
+slide_effect_class_init (SlideEffectClass * klass)
+{
#line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
slide_effect_parent_class = g_type_class_peek_parent (klass);
#line 571 "SlideEffect.c"
}
-static void slide_effect_spit_transitions_effect_interface_init (SpitTransitionsEffectIface * iface) {
+static void
+slide_effect_spit_transitions_effect_interface_init (SpitTransitionsEffectIface * iface)
+{
#line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
slide_effect_spit_transitions_effect_parent_iface = g_type_interface_peek_parent (iface);
#line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
@@ -586,15 +588,19 @@ static void slide_effect_spit_transitions_effect_interface_init (SpitTransitions
iface->advance = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*, gint)) slide_effect_real_advance;
#line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
iface->cancel = (void (*) (SpitTransitionsEffect *)) slide_effect_real_cancel;
-#line 590 "SlideEffect.c"
+#line 592 "SlideEffect.c"
}
-static void slide_effect_instance_init (SlideEffect * self) {
+static void
+slide_effect_instance_init (SlideEffect * self)
+{
}
-GType slide_effect_get_type (void) {
+GType
+slide_effect_get_type (void)
+{
static volatile gsize slide_effect_type_id__volatile = 0;
if (g_once_init_enter (&slide_effect_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (SlideEffectClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) slide_effect_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SlideEffect), 0, (GInstanceInitFunc) slide_effect_instance_init, NULL };
diff --git a/plugins/shotwell-transitions/SquaresEffect.c b/plugins/shotwell-transitions/SquaresEffect.c
index 402d502..50bef64 100644
--- a/plugins/shotwell-transitions/SquaresEffect.c
+++ b/plugins/shotwell-transitions/SquaresEffect.c
@@ -1,4 +1,4 @@
-/* SquaresEffect.c generated by valac 0.36.6, the Vala compiler
+/* SquaresEffect.c generated by valac 0.40.4, the Vala compiler
* generated from SquaresEffect.vala, do not modify */
/* Copyright 2013 Jens Bav
@@ -8,6 +8,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>
@@ -42,6 +43,11 @@ typedef struct _ShotwellTransitionDescriptorPrivate ShotwellTransitionDescriptor
typedef struct _SquaresEffectDescriptor SquaresEffectDescriptor;
typedef struct _SquaresEffectDescriptorClass SquaresEffectDescriptorClass;
typedef struct _SquaresEffectDescriptorPrivate SquaresEffectDescriptorPrivate;
+enum {
+ SQUARES_EFFECT_DESCRIPTOR_0_PROPERTY,
+ SQUARES_EFFECT_DESCRIPTOR_NUM_PROPERTIES
+};
+static GParamSpec* squares_effect_descriptor_properties[SQUARES_EFFECT_DESCRIPTOR_NUM_PROPERTIES];
#define TYPE_SQUARES_EFFECT (squares_effect_get_type ())
#define SQUARES_EFFECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SQUARES_EFFECT, SquaresEffect))
@@ -53,6 +59,11 @@ typedef struct _SquaresEffectDescriptorPrivate SquaresEffectDescriptorPrivate;
typedef struct _SquaresEffect SquaresEffect;
typedef struct _SquaresEffectClass SquaresEffectClass;
typedef struct _SquaresEffectPrivate SquaresEffectPrivate;
+enum {
+ SQUARES_EFFECT_0_PROPERTY,
+ SQUARES_EFFECT_NUM_PROPERTIES
+};
+static GParamSpec* squares_effect_properties[SQUARES_EFFECT_NUM_PROPERTIES];
struct _ShotwellTransitionDescriptor {
GObject parent_instance;
@@ -96,57 +107,71 @@ static SpitTransitionsEffectIface * squares_effect_spit_transitions_effect_paren
GType shotwell_transition_descriptor_get_type (void) G_GNUC_CONST;
GType squares_effect_descriptor_get_type (void) G_GNUC_CONST;
-enum {
- SQUARES_EFFECT_DESCRIPTOR_DUMMY_PROPERTY
-};
SquaresEffectDescriptor* squares_effect_descriptor_new (GFile* resource_directory);
-SquaresEffectDescriptor* squares_effect_descriptor_construct (GType object_type, GFile* resource_directory);
-ShotwellTransitionDescriptor* shotwell_transition_descriptor_construct (GType object_type, GFile* resource_directory);
+SquaresEffectDescriptor* squares_effect_descriptor_construct (GType object_type,
+ GFile* resource_directory);
+ShotwellTransitionDescriptor* shotwell_transition_descriptor_construct (GType object_type,
+ GFile* resource_directory);
static const gchar* squares_effect_descriptor_real_get_id (ShotwellTransitionDescriptor* base);
static const gchar* squares_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base);
-static SpitTransitionsEffect* squares_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, SpitHostInterface* host);
+static SpitTransitionsEffect* squares_effect_descriptor_real_create (ShotwellTransitionDescriptor* base,
+ SpitHostInterface* host);
SquaresEffect* squares_effect_new (void);
SquaresEffect* squares_effect_construct (GType object_type);
GType squares_effect_get_type (void) G_GNUC_CONST;
#define SQUARES_EFFECT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SQUARES_EFFECT, SquaresEffectPrivate))
-enum {
- SQUARES_EFFECT_DUMMY_PROPERTY
-};
#define SQUARES_EFFECT_DESIRED_FPS 25
#define SQUARES_EFFECT_MIN_FPS 10
#define SQUARES_EFFECT_SQUARE_SIZE 100
-static void squares_effect_real_get_fps (SpitTransitionsEffect* base, gint* desired_fps, gint* min_fps);
-static void squares_effect_real_start (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion);
+static void squares_effect_real_get_fps (SpitTransitionsEffect* base,
+ gint* desired_fps,
+ gint* min_fps);
+static void squares_effect_real_start (SpitTransitionsEffect* base,
+ SpitTransitionsVisuals* visuals,
+ SpitTransitionsMotion* motion);
static gboolean squares_effect_real_needs_clear_background (SpitTransitionsEffect* base);
-static void squares_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number);
-static void squares_effect_real_advance (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, gint frame_number);
+static void squares_effect_real_paint (SpitTransitionsEffect* base,
+ SpitTransitionsVisuals* visuals,
+ SpitTransitionsMotion* motion,
+ cairo_t* ctx,
+ gint width,
+ gint height,
+ gint frame_number);
+static void squares_effect_real_advance (SpitTransitionsEffect* base,
+ SpitTransitionsVisuals* visuals,
+ SpitTransitionsMotion* motion,
+ gint frame_number);
static void squares_effect_real_cancel (SpitTransitionsEffect* base);
static void squares_effect_finalize (GObject * obj);
-SquaresEffectDescriptor* squares_effect_descriptor_construct (GType object_type, GFile* resource_directory) {
+SquaresEffectDescriptor*
+squares_effect_descriptor_construct (GType object_type,
+ GFile* resource_directory)
+{
SquaresEffectDescriptor * self = NULL;
- GFile* _tmp0_;
#line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
g_return_val_if_fail (G_IS_FILE (resource_directory), NULL);
#line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- _tmp0_ = resource_directory;
-#line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- self = (SquaresEffectDescriptor*) shotwell_transition_descriptor_construct (object_type, _tmp0_);
+ self = (SquaresEffectDescriptor*) shotwell_transition_descriptor_construct (object_type, resource_directory);
#line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
return self;
-#line 139 "SquaresEffect.c"
+#line 160 "SquaresEffect.c"
}
-SquaresEffectDescriptor* squares_effect_descriptor_new (GFile* resource_directory) {
+SquaresEffectDescriptor*
+squares_effect_descriptor_new (GFile* resource_directory)
+{
#line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
return squares_effect_descriptor_construct (TYPE_SQUARES_EFFECT_DESCRIPTOR, resource_directory);
-#line 146 "SquaresEffect.c"
+#line 169 "SquaresEffect.c"
}
-static const gchar* squares_effect_descriptor_real_get_id (ShotwellTransitionDescriptor* base) {
+static const gchar*
+squares_effect_descriptor_real_get_id (ShotwellTransitionDescriptor* base)
+{
SquaresEffectDescriptor * self;
const gchar* result = NULL;
#line 15 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
@@ -155,11 +180,13 @@ static const gchar* squares_effect_descriptor_real_get_id (ShotwellTransitionDes
result = "org.yorba.shotwell.transitions.squares";
#line 16 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
return result;
-#line 159 "SquaresEffect.c"
+#line 184 "SquaresEffect.c"
}
-static const gchar* squares_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base) {
+static const gchar*
+squares_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base)
+{
SquaresEffectDescriptor * self;
const gchar* result = NULL;
#line 19 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
@@ -168,11 +195,14 @@ static const gchar* squares_effect_descriptor_real_get_pluggable_name (ShotwellT
result = _ ("Squares");
#line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
return result;
-#line 172 "SquaresEffect.c"
+#line 199 "SquaresEffect.c"
}
-static SpitTransitionsEffect* squares_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, SpitHostInterface* host) {
+static SpitTransitionsEffect*
+squares_effect_descriptor_real_create (ShotwellTransitionDescriptor* base,
+ SpitHostInterface* host)
+{
SquaresEffectDescriptor * self;
SpitTransitionsEffect* result = NULL;
SquaresEffect* _tmp0_;
@@ -186,11 +216,13 @@ static SpitTransitionsEffect* squares_effect_descriptor_real_create (ShotwellTra
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TRANSITIONS_TYPE_EFFECT, SpitTransitionsEffect);
#line 24 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
return result;
-#line 190 "SquaresEffect.c"
+#line 220 "SquaresEffect.c"
}
-static void squares_effect_descriptor_class_init (SquaresEffectDescriptorClass * klass) {
+static void
+squares_effect_descriptor_class_init (SquaresEffectDescriptorClass * klass)
+{
#line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
squares_effect_descriptor_parent_class = g_type_class_peek_parent (klass);
#line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
@@ -199,15 +231,19 @@ static void squares_effect_descriptor_class_init (SquaresEffectDescriptorClass *
((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*) (ShotwellTransitionDescriptor *)) squares_effect_descriptor_real_get_pluggable_name;
#line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*) (ShotwellTransitionDescriptor *, SpitHostInterface*)) squares_effect_descriptor_real_create;
-#line 203 "SquaresEffect.c"
+#line 235 "SquaresEffect.c"
}
-static void squares_effect_descriptor_instance_init (SquaresEffectDescriptor * self) {
+static void
+squares_effect_descriptor_instance_init (SquaresEffectDescriptor * self)
+{
}
-GType squares_effect_descriptor_get_type (void) {
+GType
+squares_effect_descriptor_get_type (void)
+{
static volatile gsize squares_effect_descriptor_type_id__volatile = 0;
if (g_once_init_enter (&squares_effect_descriptor_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (SquaresEffectDescriptorClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) squares_effect_descriptor_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SquaresEffectDescriptor), 0, (GInstanceInitFunc) squares_effect_descriptor_instance_init, NULL };
@@ -219,24 +255,32 @@ GType squares_effect_descriptor_get_type (void) {
}
-SquaresEffect* squares_effect_construct (GType object_type) {
+SquaresEffect*
+squares_effect_construct (GType object_type)
+{
SquaresEffect * self = NULL;
#line 35 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
self = (SquaresEffect*) g_object_new (object_type, NULL);
#line 35 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
return self;
-#line 229 "SquaresEffect.c"
+#line 267 "SquaresEffect.c"
}
-SquaresEffect* squares_effect_new (void) {
+SquaresEffect*
+squares_effect_new (void)
+{
#line 35 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
return squares_effect_construct (TYPE_SQUARES_EFFECT);
-#line 236 "SquaresEffect.c"
+#line 276 "SquaresEffect.c"
}
-static void squares_effect_real_get_fps (SpitTransitionsEffect* base, gint* desired_fps, gint* min_fps) {
+static void
+squares_effect_real_get_fps (SpitTransitionsEffect* base,
+ gint* desired_fps,
+ gint* min_fps)
+{
SquaresEffect * self;
gint _vala_desired_fps = 0;
gint _vala_min_fps = 0;
@@ -250,27 +294,29 @@ static void squares_effect_real_get_fps (SpitTransitionsEffect* base, gint* desi
if (desired_fps) {
#line 38 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
*desired_fps = _vala_desired_fps;
-#line 254 "SquaresEffect.c"
+#line 298 "SquaresEffect.c"
}
#line 38 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
if (min_fps) {
#line 38 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
*min_fps = _vala_min_fps;
-#line 260 "SquaresEffect.c"
+#line 304 "SquaresEffect.c"
}
}
-static void squares_effect_real_start (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion) {
+static void
+squares_effect_real_start (SpitTransitionsEffect* base,
+ SpitTransitionsVisuals* visuals,
+ SpitTransitionsMotion* motion)
+{
SquaresEffect * self;
- SpitTransitionsVisuals* _tmp0_;
- GdkRectangle _tmp1_ = {0};
- GdkRectangle _tmp2_;
- gint _tmp3_;
- SpitTransitionsVisuals* _tmp4_;
- GdkRectangle _tmp5_ = {0};
- GdkRectangle _tmp6_;
- gint _tmp7_;
+ GdkRectangle _tmp0_ = {0};
+ GdkRectangle _tmp1_;
+ gint _tmp2_;
+ GdkRectangle _tmp3_ = {0};
+ GdkRectangle _tmp4_;
+ gint _tmp5_;
#line 43 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SQUARES_EFFECT, SquaresEffect);
#line 43 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
@@ -278,30 +324,28 @@ static void squares_effect_real_start (SpitTransitionsEffect* base, SpitTransiti
#line 43 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion));
#line 44 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- _tmp0_ = visuals;
-#line 44 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- spit_transitions_visuals_get_to_pos (_tmp0_, &_tmp1_);
+ spit_transitions_visuals_get_to_pos (visuals, &_tmp0_);
#line 44 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- _tmp2_ = _tmp1_;
+ _tmp1_ = _tmp0_;
#line 44 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- _tmp3_ = _tmp2_.width;
+ _tmp2_ = _tmp1_.width;
#line 44 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- self->priv->square_count_x = (gdouble) ((_tmp3_ / SQUARES_EFFECT_SQUARE_SIZE) + 1);
+ self->priv->square_count_x = (gdouble) ((_tmp2_ / SQUARES_EFFECT_SQUARE_SIZE) + 1);
#line 45 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- _tmp4_ = visuals;
+ spit_transitions_visuals_get_to_pos (visuals, &_tmp3_);
#line 45 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- spit_transitions_visuals_get_to_pos (_tmp4_, &_tmp5_);
+ _tmp4_ = _tmp3_;
#line 45 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- _tmp6_ = _tmp5_;
+ _tmp5_ = _tmp4_.height;
#line 45 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- _tmp7_ = _tmp6_.height;
-#line 45 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- self->priv->square_count_y = (gdouble) ((_tmp7_ / SQUARES_EFFECT_SQUARE_SIZE) + 1);
-#line 301 "SquaresEffect.c"
+ self->priv->square_count_y = (gdouble) ((_tmp5_ / SQUARES_EFFECT_SQUARE_SIZE) + 1);
+#line 343 "SquaresEffect.c"
}
-static gboolean squares_effect_real_needs_clear_background (SpitTransitionsEffect* base) {
+static gboolean
+squares_effect_real_needs_clear_background (SpitTransitionsEffect* base)
+{
SquaresEffect * self;
gboolean result = FALSE;
#line 48 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
@@ -310,22 +354,25 @@ static gboolean squares_effect_real_needs_clear_background (SpitTransitionsEffec
result = TRUE;
#line 49 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
return result;
-#line 314 "SquaresEffect.c"
+#line 358 "SquaresEffect.c"
}
-static void squares_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number) {
+static void
+squares_effect_real_paint (SpitTransitionsEffect* base,
+ SpitTransitionsVisuals* visuals,
+ SpitTransitionsMotion* motion,
+ cairo_t* ctx,
+ gint width,
+ gint height,
+ gint frame_number)
+{
SquaresEffect * self;
gdouble alpha = 0.0;
- SpitTransitionsMotion* _tmp0_;
- gint _tmp1_;
- gdouble _tmp2_;
- SpitTransitionsVisuals* _tmp3_;
- GdkPixbuf* _tmp4_;
- GdkPixbuf* _tmp5_;
- SpitTransitionsVisuals* _tmp20_;
- GdkPixbuf* _tmp21_;
- GdkPixbuf* _tmp22_;
+ GdkPixbuf* _tmp0_;
+ GdkPixbuf* _tmp1_;
+ GdkPixbuf* _tmp11_;
+ GdkPixbuf* _tmp12_;
#line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SQUARES_EFFECT, SquaresEffect);
#line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
@@ -335,267 +382,213 @@ static void squares_effect_real_paint (SpitTransitionsEffect* base, SpitTransiti
#line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
g_return_if_fail (ctx != NULL);
#line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- _tmp0_ = motion;
-#line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- _tmp1_ = frame_number;
-#line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- _tmp2_ = spit_transitions_motion_get_alpha (_tmp0_, _tmp1_);
-#line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- alpha = _tmp2_;
-#line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- _tmp3_ = visuals;
+ alpha = spit_transitions_motion_get_alpha (motion, frame_number);
#line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- _tmp4_ = spit_transitions_visuals_get_from_pixbuf (_tmp3_);
+ _tmp0_ = spit_transitions_visuals_get_from_pixbuf (visuals);
#line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- _tmp5_ = _tmp4_;
+ _tmp1_ = _tmp0_;
#line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- if (_tmp5_ != NULL) {
-#line 354 "SquaresEffect.c"
- cairo_t* _tmp6_;
- SpitTransitionsVisuals* _tmp7_;
- GdkPixbuf* _tmp8_;
- GdkPixbuf* _tmp9_;
- SpitTransitionsVisuals* _tmp10_;
- GdkRectangle _tmp11_ = {0};
- GdkRectangle _tmp12_;
- gint _tmp13_;
- SpitTransitionsVisuals* _tmp14_;
- GdkRectangle _tmp15_ = {0};
- GdkRectangle _tmp16_;
- gint _tmp17_;
- cairo_t* _tmp18_;
- gdouble _tmp19_;
-#line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- _tmp6_ = ctx;
-#line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- _tmp7_ = visuals;
+ if (_tmp1_ != NULL) {
+#line 393 "SquaresEffect.c"
+ GdkPixbuf* _tmp2_;
+ GdkPixbuf* _tmp3_;
+ GdkRectangle _tmp4_ = {0};
+ GdkRectangle _tmp5_;
+ gint _tmp6_;
+ GdkRectangle _tmp7_ = {0};
+ GdkRectangle _tmp8_;
+ gint _tmp9_;
+ gdouble _tmp10_;
#line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- _tmp8_ = spit_transitions_visuals_get_from_pixbuf (_tmp7_);
+ _tmp2_ = spit_transitions_visuals_get_from_pixbuf (visuals);
#line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- _tmp9_ = _tmp8_;
+ _tmp3_ = _tmp2_;
#line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- _tmp10_ = visuals;
+ spit_transitions_visuals_get_from_pos (visuals, &_tmp4_);
#line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- spit_transitions_visuals_get_from_pos (_tmp10_, &_tmp11_);
+ _tmp5_ = _tmp4_;
#line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- _tmp12_ = _tmp11_;
+ _tmp6_ = _tmp5_.x;
#line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- _tmp13_ = _tmp12_.x;
+ spit_transitions_visuals_get_from_pos (visuals, &_tmp7_);
#line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- _tmp14_ = visuals;
+ _tmp8_ = _tmp7_;
#line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- spit_transitions_visuals_get_from_pos (_tmp14_, &_tmp15_);
+ _tmp9_ = _tmp8_.y;
#line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- _tmp16_ = _tmp15_;
-#line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- _tmp17_ = _tmp16_.y;
-#line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- gdk_cairo_set_source_pixbuf (_tmp6_, _tmp9_, (gdouble) _tmp13_, (gdouble) _tmp17_);
+ gdk_cairo_set_source_pixbuf (ctx, _tmp3_, (gdouble) _tmp6_, (gdouble) _tmp9_);
#line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- _tmp18_ = ctx;
+ _tmp10_ = alpha;
#line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- _tmp19_ = alpha;
-#line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- cairo_paint_with_alpha (_tmp18_, 1 - _tmp19_);
-#line 401 "SquaresEffect.c"
+ cairo_paint_with_alpha (ctx, 1 - _tmp10_);
+#line 425 "SquaresEffect.c"
}
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- _tmp20_ = visuals;
-#line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- _tmp21_ = spit_transitions_visuals_get_to_pixbuf (_tmp20_);
+ _tmp11_ = spit_transitions_visuals_get_to_pixbuf (visuals);
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- _tmp22_ = _tmp21_;
+ _tmp12_ = _tmp11_;
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- if (_tmp22_ != NULL) {
-#line 411 "SquaresEffect.c"
- cairo_t* _tmp23_;
- SpitTransitionsVisuals* _tmp24_;
- GdkPixbuf* _tmp25_;
- GdkPixbuf* _tmp26_;
- SpitTransitionsVisuals* _tmp27_;
- GdkRectangle _tmp28_ = {0};
- GdkRectangle _tmp29_;
- gint _tmp30_;
- SpitTransitionsVisuals* _tmp31_;
- GdkRectangle _tmp32_ = {0};
- GdkRectangle _tmp33_;
- gint _tmp34_;
- cairo_t* _tmp65_;
- cairo_t* _tmp66_;
- gdouble _tmp67_;
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- _tmp23_ = ctx;
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- _tmp24_ = visuals;
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- _tmp25_ = spit_transitions_visuals_get_to_pixbuf (_tmp24_);
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- _tmp26_ = _tmp25_;
+ if (_tmp12_ != NULL) {
+#line 433 "SquaresEffect.c"
+ GdkPixbuf* _tmp13_;
+ GdkPixbuf* _tmp14_;
+ GdkRectangle _tmp15_ = {0};
+ GdkRectangle _tmp16_;
+ gint _tmp17_;
+ GdkRectangle _tmp18_ = {0};
+ GdkRectangle _tmp19_;
+ gint _tmp20_;
+ gdouble _tmp46_;
#line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- _tmp27_ = visuals;
+ _tmp13_ = spit_transitions_visuals_get_to_pixbuf (visuals);
#line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- spit_transitions_visuals_get_to_pos (_tmp27_, &_tmp28_);
+ _tmp14_ = _tmp13_;
#line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- _tmp29_ = _tmp28_;
+ spit_transitions_visuals_get_to_pos (visuals, &_tmp15_);
#line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- _tmp30_ = _tmp29_.x;
+ _tmp16_ = _tmp15_;
#line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- _tmp31_ = visuals;
+ _tmp17_ = _tmp16_.x;
#line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- spit_transitions_visuals_get_to_pos (_tmp31_, &_tmp32_);
+ spit_transitions_visuals_get_to_pos (visuals, &_tmp18_);
#line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- _tmp33_ = _tmp32_;
+ _tmp19_ = _tmp18_;
#line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- _tmp34_ = _tmp33_.y;
+ _tmp20_ = _tmp19_.y;
#line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- gdk_cairo_set_source_pixbuf (_tmp23_, _tmp26_, (gdouble) _tmp30_, (gdouble) _tmp34_);
-#line 453 "SquaresEffect.c"
+ gdk_cairo_set_source_pixbuf (ctx, _tmp14_, (gdouble) _tmp17_, (gdouble) _tmp20_);
+#line 461 "SquaresEffect.c"
{
gdouble y = 0.0;
#line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
y = (gdouble) 0;
-#line 458 "SquaresEffect.c"
+#line 466 "SquaresEffect.c"
{
- gboolean _tmp35_ = FALSE;
+ gboolean _tmp21_ = FALSE;
#line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- _tmp35_ = TRUE;
+ _tmp21_ = TRUE;
#line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
while (TRUE) {
-#line 465 "SquaresEffect.c"
- gdouble _tmp37_;
- gdouble _tmp38_;
+#line 473 "SquaresEffect.c"
+ gdouble _tmp23_;
+ gdouble _tmp24_;
#line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- if (!_tmp35_) {
-#line 470 "SquaresEffect.c"
- gdouble _tmp36_;
+ if (!_tmp21_) {
+#line 478 "SquaresEffect.c"
+ gdouble _tmp22_;
#line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- _tmp36_ = y;
+ _tmp22_ = y;
#line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- y = _tmp36_ + 1;
-#line 476 "SquaresEffect.c"
+ y = _tmp22_ + 1;
+#line 484 "SquaresEffect.c"
}
#line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- _tmp35_ = FALSE;
+ _tmp21_ = FALSE;
#line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- _tmp37_ = y;
+ _tmp23_ = y;
#line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- _tmp38_ = self->priv->square_count_y;
+ _tmp24_ = self->priv->square_count_y;
#line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- if (!(_tmp37_ <= _tmp38_)) {
+ if (!(_tmp23_ <= _tmp24_)) {
#line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
break;
-#line 488 "SquaresEffect.c"
+#line 496 "SquaresEffect.c"
}
{
gdouble x = 0.0;
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
x = (gdouble) 0;
-#line 494 "SquaresEffect.c"
+#line 502 "SquaresEffect.c"
{
- gboolean _tmp39_ = FALSE;
+ gboolean _tmp25_ = FALSE;
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- _tmp39_ = TRUE;
+ _tmp25_ = TRUE;
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
while (TRUE) {
-#line 501 "SquaresEffect.c"
- gdouble _tmp41_;
- gdouble _tmp42_;
+#line 509 "SquaresEffect.c"
+ gdouble _tmp27_;
+ gdouble _tmp28_;
gdouble size = 0.0;
+ gdouble _tmp29_;
+ gdouble _tmp30_;
+ gdouble _tmp31_;
+ gdouble _tmp32_;
+ gdouble _tmp33_;
+ gdouble _tmp34_;
+ gdouble _tmp35_;
+ GdkRectangle _tmp36_ = {0};
+ GdkRectangle _tmp37_;
+ gint _tmp38_;
+ gdouble _tmp39_;
+ GdkRectangle _tmp40_ = {0};
+ GdkRectangle _tmp41_;
+ gint _tmp42_;
gdouble _tmp43_;
gdouble _tmp44_;
gdouble _tmp45_;
- gdouble _tmp46_;
- gdouble _tmp47_;
- gdouble _tmp48_;
- gdouble _tmp49_;
- gdouble _tmp50_;
- cairo_t* _tmp51_;
- SpitTransitionsVisuals* _tmp52_;
- GdkRectangle _tmp53_ = {0};
- GdkRectangle _tmp54_;
- gint _tmp55_;
- gdouble _tmp56_;
- SpitTransitionsVisuals* _tmp57_;
- GdkRectangle _tmp58_ = {0};
- GdkRectangle _tmp59_;
- gint _tmp60_;
- gdouble _tmp61_;
- gdouble _tmp62_;
- gdouble _tmp63_;
- cairo_t* _tmp64_;
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- if (!_tmp39_) {
-#line 529 "SquaresEffect.c"
- gdouble _tmp40_;
+ if (!_tmp25_) {
+#line 532 "SquaresEffect.c"
+ gdouble _tmp26_;
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- _tmp40_ = x;
+ _tmp26_ = x;
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- x = _tmp40_ + 1;
-#line 535 "SquaresEffect.c"
+ x = _tmp26_ + 1;
+#line 538 "SquaresEffect.c"
}
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- _tmp39_ = FALSE;
+ _tmp25_ = FALSE;
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- _tmp41_ = x;
+ _tmp27_ = x;
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- _tmp42_ = self->priv->square_count_x;
+ _tmp28_ = self->priv->square_count_x;
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- if (!(_tmp41_ <= _tmp42_)) {
+ if (!(_tmp27_ <= _tmp28_)) {
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
break;
-#line 547 "SquaresEffect.c"
+#line 550 "SquaresEffect.c"
}
#line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- _tmp43_ = alpha;
+ _tmp29_ = alpha;
#line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- _tmp44_ = self->priv->square_count_x;
+ _tmp30_ = self->priv->square_count_x;
#line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- _tmp45_ = x;
+ _tmp31_ = x;
#line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- _tmp46_ = self->priv->square_count_x;
+ _tmp32_ = self->priv->square_count_x;
#line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- _tmp47_ = self->priv->square_count_y;
+ _tmp33_ = self->priv->square_count_y;
#line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- _tmp48_ = y;
+ _tmp34_ = y;
#line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- _tmp49_ = self->priv->square_count_y;
+ _tmp35_ = self->priv->square_count_y;
#line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- _tmp50_ = fmin ((gdouble) 1, _tmp43_ + ((((_tmp44_ - _tmp45_) / _tmp46_) + ((_tmp47_ - _tmp48_) / _tmp49_)) / 2.5));
-#line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- size = SQUARES_EFFECT_SQUARE_SIZE * _tmp50_;
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- _tmp51_ = ctx;
+ size = SQUARES_EFFECT_SQUARE_SIZE * fmin ((gdouble) 1, _tmp29_ + ((((_tmp30_ - _tmp31_) / _tmp32_) + ((_tmp33_ - _tmp34_) / _tmp35_)) / 2.5));
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- _tmp52_ = visuals;
+ spit_transitions_visuals_get_to_pos (visuals, &_tmp36_);
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- spit_transitions_visuals_get_to_pos (_tmp52_, &_tmp53_);
+ _tmp37_ = _tmp36_;
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- _tmp54_ = _tmp53_;
+ _tmp38_ = _tmp37_.x;
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- _tmp55_ = _tmp54_.x;
+ _tmp39_ = x;
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- _tmp56_ = x;
+ spit_transitions_visuals_get_to_pos (visuals, &_tmp40_);
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- _tmp57_ = visuals;
+ _tmp41_ = _tmp40_;
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- spit_transitions_visuals_get_to_pos (_tmp57_, &_tmp58_);
+ _tmp42_ = _tmp41_.y;
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- _tmp59_ = _tmp58_;
+ _tmp43_ = y;
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- _tmp60_ = _tmp59_.y;
+ _tmp44_ = size;
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- _tmp61_ = y;
+ _tmp45_ = size;
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- _tmp62_ = size;
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- _tmp63_ = size;
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- cairo_rectangle (_tmp51_, _tmp55_ + (_tmp56_ * SQUARES_EFFECT_SQUARE_SIZE), _tmp60_ + (_tmp61_ * SQUARES_EFFECT_SQUARE_SIZE), _tmp62_, _tmp63_);
-#line 71 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- _tmp64_ = ctx;
+ cairo_rectangle (ctx, _tmp38_ + (_tmp39_ * SQUARES_EFFECT_SQUARE_SIZE), _tmp42_ + (_tmp43_ * SQUARES_EFFECT_SQUARE_SIZE), _tmp44_, _tmp45_);
#line 71 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- cairo_fill (_tmp64_);
-#line 599 "SquaresEffect.c"
+ cairo_fill (ctx);
+#line 592 "SquaresEffect.c"
}
}
}
@@ -603,21 +596,22 @@ static void squares_effect_real_paint (SpitTransitionsEffect* base, SpitTransiti
}
}
#line 75 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- _tmp65_ = ctx;
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- cairo_clip (_tmp65_);
-#line 76 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- _tmp66_ = ctx;
+ cairo_clip (ctx);
#line 76 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- _tmp67_ = alpha;
+ _tmp46_ = alpha;
#line 76 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
- cairo_paint_with_alpha (_tmp66_, _tmp67_);
-#line 616 "SquaresEffect.c"
+ cairo_paint_with_alpha (ctx, _tmp46_);
+#line 605 "SquaresEffect.c"
}
}
-static void squares_effect_real_advance (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, gint frame_number) {
+static void
+squares_effect_real_advance (SpitTransitionsEffect* base,
+ SpitTransitionsVisuals* visuals,
+ SpitTransitionsMotion* motion,
+ gint frame_number)
+{
SquaresEffect * self;
#line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SQUARES_EFFECT, SquaresEffect);
@@ -625,30 +619,36 @@ static void squares_effect_real_advance (SpitTransitionsEffect* base, SpitTransi
g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals));
#line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion));
-#line 629 "SquaresEffect.c"
+#line 623 "SquaresEffect.c"
}
-static void squares_effect_real_cancel (SpitTransitionsEffect* base) {
+static void
+squares_effect_real_cancel (SpitTransitionsEffect* base)
+{
SquaresEffect * self;
#line 83 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SQUARES_EFFECT, SquaresEffect);
-#line 637 "SquaresEffect.c"
+#line 633 "SquaresEffect.c"
}
-static void squares_effect_class_init (SquaresEffectClass * klass) {
+static void
+squares_effect_class_init (SquaresEffectClass * klass)
+{
#line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
squares_effect_parent_class = g_type_class_peek_parent (klass);
#line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
g_type_class_add_private (klass, sizeof (SquaresEffectPrivate));
#line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
G_OBJECT_CLASS (klass)->finalize = squares_effect_finalize;
-#line 648 "SquaresEffect.c"
+#line 646 "SquaresEffect.c"
}
-static void squares_effect_spit_transitions_effect_interface_init (SpitTransitionsEffectIface * iface) {
+static void
+squares_effect_spit_transitions_effect_interface_init (SpitTransitionsEffectIface * iface)
+{
#line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
squares_effect_spit_transitions_effect_parent_iface = g_type_interface_peek_parent (iface);
#line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
@@ -667,24 +667,30 @@ static void squares_effect_spit_transitions_effect_interface_init (SpitTransitio
}
-static void squares_effect_instance_init (SquaresEffect * self) {
+static void
+squares_effect_instance_init (SquaresEffect * self)
+{
#line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
self->priv = SQUARES_EFFECT_GET_PRIVATE (self);
-#line 674 "SquaresEffect.c"
+#line 676 "SquaresEffect.c"
}
-static void squares_effect_finalize (GObject * obj) {
+static void
+squares_effect_finalize (GObject * obj)
+{
SquaresEffect * self;
#line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SQUARES_EFFECT, SquaresEffect);
#line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
G_OBJECT_CLASS (squares_effect_parent_class)->finalize (obj);
-#line 684 "SquaresEffect.c"
+#line 688 "SquaresEffect.c"
}
-GType squares_effect_get_type (void) {
+GType
+squares_effect_get_type (void)
+{
static volatile gsize squares_effect_type_id__volatile = 0;
if (g_once_init_enter (&squares_effect_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (SquaresEffectClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) squares_effect_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SquaresEffect), 0, (GInstanceInitFunc) squares_effect_instance_init, NULL };
diff --git a/plugins/shotwell-transitions/StripesEffect.c b/plugins/shotwell-transitions/StripesEffect.c
index 53ef18d..d0bac4d 100644
--- a/plugins/shotwell-transitions/StripesEffect.c
+++ b/plugins/shotwell-transitions/StripesEffect.c
@@ -1,4 +1,4 @@
-/* StripesEffect.c generated by valac 0.36.6, the Vala compiler
+/* StripesEffect.c generated by valac 0.40.4, the Vala compiler
* generated from StripesEffect.vala, do not modify */
/* Copyright 2013 Jens Bav
@@ -8,6 +8,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>
@@ -42,6 +43,11 @@ typedef struct _ShotwellTransitionDescriptorPrivate ShotwellTransitionDescriptor
typedef struct _StripesEffectDescriptor StripesEffectDescriptor;
typedef struct _StripesEffectDescriptorClass StripesEffectDescriptorClass;
typedef struct _StripesEffectDescriptorPrivate StripesEffectDescriptorPrivate;
+enum {
+ STRIPES_EFFECT_DESCRIPTOR_0_PROPERTY,
+ STRIPES_EFFECT_DESCRIPTOR_NUM_PROPERTIES
+};
+static GParamSpec* stripes_effect_descriptor_properties[STRIPES_EFFECT_DESCRIPTOR_NUM_PROPERTIES];
#define TYPE_STRIPES_EFFECT (stripes_effect_get_type ())
#define STRIPES_EFFECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_STRIPES_EFFECT, StripesEffect))
@@ -53,6 +59,11 @@ typedef struct _StripesEffectDescriptorPrivate StripesEffectDescriptorPrivate;
typedef struct _StripesEffect StripesEffect;
typedef struct _StripesEffectClass StripesEffectClass;
typedef struct _StripesEffectPrivate StripesEffectPrivate;
+enum {
+ STRIPES_EFFECT_0_PROPERTY,
+ STRIPES_EFFECT_NUM_PROPERTIES
+};
+static GParamSpec* stripes_effect_properties[STRIPES_EFFECT_NUM_PROPERTIES];
struct _ShotwellTransitionDescriptor {
GObject parent_instance;
@@ -95,57 +106,71 @@ static SpitTransitionsEffectIface * stripes_effect_spit_transitions_effect_paren
GType shotwell_transition_descriptor_get_type (void) G_GNUC_CONST;
GType stripes_effect_descriptor_get_type (void) G_GNUC_CONST;
-enum {
- STRIPES_EFFECT_DESCRIPTOR_DUMMY_PROPERTY
-};
StripesEffectDescriptor* stripes_effect_descriptor_new (GFile* resource_directory);
-StripesEffectDescriptor* stripes_effect_descriptor_construct (GType object_type, GFile* resource_directory);
-ShotwellTransitionDescriptor* shotwell_transition_descriptor_construct (GType object_type, GFile* resource_directory);
+StripesEffectDescriptor* stripes_effect_descriptor_construct (GType object_type,
+ GFile* resource_directory);
+ShotwellTransitionDescriptor* shotwell_transition_descriptor_construct (GType object_type,
+ GFile* resource_directory);
static const gchar* stripes_effect_descriptor_real_get_id (ShotwellTransitionDescriptor* base);
static const gchar* stripes_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base);
-static SpitTransitionsEffect* stripes_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, SpitHostInterface* host);
+static SpitTransitionsEffect* stripes_effect_descriptor_real_create (ShotwellTransitionDescriptor* base,
+ SpitHostInterface* host);
StripesEffect* stripes_effect_new (void);
StripesEffect* stripes_effect_construct (GType object_type);
GType stripes_effect_get_type (void) G_GNUC_CONST;
#define STRIPES_EFFECT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_STRIPES_EFFECT, StripesEffectPrivate))
-enum {
- STRIPES_EFFECT_DUMMY_PROPERTY
-};
#define STRIPES_EFFECT_DESIRED_FPS 25
#define STRIPES_EFFECT_MIN_FPS 10
#define STRIPES_EFFECT_STRIPE_HEIGHT 100
-static void stripes_effect_real_get_fps (SpitTransitionsEffect* base, gint* desired_fps, gint* min_fps);
-static void stripes_effect_real_start (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion);
+static void stripes_effect_real_get_fps (SpitTransitionsEffect* base,
+ gint* desired_fps,
+ gint* min_fps);
+static void stripes_effect_real_start (SpitTransitionsEffect* base,
+ SpitTransitionsVisuals* visuals,
+ SpitTransitionsMotion* motion);
static gboolean stripes_effect_real_needs_clear_background (SpitTransitionsEffect* base);
-static void stripes_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number);
-static void stripes_effect_real_advance (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, gint frame_number);
+static void stripes_effect_real_paint (SpitTransitionsEffect* base,
+ SpitTransitionsVisuals* visuals,
+ SpitTransitionsMotion* motion,
+ cairo_t* ctx,
+ gint width,
+ gint height,
+ gint frame_number);
+static void stripes_effect_real_advance (SpitTransitionsEffect* base,
+ SpitTransitionsVisuals* visuals,
+ SpitTransitionsMotion* motion,
+ gint frame_number);
static void stripes_effect_real_cancel (SpitTransitionsEffect* base);
static void stripes_effect_finalize (GObject * obj);
-StripesEffectDescriptor* stripes_effect_descriptor_construct (GType object_type, GFile* resource_directory) {
+StripesEffectDescriptor*
+stripes_effect_descriptor_construct (GType object_type,
+ GFile* resource_directory)
+{
StripesEffectDescriptor * self = NULL;
- GFile* _tmp0_;
#line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
g_return_val_if_fail (G_IS_FILE (resource_directory), NULL);
#line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp0_ = resource_directory;
-#line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- self = (StripesEffectDescriptor*) shotwell_transition_descriptor_construct (object_type, _tmp0_);
+ self = (StripesEffectDescriptor*) shotwell_transition_descriptor_construct (object_type, resource_directory);
#line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
return self;
-#line 138 "StripesEffect.c"
+#line 159 "StripesEffect.c"
}
-StripesEffectDescriptor* stripes_effect_descriptor_new (GFile* resource_directory) {
+StripesEffectDescriptor*
+stripes_effect_descriptor_new (GFile* resource_directory)
+{
#line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
return stripes_effect_descriptor_construct (TYPE_STRIPES_EFFECT_DESCRIPTOR, resource_directory);
-#line 145 "StripesEffect.c"
+#line 168 "StripesEffect.c"
}
-static const gchar* stripes_effect_descriptor_real_get_id (ShotwellTransitionDescriptor* base) {
+static const gchar*
+stripes_effect_descriptor_real_get_id (ShotwellTransitionDescriptor* base)
+{
StripesEffectDescriptor * self;
const gchar* result = NULL;
#line 15 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
@@ -154,11 +179,13 @@ static const gchar* stripes_effect_descriptor_real_get_id (ShotwellTransitionDes
result = "org.yorba.shotwell.transitions.stripes";
#line 16 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
return result;
-#line 158 "StripesEffect.c"
+#line 183 "StripesEffect.c"
}
-static const gchar* stripes_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base) {
+static const gchar*
+stripes_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base)
+{
StripesEffectDescriptor * self;
const gchar* result = NULL;
#line 19 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
@@ -167,11 +194,14 @@ static const gchar* stripes_effect_descriptor_real_get_pluggable_name (ShotwellT
result = _ ("Stripes");
#line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
return result;
-#line 171 "StripesEffect.c"
+#line 198 "StripesEffect.c"
}
-static SpitTransitionsEffect* stripes_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, SpitHostInterface* host) {
+static SpitTransitionsEffect*
+stripes_effect_descriptor_real_create (ShotwellTransitionDescriptor* base,
+ SpitHostInterface* host)
+{
StripesEffectDescriptor * self;
SpitTransitionsEffect* result = NULL;
StripesEffect* _tmp0_;
@@ -185,11 +215,13 @@ static SpitTransitionsEffect* stripes_effect_descriptor_real_create (ShotwellTra
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TRANSITIONS_TYPE_EFFECT, SpitTransitionsEffect);
#line 24 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
return result;
-#line 189 "StripesEffect.c"
+#line 219 "StripesEffect.c"
}
-static void stripes_effect_descriptor_class_init (StripesEffectDescriptorClass * klass) {
+static void
+stripes_effect_descriptor_class_init (StripesEffectDescriptorClass * klass)
+{
#line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
stripes_effect_descriptor_parent_class = g_type_class_peek_parent (klass);
#line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
@@ -198,15 +230,19 @@ static void stripes_effect_descriptor_class_init (StripesEffectDescriptorClass *
((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*) (ShotwellTransitionDescriptor *)) stripes_effect_descriptor_real_get_pluggable_name;
#line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*) (ShotwellTransitionDescriptor *, SpitHostInterface*)) stripes_effect_descriptor_real_create;
-#line 202 "StripesEffect.c"
+#line 234 "StripesEffect.c"
}
-static void stripes_effect_descriptor_instance_init (StripesEffectDescriptor * self) {
+static void
+stripes_effect_descriptor_instance_init (StripesEffectDescriptor * self)
+{
}
-GType stripes_effect_descriptor_get_type (void) {
+GType
+stripes_effect_descriptor_get_type (void)
+{
static volatile gsize stripes_effect_descriptor_type_id__volatile = 0;
if (g_once_init_enter (&stripes_effect_descriptor_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (StripesEffectDescriptorClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) stripes_effect_descriptor_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (StripesEffectDescriptor), 0, (GInstanceInitFunc) stripes_effect_descriptor_instance_init, NULL };
@@ -218,24 +254,32 @@ GType stripes_effect_descriptor_get_type (void) {
}
-StripesEffect* stripes_effect_construct (GType object_type) {
+StripesEffect*
+stripes_effect_construct (GType object_type)
+{
StripesEffect * self = NULL;
#line 34 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
self = (StripesEffect*) g_object_new (object_type, NULL);
#line 34 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
return self;
-#line 228 "StripesEffect.c"
+#line 266 "StripesEffect.c"
}
-StripesEffect* stripes_effect_new (void) {
+StripesEffect*
+stripes_effect_new (void)
+{
#line 34 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
return stripes_effect_construct (TYPE_STRIPES_EFFECT);
-#line 235 "StripesEffect.c"
+#line 275 "StripesEffect.c"
}
-static void stripes_effect_real_get_fps (SpitTransitionsEffect* base, gint* desired_fps, gint* min_fps) {
+static void
+stripes_effect_real_get_fps (SpitTransitionsEffect* base,
+ gint* desired_fps,
+ gint* min_fps)
+{
StripesEffect * self;
gint _vala_desired_fps = 0;
gint _vala_min_fps = 0;
@@ -249,23 +293,26 @@ static void stripes_effect_real_get_fps (SpitTransitionsEffect* base, gint* desi
if (desired_fps) {
#line 37 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
*desired_fps = _vala_desired_fps;
-#line 253 "StripesEffect.c"
+#line 297 "StripesEffect.c"
}
#line 37 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
if (min_fps) {
#line 37 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
*min_fps = _vala_min_fps;
-#line 259 "StripesEffect.c"
+#line 303 "StripesEffect.c"
}
}
-static void stripes_effect_real_start (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion) {
+static void
+stripes_effect_real_start (SpitTransitionsEffect* base,
+ SpitTransitionsVisuals* visuals,
+ SpitTransitionsMotion* motion)
+{
StripesEffect * self;
- SpitTransitionsVisuals* _tmp0_;
- GdkRectangle _tmp1_ = {0};
- GdkRectangle _tmp2_;
- gint _tmp3_;
+ GdkRectangle _tmp0_ = {0};
+ GdkRectangle _tmp1_;
+ gint _tmp2_;
#line 42 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_STRIPES_EFFECT, StripesEffect);
#line 42 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
@@ -273,20 +320,20 @@ static void stripes_effect_real_start (SpitTransitionsEffect* base, SpitTransiti
#line 42 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion));
#line 43 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp0_ = visuals;
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- spit_transitions_visuals_get_to_pos (_tmp0_, &_tmp1_);
+ spit_transitions_visuals_get_to_pos (visuals, &_tmp0_);
#line 43 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp2_ = _tmp1_;
+ _tmp1_ = _tmp0_;
#line 43 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp3_ = _tmp2_.height;
+ _tmp2_ = _tmp1_.height;
#line 43 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- self->priv->stripe_count = (_tmp3_ / STRIPES_EFFECT_STRIPE_HEIGHT) + 1;
-#line 286 "StripesEffect.c"
+ self->priv->stripe_count = (_tmp2_ / STRIPES_EFFECT_STRIPE_HEIGHT) + 1;
+#line 331 "StripesEffect.c"
}
-static gboolean stripes_effect_real_needs_clear_background (SpitTransitionsEffect* base) {
+static gboolean
+stripes_effect_real_needs_clear_background (SpitTransitionsEffect* base)
+{
StripesEffect * self;
gboolean result = FALSE;
#line 46 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
@@ -295,22 +342,25 @@ static gboolean stripes_effect_real_needs_clear_background (SpitTransitionsEffec
result = TRUE;
#line 47 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
return result;
-#line 299 "StripesEffect.c"
+#line 346 "StripesEffect.c"
}
-static void stripes_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number) {
+static void
+stripes_effect_real_paint (SpitTransitionsEffect* base,
+ SpitTransitionsVisuals* visuals,
+ SpitTransitionsMotion* motion,
+ cairo_t* ctx,
+ gint width,
+ gint height,
+ gint frame_number)
+{
StripesEffect * self;
gdouble alpha = 0.0;
- SpitTransitionsMotion* _tmp0_;
- gint _tmp1_;
- gdouble _tmp2_;
- SpitTransitionsVisuals* _tmp3_;
- GdkPixbuf* _tmp4_;
- GdkPixbuf* _tmp5_;
- SpitTransitionsVisuals* _tmp21_;
- GdkPixbuf* _tmp22_;
- GdkPixbuf* _tmp23_;
+ GdkPixbuf* _tmp0_;
+ GdkPixbuf* _tmp1_;
+ GdkPixbuf* _tmp11_;
+ GdkPixbuf* _tmp12_;
#line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_STRIPES_EFFECT, StripesEffect);
#line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
@@ -320,313 +370,245 @@ static void stripes_effect_real_paint (SpitTransitionsEffect* base, SpitTransiti
#line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
g_return_if_fail (ctx != NULL);
#line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp0_ = motion;
-#line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp1_ = frame_number;
-#line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp2_ = spit_transitions_motion_get_alpha (_tmp0_, _tmp1_);
-#line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- alpha = _tmp2_;
-#line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp3_ = visuals;
+ alpha = spit_transitions_motion_get_alpha (motion, frame_number);
#line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp4_ = spit_transitions_visuals_get_from_pixbuf (_tmp3_);
+ _tmp0_ = spit_transitions_visuals_get_from_pixbuf (visuals);
#line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp5_ = _tmp4_;
+ _tmp1_ = _tmp0_;
#line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- if (_tmp5_ != NULL) {
-#line 339 "StripesEffect.c"
- cairo_t* _tmp6_;
- SpitTransitionsVisuals* _tmp7_;
- GdkPixbuf* _tmp8_;
- GdkPixbuf* _tmp9_;
- SpitTransitionsVisuals* _tmp10_;
- GdkRectangle _tmp11_ = {0};
- GdkRectangle _tmp12_;
- gint _tmp13_;
- SpitTransitionsVisuals* _tmp14_;
- GdkRectangle _tmp15_ = {0};
- GdkRectangle _tmp16_;
- gint _tmp17_;
- cairo_t* _tmp18_;
- gdouble _tmp19_;
- gdouble _tmp20_;
+ if (_tmp1_ != NULL) {
+#line 381 "StripesEffect.c"
+ GdkPixbuf* _tmp2_;
+ GdkPixbuf* _tmp3_;
+ GdkRectangle _tmp4_ = {0};
+ GdkRectangle _tmp5_;
+ gint _tmp6_;
+ GdkRectangle _tmp7_ = {0};
+ GdkRectangle _tmp8_;
+ gint _tmp9_;
+ gdouble _tmp10_;
#line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp6_ = ctx;
+ _tmp2_ = spit_transitions_visuals_get_from_pixbuf (visuals);
#line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp7_ = visuals;
+ _tmp3_ = _tmp2_;
#line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp8_ = spit_transitions_visuals_get_from_pixbuf (_tmp7_);
+ spit_transitions_visuals_get_from_pos (visuals, &_tmp4_);
#line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp9_ = _tmp8_;
+ _tmp5_ = _tmp4_;
#line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp10_ = visuals;
+ _tmp6_ = _tmp5_.x;
#line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- spit_transitions_visuals_get_from_pos (_tmp10_, &_tmp11_);
+ spit_transitions_visuals_get_from_pos (visuals, &_tmp7_);
#line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp12_ = _tmp11_;
+ _tmp8_ = _tmp7_;
#line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp13_ = _tmp12_.x;
+ _tmp9_ = _tmp8_.y;
#line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp14_ = visuals;
-#line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- spit_transitions_visuals_get_from_pos (_tmp14_, &_tmp15_);
-#line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp16_ = _tmp15_;
-#line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp17_ = _tmp16_.y;
-#line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- gdk_cairo_set_source_pixbuf (_tmp6_, _tmp9_, (gdouble) _tmp13_, (gdouble) _tmp17_);
-#line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp18_ = ctx;
+ gdk_cairo_set_source_pixbuf (ctx, _tmp3_, (gdouble) _tmp6_, (gdouble) _tmp9_);
#line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp19_ = alpha;
+ _tmp10_ = alpha;
#line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp20_ = fmin ((gdouble) 1, _tmp19_ * 2);
-#line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- cairo_paint_with_alpha (_tmp18_, 1 - _tmp20_);
-#line 389 "StripesEffect.c"
+ cairo_paint_with_alpha (ctx, 1 - fmin ((gdouble) 1, _tmp10_ * 2));
+#line 413 "StripesEffect.c"
}
#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp21_ = visuals;
-#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp22_ = spit_transitions_visuals_get_to_pixbuf (_tmp21_);
+ _tmp11_ = spit_transitions_visuals_get_to_pixbuf (visuals);
#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp23_ = _tmp22_;
+ _tmp12_ = _tmp11_;
#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- if (_tmp23_ != NULL) {
-#line 399 "StripesEffect.c"
- cairo_t* _tmp24_;
- SpitTransitionsVisuals* _tmp25_;
- GdkPixbuf* _tmp26_;
- GdkPixbuf* _tmp27_;
- SpitTransitionsVisuals* _tmp28_;
- GdkRectangle _tmp29_ = {0};
- GdkRectangle _tmp30_;
- gint _tmp31_;
- SpitTransitionsVisuals* _tmp32_;
- GdkRectangle _tmp33_ = {0};
- GdkRectangle _tmp34_;
- gint _tmp35_;
+ if (_tmp12_ != NULL) {
+#line 421 "StripesEffect.c"
+ GdkPixbuf* _tmp13_;
+ GdkPixbuf* _tmp14_;
+ GdkRectangle _tmp15_ = {0};
+ GdkRectangle _tmp16_;
+ gint _tmp17_;
+ GdkRectangle _tmp18_ = {0};
+ GdkRectangle _tmp19_;
+ gint _tmp20_;
gint x = 0;
- SpitTransitionsVisuals* _tmp36_;
- GdkRectangle _tmp37_ = {0};
- GdkRectangle _tmp38_;
- gint _tmp39_;
+ GdkRectangle _tmp21_ = {0};
+ GdkRectangle _tmp22_;
+ gint _tmp23_;
gint y = 0;
- SpitTransitionsVisuals* _tmp40_;
- GdkRectangle _tmp41_ = {0};
- GdkRectangle _tmp42_;
- gint _tmp43_;
- cairo_t* _tmp79_;
- cairo_t* _tmp80_;
- gdouble _tmp81_;
-#line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp24_ = ctx;
+ GdkRectangle _tmp24_ = {0};
+ GdkRectangle _tmp25_;
+ gint _tmp26_;
+ gdouble _tmp55_;
#line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp25_ = visuals;
+ _tmp13_ = spit_transitions_visuals_get_to_pixbuf (visuals);
#line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp26_ = spit_transitions_visuals_get_to_pixbuf (_tmp25_);
+ _tmp14_ = _tmp13_;
#line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp27_ = _tmp26_;
+ spit_transitions_visuals_get_to_pos (visuals, &_tmp15_);
#line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp28_ = visuals;
-#line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- spit_transitions_visuals_get_to_pos (_tmp28_, &_tmp29_);
-#line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp30_ = _tmp29_;
-#line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp31_ = _tmp30_.x;
+ _tmp16_ = _tmp15_;
#line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp32_ = visuals;
+ _tmp17_ = _tmp16_.x;
#line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- spit_transitions_visuals_get_to_pos (_tmp32_, &_tmp33_);
+ spit_transitions_visuals_get_to_pos (visuals, &_tmp18_);
#line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp34_ = _tmp33_;
+ _tmp19_ = _tmp18_;
#line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp35_ = _tmp34_.y;
+ _tmp20_ = _tmp19_.y;
#line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- gdk_cairo_set_source_pixbuf (_tmp24_, _tmp27_, (gdouble) _tmp31_, (gdouble) _tmp35_);
-#line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp36_ = visuals;
+ gdk_cairo_set_source_pixbuf (ctx, _tmp14_, (gdouble) _tmp17_, (gdouble) _tmp20_);
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- spit_transitions_visuals_get_to_pos (_tmp36_, &_tmp37_);
+ spit_transitions_visuals_get_to_pos (visuals, &_tmp21_);
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp38_ = _tmp37_;
+ _tmp22_ = _tmp21_;
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp39_ = _tmp38_.x;
+ _tmp23_ = _tmp22_.x;
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- x = _tmp39_;
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp40_ = visuals;
+ x = _tmp23_;
#line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- spit_transitions_visuals_get_to_pos (_tmp40_, &_tmp41_);
+ spit_transitions_visuals_get_to_pos (visuals, &_tmp24_);
#line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp42_ = _tmp41_;
+ _tmp25_ = _tmp24_;
#line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp43_ = _tmp42_.y;
+ _tmp26_ = _tmp25_.y;
#line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- y = _tmp43_;
-#line 471 "StripesEffect.c"
+ y = _tmp26_;
+#line 473 "StripesEffect.c"
{
gint i = 0;
#line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
i = 0;
-#line 476 "StripesEffect.c"
+#line 478 "StripesEffect.c"
{
- gboolean _tmp44_ = FALSE;
+ gboolean _tmp27_ = FALSE;
#line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp44_ = TRUE;
+ _tmp27_ = TRUE;
#line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
while (TRUE) {
-#line 483 "StripesEffect.c"
- gint _tmp46_;
- gint _tmp47_;
- gint _tmp48_;
- SpitTransitionsMotion* _tmp49_;
- SpitTransitionsDirection _tmp50_;
- SpitTransitionsDirection _tmp51_;
+#line 485 "StripesEffect.c"
+ gint _tmp29_;
+ gint _tmp30_;
+ gint _tmp31_;
+ SpitTransitionsDirection _tmp32_;
+ SpitTransitionsDirection _tmp33_;
#line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- if (!_tmp44_) {
-#line 492 "StripesEffect.c"
- gint _tmp45_;
+ if (!_tmp27_) {
+#line 493 "StripesEffect.c"
+ gint _tmp28_;
#line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp45_ = i;
+ _tmp28_ = i;
#line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- i = _tmp45_ + 1;
-#line 498 "StripesEffect.c"
+ i = _tmp28_ + 1;
+#line 499 "StripesEffect.c"
}
#line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp44_ = FALSE;
+ _tmp27_ = FALSE;
#line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp46_ = i;
+ _tmp29_ = i;
#line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp47_ = self->priv->stripe_count;
+ _tmp30_ = self->priv->stripe_count;
#line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- if (!(_tmp46_ <= _tmp47_)) {
+ if (!(_tmp29_ <= _tmp30_)) {
#line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
break;
-#line 510 "StripesEffect.c"
+#line 511 "StripesEffect.c"
}
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp48_ = i;
+ _tmp31_ = i;
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp49_ = motion;
+ _tmp32_ = spit_transitions_motion_get_direction (motion);
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp50_ = spit_transitions_motion_get_direction (_tmp49_);
+ _tmp33_ = _tmp32_;
#line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp51_ = _tmp50_;
-#line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- if ((_tmp48_ % 2) == ((gint) _tmp51_)) {
-#line 522 "StripesEffect.c"
- cairo_t* _tmp52_;
- gint _tmp53_;
- SpitTransitionsVisuals* _tmp54_;
- GdkRectangle _tmp55_ = {0};
- GdkRectangle _tmp56_;
- gint _tmp57_;
- gdouble _tmp58_;
- SpitTransitionsVisuals* _tmp59_;
- GdkRectangle _tmp60_ = {0};
- GdkRectangle _tmp61_;
- gint _tmp62_;
- gint _tmp63_;
- gint _tmp64_;
- gint _tmp65_;
- SpitTransitionsVisuals* _tmp66_;
- GdkRectangle _tmp67_ = {0};
- GdkRectangle _tmp68_;
- gint _tmp69_;
-#line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp52_ = ctx;
-#line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp53_ = x;
-#line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp54_ = visuals;
-#line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- spit_transitions_visuals_get_to_pos (_tmp54_, &_tmp55_);
+ if ((_tmp31_ % 2) == ((gint) _tmp33_)) {
+#line 521 "StripesEffect.c"
+ gint _tmp34_;
+ GdkRectangle _tmp35_ = {0};
+ GdkRectangle _tmp36_;
+ gint _tmp37_;
+ gdouble _tmp38_;
+ GdkRectangle _tmp39_ = {0};
+ GdkRectangle _tmp40_;
+ gint _tmp41_;
+ gint _tmp42_;
+ gint _tmp43_;
+ gint _tmp44_;
+ GdkRectangle _tmp45_ = {0};
+ GdkRectangle _tmp46_;
+ gint _tmp47_;
#line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp56_ = _tmp55_;
+ _tmp34_ = x;
#line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp57_ = _tmp56_.width;
+ spit_transitions_visuals_get_to_pos (visuals, &_tmp35_);
#line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp58_ = alpha;
+ _tmp36_ = _tmp35_;
#line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp59_ = visuals;
+ _tmp37_ = _tmp36_.width;
#line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- spit_transitions_visuals_get_to_pos (_tmp59_, &_tmp60_);
+ _tmp38_ = alpha;
#line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp61_ = _tmp60_;
+ spit_transitions_visuals_get_to_pos (visuals, &_tmp39_);
#line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp62_ = _tmp61_.width;
+ _tmp40_ = _tmp39_;
#line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp63_ = y;
+ _tmp41_ = _tmp40_.width;
#line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp64_ = i;
+ _tmp42_ = y;
#line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp65_ = x;
+ _tmp43_ = i;
#line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp66_ = visuals;
+ _tmp44_ = x;
#line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- spit_transitions_visuals_get_to_pos (_tmp66_, &_tmp67_);
+ spit_transitions_visuals_get_to_pos (visuals, &_tmp45_);
#line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp68_ = _tmp67_;
+ _tmp46_ = _tmp45_;
#line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp69_ = _tmp68_.width;
+ _tmp47_ = _tmp46_.width;
#line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- cairo_rectangle (_tmp52_, (_tmp53_ + _tmp57_) - (_tmp58_ * _tmp62_), (gdouble) (_tmp63_ + (_tmp64_ * STRIPES_EFFECT_STRIPE_HEIGHT)), (gdouble) (_tmp65_ + _tmp69_), (gdouble) STRIPES_EFFECT_STRIPE_HEIGHT);
-#line 579 "StripesEffect.c"
+ cairo_rectangle (ctx, (_tmp34_ + _tmp37_) - (_tmp38_ * _tmp41_), (gdouble) (_tmp42_ + (_tmp43_ * STRIPES_EFFECT_STRIPE_HEIGHT)), (gdouble) (_tmp44_ + _tmp47_), (gdouble) STRIPES_EFFECT_STRIPE_HEIGHT);
+#line 566 "StripesEffect.c"
} else {
- cairo_t* _tmp70_;
- gint _tmp71_;
- gint _tmp72_;
- gint _tmp73_;
- SpitTransitionsVisuals* _tmp74_;
- GdkRectangle _tmp75_ = {0};
- GdkRectangle _tmp76_;
- gint _tmp77_;
- gdouble _tmp78_;
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp70_ = ctx;
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp71_ = x;
+ gint _tmp48_;
+ gint _tmp49_;
+ gint _tmp50_;
+ GdkRectangle _tmp51_ = {0};
+ GdkRectangle _tmp52_;
+ gint _tmp53_;
+ gdouble _tmp54_;
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp72_ = y;
+ _tmp48_ = x;
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp73_ = i;
+ _tmp49_ = y;
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp74_ = visuals;
+ _tmp50_ = i;
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- spit_transitions_visuals_get_to_pos (_tmp74_, &_tmp75_);
+ spit_transitions_visuals_get_to_pos (visuals, &_tmp51_);
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp76_ = _tmp75_;
+ _tmp52_ = _tmp51_;
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp77_ = _tmp76_.width;
+ _tmp53_ = _tmp52_.width;
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp78_ = alpha;
+ _tmp54_ = alpha;
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- cairo_rectangle (_tmp70_, (gdouble) _tmp71_, (gdouble) (_tmp72_ + (STRIPES_EFFECT_STRIPE_HEIGHT * _tmp73_)), _tmp77_ * _tmp78_, (gdouble) STRIPES_EFFECT_STRIPE_HEIGHT);
-#line 610 "StripesEffect.c"
+ cairo_rectangle (ctx, (gdouble) _tmp48_, (gdouble) (_tmp49_ + (STRIPES_EFFECT_STRIPE_HEIGHT * _tmp50_)), _tmp53_ * _tmp54_, (gdouble) STRIPES_EFFECT_STRIPE_HEIGHT);
+#line 591 "StripesEffect.c"
}
}
}
}
#line 73 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp79_ = ctx;
-#line 73 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- cairo_clip (_tmp79_);
-#line 74 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp80_ = ctx;
+ cairo_clip (ctx);
#line 74 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- _tmp81_ = alpha;
+ _tmp55_ = alpha;
#line 74 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
- cairo_paint_with_alpha (_tmp80_, _tmp81_);
-#line 625 "StripesEffect.c"
+ cairo_paint_with_alpha (ctx, _tmp55_);
+#line 602 "StripesEffect.c"
}
}
-static void stripes_effect_real_advance (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, gint frame_number) {
+static void
+stripes_effect_real_advance (SpitTransitionsEffect* base,
+ SpitTransitionsVisuals* visuals,
+ SpitTransitionsMotion* motion,
+ gint frame_number)
+{
StripesEffect * self;
#line 78 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_STRIPES_EFFECT, StripesEffect);
@@ -634,30 +616,36 @@ static void stripes_effect_real_advance (SpitTransitionsEffect* base, SpitTransi
g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals));
#line 78 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion));
-#line 638 "StripesEffect.c"
+#line 620 "StripesEffect.c"
}
-static void stripes_effect_real_cancel (SpitTransitionsEffect* base) {
+static void
+stripes_effect_real_cancel (SpitTransitionsEffect* base)
+{
StripesEffect * self;
#line 81 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_STRIPES_EFFECT, StripesEffect);
-#line 646 "StripesEffect.c"
+#line 630 "StripesEffect.c"
}
-static void stripes_effect_class_init (StripesEffectClass * klass) {
+static void
+stripes_effect_class_init (StripesEffectClass * klass)
+{
#line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
stripes_effect_parent_class = g_type_class_peek_parent (klass);
#line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
g_type_class_add_private (klass, sizeof (StripesEffectPrivate));
#line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
G_OBJECT_CLASS (klass)->finalize = stripes_effect_finalize;
-#line 657 "StripesEffect.c"
+#line 643 "StripesEffect.c"
}
-static void stripes_effect_spit_transitions_effect_interface_init (SpitTransitionsEffectIface * iface) {
+static void
+stripes_effect_spit_transitions_effect_interface_init (SpitTransitionsEffectIface * iface)
+{
#line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
stripes_effect_spit_transitions_effect_parent_iface = g_type_interface_peek_parent (iface);
#line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
@@ -672,28 +660,34 @@ static void stripes_effect_spit_transitions_effect_interface_init (SpitTransitio
iface->advance = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*, gint)) stripes_effect_real_advance;
#line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
iface->cancel = (void (*) (SpitTransitionsEffect *)) stripes_effect_real_cancel;
-#line 676 "StripesEffect.c"
+#line 664 "StripesEffect.c"
}
-static void stripes_effect_instance_init (StripesEffect * self) {
+static void
+stripes_effect_instance_init (StripesEffect * self)
+{
#line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
self->priv = STRIPES_EFFECT_GET_PRIVATE (self);
-#line 683 "StripesEffect.c"
+#line 673 "StripesEffect.c"
}
-static void stripes_effect_finalize (GObject * obj) {
+static void
+stripes_effect_finalize (GObject * obj)
+{
StripesEffect * self;
#line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_STRIPES_EFFECT, StripesEffect);
#line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
G_OBJECT_CLASS (stripes_effect_parent_class)->finalize (obj);
-#line 693 "StripesEffect.c"
+#line 685 "StripesEffect.c"
}
-GType stripes_effect_get_type (void) {
+GType
+stripes_effect_get_type (void)
+{
static volatile gsize stripes_effect_type_id__volatile = 0;
if (g_once_init_enter (&stripes_effect_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (StripesEffectClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) stripes_effect_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (StripesEffect), 0, (GInstanceInitFunc) stripes_effect_instance_init, NULL };
diff --git a/plugins/shotwell-transitions/shotwell-transitions.c b/plugins/shotwell-transitions/shotwell-transitions.c
index 37d3f6d..b8be39c 100644
--- a/plugins/shotwell-transitions/shotwell-transitions.c
+++ b/plugins/shotwell-transitions/shotwell-transitions.c
@@ -1,4 +1,4 @@
-/* shotwell-transitions.c generated by valac 0.36.6, the Vala compiler
+/* shotwell-transitions.c generated by valac 0.40.4, the Vala compiler
* generated from shotwell-transitions.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>
@@ -28,6 +29,11 @@
typedef struct _ShotwellTransitions ShotwellTransitions;
typedef struct _ShotwellTransitionsClass ShotwellTransitionsClass;
typedef struct _ShotwellTransitionsPrivate ShotwellTransitionsPrivate;
+enum {
+ SHOTWELL_TRANSITIONS_0_PROPERTY,
+ SHOTWELL_TRANSITIONS_NUM_PROPERTIES
+};
+static GParamSpec* shotwell_transitions_properties[SHOTWELL_TRANSITIONS_NUM_PROPERTIES];
#define TYPE_SHOTWELL_TRANSITION_DESCRIPTOR (shotwell_transition_descriptor_get_type ())
#define SHOTWELL_TRANSITION_DESCRIPTOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SHOTWELL_TRANSITION_DESCRIPTOR, ShotwellTransitionDescriptor))
@@ -140,6 +146,11 @@ typedef struct _StripesEffectDescriptor StripesEffectDescriptor;
typedef struct _StripesEffectDescriptorClass StripesEffectDescriptorClass;
#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
typedef struct _ShotwellTransitionDescriptorPrivate ShotwellTransitionDescriptorPrivate;
+enum {
+ SHOTWELL_TRANSITION_DESCRIPTOR_0_PROPERTY,
+ SHOTWELL_TRANSITION_DESCRIPTOR_NUM_PROPERTIES
+};
+static GParamSpec* shotwell_transition_descriptor_properties[SHOTWELL_TRANSITION_DESCRIPTOR_NUM_PROPERTIES];
#define _g_free0(var) (var = (g_free (var), NULL))
struct _ShotwellTransitions {
@@ -183,389 +194,491 @@ static SpitTransitionsDescriptorIface * shotwell_transition_descriptor_spit_tran
GType shotwell_transitions_get_type (void) G_GNUC_CONST;
#define SHOTWELL_TRANSITIONS_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SHOTWELL_TRANSITIONS, ShotwellTransitionsPrivate))
-enum {
- SHOTWELL_TRANSITIONS_DUMMY_PROPERTY
-};
ShotwellTransitions* shotwell_transitions_new (GFile* module_file);
-ShotwellTransitions* shotwell_transitions_construct (GType object_type, GFile* module_file);
+ShotwellTransitions* shotwell_transitions_construct (GType object_type,
+ GFile* module_file);
FadeEffectDescriptor* fade_effect_descriptor_new (GFile* resource_directory);
-FadeEffectDescriptor* fade_effect_descriptor_construct (GType object_type, GFile* resource_directory);
+FadeEffectDescriptor* fade_effect_descriptor_construct (GType object_type,
+ GFile* resource_directory);
GType shotwell_transition_descriptor_get_type (void) G_GNUC_CONST;
GType fade_effect_descriptor_get_type (void) G_GNUC_CONST;
-static void _vala_array_add1 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value);
+static void _vala_array_add1 (SpitPluggable** * array,
+ int* length,
+ int* size,
+ SpitPluggable* value);
SlideEffectDescriptor* slide_effect_descriptor_new (GFile* resource_directory);
-SlideEffectDescriptor* slide_effect_descriptor_construct (GType object_type, GFile* resource_directory);
+SlideEffectDescriptor* slide_effect_descriptor_construct (GType object_type,
+ GFile* resource_directory);
GType slide_effect_descriptor_get_type (void) G_GNUC_CONST;
-static void _vala_array_add2 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value);
+static void _vala_array_add2 (SpitPluggable** * array,
+ int* length,
+ int* size,
+ SpitPluggable* value);
CrumbleEffectDescriptor* crumble_effect_descriptor_new (GFile* resource_directory);
-CrumbleEffectDescriptor* crumble_effect_descriptor_construct (GType object_type, GFile* resource_directory);
+CrumbleEffectDescriptor* crumble_effect_descriptor_construct (GType object_type,
+ GFile* resource_directory);
GType crumble_effect_descriptor_get_type (void) G_GNUC_CONST;
-static void _vala_array_add3 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value);
+static void _vala_array_add3 (SpitPluggable** * array,
+ int* length,
+ int* size,
+ SpitPluggable* value);
BlindsEffectDescriptor* blinds_effect_descriptor_new (GFile* resource_directory);
-BlindsEffectDescriptor* blinds_effect_descriptor_construct (GType object_type, GFile* resource_directory);
+BlindsEffectDescriptor* blinds_effect_descriptor_construct (GType object_type,
+ GFile* resource_directory);
GType blinds_effect_descriptor_get_type (void) G_GNUC_CONST;
-static void _vala_array_add4 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value);
+static void _vala_array_add4 (SpitPluggable** * array,
+ int* length,
+ int* size,
+ SpitPluggable* value);
CircleEffectDescriptor* circle_effect_descriptor_new (GFile* resource_directory);
-CircleEffectDescriptor* circle_effect_descriptor_construct (GType object_type, GFile* resource_directory);
+CircleEffectDescriptor* circle_effect_descriptor_construct (GType object_type,
+ GFile* resource_directory);
GType circle_effect_descriptor_get_type (void) G_GNUC_CONST;
-static void _vala_array_add5 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value);
+static void _vala_array_add5 (SpitPluggable** * array,
+ int* length,
+ int* size,
+ SpitPluggable* value);
CirclesEffectDescriptor* circles_effect_descriptor_new (GFile* resource_directory);
-CirclesEffectDescriptor* circles_effect_descriptor_construct (GType object_type, GFile* resource_directory);
+CirclesEffectDescriptor* circles_effect_descriptor_construct (GType object_type,
+ GFile* resource_directory);
GType circles_effect_descriptor_get_type (void) G_GNUC_CONST;
-static void _vala_array_add6 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value);
+static void _vala_array_add6 (SpitPluggable** * array,
+ int* length,
+ int* size,
+ SpitPluggable* value);
ClockEffectDescriptor* clock_effect_descriptor_new (GFile* resource_directory);
-ClockEffectDescriptor* clock_effect_descriptor_construct (GType object_type, GFile* resource_directory);
+ClockEffectDescriptor* clock_effect_descriptor_construct (GType object_type,
+ GFile* resource_directory);
GType clock_effect_descriptor_get_type (void) G_GNUC_CONST;
-static void _vala_array_add7 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value);
+static void _vala_array_add7 (SpitPluggable** * array,
+ int* length,
+ int* size,
+ SpitPluggable* value);
SquaresEffectDescriptor* squares_effect_descriptor_new (GFile* resource_directory);
-SquaresEffectDescriptor* squares_effect_descriptor_construct (GType object_type, GFile* resource_directory);
+SquaresEffectDescriptor* squares_effect_descriptor_construct (GType object_type,
+ GFile* resource_directory);
GType squares_effect_descriptor_get_type (void) G_GNUC_CONST;
-static void _vala_array_add8 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value);
+static void _vala_array_add8 (SpitPluggable** * array,
+ int* length,
+ int* size,
+ SpitPluggable* value);
ChessEffectDescriptor* chess_effect_descriptor_new (GFile* resource_directory);
-ChessEffectDescriptor* chess_effect_descriptor_construct (GType object_type, GFile* resource_directory);
+ChessEffectDescriptor* chess_effect_descriptor_construct (GType object_type,
+ GFile* resource_directory);
GType chess_effect_descriptor_get_type (void) G_GNUC_CONST;
-static void _vala_array_add9 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value);
+static void _vala_array_add9 (SpitPluggable** * array,
+ int* length,
+ int* size,
+ SpitPluggable* value);
StripesEffectDescriptor* stripes_effect_descriptor_new (GFile* resource_directory);
-StripesEffectDescriptor* stripes_effect_descriptor_construct (GType object_type, GFile* resource_directory);
+StripesEffectDescriptor* stripes_effect_descriptor_construct (GType object_type,
+ GFile* resource_directory);
GType stripes_effect_descriptor_get_type (void) G_GNUC_CONST;
-static void _vala_array_add10 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value);
+static void _vala_array_add10 (SpitPluggable** * array,
+ int* length,
+ int* size,
+ SpitPluggable* value);
static const gchar* shotwell_transitions_real_get_module_name (SpitModule* base);
static const gchar* shotwell_transitions_real_get_version (SpitModule* base);
static const gchar* shotwell_transitions_real_get_id (SpitModule* base);
-static SpitPluggable** shotwell_transitions_real_get_pluggables (SpitModule* base, int* result_length1);
+static SpitPluggable** shotwell_transitions_real_get_pluggables (SpitModule* base,
+ int* result_length1);
static void shotwell_transitions_finalize (GObject * obj);
SpitModule* spit_entry_point (SpitEntryPointParams* params);
-enum {
- SHOTWELL_TRANSITION_DESCRIPTOR_DUMMY_PROPERTY
-};
#define SHOTWELL_TRANSITION_DESCRIPTOR_ICON_FILENAME "slideshow-plugin.png"
-ShotwellTransitionDescriptor* shotwell_transition_descriptor_construct (GType object_type, GFile* resource_directory);
-static gint shotwell_transition_descriptor_real_get_pluggable_interface (SpitPluggable* base, gint min_host_interface, gint max_host_interface);
+ShotwellTransitionDescriptor* shotwell_transition_descriptor_construct (GType object_type,
+ GFile* resource_directory);
+static gint shotwell_transition_descriptor_real_get_pluggable_interface (SpitPluggable* base,
+ gint min_host_interface,
+ gint max_host_interface);
const gchar* shotwell_transition_descriptor_get_id (ShotwellTransitionDescriptor* self);
static const gchar* shotwell_transition_descriptor_real_get_id (ShotwellTransitionDescriptor* self);
const gchar* shotwell_transition_descriptor_get_pluggable_name (ShotwellTransitionDescriptor* self);
static const gchar* shotwell_transition_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* self);
-static void shotwell_transition_descriptor_real_get_info (SpitPluggable* base, SpitPluggableInfo* info);
-static GdkPixbuf** _vala_array_dup1 (GdkPixbuf** self, int length);
-static void shotwell_transition_descriptor_real_activation (SpitPluggable* base, gboolean enabled);
-SpitTransitionsEffect* shotwell_transition_descriptor_create (ShotwellTransitionDescriptor* self, SpitHostInterface* host);
-static SpitTransitionsEffect* shotwell_transition_descriptor_real_create (ShotwellTransitionDescriptor* self, SpitHostInterface* host);
+static void shotwell_transition_descriptor_real_get_info (SpitPluggable* base,
+ SpitPluggableInfo* info);
+static GdkPixbuf** _vala_array_dup1 (GdkPixbuf** self,
+ int length);
+static void shotwell_transition_descriptor_real_activation (SpitPluggable* base,
+ gboolean enabled);
+SpitTransitionsEffect* shotwell_transition_descriptor_create (ShotwellTransitionDescriptor* self,
+ SpitHostInterface* host);
+static SpitTransitionsEffect* shotwell_transition_descriptor_real_create (ShotwellTransitionDescriptor* self,
+ SpitHostInterface* host);
static void shotwell_transition_descriptor_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_add1 (SpitPluggable** * array, int* length, int* size, SpitPluggable* 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_add1 (SpitPluggable** * array,
+ int* length,
+ int* size,
+ SpitPluggable* value)
+{
#line 15 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
if ((*length) == (*size)) {
#line 15 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 15 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
*array = g_renew (SpitPluggable*, *array, (*size) + 1);
-#line 266 "shotwell-transitions.c"
+#line 330 "shotwell-transitions.c"
}
#line 15 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
(*array)[(*length)++] = value;
#line 15 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
(*array)[*length] = NULL;
-#line 272 "shotwell-transitions.c"
+#line 336 "shotwell-transitions.c"
}
-static void _vala_array_add2 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) {
+static void
+_vala_array_add2 (SpitPluggable** * array,
+ int* length,
+ int* size,
+ SpitPluggable* value)
+{
#line 16 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
if ((*length) == (*size)) {
#line 16 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 16 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
*array = g_renew (SpitPluggable*, *array, (*size) + 1);
-#line 283 "shotwell-transitions.c"
+#line 352 "shotwell-transitions.c"
}
#line 16 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
(*array)[(*length)++] = value;
#line 16 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
(*array)[*length] = NULL;
-#line 289 "shotwell-transitions.c"
+#line 358 "shotwell-transitions.c"
}
-static void _vala_array_add3 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) {
+static void
+_vala_array_add3 (SpitPluggable** * array,
+ int* length,
+ int* size,
+ SpitPluggable* value)
+{
#line 17 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
if ((*length) == (*size)) {
#line 17 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 17 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
*array = g_renew (SpitPluggable*, *array, (*size) + 1);
-#line 300 "shotwell-transitions.c"
+#line 374 "shotwell-transitions.c"
}
#line 17 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
(*array)[(*length)++] = value;
#line 17 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
(*array)[*length] = NULL;
-#line 306 "shotwell-transitions.c"
+#line 380 "shotwell-transitions.c"
}
-static void _vala_array_add4 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) {
+static void
+_vala_array_add4 (SpitPluggable** * array,
+ int* length,
+ int* size,
+ SpitPluggable* value)
+{
#line 18 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
if ((*length) == (*size)) {
#line 18 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 18 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
*array = g_renew (SpitPluggable*, *array, (*size) + 1);
-#line 317 "shotwell-transitions.c"
+#line 396 "shotwell-transitions.c"
}
#line 18 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
(*array)[(*length)++] = value;
#line 18 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
(*array)[*length] = NULL;
-#line 323 "shotwell-transitions.c"
+#line 402 "shotwell-transitions.c"
}
-static void _vala_array_add5 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) {
+static void
+_vala_array_add5 (SpitPluggable** * array,
+ int* length,
+ int* size,
+ SpitPluggable* value)
+{
#line 19 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
if ((*length) == (*size)) {
#line 19 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 19 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
*array = g_renew (SpitPluggable*, *array, (*size) + 1);
-#line 334 "shotwell-transitions.c"
+#line 418 "shotwell-transitions.c"
}
#line 19 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
(*array)[(*length)++] = value;
#line 19 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
(*array)[*length] = NULL;
-#line 340 "shotwell-transitions.c"
+#line 424 "shotwell-transitions.c"
}
-static void _vala_array_add6 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) {
+static void
+_vala_array_add6 (SpitPluggable** * array,
+ int* length,
+ int* size,
+ SpitPluggable* value)
+{
#line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
if ((*length) == (*size)) {
#line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
*array = g_renew (SpitPluggable*, *array, (*size) + 1);
-#line 351 "shotwell-transitions.c"
+#line 440 "shotwell-transitions.c"
}
#line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
(*array)[(*length)++] = value;
#line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
(*array)[*length] = NULL;
-#line 357 "shotwell-transitions.c"
+#line 446 "shotwell-transitions.c"
}
-static void _vala_array_add7 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) {
+static void
+_vala_array_add7 (SpitPluggable** * array,
+ int* length,
+ int* size,
+ SpitPluggable* value)
+{
#line 21 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
if ((*length) == (*size)) {
#line 21 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 21 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
*array = g_renew (SpitPluggable*, *array, (*size) + 1);
-#line 368 "shotwell-transitions.c"
+#line 462 "shotwell-transitions.c"
}
#line 21 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
(*array)[(*length)++] = value;
#line 21 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
(*array)[*length] = NULL;
-#line 374 "shotwell-transitions.c"
+#line 468 "shotwell-transitions.c"
}
-static void _vala_array_add8 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) {
+static void
+_vala_array_add8 (SpitPluggable** * array,
+ int* length,
+ int* size,
+ SpitPluggable* value)
+{
#line 22 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
if ((*length) == (*size)) {
#line 22 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 22 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
*array = g_renew (SpitPluggable*, *array, (*size) + 1);
-#line 385 "shotwell-transitions.c"
+#line 484 "shotwell-transitions.c"
}
#line 22 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
(*array)[(*length)++] = value;
#line 22 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
(*array)[*length] = NULL;
-#line 391 "shotwell-transitions.c"
+#line 490 "shotwell-transitions.c"
}
-static void _vala_array_add9 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) {
+static void
+_vala_array_add9 (SpitPluggable** * array,
+ int* length,
+ int* size,
+ SpitPluggable* value)
+{
#line 23 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
if ((*length) == (*size)) {
#line 23 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 23 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
*array = g_renew (SpitPluggable*, *array, (*size) + 1);
-#line 402 "shotwell-transitions.c"
+#line 506 "shotwell-transitions.c"
}
#line 23 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
(*array)[(*length)++] = value;
#line 23 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
(*array)[*length] = NULL;
-#line 408 "shotwell-transitions.c"
+#line 512 "shotwell-transitions.c"
}
-static void _vala_array_add10 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) {
+static void
+_vala_array_add10 (SpitPluggable** * array,
+ int* length,
+ int* size,
+ SpitPluggable* value)
+{
#line 24 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
if ((*length) == (*size)) {
#line 24 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 24 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
*array = g_renew (SpitPluggable*, *array, (*size) + 1);
-#line 419 "shotwell-transitions.c"
+#line 528 "shotwell-transitions.c"
}
#line 24 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
(*array)[(*length)++] = value;
#line 24 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
(*array)[*length] = NULL;
-#line 425 "shotwell-transitions.c"
+#line 534 "shotwell-transitions.c"
}
-ShotwellTransitions* shotwell_transitions_construct (GType object_type, GFile* module_file) {
+ShotwellTransitions*
+shotwell_transitions_construct (GType object_type,
+ GFile* module_file)
+{
ShotwellTransitions * self = NULL;
GFile* resource_directory = NULL;
GFile* _tmp0_;
- GFile* _tmp1_;
- SpitPluggable** _tmp2_;
- gint _tmp2__length1;
- FadeEffectDescriptor* _tmp3_;
- SpitPluggable** _tmp4_;
- gint _tmp4__length1;
- SlideEffectDescriptor* _tmp5_;
- SpitPluggable** _tmp6_;
- gint _tmp6__length1;
- CrumbleEffectDescriptor* _tmp7_;
- SpitPluggable** _tmp8_;
- gint _tmp8__length1;
- BlindsEffectDescriptor* _tmp9_;
- SpitPluggable** _tmp10_;
- gint _tmp10__length1;
- CircleEffectDescriptor* _tmp11_;
- SpitPluggable** _tmp12_;
- gint _tmp12__length1;
- CirclesEffectDescriptor* _tmp13_;
- SpitPluggable** _tmp14_;
- gint _tmp14__length1;
- ClockEffectDescriptor* _tmp15_;
- SpitPluggable** _tmp16_;
- gint _tmp16__length1;
- SquaresEffectDescriptor* _tmp17_;
- SpitPluggable** _tmp18_;
- gint _tmp18__length1;
- ChessEffectDescriptor* _tmp19_;
- SpitPluggable** _tmp20_;
- gint _tmp20__length1;
- StripesEffectDescriptor* _tmp21_;
+ SpitPluggable** _tmp1_;
+ gint _tmp1__length1;
+ FadeEffectDescriptor* _tmp2_;
+ SpitPluggable** _tmp3_;
+ gint _tmp3__length1;
+ SlideEffectDescriptor* _tmp4_;
+ SpitPluggable** _tmp5_;
+ gint _tmp5__length1;
+ CrumbleEffectDescriptor* _tmp6_;
+ SpitPluggable** _tmp7_;
+ gint _tmp7__length1;
+ BlindsEffectDescriptor* _tmp8_;
+ SpitPluggable** _tmp9_;
+ gint _tmp9__length1;
+ CircleEffectDescriptor* _tmp10_;
+ SpitPluggable** _tmp11_;
+ gint _tmp11__length1;
+ CirclesEffectDescriptor* _tmp12_;
+ SpitPluggable** _tmp13_;
+ gint _tmp13__length1;
+ ClockEffectDescriptor* _tmp14_;
+ SpitPluggable** _tmp15_;
+ gint _tmp15__length1;
+ SquaresEffectDescriptor* _tmp16_;
+ SpitPluggable** _tmp17_;
+ gint _tmp17__length1;
+ ChessEffectDescriptor* _tmp18_;
+ SpitPluggable** _tmp19_;
+ gint _tmp19__length1;
+ StripesEffectDescriptor* _tmp20_;
#line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
g_return_val_if_fail (G_IS_FILE (module_file), NULL);
#line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
self = (ShotwellTransitions*) g_object_new (object_type, NULL);
#line 13 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
- _tmp0_ = module_file;
-#line 13 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
- _tmp1_ = g_file_get_parent (_tmp0_);
+ _tmp0_ = g_file_get_parent (module_file);
#line 13 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
- resource_directory = _tmp1_;
+ resource_directory = _tmp0_;
#line 15 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
- _tmp2_ = self->priv->pluggables;
+ _tmp1_ = self->priv->pluggables;
#line 15 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
- _tmp2__length1 = self->priv->pluggables_length1;
+ _tmp1__length1 = self->priv->pluggables_length1;
#line 15 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
- _tmp3_ = fade_effect_descriptor_new (resource_directory);
+ _tmp2_ = fade_effect_descriptor_new (resource_directory);
#line 15 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
- _vala_array_add1 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+ _vala_array_add1 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
#line 16 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
- _tmp4_ = self->priv->pluggables;
+ _tmp3_ = self->priv->pluggables;
#line 16 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
- _tmp4__length1 = self->priv->pluggables_length1;
+ _tmp3__length1 = self->priv->pluggables_length1;
#line 16 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
- _tmp5_ = slide_effect_descriptor_new (resource_directory);
+ _tmp4_ = slide_effect_descriptor_new (resource_directory);
#line 16 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
- _vala_array_add2 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+ _vala_array_add2 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
#line 17 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
- _tmp6_ = self->priv->pluggables;
+ _tmp5_ = self->priv->pluggables;
#line 17 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
- _tmp6__length1 = self->priv->pluggables_length1;
+ _tmp5__length1 = self->priv->pluggables_length1;
#line 17 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
- _tmp7_ = crumble_effect_descriptor_new (resource_directory);
+ _tmp6_ = crumble_effect_descriptor_new (resource_directory);
#line 17 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
- _vala_array_add3 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+ _vala_array_add3 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
#line 18 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
- _tmp8_ = self->priv->pluggables;
+ _tmp7_ = self->priv->pluggables;
#line 18 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
- _tmp8__length1 = self->priv->pluggables_length1;
+ _tmp7__length1 = self->priv->pluggables_length1;
#line 18 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
- _tmp9_ = blinds_effect_descriptor_new (resource_directory);
+ _tmp8_ = blinds_effect_descriptor_new (resource_directory);
#line 18 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
- _vala_array_add4 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+ _vala_array_add4 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
#line 19 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
- _tmp10_ = self->priv->pluggables;
+ _tmp9_ = self->priv->pluggables;
#line 19 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
- _tmp10__length1 = self->priv->pluggables_length1;
+ _tmp9__length1 = self->priv->pluggables_length1;
#line 19 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
- _tmp11_ = circle_effect_descriptor_new (resource_directory);
+ _tmp10_ = circle_effect_descriptor_new (resource_directory);
#line 19 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
- _vala_array_add5 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+ _vala_array_add5 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
#line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
- _tmp12_ = self->priv->pluggables;
+ _tmp11_ = self->priv->pluggables;
#line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
- _tmp12__length1 = self->priv->pluggables_length1;
+ _tmp11__length1 = self->priv->pluggables_length1;
#line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
- _tmp13_ = circles_effect_descriptor_new (resource_directory);
+ _tmp12_ = circles_effect_descriptor_new (resource_directory);
#line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
- _vala_array_add6 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+ _vala_array_add6 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
#line 21 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
- _tmp14_ = self->priv->pluggables;
+ _tmp13_ = self->priv->pluggables;
#line 21 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
- _tmp14__length1 = self->priv->pluggables_length1;
+ _tmp13__length1 = self->priv->pluggables_length1;
#line 21 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
- _tmp15_ = clock_effect_descriptor_new (resource_directory);
+ _tmp14_ = clock_effect_descriptor_new (resource_directory);
#line 21 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
- _vala_array_add7 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+ _vala_array_add7 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
#line 22 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
- _tmp16_ = self->priv->pluggables;
+ _tmp15_ = self->priv->pluggables;
#line 22 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
- _tmp16__length1 = self->priv->pluggables_length1;
+ _tmp15__length1 = self->priv->pluggables_length1;
#line 22 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
- _tmp17_ = squares_effect_descriptor_new (resource_directory);
+ _tmp16_ = squares_effect_descriptor_new (resource_directory);
#line 22 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
- _vala_array_add8 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+ _vala_array_add8 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
#line 23 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
- _tmp18_ = self->priv->pluggables;
+ _tmp17_ = self->priv->pluggables;
#line 23 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
- _tmp18__length1 = self->priv->pluggables_length1;
+ _tmp17__length1 = self->priv->pluggables_length1;
#line 23 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
- _tmp19_ = chess_effect_descriptor_new (resource_directory);
+ _tmp18_ = chess_effect_descriptor_new (resource_directory);
#line 23 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
- _vala_array_add9 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+ _vala_array_add9 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
#line 24 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
- _tmp20_ = self->priv->pluggables;
+ _tmp19_ = self->priv->pluggables;
#line 24 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
- _tmp20__length1 = self->priv->pluggables_length1;
+ _tmp19__length1 = self->priv->pluggables_length1;
#line 24 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
- _tmp21_ = stripes_effect_descriptor_new (resource_directory);
+ _tmp20_ = stripes_effect_descriptor_new (resource_directory);
#line 24 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
- _vala_array_add10 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+ _vala_array_add10 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
#line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
_g_object_unref0 (resource_directory);
#line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
return self;
-#line 558 "shotwell-transitions.c"
+#line 667 "shotwell-transitions.c"
}
-ShotwellTransitions* shotwell_transitions_new (GFile* module_file) {
+ShotwellTransitions*
+shotwell_transitions_new (GFile* module_file)
+{
#line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
return shotwell_transitions_construct (TYPE_SHOTWELL_TRANSITIONS, module_file);
-#line 565 "shotwell-transitions.c"
+#line 676 "shotwell-transitions.c"
}
-static const gchar* shotwell_transitions_real_get_module_name (SpitModule* base) {
+static const gchar*
+shotwell_transitions_real_get_module_name (SpitModule* base)
+{
ShotwellTransitions * self;
const gchar* result = NULL;
#line 27 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
@@ -574,11 +687,13 @@ static const gchar* shotwell_transitions_real_get_module_name (SpitModule* base)
result = _ ("Core Slideshow Transitions");
#line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
return result;
-#line 578 "shotwell-transitions.c"
+#line 691 "shotwell-transitions.c"
}
-static const gchar* shotwell_transitions_real_get_version (SpitModule* base) {
+static const gchar*
+shotwell_transitions_real_get_version (SpitModule* base)
+{
ShotwellTransitions * self;
const gchar* result = NULL;
#line 31 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
@@ -587,11 +702,13 @@ static const gchar* shotwell_transitions_real_get_version (SpitModule* base) {
result = _VERSION;
#line 32 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
return result;
-#line 591 "shotwell-transitions.c"
+#line 706 "shotwell-transitions.c"
}
-static const gchar* shotwell_transitions_real_get_id (SpitModule* base) {
+static const gchar*
+shotwell_transitions_real_get_id (SpitModule* base)
+{
ShotwellTransitions * self;
const gchar* result = NULL;
#line 35 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
@@ -600,11 +717,14 @@ static const gchar* shotwell_transitions_real_get_id (SpitModule* base) {
result = "org.yorba.shotwell.transitions";
#line 36 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
return result;
-#line 604 "shotwell-transitions.c"
+#line 721 "shotwell-transitions.c"
}
-static SpitPluggable** shotwell_transitions_real_get_pluggables (SpitModule* base, int* result_length1) {
+static SpitPluggable**
+shotwell_transitions_real_get_pluggables (SpitModule* base,
+ int* result_length1)
+{
ShotwellTransitions * self;
SpitPluggable** result = NULL;
SpitPluggable** _tmp0_;
@@ -625,28 +745,32 @@ static SpitPluggable** shotwell_transitions_real_get_pluggables (SpitModule* bas
if (result_length1) {
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
*result_length1 = _tmp1__length1;
-#line 629 "shotwell-transitions.c"
+#line 749 "shotwell-transitions.c"
}
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
result = _tmp1_;
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
return result;
-#line 635 "shotwell-transitions.c"
+#line 755 "shotwell-transitions.c"
}
-static void shotwell_transitions_class_init (ShotwellTransitionsClass * klass) {
+static void
+shotwell_transitions_class_init (ShotwellTransitionsClass * klass)
+{
#line 9 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
shotwell_transitions_parent_class = g_type_class_peek_parent (klass);
#line 9 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
g_type_class_add_private (klass, sizeof (ShotwellTransitionsPrivate));
#line 9 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
G_OBJECT_CLASS (klass)->finalize = shotwell_transitions_finalize;
-#line 646 "shotwell-transitions.c"
+#line 768 "shotwell-transitions.c"
}
-static void shotwell_transitions_spit_module_interface_init (SpitModuleIface * iface) {
+static void
+shotwell_transitions_spit_module_interface_init (SpitModuleIface * iface)
+{
#line 9 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
shotwell_transitions_spit_module_parent_iface = g_type_interface_peek_parent (iface);
#line 9 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
@@ -657,11 +781,13 @@ static void shotwell_transitions_spit_module_interface_init (SpitModuleIface * i
iface->get_id = (const gchar* (*) (SpitModule *)) shotwell_transitions_real_get_id;
#line 9 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
iface->get_pluggables = (SpitPluggable** (*) (SpitModule *, int*)) shotwell_transitions_real_get_pluggables;
-#line 661 "shotwell-transitions.c"
+#line 785 "shotwell-transitions.c"
}
-static void shotwell_transitions_instance_init (ShotwellTransitions * self) {
+static void
+shotwell_transitions_instance_init (ShotwellTransitions * self)
+{
SpitPluggable** _tmp0_;
#line 9 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
self->priv = SHOTWELL_TRANSITIONS_GET_PRIVATE (self);
@@ -673,11 +799,13 @@ static void shotwell_transitions_instance_init (ShotwellTransitions * self) {
self->priv->pluggables_length1 = 0;
#line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
self->priv->_pluggables_size_ = self->priv->pluggables_length1;
-#line 677 "shotwell-transitions.c"
+#line 803 "shotwell-transitions.c"
}
-static void shotwell_transitions_finalize (GObject * obj) {
+static void
+shotwell_transitions_finalize (GObject * obj)
+{
ShotwellTransitions * self;
#line 9 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SHOTWELL_TRANSITIONS, ShotwellTransitions);
@@ -685,11 +813,13 @@ static void shotwell_transitions_finalize (GObject * obj) {
self->priv->pluggables = (_vala_array_free (self->priv->pluggables, self->priv->pluggables_length1, (GDestroyNotify) g_object_unref), NULL);
#line 9 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
G_OBJECT_CLASS (shotwell_transitions_parent_class)->finalize (obj);
-#line 689 "shotwell-transitions.c"
+#line 817 "shotwell-transitions.c"
}
-GType shotwell_transitions_get_type (void) {
+GType
+shotwell_transitions_get_type (void)
+{
static volatile gsize shotwell_transitions_type_id__volatile = 0;
if (g_once_init_enter (&shotwell_transitions_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (ShotwellTransitionsClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) shotwell_transitions_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ShotwellTransitions), 0, (GInstanceInitFunc) shotwell_transitions_instance_init, NULL };
@@ -703,65 +833,55 @@ GType shotwell_transitions_get_type (void) {
}
-SpitModule* spit_entry_point (SpitEntryPointParams* params) {
+SpitModule*
+spit_entry_point (SpitEntryPointParams* params)
+{
SpitModule* result = NULL;
- SpitEntryPointParams* _tmp0_;
+ gint _tmp0_;
gint _tmp1_;
- SpitEntryPointParams* _tmp2_;
+ ShotwellTransitions* _tmp2_ = NULL;
gint _tmp3_;
- gint _tmp4_;
- ShotwellTransitions* _tmp5_ = NULL;
- SpitEntryPointParams* _tmp6_;
- gint _tmp7_;
-#line 46 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
- _tmp0_ = params;
-#line 46 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
- _tmp1_ = (*_tmp0_).host_min_spit_interface;
#line 46 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
- _tmp2_ = params;
+ _tmp0_ = (*params).host_min_spit_interface;
#line 46 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
- _tmp3_ = (*_tmp2_).host_max_spit_interface;
+ _tmp1_ = (*params).host_max_spit_interface;
#line 46 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
- _tmp4_ = spit_negotiate_interfaces (_tmp1_, _tmp3_, SPIT_CURRENT_INTERFACE);
-#line 46 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
- (*params).module_spit_interface = _tmp4_;
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
- _tmp6_ = params;
+ (*params).module_spit_interface = spit_negotiate_interfaces (_tmp0_, _tmp1_, SPIT_CURRENT_INTERFACE);
#line 49 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
- _tmp7_ = (*_tmp6_).module_spit_interface;
+ _tmp3_ = (*params).module_spit_interface;
#line 49 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
- if (_tmp7_ != SPIT_UNSUPPORTED_INTERFACE) {
-#line 735 "shotwell-transitions.c"
- SpitEntryPointParams* _tmp8_;
- GFile* _tmp9_;
- ShotwellTransitions* _tmp10_;
-#line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
- _tmp8_ = params;
+ if (_tmp3_ != SPIT_UNSUPPORTED_INTERFACE) {
+#line 855 "shotwell-transitions.c"
+ GFile* _tmp4_;
+ ShotwellTransitions* _tmp5_;
#line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
- _tmp9_ = (*_tmp8_).module_file;
+ _tmp4_ = (*params).module_file;
#line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
- _tmp10_ = shotwell_transitions_new (_tmp9_);
+ _tmp5_ = shotwell_transitions_new (_tmp4_);
#line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
- _g_object_unref0 (_tmp5_);
+ _g_object_unref0 (_tmp2_);
#line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
- _tmp5_ = _tmp10_;
-#line 749 "shotwell-transitions.c"
+ _tmp2_ = _tmp5_;
+#line 866 "shotwell-transitions.c"
} else {
#line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
- _g_object_unref0 (_tmp5_);
+ _g_object_unref0 (_tmp2_);
#line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
- _tmp5_ = NULL;
-#line 755 "shotwell-transitions.c"
+ _tmp2_ = NULL;
+#line 872 "shotwell-transitions.c"
}
#line 49 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
- result = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SPIT_TYPE_MODULE, SpitModule);
+ result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SPIT_TYPE_MODULE, SpitModule);
#line 49 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
return result;
-#line 761 "shotwell-transitions.c"
+#line 878 "shotwell-transitions.c"
}
-ShotwellTransitionDescriptor* shotwell_transition_descriptor_construct (GType object_type, GFile* resource_directory) {
+ShotwellTransitionDescriptor*
+shotwell_transition_descriptor_construct (GType object_type,
+ GFile* resource_directory)
+{
ShotwellTransitionDescriptor * self = NULL;
GdkPixbuf** _tmp0_;
gint _tmp0__length1;
@@ -775,7 +895,7 @@ ShotwellTransitionDescriptor* shotwell_transition_descriptor_construct (GType ob
_tmp0__length1 = shotwell_transition_descriptor_icon_pixbuf_set_length1;
#line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
if (_tmp0_ == NULL) {
-#line 779 "shotwell-transitions.c"
+#line 899 "shotwell-transitions.c"
gint _tmp1_;
GdkPixbuf** _tmp2_;
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
@@ -788,101 +908,112 @@ ShotwellTransitionDescriptor* shotwell_transition_descriptor_construct (GType ob
shotwell_transition_descriptor_icon_pixbuf_set_length1 = _tmp1_;
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
_shotwell_transition_descriptor_icon_pixbuf_set_size_ = shotwell_transition_descriptor_icon_pixbuf_set_length1;
-#line 792 "shotwell-transitions.c"
+#line 912 "shotwell-transitions.c"
}
#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
return self;
-#line 796 "shotwell-transitions.c"
+#line 916 "shotwell-transitions.c"
}
-static gint shotwell_transition_descriptor_real_get_pluggable_interface (SpitPluggable* base, gint min_host_interface, gint max_host_interface) {
+static gint
+shotwell_transition_descriptor_real_get_pluggable_interface (SpitPluggable* base,
+ gint min_host_interface,
+ gint max_host_interface)
+{
ShotwellTransitionDescriptor * self;
gint result = 0;
- gint _tmp0_;
- gint _tmp1_;
- gint _tmp2_;
#line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SHOTWELL_TRANSITION_DESCRIPTOR, ShotwellTransitionDescriptor);
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
- _tmp0_ = min_host_interface;
-#line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
- _tmp1_ = max_host_interface;
-#line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
- _tmp2_ = spit_negotiate_interfaces (_tmp0_, _tmp1_, SPIT_TRANSITIONS_CURRENT_INTERFACE);
-#line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
- result = _tmp2_;
+ result = spit_negotiate_interfaces (min_host_interface, max_host_interface, SPIT_TRANSITIONS_CURRENT_INTERFACE);
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
return result;
-#line 818 "shotwell-transitions.c"
+#line 933 "shotwell-transitions.c"
}
-static const gchar* shotwell_transition_descriptor_real_get_id (ShotwellTransitionDescriptor* self) {
+static const gchar*
+shotwell_transition_descriptor_real_get_id (ShotwellTransitionDescriptor* self)
+{
#line 70 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
g_critical ("Type `%s' does not implement abstract method `shotwell_transition_descriptor_get_id'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 70 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
return NULL;
-#line 827 "shotwell-transitions.c"
+#line 944 "shotwell-transitions.c"
}
-const gchar* shotwell_transition_descriptor_get_id (ShotwellTransitionDescriptor* self) {
+const gchar*
+shotwell_transition_descriptor_get_id (ShotwellTransitionDescriptor* self)
+{
#line 70 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
g_return_val_if_fail (IS_SHOTWELL_TRANSITION_DESCRIPTOR (self), NULL);
#line 70 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
return SHOTWELL_TRANSITION_DESCRIPTOR_GET_CLASS (self)->get_id (self);
-#line 836 "shotwell-transitions.c"
+#line 955 "shotwell-transitions.c"
}
-static const gchar* shotwell_transition_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* self) {
+static const gchar*
+shotwell_transition_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* self)
+{
#line 72 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
g_critical ("Type `%s' does not implement abstract method `shotwell_transition_descriptor_get_pluggable_name'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 72 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
return NULL;
-#line 845 "shotwell-transitions.c"
+#line 966 "shotwell-transitions.c"
}
-const gchar* shotwell_transition_descriptor_get_pluggable_name (ShotwellTransitionDescriptor* self) {
+const gchar*
+shotwell_transition_descriptor_get_pluggable_name (ShotwellTransitionDescriptor* self)
+{
#line 72 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
g_return_val_if_fail (IS_SHOTWELL_TRANSITION_DESCRIPTOR (self), NULL);
#line 72 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
return SHOTWELL_TRANSITION_DESCRIPTOR_GET_CLASS (self)->get_pluggable_name (self);
-#line 854 "shotwell-transitions.c"
+#line 977 "shotwell-transitions.c"
}
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
#line 83 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
return self ? g_object_ref (self) : NULL;
-#line 861 "shotwell-transitions.c"
+#line 986 "shotwell-transitions.c"
}
-static GdkPixbuf** _vala_array_dup1 (GdkPixbuf** self, int length) {
+static GdkPixbuf**
+_vala_array_dup1 (GdkPixbuf** self,
+ int length)
+{
GdkPixbuf** result;
int i;
#line 83 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
result = g_new0 (GdkPixbuf*, length + 1);
#line 83 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
for (i = 0; i < length; i++) {
-#line 872 "shotwell-transitions.c"
+#line 1000 "shotwell-transitions.c"
GdkPixbuf* _tmp0_;
#line 83 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
_tmp0_ = _g_object_ref0 (self[i]);
#line 83 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
result[i] = _tmp0_;
-#line 878 "shotwell-transitions.c"
+#line 1006 "shotwell-transitions.c"
}
#line 83 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
return result;
-#line 882 "shotwell-transitions.c"
+#line 1010 "shotwell-transitions.c"
}
-static void shotwell_transition_descriptor_real_get_info (SpitPluggable* base, SpitPluggableInfo* info) {
+static void
+shotwell_transition_descriptor_real_get_info (SpitPluggable* base,
+ SpitPluggableInfo* info)
+{
ShotwellTransitionDescriptor * self;
gchar* _tmp0_;
gchar* _tmp1_;
@@ -958,37 +1089,48 @@ static void shotwell_transition_descriptor_real_get_info (SpitPluggable* base, S
(*info).icons = _tmp8_;
#line 83 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
(*info).icons_length1 = _tmp8__length1;
-#line 961 "shotwell-transitions.c"
+#line 1092 "shotwell-transitions.c"
}
-static void shotwell_transition_descriptor_real_activation (SpitPluggable* base, gboolean enabled) {
+static void
+shotwell_transition_descriptor_real_activation (SpitPluggable* base,
+ gboolean enabled)
+{
ShotwellTransitionDescriptor * self;
#line 86 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SHOTWELL_TRANSITION_DESCRIPTOR, ShotwellTransitionDescriptor);
-#line 969 "shotwell-transitions.c"
+#line 1103 "shotwell-transitions.c"
}
-static SpitTransitionsEffect* shotwell_transition_descriptor_real_create (ShotwellTransitionDescriptor* self, SpitHostInterface* host) {
+static SpitTransitionsEffect*
+shotwell_transition_descriptor_real_create (ShotwellTransitionDescriptor* self,
+ SpitHostInterface* host)
+{
#line 89 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
g_critical ("Type `%s' does not implement abstract method `shotwell_transition_descriptor_create'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 89 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
return NULL;
-#line 978 "shotwell-transitions.c"
+#line 1115 "shotwell-transitions.c"
}
-SpitTransitionsEffect* shotwell_transition_descriptor_create (ShotwellTransitionDescriptor* self, SpitHostInterface* host) {
+SpitTransitionsEffect*
+shotwell_transition_descriptor_create (ShotwellTransitionDescriptor* self,
+ SpitHostInterface* host)
+{
#line 89 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
g_return_val_if_fail (IS_SHOTWELL_TRANSITION_DESCRIPTOR (self), NULL);
#line 89 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
return SHOTWELL_TRANSITION_DESCRIPTOR_GET_CLASS (self)->create (self, host);
-#line 987 "shotwell-transitions.c"
+#line 1127 "shotwell-transitions.c"
}
-static void shotwell_transition_descriptor_class_init (ShotwellTransitionDescriptorClass * klass) {
+static void
+shotwell_transition_descriptor_class_init (ShotwellTransitionDescriptorClass * klass)
+{
#line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
shotwell_transition_descriptor_parent_class = g_type_class_peek_parent (klass);
#line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
@@ -999,11 +1141,13 @@ static void shotwell_transition_descriptor_class_init (ShotwellTransitionDescrip
((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*) (ShotwellTransitionDescriptor *, SpitHostInterface*)) shotwell_transition_descriptor_real_create;
#line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
G_OBJECT_CLASS (klass)->finalize = shotwell_transition_descriptor_finalize;
-#line 1002 "shotwell-transitions.c"
+#line 1144 "shotwell-transitions.c"
}
-static void shotwell_transition_descriptor_spit_pluggable_interface_init (SpitPluggableIface * iface) {
+static void
+shotwell_transition_descriptor_spit_pluggable_interface_init (SpitPluggableIface * iface)
+{
#line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
shotwell_transition_descriptor_spit_pluggable_parent_iface = g_type_interface_peek_parent (iface);
#line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
@@ -1016,34 +1160,42 @@ static void shotwell_transition_descriptor_spit_pluggable_interface_init (SpitPl
iface->get_info = (void (*) (SpitPluggable *, SpitPluggableInfo*)) shotwell_transition_descriptor_real_get_info;
#line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
iface->activation = (void (*) (SpitPluggable *, gboolean)) shotwell_transition_descriptor_real_activation;
-#line 1019 "shotwell-transitions.c"
+#line 1163 "shotwell-transitions.c"
}
-static void shotwell_transition_descriptor_spit_transitions_descriptor_interface_init (SpitTransitionsDescriptorIface * iface) {
+static void
+shotwell_transition_descriptor_spit_transitions_descriptor_interface_init (SpitTransitionsDescriptorIface * iface)
+{
#line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
shotwell_transition_descriptor_spit_transitions_descriptor_parent_iface = g_type_interface_peek_parent (iface);
#line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
iface->create = (SpitTransitionsEffect* (*) (SpitTransitionsDescriptor *, SpitHostInterface*)) shotwell_transition_descriptor_create;
-#line 1028 "shotwell-transitions.c"
+#line 1174 "shotwell-transitions.c"
}
-static void shotwell_transition_descriptor_instance_init (ShotwellTransitionDescriptor * self) {
+static void
+shotwell_transition_descriptor_instance_init (ShotwellTransitionDescriptor * self)
+{
}
-static void shotwell_transition_descriptor_finalize (GObject * obj) {
+static void
+shotwell_transition_descriptor_finalize (GObject * obj)
+{
ShotwellTransitionDescriptor * self;
#line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SHOTWELL_TRANSITION_DESCRIPTOR, ShotwellTransitionDescriptor);
#line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
G_OBJECT_CLASS (shotwell_transition_descriptor_parent_class)->finalize (obj);
-#line 1042 "shotwell-transitions.c"
+#line 1192 "shotwell-transitions.c"
}
-GType shotwell_transition_descriptor_get_type (void) {
+GType
+shotwell_transition_descriptor_get_type (void)
+{
static volatile gsize shotwell_transition_descriptor_type_id__volatile = 0;
if (g_once_init_enter (&shotwell_transition_descriptor_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (ShotwellTransitionDescriptorClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) shotwell_transition_descriptor_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ShotwellTransitionDescriptor), 0, (GInstanceInitFunc) shotwell_transition_descriptor_instance_init, NULL };
@@ -1059,7 +1211,11 @@ GType shotwell_transition_descriptor_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) {
@@ -1071,7 +1227,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);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-30 13:35:25 +0000