summaryrefslogtreecommitdiff
path: root/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.c
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/authenticator/shotwell/FlickrPublishingAuthenticator.c')
-rw-r--r--plugins/authenticator/shotwell/FlickrPublishingAuthenticator.c1384
1 files changed, 690 insertions, 694 deletions
diff --git a/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.c b/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.c
index d0d74d4..ab19db3 100644
--- a/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.c
+++ b/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.c
@@ -1,4 +1,4 @@
-/* FlickrPublishingAuthenticator.c generated by valac 0.34.7, the Vala compiler
+/* FlickrPublishingAuthenticator.c generated by valac 0.36.6, the Vala compiler
* generated from FlickrPublishingAuthenticator.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -76,6 +76,11 @@ typedef struct _PublishingAuthenticatorShotwellFlickrPinEntryPaneClass Publishin
typedef struct _PublishingAuthenticatorShotwellFlickrPinEntryPanePrivate PublishingAuthenticatorShotwellFlickrPinEntryPanePrivate;
#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
#define _g_slist_free0(var) ((var == NULL) ? NULL : (var = (g_slist_free (var), NULL)))
+enum {
+ PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_PIN_ENTRY_PANE_PROCEED_SIGNAL,
+ PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_PIN_ENTRY_PANE_LAST_SIGNAL
+};
+static guint publishing_authenticator_shotwell_flickr_pin_entry_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_PIN_ENTRY_PANE_LAST_SIGNAL] = {0};
#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_FLICKR (publishing_authenticator_shotwell_flickr_flickr_get_type ())
#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_FLICKR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_FLICKR, PublishingAuthenticatorShotwellFlickrFlickr))
@@ -180,9 +185,9 @@ static gpointer publishing_authenticator_shotwell_flickr_session_parent_class =
static gpointer publishing_authenticator_shotwell_flickr_authentication_request_transaction_parent_class = NULL;
static gpointer publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_parent_class = NULL;
static gpointer publishing_authenticator_shotwell_flickr_pin_entry_pane_parent_class = NULL;
-static SpitPublishingDialogPaneIface* publishing_authenticator_shotwell_flickr_pin_entry_pane_spit_publishing_dialog_pane_parent_iface = NULL;
+static SpitPublishingDialogPaneIface * publishing_authenticator_shotwell_flickr_pin_entry_pane_spit_publishing_dialog_pane_parent_iface = NULL;
static gpointer publishing_authenticator_shotwell_flickr_flickr_parent_class = NULL;
-static SpitPublishingAuthenticatorIface* publishing_authenticator_shotwell_flickr_flickr_spit_publishing_authenticator_parent_iface = NULL;
+static SpitPublishingAuthenticatorIface * publishing_authenticator_shotwell_flickr_flickr_spit_publishing_authenticator_parent_iface = NULL;
#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_ENDPOINT_URL "https://api.flickr.com/services/rest"
#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_EXPIRED_SESSION_ERROR_CODE "98"
@@ -218,7 +223,7 @@ gchar* publishing_authenticator_shotwell_flickr_session_get_request_phase_token
gchar* publishing_authenticator_shotwell_flickr_session_get_access_phase_token (PublishingAuthenticatorShotwellFlickrSession* self);
gchar* publishing_authenticator_shotwell_flickr_session_get_access_phase_token_secret (PublishingAuthenticatorShotwellFlickrSession* self);
gchar* publishing_authenticator_shotwell_flickr_session_get_username (PublishingAuthenticatorShotwellFlickrSession* self);
-static void publishing_authenticator_shotwell_flickr_session_finalize (PublishingRESTSupportSession* obj);
+static void publishing_authenticator_shotwell_flickr_session_finalize (PublishingRESTSupportSession * obj);
#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_API_KEY "60dd96d4a2ad04888b09c9e18d82c26f"
#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_API_SECRET "d0960565e03547c1"
#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_SERVICE_WELCOME_MESSAGE _ ("You are not currently logged into Flickr.\n" \
@@ -253,7 +258,7 @@ static void _publishing_authenticator_shotwell_flickr_pin_entry_pane_on_continue
static void _publishing_authenticator_shotwell_flickr_pin_entry_pane_on_pin_entry_contents_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self);
static void publishing_authenticator_shotwell_flickr_pin_entry_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base);
static void g_cclosure_user_marshal_VOID__OBJECT_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_flickr_pin_entry_pane_finalize (GObject* obj);
+static void publishing_authenticator_shotwell_flickr_pin_entry_pane_finalize (GObject * obj);
GType publishing_authenticator_shotwell_flickr_flickr_get_type (void) G_GNUC_CONST;
#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_FLICKR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_FLICKR, PublishingAuthenticatorShotwellFlickrFlickrPrivate))
enum {
@@ -304,15 +309,15 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_extract_access_ph
static GVariant* _variant_new3 (gchar* value);
static GVariant* _variant_new4 (gchar* value);
static GVariant* _variant_new5 (gchar* value);
-static void publishing_authenticator_shotwell_flickr_flickr_finalize (GObject* obj);
+static void publishing_authenticator_shotwell_flickr_flickr_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);
PublishingAuthenticatorShotwellFlickrTransaction* publishing_authenticator_shotwell_flickr_transaction_construct (GType object_type, PublishingAuthenticatorShotwellFlickrSession* session, PublishingRESTSupportHttpMethod method) {
PublishingAuthenticatorShotwellFlickrTransaction* self = NULL;
- PublishingAuthenticatorShotwellFlickrSession* _tmp0_ = NULL;
- PublishingRESTSupportHttpMethod _tmp1_ = 0;
+ PublishingAuthenticatorShotwellFlickrSession* _tmp0_;
+ PublishingRESTSupportHttpMethod _tmp1_;
#line 13 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_SESSION (session), NULL);
#line 15 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -325,22 +330,22 @@ PublishingAuthenticatorShotwellFlickrTransaction* publishing_authenticator_shotw
publishing_authenticator_shotwell_flickr_transaction_setup_arguments (self);
#line 13 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
return self;
-#line 326 "FlickrPublishingAuthenticator.c"
+#line 331 "FlickrPublishingAuthenticator.c"
}
PublishingAuthenticatorShotwellFlickrTransaction* publishing_authenticator_shotwell_flickr_transaction_new (PublishingAuthenticatorShotwellFlickrSession* session, PublishingRESTSupportHttpMethod method) {
#line 13 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
return publishing_authenticator_shotwell_flickr_transaction_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_TRANSACTION, session, method);
-#line 333 "FlickrPublishingAuthenticator.c"
+#line 338 "FlickrPublishingAuthenticator.c"
}
PublishingAuthenticatorShotwellFlickrTransaction* publishing_authenticator_shotwell_flickr_transaction_construct_with_uri (GType object_type, PublishingAuthenticatorShotwellFlickrSession* session, const gchar* uri, PublishingRESTSupportHttpMethod method) {
PublishingAuthenticatorShotwellFlickrTransaction* self = NULL;
- PublishingAuthenticatorShotwellFlickrSession* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- PublishingRESTSupportHttpMethod _tmp2_ = 0;
+ PublishingAuthenticatorShotwellFlickrSession* _tmp0_;
+ const gchar* _tmp1_;
+ PublishingRESTSupportHttpMethod _tmp2_;
#line 19 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_SESSION (session), NULL);
#line 19 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -357,26 +362,26 @@ PublishingAuthenticatorShotwellFlickrTransaction* publishing_authenticator_shotw
publishing_authenticator_shotwell_flickr_transaction_setup_arguments (self);
#line 19 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
return self;
-#line 358 "FlickrPublishingAuthenticator.c"
+#line 363 "FlickrPublishingAuthenticator.c"
}
PublishingAuthenticatorShotwellFlickrTransaction* publishing_authenticator_shotwell_flickr_transaction_new_with_uri (PublishingAuthenticatorShotwellFlickrSession* session, const gchar* uri, PublishingRESTSupportHttpMethod method) {
#line 19 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
return publishing_authenticator_shotwell_flickr_transaction_construct_with_uri (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_TRANSACTION, session, uri, method);
-#line 365 "FlickrPublishingAuthenticator.c"
+#line 370 "FlickrPublishingAuthenticator.c"
}
static void publishing_authenticator_shotwell_flickr_transaction_setup_arguments (PublishingAuthenticatorShotwellFlickrTransaction* self) {
PublishingAuthenticatorShotwellFlickrSession* session = NULL;
- PublishingRESTSupportSession* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
- gchar* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
- gchar* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
- gchar* _tmp6_ = NULL;
+ PublishingRESTSupportSession* _tmp0_;
+ gchar* _tmp1_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
+ gchar* _tmp4_;
+ gchar* _tmp5_;
+ gchar* _tmp6_;
#line 25 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_TRANSACTION (self));
#line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -415,14 +420,14 @@ static void publishing_authenticator_shotwell_flickr_transaction_setup_arguments
_g_free0 (_tmp6_);
#line 25 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_publishing_rest_support_session_unref0 (session);
-#line 416 "FlickrPublishingAuthenticator.c"
+#line 421 "FlickrPublishingAuthenticator.c"
}
static void publishing_authenticator_shotwell_flickr_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error) {
PublishingAuthenticatorShotwellFlickrTransaction * self;
- PublishingRESTSupportSession* _tmp0_ = NULL;
- PublishingAuthenticatorShotwellFlickrSession* _tmp1_ = NULL;
+ PublishingRESTSupportSession* _tmp0_;
+ PublishingAuthenticatorShotwellFlickrSession* _tmp1_;
GError * _inner_error_ = NULL;
#line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_TRANSACTION, PublishingAuthenticatorShotwellFlickrTransaction);
@@ -444,7 +449,7 @@ static void publishing_authenticator_shotwell_flickr_transaction_real_execute (P
g_propagate_error (error, _inner_error_);
#line 40 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
return;
-#line 445 "FlickrPublishingAuthenticator.c"
+#line 450 "FlickrPublishingAuthenticator.c"
} else {
#line 40 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.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);
@@ -452,7 +457,7 @@ static void publishing_authenticator_shotwell_flickr_transaction_real_execute (P
g_clear_error (&_inner_error_);
#line 40 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
return;
-#line 453 "FlickrPublishingAuthenticator.c"
+#line 458 "FlickrPublishingAuthenticator.c"
}
}
}
@@ -462,8 +467,8 @@ static void publishing_authenticator_shotwell_flickr_transaction_class_init (Pub
#line 12 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
publishing_authenticator_shotwell_flickr_transaction_parent_class = g_type_class_peek_parent (klass);
#line 12 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- ((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*)(PublishingRESTSupportTransaction*, GError**)) publishing_authenticator_shotwell_flickr_transaction_real_execute;
-#line 464 "FlickrPublishingAuthenticator.c"
+ ((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*) (PublishingRESTSupportTransaction *, GError**)) publishing_authenticator_shotwell_flickr_transaction_real_execute;
+#line 469 "FlickrPublishingAuthenticator.c"
}
@@ -489,14 +494,14 @@ PublishingAuthenticatorShotwellFlickrSession* publishing_authenticator_shotwell_
self = (PublishingAuthenticatorShotwellFlickrSession*) publishing_rest_support_session_construct (object_type, NULL);
#line 53 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
return self;
-#line 490 "FlickrPublishingAuthenticator.c"
+#line 495 "FlickrPublishingAuthenticator.c"
}
PublishingAuthenticatorShotwellFlickrSession* publishing_authenticator_shotwell_flickr_session_new (void) {
#line 53 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
return publishing_authenticator_shotwell_flickr_session_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_SESSION);
-#line 497 "FlickrPublishingAuthenticator.c"
+#line 502 "FlickrPublishingAuthenticator.c"
}
@@ -505,54 +510,54 @@ static gboolean publishing_authenticator_shotwell_flickr_session_real_is_authent
gboolean result = FALSE;
gboolean _tmp0_ = FALSE;
gboolean _tmp1_ = FALSE;
- const gchar* _tmp2_ = NULL;
+ const gchar* _tmp2_;
#line 57 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_SESSION, PublishingAuthenticatorShotwellFlickrSession);
#line 58 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_tmp2_ = self->priv->access_phase_token;
#line 58 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
if (_tmp2_ != NULL) {
-#line 513 "FlickrPublishingAuthenticator.c"
- const gchar* _tmp3_ = NULL;
+#line 518 "FlickrPublishingAuthenticator.c"
+ const gchar* _tmp3_;
#line 58 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_tmp3_ = self->priv->access_phase_token_secret;
#line 58 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_tmp1_ = _tmp3_ != NULL;
-#line 519 "FlickrPublishingAuthenticator.c"
+#line 524 "FlickrPublishingAuthenticator.c"
} else {
#line 58 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_tmp1_ = FALSE;
-#line 523 "FlickrPublishingAuthenticator.c"
+#line 528 "FlickrPublishingAuthenticator.c"
}
#line 58 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
if (_tmp1_) {
-#line 527 "FlickrPublishingAuthenticator.c"
- const gchar* _tmp4_ = NULL;
+#line 532 "FlickrPublishingAuthenticator.c"
+ const gchar* _tmp4_;
#line 59 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_tmp4_ = self->priv->username;
#line 59 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_tmp0_ = _tmp4_ != NULL;
-#line 533 "FlickrPublishingAuthenticator.c"
+#line 538 "FlickrPublishingAuthenticator.c"
} else {
#line 58 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_tmp0_ = FALSE;
-#line 537 "FlickrPublishingAuthenticator.c"
+#line 542 "FlickrPublishingAuthenticator.c"
}
#line 58 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
result = _tmp0_;
#line 58 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
return result;
-#line 543 "FlickrPublishingAuthenticator.c"
+#line 548 "FlickrPublishingAuthenticator.c"
}
void publishing_authenticator_shotwell_flickr_session_authenticate_from_persistent_credentials (PublishingAuthenticatorShotwellFlickrSession* self, const gchar* token, const gchar* secret, const gchar* username) {
- const gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
- const gchar* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
+ const gchar* _tmp0_;
+ gchar* _tmp1_;
+ const gchar* _tmp2_;
+ gchar* _tmp3_;
+ const gchar* _tmp4_;
+ gchar* _tmp5_;
#line 62 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_SESSION (self));
#line 62 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -587,7 +592,7 @@ void publishing_authenticator_shotwell_flickr_session_authenticate_from_persiste
self->priv->username = _tmp5_;
#line 68 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), "authenticated");
-#line 588 "FlickrPublishingAuthenticator.c"
+#line 593 "FlickrPublishingAuthenticator.c"
}
@@ -606,15 +611,15 @@ void publishing_authenticator_shotwell_flickr_session_deauthenticate (Publishing
_g_free0 (self->priv->username);
#line 74 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
self->priv->username = NULL;
-#line 607 "FlickrPublishingAuthenticator.c"
+#line 612 "FlickrPublishingAuthenticator.c"
}
void publishing_authenticator_shotwell_flickr_session_set_api_credentials (PublishingAuthenticatorShotwellFlickrSession* self, const gchar* consumer_key, const gchar* consumer_secret) {
- const gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
+ const gchar* _tmp0_;
+ gchar* _tmp1_;
+ const gchar* _tmp2_;
+ gchar* _tmp3_;
#line 77 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_SESSION (self));
#line 77 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -637,62 +642,62 @@ void publishing_authenticator_shotwell_flickr_session_set_api_credentials (Publi
_g_free0 (self->priv->consumer_secret);
#line 79 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
self->priv->consumer_secret = _tmp3_;
-#line 638 "FlickrPublishingAuthenticator.c"
+#line 643 "FlickrPublishingAuthenticator.c"
}
void publishing_authenticator_shotwell_flickr_session_sign_transaction (PublishingAuthenticatorShotwellFlickrSession* self, PublishingRESTSupportTransaction* txn) {
gchar* http_method = NULL;
- PublishingRESTSupportTransaction* _tmp0_ = NULL;
- PublishingRESTSupportHttpMethod _tmp1_ = 0;
- gchar* _tmp2_ = NULL;
- const gchar* _tmp3_ = NULL;
- gchar* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
+ PublishingRESTSupportTransaction* _tmp0_;
+ PublishingRESTSupportHttpMethod _tmp1_;
+ gchar* _tmp2_;
+ const gchar* _tmp3_;
+ gchar* _tmp4_;
+ gchar* _tmp5_;
PublishingRESTSupportArgument** base_string_arguments = NULL;
- PublishingRESTSupportTransaction* _tmp6_ = NULL;
- gint _tmp7_ = 0;
- PublishingRESTSupportArgument** _tmp8_ = NULL;
- gint base_string_arguments_length1 = 0;
- gint _base_string_arguments_size_ = 0;
+ PublishingRESTSupportTransaction* _tmp6_;
+ gint _tmp7_;
+ PublishingRESTSupportArgument** _tmp8_;
+ gint base_string_arguments_length1;
+ gint _base_string_arguments_size_;
PublishingRESTSupportArgument** sorted_args = NULL;
- PublishingRESTSupportArgument** _tmp9_ = NULL;
- gint _tmp9__length1 = 0;
- gint _tmp10_ = 0;
- PublishingRESTSupportArgument** _tmp11_ = NULL;
- gint sorted_args_length1 = 0;
- gint _sorted_args_size_ = 0;
+ PublishingRESTSupportArgument** _tmp9_;
+ gint _tmp9__length1;
+ gint _tmp10_;
+ PublishingRESTSupportArgument** _tmp11_;
+ gint sorted_args_length1;
+ gint _sorted_args_size_;
gchar* arguments_string = NULL;
- gchar* _tmp12_ = NULL;
+ gchar* _tmp12_;
gchar* signing_key = NULL;
- const gchar* _tmp35_ = NULL;
+ const gchar* _tmp35_;
gchar* signature_base_string = NULL;
- const gchar* _tmp49_ = NULL;
- gchar* _tmp50_ = NULL;
- gchar* _tmp51_ = NULL;
- PublishingRESTSupportTransaction* _tmp52_ = NULL;
- gchar* _tmp53_ = NULL;
- gchar* _tmp54_ = NULL;
- gchar* _tmp55_ = NULL;
- gchar* _tmp56_ = NULL;
- gchar* _tmp57_ = NULL;
- gchar* _tmp58_ = NULL;
- gchar* _tmp59_ = NULL;
- gchar* _tmp60_ = NULL;
- const gchar* _tmp61_ = NULL;
- gchar* _tmp62_ = NULL;
- gchar* _tmp63_ = NULL;
- gchar* _tmp64_ = NULL;
- gchar* _tmp65_ = NULL;
- const gchar* _tmp66_ = NULL;
+ const gchar* _tmp49_;
+ gchar* _tmp50_;
+ gchar* _tmp51_;
+ PublishingRESTSupportTransaction* _tmp52_;
+ gchar* _tmp53_;
+ gchar* _tmp54_;
+ gchar* _tmp55_;
+ gchar* _tmp56_;
+ gchar* _tmp57_;
+ gchar* _tmp58_;
+ gchar* _tmp59_;
+ gchar* _tmp60_;
+ const gchar* _tmp61_;
+ gchar* _tmp62_;
+ gchar* _tmp63_;
+ gchar* _tmp64_;
+ gchar* _tmp65_;
+ const gchar* _tmp66_;
gchar* signature = NULL;
- const gchar* _tmp67_ = NULL;
- gchar* _tmp68_ = NULL;
- const gchar* _tmp69_ = NULL;
- gchar* _tmp70_ = NULL;
- const gchar* _tmp71_ = NULL;
- PublishingRESTSupportTransaction* _tmp72_ = NULL;
- const gchar* _tmp73_ = NULL;
+ const gchar* _tmp67_;
+ gchar* _tmp68_;
+ const gchar* _tmp69_;
+ gchar* _tmp70_;
+ const gchar* _tmp71_;
+ PublishingRESTSupportTransaction* _tmp72_;
+ const gchar* _tmp73_;
#line 82 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_SESSION (self));
#line 82 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -744,50 +749,50 @@ void publishing_authenticator_shotwell_flickr_session_sign_transaction (Publishi
_tmp12_ = g_strdup ("");
#line 93 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
arguments_string = _tmp12_;
-#line 744 "FlickrPublishingAuthenticator.c"
+#line 749 "FlickrPublishingAuthenticator.c"
{
gint i = 0;
#line 94 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
i = 0;
-#line 749 "FlickrPublishingAuthenticator.c"
+#line 754 "FlickrPublishingAuthenticator.c"
{
gboolean _tmp13_ = FALSE;
#line 94 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_tmp13_ = TRUE;
#line 94 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
while (TRUE) {
-#line 756 "FlickrPublishingAuthenticator.c"
- gint _tmp15_ = 0;
- PublishingRESTSupportArgument** _tmp16_ = NULL;
- gint _tmp16__length1 = 0;
- const gchar* _tmp17_ = NULL;
- PublishingRESTSupportArgument** _tmp18_ = NULL;
- gint _tmp18__length1 = 0;
- gint _tmp19_ = 0;
- PublishingRESTSupportArgument* _tmp20_ = NULL;
- const gchar* _tmp21_ = NULL;
- gchar* _tmp22_ = NULL;
- gchar* _tmp23_ = NULL;
- PublishingRESTSupportArgument** _tmp24_ = NULL;
- gint _tmp24__length1 = 0;
- gint _tmp25_ = 0;
- PublishingRESTSupportArgument* _tmp26_ = NULL;
- const gchar* _tmp27_ = NULL;
- gchar* _tmp28_ = NULL;
- gchar* _tmp29_ = NULL;
- gchar* _tmp30_ = NULL;
- gint _tmp31_ = 0;
- PublishingRESTSupportArgument** _tmp32_ = NULL;
- gint _tmp32__length1 = 0;
+#line 761 "FlickrPublishingAuthenticator.c"
+ gint _tmp15_;
+ PublishingRESTSupportArgument** _tmp16_;
+ gint _tmp16__length1;
+ const gchar* _tmp17_;
+ PublishingRESTSupportArgument** _tmp18_;
+ gint _tmp18__length1;
+ gint _tmp19_;
+ PublishingRESTSupportArgument* _tmp20_;
+ const gchar* _tmp21_;
+ gchar* _tmp22_;
+ gchar* _tmp23_;
+ PublishingRESTSupportArgument** _tmp24_;
+ gint _tmp24__length1;
+ gint _tmp25_;
+ PublishingRESTSupportArgument* _tmp26_;
+ const gchar* _tmp27_;
+ gchar* _tmp28_;
+ gchar* _tmp29_;
+ gchar* _tmp30_;
+ gint _tmp31_;
+ PublishingRESTSupportArgument** _tmp32_;
+ gint _tmp32__length1;
#line 94 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
if (!_tmp13_) {
-#line 781 "FlickrPublishingAuthenticator.c"
- gint _tmp14_ = 0;
+#line 786 "FlickrPublishingAuthenticator.c"
+ gint _tmp14_;
#line 94 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_tmp14_ = i;
#line 94 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
i = _tmp14_ + 1;
-#line 787 "FlickrPublishingAuthenticator.c"
+#line 792 "FlickrPublishingAuthenticator.c"
}
#line 94 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_tmp13_ = FALSE;
@@ -801,7 +806,7 @@ void publishing_authenticator_shotwell_flickr_session_sign_transaction (Publishi
if (!(_tmp15_ < _tmp16__length1)) {
#line 94 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
break;
-#line 801 "FlickrPublishingAuthenticator.c"
+#line 806 "FlickrPublishingAuthenticator.c"
}
#line 95 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_tmp17_ = arguments_string;
@@ -851,9 +856,9 @@ void publishing_authenticator_shotwell_flickr_session_sign_transaction (Publishi
_tmp32__length1 = sorted_args_length1;
#line 96 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
if (_tmp31_ < (_tmp32__length1 - 1)) {
-#line 851 "FlickrPublishingAuthenticator.c"
- const gchar* _tmp33_ = NULL;
- gchar* _tmp34_ = NULL;
+#line 856 "FlickrPublishingAuthenticator.c"
+ const gchar* _tmp33_;
+ gchar* _tmp34_;
#line 97 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_tmp33_ = arguments_string;
#line 97 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -862,7 +867,7 @@ void publishing_authenticator_shotwell_flickr_session_sign_transaction (Publishi
_g_free0 (arguments_string);
#line 97 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
arguments_string = _tmp34_;
-#line 862 "FlickrPublishingAuthenticator.c"
+#line 867 "FlickrPublishingAuthenticator.c"
}
}
}
@@ -873,12 +878,12 @@ void publishing_authenticator_shotwell_flickr_session_sign_transaction (Publishi
_tmp35_ = self->priv->access_phase_token_secret;
#line 101 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
if (_tmp35_ != NULL) {
-#line 873 "FlickrPublishingAuthenticator.c"
- const gchar* _tmp36_ = NULL;
- gchar* _tmp37_ = NULL;
- gchar* _tmp38_ = NULL;
- const gchar* _tmp39_ = NULL;
- gchar* _tmp40_ = NULL;
+#line 878 "FlickrPublishingAuthenticator.c"
+ const gchar* _tmp36_;
+ gchar* _tmp37_;
+ gchar* _tmp38_;
+ const gchar* _tmp39_;
+ gchar* _tmp40_;
#line 102 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_debug ("FlickrPublishingAuthenticator.vala:102: access phase token secret avai" \
"lable; using it as signing key");
@@ -898,19 +903,19 @@ void publishing_authenticator_shotwell_flickr_session_sign_transaction (Publishi
signing_key = _tmp40_;
#line 104 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_g_free0 (_tmp38_);
-#line 897 "FlickrPublishingAuthenticator.c"
+#line 902 "FlickrPublishingAuthenticator.c"
} else {
- const gchar* _tmp41_ = NULL;
+ const gchar* _tmp41_;
#line 105 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_tmp41_ = self->priv->request_phase_token_secret;
#line 105 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
if (_tmp41_ != NULL) {
-#line 904 "FlickrPublishingAuthenticator.c"
- const gchar* _tmp42_ = NULL;
- gchar* _tmp43_ = NULL;
- gchar* _tmp44_ = NULL;
- const gchar* _tmp45_ = NULL;
- gchar* _tmp46_ = NULL;
+#line 909 "FlickrPublishingAuthenticator.c"
+ const gchar* _tmp42_;
+ gchar* _tmp43_;
+ gchar* _tmp44_;
+ const gchar* _tmp45_;
+ gchar* _tmp46_;
#line 106 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_debug ("FlickrPublishingAuthenticator.vala:106: request phase token secret ava" \
"ilable; using it as signing key");
@@ -930,10 +935,10 @@ void publishing_authenticator_shotwell_flickr_session_sign_transaction (Publishi
signing_key = _tmp46_;
#line 108 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_g_free0 (_tmp44_);
-#line 928 "FlickrPublishingAuthenticator.c"
+#line 933 "FlickrPublishingAuthenticator.c"
} else {
- const gchar* _tmp47_ = NULL;
- gchar* _tmp48_ = NULL;
+ const gchar* _tmp47_;
+ gchar* _tmp48_;
#line 110 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_debug ("FlickrPublishingAuthenticator.vala:110: %s", "neither access phase nor request phase token secrets available; using " \
"API " "key as signing key");
@@ -945,7 +950,7 @@ void publishing_authenticator_shotwell_flickr_session_sign_transaction (Publishi
_g_free0 (signing_key);
#line 113 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
signing_key = _tmp48_;
-#line 942 "FlickrPublishingAuthenticator.c"
+#line 947 "FlickrPublishingAuthenticator.c"
}
}
#line 116 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -1040,15 +1045,15 @@ void publishing_authenticator_shotwell_flickr_session_sign_transaction (Publishi
base_string_arguments = (_vala_array_free (base_string_arguments, base_string_arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
#line 82 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_g_free0 (http_method);
-#line 1037 "FlickrPublishingAuthenticator.c"
+#line 1042 "FlickrPublishingAuthenticator.c"
}
void publishing_authenticator_shotwell_flickr_session_set_request_phase_credentials (PublishingAuthenticatorShotwellFlickrSession* self, const gchar* token, const gchar* secret) {
- const gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
+ const gchar* _tmp0_;
+ gchar* _tmp1_;
+ const gchar* _tmp2_;
+ gchar* _tmp3_;
#line 133 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_SESSION (self));
#line 133 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -1071,17 +1076,17 @@ void publishing_authenticator_shotwell_flickr_session_set_request_phase_credenti
_g_free0 (self->priv->request_phase_token_secret);
#line 135 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
self->priv->request_phase_token_secret = _tmp3_;
-#line 1068 "FlickrPublishingAuthenticator.c"
+#line 1073 "FlickrPublishingAuthenticator.c"
}
void publishing_authenticator_shotwell_flickr_session_set_access_phase_credentials (PublishingAuthenticatorShotwellFlickrSession* self, const gchar* token, const gchar* secret, const gchar* username) {
- const gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
- const gchar* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
+ const gchar* _tmp0_;
+ gchar* _tmp1_;
+ const gchar* _tmp2_;
+ gchar* _tmp3_;
+ const gchar* _tmp4_;
+ gchar* _tmp5_;
#line 138 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_SESSION (self));
#line 138 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -1116,25 +1121,25 @@ void publishing_authenticator_shotwell_flickr_session_set_access_phase_credentia
self->priv->username = _tmp5_;
#line 143 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), "authenticated");
-#line 1113 "FlickrPublishingAuthenticator.c"
+#line 1118 "FlickrPublishingAuthenticator.c"
}
gchar* publishing_authenticator_shotwell_flickr_session_get_oauth_nonce (PublishingAuthenticatorShotwellFlickrSession* self) {
gchar* result = NULL;
GTimeVal currtime = {0};
- GTimeVal _tmp0_ = {0};
- glong _tmp1_ = 0L;
- gchar* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
- GTimeVal _tmp4_ = {0};
- glong _tmp5_ = 0L;
- gchar* _tmp6_ = NULL;
- gchar* _tmp7_ = NULL;
- gchar* _tmp8_ = NULL;
- gchar* _tmp9_ = NULL;
- gchar* _tmp10_ = NULL;
- gchar* _tmp11_ = NULL;
+ GTimeVal _tmp0_;
+ glong _tmp1_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
+ GTimeVal _tmp4_;
+ glong _tmp5_;
+ gchar* _tmp6_;
+ gchar* _tmp7_;
+ gchar* _tmp8_;
+ gchar* _tmp9_;
+ gchar* _tmp10_;
+ gchar* _tmp11_;
#line 146 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_SESSION (self), NULL);
#line 147 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -1175,50 +1180,50 @@ gchar* publishing_authenticator_shotwell_flickr_session_get_oauth_nonce (Publish
result = _tmp11_;
#line 150 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
return result;
-#line 1172 "FlickrPublishingAuthenticator.c"
+#line 1177 "FlickrPublishingAuthenticator.c"
}
static glong string_strnlen (gchar* str, glong maxlen) {
glong result = 0L;
gchar* end = NULL;
- gchar* _tmp0_ = NULL;
- glong _tmp1_ = 0L;
- gchar* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ gchar* _tmp0_;
+ glong _tmp1_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
end = _tmp2_;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp3_ == NULL) {
-#line 1195 "FlickrPublishingAuthenticator.c"
- glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1200 "FlickrPublishingAuthenticator.c"
+ glong _tmp4_;
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
result = _tmp4_;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
-#line 1203 "FlickrPublishingAuthenticator.c"
+#line 1208 "FlickrPublishingAuthenticator.c"
} else {
- gchar* _tmp5_ = NULL;
- gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ gchar* _tmp5_;
+ gchar* _tmp6_;
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
-#line 1215 "FlickrPublishingAuthenticator.c"
+#line 1220 "FlickrPublishingAuthenticator.c"
}
}
@@ -1227,133 +1232,133 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
gchar* result = NULL;
glong string_length = 0L;
gboolean _tmp0_ = FALSE;
- glong _tmp1_ = 0L;
- glong _tmp8_ = 0L;
- glong _tmp14_ = 0L;
- glong _tmp17_ = 0L;
- glong _tmp18_ = 0L;
- glong _tmp19_ = 0L;
- glong _tmp20_ = 0L;
- glong _tmp21_ = 0L;
- gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ 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"
g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp1_ >= ((glong) 0)) {
-#line 1239 "FlickrPublishingAuthenticator.c"
- glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1244 "FlickrPublishingAuthenticator.c"
+ glong _tmp2_;
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 1245 "FlickrPublishingAuthenticator.c"
+#line 1250 "FlickrPublishingAuthenticator.c"
} else {
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp0_ = FALSE;
-#line 1249 "FlickrPublishingAuthenticator.c"
+#line 1254 "FlickrPublishingAuthenticator.c"
}
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp0_) {
-#line 1253 "FlickrPublishingAuthenticator.c"
- glong _tmp3_ = 0L;
- glong _tmp4_ = 0L;
- glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1258 "FlickrPublishingAuthenticator.c"
+ glong _tmp3_;
+ glong _tmp4_;
+ glong _tmp5_;
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
string_length = _tmp5_;
-#line 1265 "FlickrPublishingAuthenticator.c"
+#line 1270 "FlickrPublishingAuthenticator.c"
} else {
- gint _tmp6_ = 0;
- gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ gint _tmp6_;
+ gint _tmp7_;
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
string_length = (glong) _tmp7_;
-#line 1275 "FlickrPublishingAuthenticator.c"
+#line 1280 "FlickrPublishingAuthenticator.c"
}
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp8_ < ((glong) 0)) {
-#line 1281 "FlickrPublishingAuthenticator.c"
- glong _tmp9_ = 0L;
- glong _tmp10_ = 0L;
- glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1286 "FlickrPublishingAuthenticator.c"
+ glong _tmp9_;
+ glong _tmp10_;
+ glong _tmp11_;
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 1295 "FlickrPublishingAuthenticator.c"
+#line 1300 "FlickrPublishingAuthenticator.c"
} else {
- glong _tmp12_ = 0L;
- glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ glong _tmp12_;
+ glong _tmp13_;
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 1305 "FlickrPublishingAuthenticator.c"
+#line 1310 "FlickrPublishingAuthenticator.c"
}
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp14_ < ((glong) 0)) {
-#line 1311 "FlickrPublishingAuthenticator.c"
- glong _tmp15_ = 0L;
- glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1316 "FlickrPublishingAuthenticator.c"
+ glong _tmp15_;
+ glong _tmp16_;
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
len = _tmp15_ - _tmp16_;
-#line 1320 "FlickrPublishingAuthenticator.c"
+#line 1325 "FlickrPublishingAuthenticator.c"
}
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
result = _tmp22_;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
-#line 1340 "FlickrPublishingAuthenticator.c"
+#line 1345 "FlickrPublishingAuthenticator.c"
}
gchar* publishing_authenticator_shotwell_flickr_session_get_oauth_timestamp (PublishingAuthenticatorShotwellFlickrSession* self) {
gchar* result = NULL;
- gint64 _tmp0_ = 0LL;
- gchar* _tmp1_ = NULL;
- gchar* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
- gchar* _tmp4_ = NULL;
+ gint64 _tmp0_;
+ gchar* _tmp1_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
+ gchar* _tmp4_;
#line 154 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_SESSION (self), NULL);
#line 155 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -1372,15 +1377,15 @@ gchar* publishing_authenticator_shotwell_flickr_session_get_oauth_timestamp (Pub
result = _tmp4_;
#line 155 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
return result;
-#line 1369 "FlickrPublishingAuthenticator.c"
+#line 1374 "FlickrPublishingAuthenticator.c"
}
gchar* publishing_authenticator_shotwell_flickr_session_get_consumer_key (PublishingAuthenticatorShotwellFlickrSession* self) {
gchar* result = NULL;
- const gchar* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- gchar* _tmp2_ = NULL;
+ const gchar* _tmp0_;
+ const gchar* _tmp1_;
+ gchar* _tmp2_;
#line 158 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_SESSION (self), NULL);
#line 159 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -1395,15 +1400,15 @@ gchar* publishing_authenticator_shotwell_flickr_session_get_consumer_key (Publis
result = _tmp2_;
#line 160 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
return result;
-#line 1392 "FlickrPublishingAuthenticator.c"
+#line 1397 "FlickrPublishingAuthenticator.c"
}
gchar* publishing_authenticator_shotwell_flickr_session_get_request_phase_token (PublishingAuthenticatorShotwellFlickrSession* self) {
gchar* result = NULL;
- const gchar* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- gchar* _tmp2_ = NULL;
+ const gchar* _tmp0_;
+ const gchar* _tmp1_;
+ gchar* _tmp2_;
#line 163 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_SESSION (self), NULL);
#line 164 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -1418,15 +1423,15 @@ gchar* publishing_authenticator_shotwell_flickr_session_get_request_phase_token
result = _tmp2_;
#line 165 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
return result;
-#line 1415 "FlickrPublishingAuthenticator.c"
+#line 1420 "FlickrPublishingAuthenticator.c"
}
gchar* publishing_authenticator_shotwell_flickr_session_get_access_phase_token (PublishingAuthenticatorShotwellFlickrSession* self) {
gchar* result = NULL;
- const gchar* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- gchar* _tmp2_ = NULL;
+ const gchar* _tmp0_;
+ const gchar* _tmp1_;
+ gchar* _tmp2_;
#line 168 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_SESSION (self), NULL);
#line 169 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -1441,15 +1446,15 @@ gchar* publishing_authenticator_shotwell_flickr_session_get_access_phase_token (
result = _tmp2_;
#line 170 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
return result;
-#line 1438 "FlickrPublishingAuthenticator.c"
+#line 1443 "FlickrPublishingAuthenticator.c"
}
gchar* publishing_authenticator_shotwell_flickr_session_get_access_phase_token_secret (PublishingAuthenticatorShotwellFlickrSession* self) {
gchar* result = NULL;
- const gchar* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- gchar* _tmp2_ = NULL;
+ const gchar* _tmp0_;
+ const gchar* _tmp1_;
+ gchar* _tmp2_;
#line 173 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_SESSION (self), NULL);
#line 174 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -1464,15 +1469,15 @@ gchar* publishing_authenticator_shotwell_flickr_session_get_access_phase_token_s
result = _tmp2_;
#line 175 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
return result;
-#line 1461 "FlickrPublishingAuthenticator.c"
+#line 1466 "FlickrPublishingAuthenticator.c"
}
gchar* publishing_authenticator_shotwell_flickr_session_get_username (PublishingAuthenticatorShotwellFlickrSession* self) {
gchar* result = NULL;
- gboolean _tmp0_ = FALSE;
- const gchar* _tmp1_ = NULL;
- gchar* _tmp2_ = NULL;
+ gboolean _tmp0_;
+ const gchar* _tmp1_;
+ gchar* _tmp2_;
#line 178 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_SESSION (self), NULL);
#line 179 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -1487,7 +1492,7 @@ gchar* publishing_authenticator_shotwell_flickr_session_get_username (Publishing
result = _tmp2_;
#line 180 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
return result;
-#line 1484 "FlickrPublishingAuthenticator.c"
+#line 1489 "FlickrPublishingAuthenticator.c"
}
@@ -1499,8 +1504,8 @@ static void publishing_authenticator_shotwell_flickr_session_class_init (Publish
#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_type_class_add_private (klass, sizeof (PublishingAuthenticatorShotwellFlickrSessionPrivate));
#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- ((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*)(PublishingRESTSupportSession*)) publishing_authenticator_shotwell_flickr_session_real_is_authenticated;
-#line 1497 "FlickrPublishingAuthenticator.c"
+ ((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*) (PublishingRESTSupportSession *)) publishing_authenticator_shotwell_flickr_session_real_is_authenticated;
+#line 1502 "FlickrPublishingAuthenticator.c"
}
@@ -1521,11 +1526,11 @@ static void publishing_authenticator_shotwell_flickr_session_instance_init (Publ
self->priv->consumer_key = NULL;
#line 51 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
self->priv->consumer_secret = NULL;
-#line 1518 "FlickrPublishingAuthenticator.c"
+#line 1523 "FlickrPublishingAuthenticator.c"
}
-static void publishing_authenticator_shotwell_flickr_session_finalize (PublishingRESTSupportSession* obj) {
+static void publishing_authenticator_shotwell_flickr_session_finalize (PublishingRESTSupportSession * obj) {
PublishingAuthenticatorShotwellFlickrSession * self;
#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_SESSION, PublishingAuthenticatorShotwellFlickrSession);
@@ -1545,7 +1550,7 @@ static void publishing_authenticator_shotwell_flickr_session_finalize (Publishin
_g_free0 (self->priv->consumer_secret);
#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
PUBLISHING_REST_SUPPORT_SESSION_CLASS (publishing_authenticator_shotwell_flickr_session_parent_class)->finalize (obj);
-#line 1542 "FlickrPublishingAuthenticator.c"
+#line 1547 "FlickrPublishingAuthenticator.c"
}
@@ -1563,7 +1568,7 @@ GType publishing_authenticator_shotwell_flickr_session_get_type (void) {
PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction* publishing_authenticator_shotwell_flickr_authentication_request_transaction_construct (GType object_type, PublishingAuthenticatorShotwellFlickrSession* session) {
PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction* self = NULL;
- PublishingAuthenticatorShotwellFlickrSession* _tmp0_ = NULL;
+ PublishingAuthenticatorShotwellFlickrSession* _tmp0_;
#line 190 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_SESSION (session), NULL);
#line 191 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -1572,21 +1577,21 @@ PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction* publishin
self = (PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction*) publishing_authenticator_shotwell_flickr_transaction_construct_with_uri (object_type, _tmp0_, "https://www.flickr.com/services/oauth/request_token", PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET);
#line 190 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
return self;
-#line 1569 "FlickrPublishingAuthenticator.c"
+#line 1574 "FlickrPublishingAuthenticator.c"
}
PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction* publishing_authenticator_shotwell_flickr_authentication_request_transaction_new (PublishingAuthenticatorShotwellFlickrSession* session) {
#line 190 "/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 1576 "FlickrPublishingAuthenticator.c"
+#line 1581 "FlickrPublishingAuthenticator.c"
}
static void publishing_authenticator_shotwell_flickr_authentication_request_transaction_class_init (PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransactionClass * klass) {
#line 189 "/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 1583 "FlickrPublishingAuthenticator.c"
+#line 1588 "FlickrPublishingAuthenticator.c"
}
@@ -1608,11 +1613,11 @@ GType publishing_authenticator_shotwell_flickr_authentication_request_transactio
PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction* publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_construct (GType object_type, PublishingAuthenticatorShotwellFlickrSession* session, const gchar* user_verifier) {
PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction* self = NULL;
- PublishingAuthenticatorShotwellFlickrSession* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- PublishingAuthenticatorShotwellFlickrSession* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
- gchar* _tmp4_ = NULL;
+ PublishingAuthenticatorShotwellFlickrSession* _tmp0_;
+ const gchar* _tmp1_;
+ PublishingAuthenticatorShotwellFlickrSession* _tmp2_;
+ gchar* _tmp3_;
+ gchar* _tmp4_;
#line 197 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_SESSION (session), NULL);
#line 197 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -1637,21 +1642,21 @@ PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction* publishing_aut
_g_free0 (_tmp4_);
#line 197 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
return self;
-#line 1634 "FlickrPublishingAuthenticator.c"
+#line 1639 "FlickrPublishingAuthenticator.c"
}
PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction* publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_new (PublishingAuthenticatorShotwellFlickrSession* session, const gchar* user_verifier) {
#line 197 "/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 1641 "FlickrPublishingAuthenticator.c"
+#line 1646 "FlickrPublishingAuthenticator.c"
}
static void publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_class_init (PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransactionClass * klass) {
#line 196 "/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 1648 "FlickrPublishingAuthenticator.c"
+#line 1653 "FlickrPublishingAuthenticator.c"
}
@@ -1674,35 +1679,35 @@ GType publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_ge
static gpointer _g_object_ref0 (gpointer self) {
#line 216 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
return self ? g_object_ref (self) : NULL;
-#line 1671 "FlickrPublishingAuthenticator.c"
+#line 1676 "FlickrPublishingAuthenticator.c"
}
PublishingAuthenticatorShotwellFlickrPinEntryPane* publishing_authenticator_shotwell_flickr_pin_entry_pane_construct (GType object_type, GtkBuilder* builder) {
PublishingAuthenticatorShotwellFlickrPinEntryPane * self = NULL;
- GtkBuilder* _tmp0_ = NULL;
- GtkBuilder* _tmp1_ = NULL;
- GtkBuilder* _tmp2_ = NULL;
- GtkBuilder* _tmp3_ = NULL;
- GSList* _tmp4_ = NULL;
- GSList* _tmp5_ = NULL;
- guint _tmp6_ = 0U;
- GtkBuilder* _tmp7_ = NULL;
- GObject* _tmp8_ = NULL;
- GtkLabel* _tmp9_ = NULL;
- GtkBuilder* _tmp10_ = NULL;
- GObject* _tmp11_ = NULL;
- GtkLabel* _tmp12_ = NULL;
- GtkBuilder* _tmp13_ = NULL;
- GObject* _tmp14_ = NULL;
- GtkEntry* _tmp15_ = NULL;
- GtkBuilder* _tmp16_ = NULL;
- GObject* _tmp17_ = NULL;
- GtkButton* _tmp18_ = NULL;
- GtkBuilder* _tmp19_ = NULL;
- GObject* _tmp20_ = NULL;
- GtkBox* _tmp21_ = NULL;
- GtkBox* _tmp22_ = NULL;
+ GtkBuilder* _tmp0_;
+ GtkBuilder* _tmp1_;
+ GtkBuilder* _tmp2_;
+ GtkBuilder* _tmp3_;
+ GSList* _tmp4_;
+ GSList* _tmp5_;
+ guint _tmp6_;
+ GtkBuilder* _tmp7_;
+ GObject* _tmp8_;
+ GtkLabel* _tmp9_;
+ GtkBuilder* _tmp10_;
+ GObject* _tmp11_;
+ GtkLabel* _tmp12_;
+ GtkBuilder* _tmp13_;
+ GObject* _tmp14_;
+ GtkEntry* _tmp15_;
+ GtkBuilder* _tmp16_;
+ GObject* _tmp17_;
+ GtkButton* _tmp18_;
+ GtkBuilder* _tmp19_;
+ GObject* _tmp20_;
+ GtkBox* _tmp21_;
+ GtkBox* _tmp22_;
#line 215 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_return_val_if_fail (GTK_IS_BUILDER (builder), NULL);
#line 215 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -1789,20 +1794,20 @@ PublishingAuthenticatorShotwellFlickrPinEntryPane* publishing_authenticator_shot
publishing_authenticator_shotwell_flickr_pin_entry_pane_on_pin_entry_contents_changed (self);
#line 215 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
return self;
-#line 1786 "FlickrPublishingAuthenticator.c"
+#line 1791 "FlickrPublishingAuthenticator.c"
}
PublishingAuthenticatorShotwellFlickrPinEntryPane* publishing_authenticator_shotwell_flickr_pin_entry_pane_new (GtkBuilder* builder) {
#line 215 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
return publishing_authenticator_shotwell_flickr_pin_entry_pane_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_PIN_ENTRY_PANE, builder);
-#line 1793 "FlickrPublishingAuthenticator.c"
+#line 1798 "FlickrPublishingAuthenticator.c"
}
static void publishing_authenticator_shotwell_flickr_pin_entry_pane_on_continue_clicked (PublishingAuthenticatorShotwellFlickrPinEntryPane* self) {
- GtkEntry* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
+ GtkEntry* _tmp0_;
+ const gchar* _tmp1_;
#line 232 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_PIN_ENTRY_PANE (self));
#line 233 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -1810,16 +1815,16 @@ static void publishing_authenticator_shotwell_flickr_pin_entry_pane_on_continue_
#line 233 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_tmp1_ = gtk_entry_get_text (_tmp0_);
#line 233 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- g_signal_emit_by_name (self, "proceed", self, _tmp1_);
-#line 1808 "FlickrPublishingAuthenticator.c"
+ g_signal_emit (self, publishing_authenticator_shotwell_flickr_pin_entry_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_PIN_ENTRY_PANE_PROCEED_SIGNAL], 0, self, _tmp1_);
+#line 1813 "FlickrPublishingAuthenticator.c"
}
static void publishing_authenticator_shotwell_flickr_pin_entry_pane_on_pin_entry_contents_changed (PublishingAuthenticatorShotwellFlickrPinEntryPane* self) {
- GtkButton* _tmp0_ = NULL;
- GtkEntry* _tmp1_ = NULL;
- guint _tmp2_ = 0U;
- guint _tmp3_ = 0U;
+ GtkButton* _tmp0_;
+ GtkEntry* _tmp1_;
+ guint _tmp2_;
+ guint _tmp3_;
#line 236 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_PIN_ENTRY_PANE (self));
#line 237 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -1832,15 +1837,15 @@ static void publishing_authenticator_shotwell_flickr_pin_entry_pane_on_pin_entry
_tmp3_ = _tmp2_;
#line 237 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), _tmp3_ > ((guint) 0));
-#line 1829 "FlickrPublishingAuthenticator.c"
+#line 1834 "FlickrPublishingAuthenticator.c"
}
static GtkWidget* publishing_authenticator_shotwell_flickr_pin_entry_pane_real_get_widget (SpitPublishingDialogPane* base) {
PublishingAuthenticatorShotwellFlickrPinEntryPane * self;
GtkWidget* result = NULL;
- GtkBox* _tmp0_ = NULL;
- GtkWidget* _tmp1_ = NULL;
+ GtkBox* _tmp0_;
+ GtkWidget* _tmp1_;
#line 240 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_PIN_ENTRY_PANE, PublishingAuthenticatorShotwellFlickrPinEntryPane);
#line 241 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -1851,7 +1856,7 @@ static GtkWidget* publishing_authenticator_shotwell_flickr_pin_entry_pane_real_g
result = _tmp1_;
#line 241 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
return result;
-#line 1848 "FlickrPublishingAuthenticator.c"
+#line 1853 "FlickrPublishingAuthenticator.c"
}
@@ -1864,28 +1869,28 @@ static SpitPublishingDialogPaneGeometryOptions publishing_authenticator_shotwell
result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
#line 245 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
return result;
-#line 1861 "FlickrPublishingAuthenticator.c"
+#line 1866 "FlickrPublishingAuthenticator.c"
}
static void _publishing_authenticator_shotwell_flickr_pin_entry_pane_on_continue_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
#line 249 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
publishing_authenticator_shotwell_flickr_pin_entry_pane_on_continue_clicked ((PublishingAuthenticatorShotwellFlickrPinEntryPane*) self);
-#line 1868 "FlickrPublishingAuthenticator.c"
+#line 1873 "FlickrPublishingAuthenticator.c"
}
static void _publishing_authenticator_shotwell_flickr_pin_entry_pane_on_pin_entry_contents_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
#line 250 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
publishing_authenticator_shotwell_flickr_pin_entry_pane_on_pin_entry_contents_changed ((PublishingAuthenticatorShotwellFlickrPinEntryPane*) self);
-#line 1875 "FlickrPublishingAuthenticator.c"
+#line 1880 "FlickrPublishingAuthenticator.c"
}
static void publishing_authenticator_shotwell_flickr_pin_entry_pane_real_on_pane_installed (SpitPublishingDialogPane* base) {
PublishingAuthenticatorShotwellFlickrPinEntryPane * self;
- GtkButton* _tmp0_ = NULL;
- GtkEntry* _tmp1_ = NULL;
+ GtkButton* _tmp0_;
+ GtkEntry* _tmp1_;
#line 248 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_PIN_ENTRY_PANE, PublishingAuthenticatorShotwellFlickrPinEntryPane);
#line 249 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -1896,16 +1901,16 @@ static void publishing_authenticator_shotwell_flickr_pin_entry_pane_real_on_pane
_tmp1_ = self->priv->pin_entry;
#line 250 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_authenticator_shotwell_flickr_pin_entry_pane_on_pin_entry_contents_changed_gtk_editable_changed, self, 0);
-#line 1893 "FlickrPublishingAuthenticator.c"
+#line 1898 "FlickrPublishingAuthenticator.c"
}
static void publishing_authenticator_shotwell_flickr_pin_entry_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) {
PublishingAuthenticatorShotwellFlickrPinEntryPane * self;
- GtkButton* _tmp0_ = NULL;
- guint _tmp1_ = 0U;
- GtkEntry* _tmp2_ = NULL;
- guint _tmp3_ = 0U;
+ GtkButton* _tmp0_;
+ guint _tmp1_;
+ GtkEntry* _tmp2_;
+ guint _tmp3_;
#line 253 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_PIN_ENTRY_PANE, PublishingAuthenticatorShotwellFlickrPinEntryPane);
#line 254 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -1920,7 +1925,7 @@ static void publishing_authenticator_shotwell_flickr_pin_entry_pane_real_on_pane
g_signal_parse_name ("changed", GTK_TYPE_EDITABLE, &_tmp3_, NULL, FALSE);
#line 255 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GTK_TYPE_EDITABLE, GtkEditable), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_flickr_pin_entry_pane_on_pin_entry_contents_changed_gtk_editable_changed, self);
-#line 1917 "FlickrPublishingAuthenticator.c"
+#line 1922 "FlickrPublishingAuthenticator.c"
}
@@ -1939,19 +1944,19 @@ static void g_cclosure_user_marshal_VOID__OBJECT_STRING (GClosure * closure, GVa
data1 = closure->data;
#line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
data2 = param_values->data[0].v_pointer;
-#line 1936 "FlickrPublishingAuthenticator.c"
+#line 1941 "FlickrPublishingAuthenticator.c"
} else {
#line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
data1 = param_values->data[0].v_pointer;
#line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
data2 = closure->data;
-#line 1942 "FlickrPublishingAuthenticator.c"
+#line 1947 "FlickrPublishingAuthenticator.c"
}
#line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
callback = (GMarshalFunc_VOID__OBJECT_STRING) (marshal_data ? marshal_data : cc->callback);
#line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
callback (data1, g_value_get_object (param_values + 1), g_value_get_string (param_values + 2), data2);
-#line 1948 "FlickrPublishingAuthenticator.c"
+#line 1953 "FlickrPublishingAuthenticator.c"
}
@@ -1963,8 +1968,8 @@ static void publishing_authenticator_shotwell_flickr_pin_entry_pane_class_init (
#line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
G_OBJECT_CLASS (klass)->finalize = publishing_authenticator_shotwell_flickr_pin_entry_pane_finalize;
#line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- g_signal_new ("proceed", PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_PIN_ENTRY_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_STRING, G_TYPE_NONE, 2, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_PIN_ENTRY_PANE, G_TYPE_STRING);
-#line 1961 "FlickrPublishingAuthenticator.c"
+ publishing_authenticator_shotwell_flickr_pin_entry_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_PIN_ENTRY_PANE_PROCEED_SIGNAL] = g_signal_new ("proceed", PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_PIN_ENTRY_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_STRING, G_TYPE_NONE, 2, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_PIN_ENTRY_PANE, G_TYPE_STRING);
+#line 1966 "FlickrPublishingAuthenticator.c"
}
@@ -1972,14 +1977,14 @@ static void publishing_authenticator_shotwell_flickr_pin_entry_pane_spit_publish
#line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
publishing_authenticator_shotwell_flickr_pin_entry_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
#line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- iface->get_widget = (GtkWidget* (*)(SpitPublishingDialogPane*)) publishing_authenticator_shotwell_flickr_pin_entry_pane_real_get_widget;
+ iface->get_widget = (GtkWidget* (*) (SpitPublishingDialogPane *)) publishing_authenticator_shotwell_flickr_pin_entry_pane_real_get_widget;
#line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*)(SpitPublishingDialogPane*)) publishing_authenticator_shotwell_flickr_pin_entry_pane_real_get_preferred_geometry;
+ iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*) (SpitPublishingDialogPane *)) publishing_authenticator_shotwell_flickr_pin_entry_pane_real_get_preferred_geometry;
#line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_authenticator_shotwell_flickr_pin_entry_pane_real_on_pane_installed;
+ iface->on_pane_installed = (void (*) (SpitPublishingDialogPane *)) publishing_authenticator_shotwell_flickr_pin_entry_pane_real_on_pane_installed;
#line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_authenticator_shotwell_flickr_pin_entry_pane_real_on_pane_uninstalled;
-#line 1976 "FlickrPublishingAuthenticator.c"
+ iface->on_pane_uninstalled = (void (*) (SpitPublishingDialogPane *)) publishing_authenticator_shotwell_flickr_pin_entry_pane_real_on_pane_uninstalled;
+#line 1981 "FlickrPublishingAuthenticator.c"
}
@@ -1998,11 +2003,11 @@ static void publishing_authenticator_shotwell_flickr_pin_entry_pane_instance_ini
self->priv->explanatory_text = NULL;
#line 211 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
self->priv->builder = NULL;
-#line 1995 "FlickrPublishingAuthenticator.c"
+#line 2000 "FlickrPublishingAuthenticator.c"
}
-static void publishing_authenticator_shotwell_flickr_pin_entry_pane_finalize (GObject* obj) {
+static void publishing_authenticator_shotwell_flickr_pin_entry_pane_finalize (GObject * obj) {
PublishingAuthenticatorShotwellFlickrPinEntryPane * self;
#line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_PIN_ENTRY_PANE, PublishingAuthenticatorShotwellFlickrPinEntryPane);
@@ -2020,7 +2025,7 @@ static void publishing_authenticator_shotwell_flickr_pin_entry_pane_finalize (GO
_g_object_unref0 (self->priv->builder);
#line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
G_OBJECT_CLASS (publishing_authenticator_shotwell_flickr_pin_entry_pane_parent_class)->finalize (obj);
-#line 2017 "FlickrPublishingAuthenticator.c"
+#line 2022 "FlickrPublishingAuthenticator.c"
}
@@ -2041,54 +2046,54 @@ GType publishing_authenticator_shotwell_flickr_pin_entry_pane_get_type (void) {
static void _publishing_authenticator_shotwell_flickr_flickr_on_session_authenticated_publishing_rest_support_session_authenticated (PublishingRESTSupportSession* _sender, gpointer self) {
#line 279 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
publishing_authenticator_shotwell_flickr_flickr_on_session_authenticated ((PublishingAuthenticatorShotwellFlickrFlickr*) self);
-#line 2038 "FlickrPublishingAuthenticator.c"
+#line 2043 "FlickrPublishingAuthenticator.c"
}
static void _g_free0_ (gpointer var) {
#line 269 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
var = (g_free (var), NULL);
-#line 2045 "FlickrPublishingAuthenticator.c"
+#line 2050 "FlickrPublishingAuthenticator.c"
}
static void _g_variant_unref0_ (gpointer var) {
#line 269 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
(var == NULL) ? NULL : (var = (g_variant_unref (var), NULL));
-#line 2052 "FlickrPublishingAuthenticator.c"
+#line 2057 "FlickrPublishingAuthenticator.c"
}
static GVariant* _variant_new1 (const gchar* value) {
#line 270 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
return g_variant_ref_sink (g_variant_new_string (value));
-#line 2059 "FlickrPublishingAuthenticator.c"
+#line 2064 "FlickrPublishingAuthenticator.c"
}
static GVariant* _variant_new2 (const gchar* value) {
#line 271 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
return g_variant_ref_sink (g_variant_new_string (value));
-#line 2066 "FlickrPublishingAuthenticator.c"
+#line 2071 "FlickrPublishingAuthenticator.c"
}
PublishingAuthenticatorShotwellFlickrFlickr* publishing_authenticator_shotwell_flickr_flickr_construct (GType object_type, SpitPublishingPluginHost* host) {
PublishingAuthenticatorShotwellFlickrFlickr * self = NULL;
- SpitPublishingPluginHost* _tmp0_ = NULL;
- SpitPublishingPluginHost* _tmp1_ = NULL;
- GHashFunc _tmp2_ = NULL;
- GEqualFunc _tmp3_ = NULL;
- GHashTable* _tmp4_ = NULL;
- GHashTable* _tmp5_ = NULL;
- gchar* _tmp6_ = NULL;
- GVariant* _tmp7_ = NULL;
- GHashTable* _tmp8_ = NULL;
- gchar* _tmp9_ = NULL;
- GVariant* _tmp10_ = NULL;
- PublishingAuthenticatorShotwellFlickrSession* _tmp11_ = NULL;
- PublishingAuthenticatorShotwellFlickrSession* _tmp12_ = NULL;
- PublishingAuthenticatorShotwellFlickrSession* _tmp13_ = NULL;
+ SpitPublishingPluginHost* _tmp0_;
+ SpitPublishingPluginHost* _tmp1_;
+ GHashFunc _tmp2_;
+ GEqualFunc _tmp3_;
+ GHashTable* _tmp4_;
+ GHashTable* _tmp5_;
+ gchar* _tmp6_;
+ GVariant* _tmp7_;
+ GHashTable* _tmp8_;
+ gchar* _tmp9_;
+ GVariant* _tmp10_;
+ PublishingAuthenticatorShotwellFlickrSession* _tmp11_;
+ PublishingAuthenticatorShotwellFlickrSession* _tmp12_;
+ PublishingAuthenticatorShotwellFlickrSession* _tmp13_;
#line 265 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL);
#line 266 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -2143,14 +2148,14 @@ PublishingAuthenticatorShotwellFlickrFlickr* publishing_authenticator_shotwell_f
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), "authenticated", (GCallback) _publishing_authenticator_shotwell_flickr_flickr_on_session_authenticated_publishing_rest_support_session_authenticated, self, 0);
#line 265 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
return self;
-#line 2140 "FlickrPublishingAuthenticator.c"
+#line 2145 "FlickrPublishingAuthenticator.c"
}
PublishingAuthenticatorShotwellFlickrFlickr* publishing_authenticator_shotwell_flickr_flickr_new (SpitPublishingPluginHost* host) {
#line 265 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
return publishing_authenticator_shotwell_flickr_flickr_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_FLICKR, host);
-#line 2147 "FlickrPublishingAuthenticator.c"
+#line 2152 "FlickrPublishingAuthenticator.c"
}
@@ -2163,7 +2168,7 @@ void publishing_authenticator_shotwell_flickr_flickr_invalidate_persistent_sessi
publishing_authenticator_shotwell_flickr_flickr_set_persistent_access_phase_token_secret (self, "");
#line 285 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
publishing_authenticator_shotwell_flickr_flickr_set_persistent_access_phase_username (self, "");
-#line 2160 "FlickrPublishingAuthenticator.c"
+#line 2165 "FlickrPublishingAuthenticator.c"
}
@@ -2171,9 +2176,9 @@ static gboolean publishing_authenticator_shotwell_flickr_flickr_is_persistent_se
gboolean result = FALSE;
gboolean _tmp0_ = FALSE;
gboolean _tmp1_ = FALSE;
- gchar* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
- gboolean _tmp4_ = FALSE;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
+ gboolean _tmp4_;
#line 288 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self), FALSE);
#line 289 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -2186,9 +2191,9 @@ static gboolean publishing_authenticator_shotwell_flickr_flickr_is_persistent_se
_g_free0 (_tmp3_);
#line 289 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
if (_tmp4_) {
-#line 2183 "FlickrPublishingAuthenticator.c"
- gchar* _tmp5_ = NULL;
- gchar* _tmp6_ = NULL;
+#line 2188 "FlickrPublishingAuthenticator.c"
+ gchar* _tmp5_;
+ gchar* _tmp6_;
#line 290 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_tmp5_ = publishing_authenticator_shotwell_flickr_flickr_get_persistent_access_phase_token (self);
#line 290 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -2197,17 +2202,17 @@ static gboolean publishing_authenticator_shotwell_flickr_flickr_is_persistent_se
_tmp1_ = _tmp6_ != NULL;
#line 290 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_g_free0 (_tmp6_);
-#line 2194 "FlickrPublishingAuthenticator.c"
+#line 2199 "FlickrPublishingAuthenticator.c"
} else {
#line 289 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_tmp1_ = FALSE;
-#line 2198 "FlickrPublishingAuthenticator.c"
+#line 2203 "FlickrPublishingAuthenticator.c"
}
#line 289 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
if (_tmp1_) {
-#line 2202 "FlickrPublishingAuthenticator.c"
- gchar* _tmp7_ = NULL;
- gchar* _tmp8_ = NULL;
+#line 2207 "FlickrPublishingAuthenticator.c"
+ gchar* _tmp7_;
+ gchar* _tmp8_;
#line 291 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_tmp7_ = publishing_authenticator_shotwell_flickr_flickr_get_persistent_access_phase_token_secret (self);
#line 291 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -2216,24 +2221,24 @@ static gboolean publishing_authenticator_shotwell_flickr_flickr_is_persistent_se
_tmp0_ = _tmp8_ != NULL;
#line 291 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_g_free0 (_tmp8_);
-#line 2213 "FlickrPublishingAuthenticator.c"
+#line 2218 "FlickrPublishingAuthenticator.c"
} else {
#line 289 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_tmp0_ = FALSE;
-#line 2217 "FlickrPublishingAuthenticator.c"
+#line 2222 "FlickrPublishingAuthenticator.c"
}
#line 289 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
result = _tmp0_;
#line 289 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
return result;
-#line 2223 "FlickrPublishingAuthenticator.c"
+#line 2228 "FlickrPublishingAuthenticator.c"
}
static gchar* publishing_authenticator_shotwell_flickr_flickr_get_persistent_access_phase_username (PublishingAuthenticatorShotwellFlickrFlickr* self) {
gchar* result = NULL;
- SpitPublishingPluginHost* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
+ SpitPublishingPluginHost* _tmp0_;
+ gchar* _tmp1_;
#line 294 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self), NULL);
#line 295 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -2244,13 +2249,13 @@ static gchar* publishing_authenticator_shotwell_flickr_flickr_get_persistent_acc
result = _tmp1_;
#line 295 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
return result;
-#line 2241 "FlickrPublishingAuthenticator.c"
+#line 2246 "FlickrPublishingAuthenticator.c"
}
static void publishing_authenticator_shotwell_flickr_flickr_set_persistent_access_phase_username (PublishingAuthenticatorShotwellFlickrFlickr* self, const gchar* username) {
- SpitPublishingPluginHost* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
+ SpitPublishingPluginHost* _tmp0_;
+ const gchar* _tmp1_;
#line 298 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self));
#line 298 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -2261,14 +2266,14 @@ static void publishing_authenticator_shotwell_flickr_flickr_set_persistent_acces
_tmp1_ = username;
#line 299 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "access_phase_username", _tmp1_);
-#line 2258 "FlickrPublishingAuthenticator.c"
+#line 2263 "FlickrPublishingAuthenticator.c"
}
static gchar* publishing_authenticator_shotwell_flickr_flickr_get_persistent_access_phase_token (PublishingAuthenticatorShotwellFlickrFlickr* self) {
gchar* result = NULL;
- SpitPublishingPluginHost* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
+ SpitPublishingPluginHost* _tmp0_;
+ gchar* _tmp1_;
#line 302 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self), NULL);
#line 303 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -2279,13 +2284,13 @@ static gchar* publishing_authenticator_shotwell_flickr_flickr_get_persistent_acc
result = _tmp1_;
#line 303 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
return result;
-#line 2276 "FlickrPublishingAuthenticator.c"
+#line 2281 "FlickrPublishingAuthenticator.c"
}
static void publishing_authenticator_shotwell_flickr_flickr_set_persistent_access_phase_token (PublishingAuthenticatorShotwellFlickrFlickr* self, const gchar* token) {
- SpitPublishingPluginHost* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
+ SpitPublishingPluginHost* _tmp0_;
+ const gchar* _tmp1_;
#line 306 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self));
#line 306 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -2296,14 +2301,14 @@ static void publishing_authenticator_shotwell_flickr_flickr_set_persistent_acces
_tmp1_ = token;
#line 307 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "access_phase_token", _tmp1_);
-#line 2293 "FlickrPublishingAuthenticator.c"
+#line 2298 "FlickrPublishingAuthenticator.c"
}
static gchar* publishing_authenticator_shotwell_flickr_flickr_get_persistent_access_phase_token_secret (PublishingAuthenticatorShotwellFlickrFlickr* self) {
gchar* result = NULL;
- SpitPublishingPluginHost* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
+ SpitPublishingPluginHost* _tmp0_;
+ gchar* _tmp1_;
#line 310 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self), NULL);
#line 311 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -2314,13 +2319,13 @@ static gchar* publishing_authenticator_shotwell_flickr_flickr_get_persistent_acc
result = _tmp1_;
#line 311 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
return result;
-#line 2311 "FlickrPublishingAuthenticator.c"
+#line 2316 "FlickrPublishingAuthenticator.c"
}
static void publishing_authenticator_shotwell_flickr_flickr_set_persistent_access_phase_token_secret (PublishingAuthenticatorShotwellFlickrFlickr* self, const gchar* secret) {
- SpitPublishingPluginHost* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
+ SpitPublishingPluginHost* _tmp0_;
+ const gchar* _tmp1_;
#line 314 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self));
#line 314 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -2331,27 +2336,27 @@ static void publishing_authenticator_shotwell_flickr_flickr_set_persistent_acces
_tmp1_ = secret;
#line 315 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "access_phase_token_secret", _tmp1_);
-#line 2328 "FlickrPublishingAuthenticator.c"
+#line 2333 "FlickrPublishingAuthenticator.c"
}
static void publishing_authenticator_shotwell_flickr_flickr_real_authenticate (SpitPublishingAuthenticator* base) {
PublishingAuthenticatorShotwellFlickrFlickr * self;
- gboolean _tmp0_ = FALSE;
+ gboolean _tmp0_;
#line 318 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_FLICKR, PublishingAuthenticatorShotwellFlickrFlickr);
#line 319 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_tmp0_ = publishing_authenticator_shotwell_flickr_flickr_is_persistent_session_valid (self);
#line 319 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
if (_tmp0_) {
-#line 2341 "FlickrPublishingAuthenticator.c"
- PublishingAuthenticatorShotwellFlickrSession* _tmp1_ = NULL;
- gchar* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
- gchar* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
- gchar* _tmp6_ = NULL;
- gchar* _tmp7_ = NULL;
+#line 2346 "FlickrPublishingAuthenticator.c"
+ PublishingAuthenticatorShotwellFlickrSession* _tmp1_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
+ gchar* _tmp4_;
+ gchar* _tmp5_;
+ gchar* _tmp6_;
+ gchar* _tmp7_;
#line 320 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_debug ("FlickrPublishingAuthenticator.vala:320: attempt start: a persistent se" \
"ssion is available; using it");
@@ -2377,14 +2382,14 @@ static void publishing_authenticator_shotwell_flickr_flickr_real_authenticate (S
_g_free0 (_tmp5_);
#line 322 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_g_free0 (_tmp3_);
-#line 2373 "FlickrPublishingAuthenticator.c"
+#line 2378 "FlickrPublishingAuthenticator.c"
} else {
#line 325 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_debug ("FlickrPublishingAuthenticator.vala:325: attempt start: no persistent s" \
"ession available; showing login welcome pane");
#line 326 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
publishing_authenticator_shotwell_flickr_flickr_do_show_login_welcome_pane (self);
-#line 2379 "FlickrPublishingAuthenticator.c"
+#line 2384 "FlickrPublishingAuthenticator.c"
}
}
@@ -2398,22 +2403,22 @@ static gboolean publishing_authenticator_shotwell_flickr_flickr_real_can_logout
result = TRUE;
#line 331 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
return result;
-#line 2393 "FlickrPublishingAuthenticator.c"
+#line 2398 "FlickrPublishingAuthenticator.c"
}
static gpointer _g_hash_table_ref0 (gpointer self) {
#line 335 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
return self ? g_hash_table_ref (self) : NULL;
-#line 2400 "FlickrPublishingAuthenticator.c"
+#line 2405 "FlickrPublishingAuthenticator.c"
}
static GHashTable* publishing_authenticator_shotwell_flickr_flickr_real_get_authentication_parameter (SpitPublishingAuthenticator* base) {
PublishingAuthenticatorShotwellFlickrFlickr * self;
GHashTable* result = NULL;
- GHashTable* _tmp0_ = NULL;
- GHashTable* _tmp1_ = NULL;
+ GHashTable* _tmp0_;
+ GHashTable* _tmp1_;
#line 334 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_FLICKR, PublishingAuthenticatorShotwellFlickrFlickr);
#line 335 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -2424,13 +2429,13 @@ static GHashTable* publishing_authenticator_shotwell_flickr_flickr_real_get_auth
result = _tmp1_;
#line 335 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
return result;
-#line 2419 "FlickrPublishingAuthenticator.c"
+#line 2424 "FlickrPublishingAuthenticator.c"
}
static void publishing_authenticator_shotwell_flickr_flickr_real_logout (SpitPublishingAuthenticator* base) {
PublishingAuthenticatorShotwellFlickrFlickr * self;
- PublishingAuthenticatorShotwellFlickrSession* _tmp0_ = NULL;
+ PublishingAuthenticatorShotwellFlickrSession* _tmp0_;
#line 338 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_FLICKR, PublishingAuthenticatorShotwellFlickrFlickr);
#line 339 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -2439,7 +2444,7 @@ static void publishing_authenticator_shotwell_flickr_flickr_real_logout (SpitPub
publishing_authenticator_shotwell_flickr_session_deauthenticate (_tmp0_);
#line 340 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
publishing_authenticator_shotwell_flickr_flickr_invalidate_persistent_session (self);
-#line 2434 "FlickrPublishingAuthenticator.c"
+#line 2439 "FlickrPublishingAuthenticator.c"
}
@@ -2447,20 +2452,20 @@ static void publishing_authenticator_shotwell_flickr_flickr_real_refresh (SpitPu
PublishingAuthenticatorShotwellFlickrFlickr * self;
#line 343 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_FLICKR, PublishingAuthenticatorShotwellFlickrFlickr);
-#line 2442 "FlickrPublishingAuthenticator.c"
+#line 2447 "FlickrPublishingAuthenticator.c"
}
static void _publishing_authenticator_shotwell_flickr_flickr_on_welcome_pane_login_clicked_spit_publishing_login_callback (gpointer self) {
#line 351 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
publishing_authenticator_shotwell_flickr_flickr_on_welcome_pane_login_clicked ((PublishingAuthenticatorShotwellFlickrFlickr*) self);
-#line 2449 "FlickrPublishingAuthenticator.c"
+#line 2454 "FlickrPublishingAuthenticator.c"
}
static void publishing_authenticator_shotwell_flickr_flickr_do_show_login_welcome_pane (PublishingAuthenticatorShotwellFlickrFlickr* self) {
- SpitPublishingPluginHost* _tmp0_ = NULL;
- SpitPublishingPluginHost* _tmp1_ = NULL;
+ SpitPublishingPluginHost* _tmp0_;
+ SpitPublishingPluginHost* _tmp1_;
#line 347 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self));
#line 348 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -2474,7 +2479,7 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_show_login_welcom
_tmp1_ = self->priv->host;
#line 351 "/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 2468 "FlickrPublishingAuthenticator.c"
+#line 2473 "FlickrPublishingAuthenticator.c"
}
@@ -2486,31 +2491,30 @@ static void publishing_authenticator_shotwell_flickr_flickr_on_welcome_pane_logi
"tton in the welcome pane");
#line 357 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
publishing_authenticator_shotwell_flickr_flickr_do_run_authentication_request_transaction (self);
-#line 2479 "FlickrPublishingAuthenticator.c"
+#line 2484 "FlickrPublishingAuthenticator.c"
}
static void _publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
#line 367 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_completed ((PublishingAuthenticatorShotwellFlickrFlickr*) self, _sender);
-#line 2486 "FlickrPublishingAuthenticator.c"
+#line 2491 "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) {
#line 368 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_error ((PublishingAuthenticatorShotwellFlickrFlickr*) self, _sender, err);
-#line 2493 "FlickrPublishingAuthenticator.c"
+#line 2498 "FlickrPublishingAuthenticator.c"
}
static void publishing_authenticator_shotwell_flickr_flickr_do_run_authentication_request_transaction (PublishingAuthenticatorShotwellFlickrFlickr* self) {
- SpitPublishingPluginHost* _tmp0_ = NULL;
- SpitPublishingPluginHost* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
+ SpitPublishingPluginHost* _tmp0_;
+ SpitPublishingPluginHost* _tmp1_;
PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction* txn = NULL;
- PublishingAuthenticatorShotwellFlickrSession* _tmp3_ = NULL;
- PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction* _tmp4_ = NULL;
+ PublishingAuthenticatorShotwellFlickrSession* _tmp2_;
+ PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction* _tmp3_;
GError * _inner_error_ = NULL;
#line 360 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self));
@@ -2524,20 +2528,18 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_run_authenticatio
#line 364 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_tmp1_ = self->priv->host;
#line 364 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp2_ = _ ("Preparing for login…");
-#line 364 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- spit_publishing_plugin_host_install_static_message_pane (_tmp1_, _tmp2_, SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
+ spit_publishing_plugin_host_install_static_message_pane (_tmp1_, _ ("Preparing for login…"), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
#line 366 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp3_ = self->priv->session;
+ _tmp2_ = self->priv->session;
#line 366 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp4_ = publishing_authenticator_shotwell_flickr_authentication_request_transaction_new (_tmp3_);
+ _tmp3_ = publishing_authenticator_shotwell_flickr_authentication_request_transaction_new (_tmp2_);
#line 366 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- txn = _tmp4_;
+ txn = _tmp3_;
#line 367 "/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_auth_request_txn_completed_publishing_rest_support_transaction_completed, self, 0);
#line 368 "/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 2529 "FlickrPublishingAuthenticator.c"
+#line 2531 "FlickrPublishingAuthenticator.c"
{
#line 371 "/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_);
@@ -2545,7 +2547,7 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_run_authenticatio
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 371 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2537 "FlickrPublishingAuthenticator.c"
+#line 2539 "FlickrPublishingAuthenticator.c"
goto __catch1_spit_publishing_publishing_error;
}
#line 371 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -2556,28 +2558,28 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_run_authenticatio
g_clear_error (&_inner_error_);
#line 371 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
return;
-#line 2548 "FlickrPublishingAuthenticator.c"
+#line 2550 "FlickrPublishingAuthenticator.c"
}
}
goto __finally1;
__catch1_spit_publishing_publishing_error:
{
GError* err = NULL;
- SpitPublishingPluginHost* _tmp5_ = NULL;
- GError* _tmp6_ = NULL;
+ SpitPublishingPluginHost* _tmp4_;
+ GError* _tmp5_;
#line 370 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
err = _inner_error_;
#line 370 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_inner_error_ = NULL;
#line 373 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp5_ = self->priv->host;
+ _tmp4_ = self->priv->host;
#line 373 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp6_ = err;
+ _tmp5_ = err;
#line 373 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- spit_publishing_plugin_host_post_error (_tmp5_, _tmp6_);
+ spit_publishing_plugin_host_post_error (_tmp4_, _tmp5_);
#line 370 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_g_error_free0 (err);
-#line 2569 "FlickrPublishingAuthenticator.c"
+#line 2571 "FlickrPublishingAuthenticator.c"
}
__finally1:
#line 370 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -2590,25 +2592,25 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_run_authenticatio
g_clear_error (&_inner_error_);
#line 370 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
return;
-#line 2582 "FlickrPublishingAuthenticator.c"
+#line 2584 "FlickrPublishingAuthenticator.c"
}
#line 360 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_publishing_rest_support_transaction_unref0 (txn);
-#line 2586 "FlickrPublishingAuthenticator.c"
+#line 2588 "FlickrPublishingAuthenticator.c"
}
static void publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_completed (PublishingAuthenticatorShotwellFlickrFlickr* self, PublishingRESTSupportTransaction* txn) {
- PublishingRESTSupportTransaction* _tmp0_ = NULL;
- guint _tmp1_ = 0U;
- PublishingRESTSupportTransaction* _tmp2_ = NULL;
- guint _tmp3_ = 0U;
- PublishingRESTSupportTransaction* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
- gchar* _tmp6_ = NULL;
- PublishingRESTSupportTransaction* _tmp7_ = NULL;
- gchar* _tmp8_ = NULL;
- gchar* _tmp9_ = NULL;
+ PublishingRESTSupportTransaction* _tmp0_;
+ guint _tmp1_;
+ PublishingRESTSupportTransaction* _tmp2_;
+ guint _tmp3_;
+ PublishingRESTSupportTransaction* _tmp4_;
+ gchar* _tmp5_;
+ gchar* _tmp6_;
+ PublishingRESTSupportTransaction* _tmp7_;
+ gchar* _tmp8_;
+ gchar* _tmp9_;
#line 377 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self));
#line 377 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -2646,17 +2648,17 @@ static void publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_
publishing_authenticator_shotwell_flickr_flickr_do_parse_token_info_from_auth_request (self, _tmp9_);
#line 384 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_g_free0 (_tmp9_);
-#line 2637 "FlickrPublishingAuthenticator.c"
+#line 2639 "FlickrPublishingAuthenticator.c"
}
static void publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_error (PublishingAuthenticatorShotwellFlickrFlickr* self, PublishingRESTSupportTransaction* txn, GError* err) {
- PublishingRESTSupportTransaction* _tmp0_ = NULL;
- guint _tmp1_ = 0U;
- PublishingRESTSupportTransaction* _tmp2_ = NULL;
- guint _tmp3_ = 0U;
- SpitPublishingPluginHost* _tmp4_ = NULL;
- GError* _tmp5_ = NULL;
+ PublishingRESTSupportTransaction* _tmp0_;
+ guint _tmp1_;
+ PublishingRESTSupportTransaction* _tmp2_;
+ guint _tmp3_;
+ SpitPublishingPluginHost* _tmp4_;
+ GError* _tmp5_;
#line 387 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self));
#line 387 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -2684,27 +2686,27 @@ static void publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_
spit_publishing_plugin_host_post_error (_tmp4_, _tmp5_);
#line 395 "/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 2674 "FlickrPublishingAuthenticator.c"
+#line 2676 "FlickrPublishingAuthenticator.c"
}
static void publishing_authenticator_shotwell_flickr_flickr_do_parse_token_info_from_auth_request (PublishingAuthenticatorShotwellFlickrFlickr* self, const gchar* response) {
- const gchar* _tmp0_ = NULL;
+ const gchar* _tmp0_;
gchar* oauth_token = NULL;
gchar* oauth_token_secret = NULL;
GHashTable* data = NULL;
- const gchar* _tmp1_ = NULL;
- GHashTable* _tmp2_ = NULL;
- GHashTable* _tmp3_ = NULL;
+ const gchar* _tmp1_;
+ GHashTable* _tmp2_;
+ GHashTable* _tmp3_;
gconstpointer _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
- GHashTable* _tmp6_ = NULL;
+ gchar* _tmp5_;
+ GHashTable* _tmp6_;
gconstpointer _tmp7_ = NULL;
- gchar* _tmp8_ = NULL;
+ gchar* _tmp8_;
gboolean _tmp9_ = FALSE;
- const gchar* _tmp10_ = NULL;
- const gchar* _tmp16_ = NULL;
- const gchar* _tmp17_ = NULL;
+ const gchar* _tmp10_;
+ const gchar* _tmp16_;
+ const gchar* _tmp17_;
#line 398 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self));
#line 398 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -2750,22 +2752,22 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_parse_token_info_
if (_tmp10_ == NULL) {
#line 408 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_tmp9_ = TRUE;
-#line 2739 "FlickrPublishingAuthenticator.c"
+#line 2741 "FlickrPublishingAuthenticator.c"
} else {
- const gchar* _tmp11_ = NULL;
+ const gchar* _tmp11_;
#line 408 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_tmp11_ = oauth_token_secret;
#line 408 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_tmp9_ = _tmp11_ == NULL;
-#line 2746 "FlickrPublishingAuthenticator.c"
+#line 2748 "FlickrPublishingAuthenticator.c"
}
#line 408 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
if (_tmp9_) {
-#line 2750 "FlickrPublishingAuthenticator.c"
- SpitPublishingPluginHost* _tmp12_ = NULL;
- const gchar* _tmp13_ = NULL;
- GError* _tmp14_ = NULL;
- GError* _tmp15_ = NULL;
+#line 2752 "FlickrPublishingAuthenticator.c"
+ SpitPublishingPluginHost* _tmp12_;
+ const gchar* _tmp13_;
+ GError* _tmp14_;
+ GError* _tmp15_;
#line 409 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_tmp12_ = self->priv->host;
#line 409 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -2778,7 +2780,7 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_parse_token_info_
spit_publishing_plugin_host_post_error (_tmp12_, _tmp15_);
#line 409 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_g_error_free0 (_tmp15_);
-#line 2767 "FlickrPublishingAuthenticator.c"
+#line 2769 "FlickrPublishingAuthenticator.c"
}
#line 413 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_tmp16_ = oauth_token;
@@ -2792,17 +2794,17 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_parse_token_info_
_g_free0 (oauth_token_secret);
#line 398 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_g_free0 (oauth_token);
-#line 2781 "FlickrPublishingAuthenticator.c"
+#line 2783 "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_ = NULL;
- const gchar* _tmp1_ = NULL;
- PublishingAuthenticatorShotwellFlickrSession* _tmp2_ = NULL;
- const gchar* _tmp3_ = NULL;
- const gchar* _tmp4_ = NULL;
- const gchar* _tmp5_ = NULL;
+ const gchar* _tmp0_;
+ const gchar* _tmp1_;
+ PublishingAuthenticatorShotwellFlickrSession* _tmp2_;
+ const gchar* _tmp3_;
+ const gchar* _tmp4_;
+ const gchar* _tmp5_;
#line 416 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self));
#line 416 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -2828,7 +2830,7 @@ static void publishing_authenticator_shotwell_flickr_flickr_on_authentication_to
_tmp5_ = token;
#line 422 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
publishing_authenticator_shotwell_flickr_flickr_do_launch_system_browser (self, _tmp5_);
-#line 2816 "FlickrPublishingAuthenticator.c"
+#line 2818 "FlickrPublishingAuthenticator.c"
}
@@ -2840,21 +2842,21 @@ static void publishing_authenticator_shotwell_flickr_flickr_on_system_browser_la
".");
#line 428 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
publishing_authenticator_shotwell_flickr_flickr_do_show_pin_entry_pane (self);
-#line 2827 "FlickrPublishingAuthenticator.c"
+#line 2829 "FlickrPublishingAuthenticator.c"
}
static void _publishing_authenticator_shotwell_flickr_flickr_on_pin_entry_proceed_publishing_authenticator_shotwell_flickr_pin_entry_pane_proceed (PublishingAuthenticatorShotwellFlickrPinEntryPane* _sender, PublishingAuthenticatorShotwellFlickrPinEntryPane* sender, const gchar* authorization_pin, gpointer self) {
#line 432 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
publishing_authenticator_shotwell_flickr_flickr_on_pin_entry_proceed ((PublishingAuthenticatorShotwellFlickrFlickr*) self, sender, authorization_pin);
-#line 2834 "FlickrPublishingAuthenticator.c"
+#line 2836 "FlickrPublishingAuthenticator.c"
}
static void publishing_authenticator_shotwell_flickr_flickr_on_pin_entry_proceed (PublishingAuthenticatorShotwellFlickrFlickr* self, PublishingAuthenticatorShotwellFlickrPinEntryPane* sender, const gchar* pin) {
- PublishingAuthenticatorShotwellFlickrPinEntryPane* _tmp0_ = NULL;
- guint _tmp1_ = 0U;
- const gchar* _tmp2_ = NULL;
+ PublishingAuthenticatorShotwellFlickrPinEntryPane* _tmp0_;
+ guint _tmp1_;
+ const gchar* _tmp2_;
#line 431 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self));
#line 431 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -2874,18 +2876,18 @@ static void publishing_authenticator_shotwell_flickr_flickr_on_pin_entry_proceed
_tmp2_ = pin;
#line 436 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
publishing_authenticator_shotwell_flickr_flickr_do_verify_pin (self, _tmp2_);
-#line 2860 "FlickrPublishingAuthenticator.c"
+#line 2862 "FlickrPublishingAuthenticator.c"
}
static void publishing_authenticator_shotwell_flickr_flickr_do_launch_system_browser (PublishingAuthenticatorShotwellFlickrFlickr* self, const gchar* token) {
gchar* login_uri = NULL;
- const gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
- gchar* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
- gchar* _tmp4_ = NULL;
- const gchar* _tmp5_ = NULL;
+ const gchar* _tmp0_;
+ gchar* _tmp1_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
+ gchar* _tmp4_;
+ const gchar* _tmp5_;
GError * _inner_error_ = NULL;
#line 439 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self));
@@ -2910,11 +2912,11 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_launch_system_bro
#line 443 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_debug ("FlickrPublishingAuthenticator.vala:443: ACTION: launching system brows" \
"er with uri = '%s'", _tmp5_);
-#line 2895 "FlickrPublishingAuthenticator.c"
+#line 2897 "FlickrPublishingAuthenticator.c"
{
- const gchar* _tmp6_ = NULL;
- gchar* _tmp7_ = NULL;
- gchar* _tmp8_ = NULL;
+ const gchar* _tmp6_;
+ gchar* _tmp7_;
+ gchar* _tmp8_;
#line 446 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_tmp6_ = login_uri;
#line 446 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -2929,7 +2931,7 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_launch_system_bro
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 446 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
if (_inner_error_->domain == G_SPAWN_ERROR) {
-#line 2914 "FlickrPublishingAuthenticator.c"
+#line 2916 "FlickrPublishingAuthenticator.c"
goto __catch2_g_spawn_error;
}
#line 446 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -2940,16 +2942,16 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_launch_system_bro
g_clear_error (&_inner_error_);
#line 446 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
return;
-#line 2925 "FlickrPublishingAuthenticator.c"
+#line 2927 "FlickrPublishingAuthenticator.c"
}
}
goto __finally2;
__catch2_g_spawn_error:
{
GError* e = NULL;
- SpitPublishingPluginHost* _tmp9_ = NULL;
- GError* _tmp10_ = NULL;
- GError* _tmp11_ = NULL;
+ SpitPublishingPluginHost* _tmp9_;
+ GError* _tmp10_;
+ GError* _tmp11_;
#line 445 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
e = _inner_error_;
#line 445 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -2970,7 +2972,7 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_launch_system_bro
_g_free0 (login_uri);
#line 450 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
return;
-#line 2955 "FlickrPublishingAuthenticator.c"
+#line 2957 "FlickrPublishingAuthenticator.c"
}
__finally2:
#line 445 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -2983,25 +2985,25 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_launch_system_bro
g_clear_error (&_inner_error_);
#line 445 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
return;
-#line 2968 "FlickrPublishingAuthenticator.c"
+#line 2970 "FlickrPublishingAuthenticator.c"
}
#line 453 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
publishing_authenticator_shotwell_flickr_flickr_on_system_browser_launched (self);
#line 439 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_g_free0 (login_uri);
-#line 2974 "FlickrPublishingAuthenticator.c"
+#line 2976 "FlickrPublishingAuthenticator.c"
}
static void publishing_authenticator_shotwell_flickr_flickr_do_show_pin_entry_pane (PublishingAuthenticatorShotwellFlickrFlickr* self) {
GtkBuilder* builder = NULL;
- GtkBuilder* _tmp0_ = NULL;
+ GtkBuilder* _tmp0_;
PublishingAuthenticatorShotwellFlickrPinEntryPane* pin_entry_pane = NULL;
- GtkBuilder* _tmp8_ = NULL;
- PublishingAuthenticatorShotwellFlickrPinEntryPane* _tmp9_ = NULL;
- PublishingAuthenticatorShotwellFlickrPinEntryPane* _tmp10_ = NULL;
- SpitPublishingPluginHost* _tmp11_ = NULL;
- PublishingAuthenticatorShotwellFlickrPinEntryPane* _tmp12_ = NULL;
+ GtkBuilder* _tmp7_;
+ PublishingAuthenticatorShotwellFlickrPinEntryPane* _tmp8_;
+ PublishingAuthenticatorShotwellFlickrPinEntryPane* _tmp9_;
+ SpitPublishingPluginHost* _tmp10_;
+ PublishingAuthenticatorShotwellFlickrPinEntryPane* _tmp11_;
GError * _inner_error_ = NULL;
#line 456 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self));
@@ -3011,16 +3013,16 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_show_pin_entry_pa
_tmp0_ = gtk_builder_new ();
#line 459 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
builder = _tmp0_;
-#line 2996 "FlickrPublishingAuthenticator.c"
+#line 2998 "FlickrPublishingAuthenticator.c"
{
- GtkBuilder* _tmp1_ = NULL;
+ GtkBuilder* _tmp1_;
#line 462 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_tmp1_ = builder;
#line 462 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
gtk_builder_add_from_resource (_tmp1_, PLUGIN_RESOURCE_PATH "/" "flickr_pin_entry_pane.ui", &_inner_error_);
#line 462 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3005 "FlickrPublishingAuthenticator.c"
+#line 3007 "FlickrPublishingAuthenticator.c"
goto __catch3_g_error;
}
}
@@ -3028,12 +3030,11 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_show_pin_entry_pa
__catch3_g_error:
{
GError* e = NULL;
- GError* _tmp2_ = NULL;
- const gchar* _tmp3_ = NULL;
- SpitPublishingPluginHost* _tmp4_ = NULL;
- const gchar* _tmp5_ = NULL;
- GError* _tmp6_ = NULL;
- GError* _tmp7_ = NULL;
+ GError* _tmp2_;
+ const gchar* _tmp3_;
+ SpitPublishingPluginHost* _tmp4_;
+ GError* _tmp5_;
+ GError* _tmp6_;
#line 461 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
e = _inner_error_;
#line 461 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -3048,23 +3049,21 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_show_pin_entry_pa
#line 466 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_tmp4_ = self->priv->host;
#line 466 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp5_ = _ ("A file required for publishing is unavailable. Publishing to Flickr ca" \
-"n’t continue.");
+ _tmp5_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _ ("A file required for publishing is unavailable. Publishing to Flickr ca" \
+"n’t continue."));
#line 466 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp6_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp5_);
-#line 466 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp7_ = _tmp6_;
+ _tmp6_ = _tmp5_;
#line 466 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- spit_publishing_plugin_host_post_error (_tmp4_, _tmp7_);
+ spit_publishing_plugin_host_post_error (_tmp4_, _tmp6_);
#line 466 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _g_error_free0 (_tmp7_);
+ _g_error_free0 (_tmp6_);
#line 469 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_g_error_free0 (e);
#line 469 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_g_object_unref0 (builder);
#line 469 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
return;
-#line 3047 "FlickrPublishingAuthenticator.c"
+#line 3046 "FlickrPublishingAuthenticator.c"
}
__finally3:
#line 461 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -3077,55 +3076,54 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_show_pin_entry_pa
g_clear_error (&_inner_error_);
#line 461 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
return;
-#line 3060 "FlickrPublishingAuthenticator.c"
+#line 3059 "FlickrPublishingAuthenticator.c"
}
#line 472 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp8_ = builder;
+ _tmp7_ = builder;
#line 472 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp9_ = publishing_authenticator_shotwell_flickr_pin_entry_pane_new (_tmp8_);
+ _tmp8_ = publishing_authenticator_shotwell_flickr_pin_entry_pane_new (_tmp7_);
#line 472 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- pin_entry_pane = _tmp9_;
+ pin_entry_pane = _tmp8_;
#line 473 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp10_ = pin_entry_pane;
+ _tmp9_ = pin_entry_pane;
#line 473 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- g_signal_connect_object (_tmp10_, "proceed", (GCallback) _publishing_authenticator_shotwell_flickr_flickr_on_pin_entry_proceed_publishing_authenticator_shotwell_flickr_pin_entry_pane_proceed, self, 0);
+ g_signal_connect_object (_tmp9_, "proceed", (GCallback) _publishing_authenticator_shotwell_flickr_flickr_on_pin_entry_proceed_publishing_authenticator_shotwell_flickr_pin_entry_pane_proceed, self, 0);
#line 474 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp11_ = self->priv->host;
+ _tmp10_ = self->priv->host;
#line 474 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp12_ = pin_entry_pane;
+ _tmp11_ = pin_entry_pane;
#line 474 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- spit_publishing_plugin_host_install_dialog_pane (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
+ spit_publishing_plugin_host_install_dialog_pane (_tmp10_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
#line 456 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_g_object_unref0 (pin_entry_pane);
#line 456 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_g_object_unref0 (builder);
-#line 3082 "FlickrPublishingAuthenticator.c"
+#line 3081 "FlickrPublishingAuthenticator.c"
}
static void _publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
#line 484 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_txn_completed ((PublishingAuthenticatorShotwellFlickrFlickr*) self, _sender);
-#line 3089 "FlickrPublishingAuthenticator.c"
+#line 3088 "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) {
#line 485 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_error ((PublishingAuthenticatorShotwellFlickrFlickr*) self, _sender, err);
-#line 3096 "FlickrPublishingAuthenticator.c"
+#line 3095 "FlickrPublishingAuthenticator.c"
}
static void publishing_authenticator_shotwell_flickr_flickr_do_verify_pin (PublishingAuthenticatorShotwellFlickrFlickr* self, const gchar* pin) {
- const gchar* _tmp0_ = NULL;
- SpitPublishingPluginHost* _tmp1_ = NULL;
- SpitPublishingPluginHost* _tmp2_ = NULL;
- const gchar* _tmp3_ = NULL;
+ const gchar* _tmp0_;
+ SpitPublishingPluginHost* _tmp1_;
+ SpitPublishingPluginHost* _tmp2_;
PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction* txn = NULL;
- PublishingAuthenticatorShotwellFlickrSession* _tmp4_ = NULL;
- const gchar* _tmp5_ = NULL;
- PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction* _tmp6_ = NULL;
+ PublishingAuthenticatorShotwellFlickrSession* _tmp3_;
+ const gchar* _tmp4_;
+ PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction* _tmp5_;
GError * _inner_error_ = NULL;
#line 477 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self));
@@ -3143,22 +3141,20 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_verify_pin (Publi
#line 481 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_tmp2_ = self->priv->host;
#line 481 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp3_ = _ ("Verifying authorization…");
-#line 481 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- spit_publishing_plugin_host_install_static_message_pane (_tmp2_, _tmp3_, SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
+ spit_publishing_plugin_host_install_static_message_pane (_tmp2_, _ ("Verifying authorization…"), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
#line 483 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp4_ = self->priv->session;
+ _tmp3_ = self->priv->session;
#line 483 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp5_ = pin;
+ _tmp4_ = pin;
#line 483 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp6_ = publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_new (_tmp4_, _tmp5_);
+ _tmp5_ = publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_new (_tmp3_, _tmp4_);
#line 483 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- txn = _tmp6_;
+ txn = _tmp5_;
#line 484 "/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 485 "/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 3140 "FlickrPublishingAuthenticator.c"
+#line 3136 "FlickrPublishingAuthenticator.c"
{
#line 488 "/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_);
@@ -3166,7 +3162,7 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_verify_pin (Publi
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 488 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3148 "FlickrPublishingAuthenticator.c"
+#line 3144 "FlickrPublishingAuthenticator.c"
goto __catch4_spit_publishing_publishing_error;
}
#line 488 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -3177,28 +3173,28 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_verify_pin (Publi
g_clear_error (&_inner_error_);
#line 488 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
return;
-#line 3159 "FlickrPublishingAuthenticator.c"
+#line 3155 "FlickrPublishingAuthenticator.c"
}
}
goto __finally4;
__catch4_spit_publishing_publishing_error:
{
GError* err = NULL;
- SpitPublishingPluginHost* _tmp7_ = NULL;
- GError* _tmp8_ = NULL;
+ SpitPublishingPluginHost* _tmp6_;
+ GError* _tmp7_;
#line 487 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
err = _inner_error_;
#line 487 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_inner_error_ = NULL;
#line 490 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp7_ = self->priv->host;
+ _tmp6_ = self->priv->host;
#line 490 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- _tmp8_ = err;
+ _tmp7_ = err;
#line 490 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- spit_publishing_plugin_host_post_error (_tmp7_, _tmp8_);
+ spit_publishing_plugin_host_post_error (_tmp6_, _tmp7_);
#line 487 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_g_error_free0 (err);
-#line 3180 "FlickrPublishingAuthenticator.c"
+#line 3176 "FlickrPublishingAuthenticator.c"
}
__finally4:
#line 487 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -3211,22 +3207,22 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_verify_pin (Publi
g_clear_error (&_inner_error_);
#line 487 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
return;
-#line 3193 "FlickrPublishingAuthenticator.c"
+#line 3189 "FlickrPublishingAuthenticator.c"
}
#line 477 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_publishing_rest_support_transaction_unref0 (txn);
-#line 3197 "FlickrPublishingAuthenticator.c"
+#line 3193 "FlickrPublishingAuthenticator.c"
}
static void publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_txn_completed (PublishingAuthenticatorShotwellFlickrFlickr* self, PublishingRESTSupportTransaction* txn) {
- PublishingRESTSupportTransaction* _tmp0_ = NULL;
- guint _tmp1_ = 0U;
- PublishingRESTSupportTransaction* _tmp2_ = NULL;
- guint _tmp3_ = 0U;
- PublishingRESTSupportTransaction* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
- gchar* _tmp6_ = NULL;
+ PublishingRESTSupportTransaction* _tmp0_;
+ guint _tmp1_;
+ PublishingRESTSupportTransaction* _tmp2_;
+ guint _tmp3_;
+ PublishingRESTSupportTransaction* _tmp4_;
+ gchar* _tmp5_;
+ gchar* _tmp6_;
#line 494 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self));
#line 494 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -3256,17 +3252,17 @@ static void publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetc
publishing_authenticator_shotwell_flickr_flickr_do_extract_access_phase_credentials_from_reponse (self, _tmp6_);
#line 500 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_g_free0 (_tmp6_);
-#line 3237 "FlickrPublishingAuthenticator.c"
+#line 3233 "FlickrPublishingAuthenticator.c"
}
static void publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_error (PublishingAuthenticatorShotwellFlickrFlickr* self, PublishingRESTSupportTransaction* txn, GError* err) {
- PublishingRESTSupportTransaction* _tmp0_ = NULL;
- guint _tmp1_ = 0U;
- PublishingRESTSupportTransaction* _tmp2_ = NULL;
- guint _tmp3_ = 0U;
- SpitPublishingPluginHost* _tmp4_ = NULL;
- GError* _tmp5_ = NULL;
+ PublishingRESTSupportTransaction* _tmp0_;
+ guint _tmp1_;
+ PublishingRESTSupportTransaction* _tmp2_;
+ guint _tmp3_;
+ SpitPublishingPluginHost* _tmp4_;
+ GError* _tmp5_;
#line 503 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self));
#line 503 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -3294,33 +3290,33 @@ static void publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetc
spit_publishing_plugin_host_post_error (_tmp4_, _tmp5_);
#line 511 "/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 3274 "FlickrPublishingAuthenticator.c"
+#line 3270 "FlickrPublishingAuthenticator.c"
}
static void publishing_authenticator_shotwell_flickr_flickr_do_extract_access_phase_credentials_from_reponse (PublishingAuthenticatorShotwellFlickrFlickr* self, const gchar* response) {
- const gchar* _tmp0_ = NULL;
+ const gchar* _tmp0_;
gchar* token = NULL;
gchar* token_secret = NULL;
gchar* username = NULL;
GHashTable* data = NULL;
- const gchar* _tmp1_ = NULL;
- GHashTable* _tmp2_ = NULL;
- GHashTable* _tmp3_ = NULL;
+ const gchar* _tmp1_;
+ GHashTable* _tmp2_;
+ GHashTable* _tmp3_;
gconstpointer _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
- GHashTable* _tmp6_ = NULL;
+ gchar* _tmp5_;
+ GHashTable* _tmp6_;
gconstpointer _tmp7_ = NULL;
- gchar* _tmp8_ = NULL;
- GHashTable* _tmp9_ = NULL;
+ gchar* _tmp8_;
+ GHashTable* _tmp9_;
gconstpointer _tmp10_ = NULL;
- gchar* _tmp11_ = NULL;
- const gchar* _tmp12_ = NULL;
- const gchar* _tmp13_ = NULL;
- const gchar* _tmp14_ = NULL;
+ gchar* _tmp11_;
+ const gchar* _tmp12_;
+ const gchar* _tmp13_;
+ const gchar* _tmp14_;
gboolean _tmp15_ = FALSE;
gboolean _tmp16_ = FALSE;
- const gchar* _tmp17_ = NULL;
+ const gchar* _tmp17_;
#line 514 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self));
#line 514 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -3387,34 +3383,34 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_extract_access_ph
if (_tmp17_ == NULL) {
#line 529 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_tmp16_ = TRUE;
-#line 3365 "FlickrPublishingAuthenticator.c"
+#line 3361 "FlickrPublishingAuthenticator.c"
} else {
- const gchar* _tmp18_ = NULL;
+ const gchar* _tmp18_;
#line 529 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_tmp18_ = token_secret;
#line 529 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_tmp16_ = _tmp18_ == NULL;
-#line 3372 "FlickrPublishingAuthenticator.c"
+#line 3368 "FlickrPublishingAuthenticator.c"
}
#line 529 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
if (_tmp16_) {
#line 529 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_tmp15_ = TRUE;
-#line 3378 "FlickrPublishingAuthenticator.c"
+#line 3374 "FlickrPublishingAuthenticator.c"
} else {
- const gchar* _tmp19_ = NULL;
+ const gchar* _tmp19_;
#line 529 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_tmp19_ = username;
#line 529 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_tmp15_ = _tmp19_ == NULL;
-#line 3385 "FlickrPublishingAuthenticator.c"
+#line 3381 "FlickrPublishingAuthenticator.c"
}
#line 529 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
if (_tmp15_) {
-#line 3389 "FlickrPublishingAuthenticator.c"
- SpitPublishingPluginHost* _tmp20_ = NULL;
- GError* _tmp21_ = NULL;
- GError* _tmp22_ = NULL;
+#line 3385 "FlickrPublishingAuthenticator.c"
+ SpitPublishingPluginHost* _tmp20_;
+ GError* _tmp21_;
+ GError* _tmp22_;
#line 530 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_tmp20_ = self->priv->host;
#line 530 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -3428,12 +3424,12 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_extract_access_ph
_g_error_free0 (_tmp22_);
#line 533 "/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 3405 "FlickrPublishingAuthenticator.c"
+#line 3401 "FlickrPublishingAuthenticator.c"
} else {
- PublishingAuthenticatorShotwellFlickrSession* _tmp23_ = NULL;
- const gchar* _tmp24_ = NULL;
- const gchar* _tmp25_ = NULL;
- const gchar* _tmp26_ = NULL;
+ PublishingAuthenticatorShotwellFlickrSession* _tmp23_;
+ const gchar* _tmp24_;
+ const gchar* _tmp25_;
+ const gchar* _tmp26_;
#line 535 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_tmp23_ = self->priv->session;
#line 535 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -3444,7 +3440,7 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_extract_access_ph
_tmp26_ = username;
#line 535 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
publishing_authenticator_shotwell_flickr_session_set_access_phase_credentials (_tmp23_, _tmp24_, _tmp25_, _tmp26_);
-#line 3421 "FlickrPublishingAuthenticator.c"
+#line 3417 "FlickrPublishingAuthenticator.c"
}
#line 514 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_g_hash_table_unref0 (data);
@@ -3454,59 +3450,59 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_extract_access_ph
_g_free0 (token_secret);
#line 514 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
_g_free0 (token);
-#line 3431 "FlickrPublishingAuthenticator.c"
+#line 3427 "FlickrPublishingAuthenticator.c"
}
static GVariant* _variant_new3 (gchar* value) {
#line 540 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
return g_variant_ref_sink (g_variant_new_string (value));
-#line 3438 "FlickrPublishingAuthenticator.c"
+#line 3434 "FlickrPublishingAuthenticator.c"
}
static GVariant* _variant_new4 (gchar* value) {
#line 541 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
return g_variant_ref_sink (g_variant_new_string (value));
-#line 3445 "FlickrPublishingAuthenticator.c"
+#line 3441 "FlickrPublishingAuthenticator.c"
}
static GVariant* _variant_new5 (gchar* value) {
#line 542 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
return g_variant_ref_sink (g_variant_new_string (value));
-#line 3452 "FlickrPublishingAuthenticator.c"
+#line 3448 "FlickrPublishingAuthenticator.c"
}
static void publishing_authenticator_shotwell_flickr_flickr_on_session_authenticated (PublishingAuthenticatorShotwellFlickrFlickr* self) {
- GHashTable* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
- PublishingAuthenticatorShotwellFlickrSession* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
- gchar* _tmp4_ = NULL;
- GVariant* _tmp5_ = NULL;
- GHashTable* _tmp6_ = NULL;
- gchar* _tmp7_ = NULL;
- PublishingAuthenticatorShotwellFlickrSession* _tmp8_ = NULL;
- gchar* _tmp9_ = NULL;
- gchar* _tmp10_ = NULL;
- GVariant* _tmp11_ = NULL;
- GHashTable* _tmp12_ = NULL;
- gchar* _tmp13_ = NULL;
- PublishingAuthenticatorShotwellFlickrSession* _tmp14_ = NULL;
- gchar* _tmp15_ = NULL;
- gchar* _tmp16_ = NULL;
- GVariant* _tmp17_ = NULL;
- PublishingAuthenticatorShotwellFlickrSession* _tmp18_ = NULL;
- gchar* _tmp19_ = NULL;
- gchar* _tmp20_ = NULL;
- PublishingAuthenticatorShotwellFlickrSession* _tmp21_ = NULL;
- gchar* _tmp22_ = NULL;
- gchar* _tmp23_ = NULL;
- PublishingAuthenticatorShotwellFlickrSession* _tmp24_ = NULL;
- gchar* _tmp25_ = NULL;
- gchar* _tmp26_ = NULL;
+ GHashTable* _tmp0_;
+ gchar* _tmp1_;
+ PublishingAuthenticatorShotwellFlickrSession* _tmp2_;
+ gchar* _tmp3_;
+ gchar* _tmp4_;
+ GVariant* _tmp5_;
+ GHashTable* _tmp6_;
+ gchar* _tmp7_;
+ PublishingAuthenticatorShotwellFlickrSession* _tmp8_;
+ gchar* _tmp9_;
+ gchar* _tmp10_;
+ GVariant* _tmp11_;
+ GHashTable* _tmp12_;
+ gchar* _tmp13_;
+ PublishingAuthenticatorShotwellFlickrSession* _tmp14_;
+ gchar* _tmp15_;
+ gchar* _tmp16_;
+ GVariant* _tmp17_;
+ PublishingAuthenticatorShotwellFlickrSession* _tmp18_;
+ gchar* _tmp19_;
+ gchar* _tmp20_;
+ PublishingAuthenticatorShotwellFlickrSession* _tmp21_;
+ gchar* _tmp22_;
+ gchar* _tmp23_;
+ PublishingAuthenticatorShotwellFlickrSession* _tmp24_;
+ gchar* _tmp25_;
+ gchar* _tmp26_;
#line 539 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self));
#line 540 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -3589,7 +3585,7 @@ static void publishing_authenticator_shotwell_flickr_flickr_on_session_authentic
_g_free0 (_tmp26_);
#line 549 "/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), "authenticated");
-#line 3566 "FlickrPublishingAuthenticator.c"
+#line 3562 "FlickrPublishingAuthenticator.c"
}
@@ -3600,7 +3596,7 @@ static void publishing_authenticator_shotwell_flickr_flickr_class_init (Publishi
g_type_class_add_private (klass, sizeof (PublishingAuthenticatorShotwellFlickrFlickrPrivate));
#line 260 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
G_OBJECT_CLASS (klass)->finalize = publishing_authenticator_shotwell_flickr_flickr_finalize;
-#line 3577 "FlickrPublishingAuthenticator.c"
+#line 3573 "FlickrPublishingAuthenticator.c"
}
@@ -3608,30 +3604,30 @@ static void publishing_authenticator_shotwell_flickr_flickr_spit_publishing_auth
#line 260 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
publishing_authenticator_shotwell_flickr_flickr_spit_publishing_authenticator_parent_iface = g_type_interface_peek_parent (iface);
#line 260 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- iface->authenticate = (void (*)(SpitPublishingAuthenticator*)) publishing_authenticator_shotwell_flickr_flickr_real_authenticate;
+ iface->authenticate = (void (*) (SpitPublishingAuthenticator *)) publishing_authenticator_shotwell_flickr_flickr_real_authenticate;
#line 260 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- iface->can_logout = (gboolean (*)(SpitPublishingAuthenticator*)) publishing_authenticator_shotwell_flickr_flickr_real_can_logout;
+ iface->can_logout = (gboolean (*) (SpitPublishingAuthenticator *)) publishing_authenticator_shotwell_flickr_flickr_real_can_logout;
#line 260 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- iface->get_authentication_parameter = (GHashTable* (*)(SpitPublishingAuthenticator*)) publishing_authenticator_shotwell_flickr_flickr_real_get_authentication_parameter;
+ iface->get_authentication_parameter = (GHashTable* (*) (SpitPublishingAuthenticator *)) publishing_authenticator_shotwell_flickr_flickr_real_get_authentication_parameter;
#line 260 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- iface->logout = (void (*)(SpitPublishingAuthenticator*)) publishing_authenticator_shotwell_flickr_flickr_real_logout;
+ iface->logout = (void (*) (SpitPublishingAuthenticator *)) publishing_authenticator_shotwell_flickr_flickr_real_logout;
#line 260 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
- iface->refresh = (void (*)(SpitPublishingAuthenticator*)) publishing_authenticator_shotwell_flickr_flickr_real_refresh;
-#line 3594 "FlickrPublishingAuthenticator.c"
+ iface->refresh = (void (*) (SpitPublishingAuthenticator *)) publishing_authenticator_shotwell_flickr_flickr_real_refresh;
+#line 3590 "FlickrPublishingAuthenticator.c"
}
static void publishing_authenticator_shotwell_flickr_flickr_instance_init (PublishingAuthenticatorShotwellFlickrFlickr * self) {
#line 260 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
self->priv = PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_FLICKR_GET_PRIVATE (self);
-#line 3601 "FlickrPublishingAuthenticator.c"
+#line 3597 "FlickrPublishingAuthenticator.c"
}
-static void publishing_authenticator_shotwell_flickr_flickr_finalize (GObject* obj) {
+static void publishing_authenticator_shotwell_flickr_flickr_finalize (GObject * obj) {
PublishingAuthenticatorShotwellFlickrFlickr * self;
- PublishingAuthenticatorShotwellFlickrSession* _tmp0_ = NULL;
- guint _tmp1_ = 0U;
+ PublishingAuthenticatorShotwellFlickrSession* _tmp0_;
+ guint _tmp1_;
#line 260 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_FLICKR, PublishingAuthenticatorShotwellFlickrFlickr);
#line 279 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -3648,7 +3644,7 @@ static void publishing_authenticator_shotwell_flickr_flickr_finalize (GObject* o
_g_object_unref0 (self->priv->host);
#line 260 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
G_OBJECT_CLASS (publishing_authenticator_shotwell_flickr_flickr_parent_class)->finalize (obj);
-#line 3625 "FlickrPublishingAuthenticator.c"
+#line 3621 "FlickrPublishingAuthenticator.c"
}