summaryrefslogtreecommitdiff
path: root/plugins/authenticator/shotwell/GoogleAuthenticator.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-12-15 20:38:57 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-12-15 20:38:57 +0100
commitf1353e9ffd34db5f755c7da0b3f9c10638fbfd38 (patch)
treea1f2ab30332a6383b0677bfcc2aec687b98851d6 /plugins/authenticator/shotwell/GoogleAuthenticator.c
parentf8ca421bdacee8851965a4b802ada1d2366bdbc1 (diff)
parentede50c561ec9811704821a9ea0f04c3d6c20b5af (diff)
Merge branch 'release/0.26.4-1'0.26.4-1
Diffstat (limited to 'plugins/authenticator/shotwell/GoogleAuthenticator.c')
-rw-r--r--plugins/authenticator/shotwell/GoogleAuthenticator.c1052
1 files changed, 527 insertions, 525 deletions
diff --git a/plugins/authenticator/shotwell/GoogleAuthenticator.c b/plugins/authenticator/shotwell/GoogleAuthenticator.c
index 400d4f1..b531dd6 100644
--- a/plugins/authenticator/shotwell/GoogleAuthenticator.c
+++ b/plugins/authenticator/shotwell/GoogleAuthenticator.c
@@ -1,4 +1,4 @@
-/* GoogleAuthenticator.c generated by valac 0.34.7, the Vala compiler
+/* GoogleAuthenticator.c generated by valac 0.36.6, the Vala compiler
* generated from GoogleAuthenticator.vala, do not modify */
@@ -26,6 +26,11 @@ typedef struct _PublishingAuthenticatorShotwellGoogleWebAuthenticationPaneClass
typedef struct _PublishingAuthenticatorShotwellGoogleWebAuthenticationPanePrivate PublishingAuthenticatorShotwellGoogleWebAuthenticationPanePrivate;
#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
#define _g_free0(var) (var = (g_free (var), NULL))
+enum {
+ PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_WEB_AUTHENTICATION_PANE_AUTHORIZED_SIGNAL,
+ PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_WEB_AUTHENTICATION_PANE_LAST_SIGNAL
+};
+static guint publishing_authenticator_shotwell_google_web_authentication_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_WEB_AUTHENTICATION_PANE_LAST_SIGNAL] = {0};
#define PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_SESSION (publishing_authenticator_shotwell_google_session_get_type ())
#define PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_SESSION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_SESSION, PublishingAuthenticatorShotwellGoogleSession))
@@ -166,7 +171,7 @@ static gpointer publishing_authenticator_shotwell_google_get_access_tokens_trans
static gpointer publishing_authenticator_shotwell_google_refresh_access_token_transaction_parent_class = NULL;
static gpointer publishing_authenticator_shotwell_google_username_fetch_transaction_parent_class = NULL;
static gpointer publishing_authenticator_shotwell_google_google_parent_class = NULL;
-static SpitPublishingAuthenticatorIface* publishing_authenticator_shotwell_google_google_spit_publishing_authenticator_parent_iface = NULL;
+static SpitPublishingAuthenticatorIface * publishing_authenticator_shotwell_google_google_spit_publishing_authenticator_parent_iface = NULL;
#define PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_OAUTH_CLIENT_ID "534227538559-hvj2e8bj0vfv2f49r7gvjoq6jibfav67.apps.googleusercontent.c" \
"om"
@@ -179,7 +184,7 @@ PublishingAuthenticatorShotwellGoogleWebAuthenticationPane* publishing_authentic
PublishingAuthenticatorShotwellGoogleWebAuthenticationPane* publishing_authenticator_shotwell_google_web_authentication_pane_construct (GType object_type, const gchar* auth_sequence_start_url);
gboolean publishing_authenticator_shotwell_google_web_authentication_pane_is_cache_dirty (void);
static void publishing_authenticator_shotwell_google_web_authentication_pane_real_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* base);
-static void publishing_authenticator_shotwell_google_web_authentication_pane_finalize (GObject* obj);
+static void publishing_authenticator_shotwell_google_web_authentication_pane_finalize (GObject * obj);
GType publishing_authenticator_shotwell_google_session_get_type (void) G_GNUC_CONST;
enum {
PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_SESSION_DUMMY_PROPERTY
@@ -188,7 +193,7 @@ static gboolean publishing_authenticator_shotwell_google_session_real_is_authent
void publishing_authenticator_shotwell_google_session_deauthenticate (PublishingAuthenticatorShotwellGoogleSession* self);
PublishingAuthenticatorShotwellGoogleSession* publishing_authenticator_shotwell_google_session_new (void);
PublishingAuthenticatorShotwellGoogleSession* publishing_authenticator_shotwell_google_session_construct (GType object_type);
-static void publishing_authenticator_shotwell_google_session_finalize (PublishingRESTSupportSession* obj);
+static void publishing_authenticator_shotwell_google_session_finalize (PublishingRESTSupportSession * obj);
GType publishing_authenticator_shotwell_google_get_access_tokens_transaction_get_type (void) G_GNUC_CONST;
enum {
PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_GET_ACCESS_TOKENS_TRANSACTION_DUMMY_PROPERTY
@@ -252,12 +257,12 @@ static gboolean ___lambda4_ (PublishingAuthenticatorShotwellGoogleGoogle* self);
static gboolean ____lambda4__gsource_func (gpointer self);
static void publishing_authenticator_shotwell_google_google_on_service_welcome_login (PublishingAuthenticatorShotwellGoogleGoogle* self);
static void _publishing_authenticator_shotwell_google_google_on_service_welcome_login_spit_publishing_login_callback (gpointer self);
-static void publishing_authenticator_shotwell_google_google_finalize (GObject* obj);
+static void publishing_authenticator_shotwell_google_google_finalize (GObject * obj);
PublishingAuthenticatorShotwellGoogleWebAuthenticationPane* publishing_authenticator_shotwell_google_web_authentication_pane_construct (GType object_type, const gchar* auth_sequence_start_url) {
PublishingAuthenticatorShotwellGoogleWebAuthenticationPane * self = NULL;
- const gchar* _tmp0_ = NULL;
+ const gchar* _tmp0_;
#line 13 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
g_return_val_if_fail (auth_sequence_start_url != NULL, NULL);
#line 14 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -266,68 +271,68 @@ PublishingAuthenticatorShotwellGoogleWebAuthenticationPane* publishing_authentic
self = (PublishingAuthenticatorShotwellGoogleWebAuthenticationPane*) g_object_new (object_type, "login-uri", _tmp0_, NULL);
#line 13 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
return self;
-#line 269 "GoogleAuthenticator.c"
+#line 274 "GoogleAuthenticator.c"
}
PublishingAuthenticatorShotwellGoogleWebAuthenticationPane* publishing_authenticator_shotwell_google_web_authentication_pane_new (const gchar* auth_sequence_start_url) {
#line 13 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
return publishing_authenticator_shotwell_google_web_authentication_pane_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_WEB_AUTHENTICATION_PANE, auth_sequence_start_url);
-#line 276 "GoogleAuthenticator.c"
+#line 281 "GoogleAuthenticator.c"
}
gboolean publishing_authenticator_shotwell_google_web_authentication_pane_is_cache_dirty (void) {
gboolean result = FALSE;
- gboolean _tmp0_ = FALSE;
+ gboolean _tmp0_;
#line 18 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_tmp0_ = publishing_authenticator_shotwell_google_web_authentication_pane_cache_dirty;
#line 18 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
result = _tmp0_;
#line 18 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
return result;
-#line 289 "GoogleAuthenticator.c"
+#line 294 "GoogleAuthenticator.c"
}
static gint string_index_of (const gchar* self, const gchar* needle, gint start_index) {
gint result = 0;
gchar* _result_ = NULL;
- gint _tmp0_ = 0;
- const gchar* _tmp1_ = NULL;
- gchar* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
-#line 987 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ gint _tmp0_;
+ const gchar* _tmp1_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
+#line 1011 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, 0);
-#line 987 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1011 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (needle != NULL, 0);
-#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1012 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp0_ = start_index;
-#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1012 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp1_ = needle;
-#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1012 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp2_ = strstr (((gchar*) self) + _tmp0_, (gchar*) _tmp1_);
-#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1012 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_result_ = _tmp2_;
-#line 990 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1014 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp3_ = _result_;
-#line 990 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1014 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp3_ != NULL) {
-#line 316 "GoogleAuthenticator.c"
- gchar* _tmp4_ = NULL;
-#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 321 "GoogleAuthenticator.c"
+ gchar* _tmp4_;
+#line 1015 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp4_ = _result_;
-#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1015 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
result = (gint) (_tmp4_ - ((gchar*) self));
-#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1015 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
-#line 324 "GoogleAuthenticator.c"
+#line 329 "GoogleAuthenticator.c"
} else {
-#line 993 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1017 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
result = -1;
-#line 993 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1017 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
-#line 330 "GoogleAuthenticator.c"
+#line 335 "GoogleAuthenticator.c"
}
}
@@ -335,43 +340,43 @@ static gint string_index_of (const gchar* self, const gchar* needle, gint start_
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 354 "GoogleAuthenticator.c"
- glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 359 "GoogleAuthenticator.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 362 "GoogleAuthenticator.c"
+#line 367 "GoogleAuthenticator.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 374 "GoogleAuthenticator.c"
+#line 379 "GoogleAuthenticator.c"
}
}
@@ -380,136 +385,136 @@ 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 398 "GoogleAuthenticator.c"
- glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 403 "GoogleAuthenticator.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 404 "GoogleAuthenticator.c"
+#line 409 "GoogleAuthenticator.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 408 "GoogleAuthenticator.c"
+#line 413 "GoogleAuthenticator.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 412 "GoogleAuthenticator.c"
- glong _tmp3_ = 0L;
- glong _tmp4_ = 0L;
- glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 417 "GoogleAuthenticator.c"
+ glong _tmp3_;
+ glong _tmp4_;
+ glong _tmp5_;
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp3_ = offset;
-#line 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 424 "GoogleAuthenticator.c"
+#line 429 "GoogleAuthenticator.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 434 "GoogleAuthenticator.c"
+#line 439 "GoogleAuthenticator.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 440 "GoogleAuthenticator.c"
- glong _tmp9_ = 0L;
- glong _tmp10_ = 0L;
- glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 445 "GoogleAuthenticator.c"
+ glong _tmp9_;
+ glong _tmp10_;
+ glong _tmp11_;
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp9_ = string_length;
-#line 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 454 "GoogleAuthenticator.c"
+#line 459 "GoogleAuthenticator.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 464 "GoogleAuthenticator.c"
+#line 469 "GoogleAuthenticator.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 470 "GoogleAuthenticator.c"
- glong _tmp15_ = 0L;
- glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 475 "GoogleAuthenticator.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 479 "GoogleAuthenticator.c"
+#line 484 "GoogleAuthenticator.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 499 "GoogleAuthenticator.c"
+#line 504 "GoogleAuthenticator.c"
}
static void publishing_authenticator_shotwell_google_web_authentication_pane_real_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* base) {
PublishingAuthenticatorShotwellGoogleWebAuthenticationPane * self;
gchar* page_title = NULL;
- WebKitWebView* _tmp0_ = NULL;
- WebKitWebView* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
- gchar* _tmp4_ = NULL;
- const gchar* _tmp5_ = NULL;
- gint _tmp6_ = 0;
+ WebKitWebView* _tmp0_;
+ WebKitWebView* _tmp1_;
+ const gchar* _tmp2_;
+ gchar* _tmp3_;
+ gchar* _tmp4_;
+ const gchar* _tmp5_;
+ gint _tmp6_;
#line 21 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_WEB_AUTHENTICATION_PANE, PublishingAuthenticatorShotwellGoogleWebAuthenticationPane);
#line 22 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -532,16 +537,16 @@ static void publishing_authenticator_shotwell_google_web_authentication_pane_rea
_tmp6_ = string_index_of (_tmp5_, "state=connect", 0);
#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
if (_tmp6_ > 0) {
-#line 535 "GoogleAuthenticator.c"
+#line 540 "GoogleAuthenticator.c"
gint auth_code_field_start = 0;
- const gchar* _tmp7_ = NULL;
- gint _tmp8_ = 0;
- gint _tmp9_ = 0;
+ const gchar* _tmp7_;
+ gint _tmp8_;
+ gint _tmp9_;
gchar* auth_code = NULL;
- const gchar* _tmp10_ = NULL;
- gint _tmp11_ = 0;
- gchar* _tmp12_ = NULL;
- const gchar* _tmp13_ = NULL;
+ const gchar* _tmp10_;
+ gint _tmp11_;
+ gchar* _tmp12_;
+ const gchar* _tmp13_;
#line 24 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_tmp7_ = page_title;
#line 24 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -556,7 +561,7 @@ static void publishing_authenticator_shotwell_google_web_authentication_pane_rea
_g_free0 (page_title);
#line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
return;
-#line 559 "GoogleAuthenticator.c"
+#line 564 "GoogleAuthenticator.c"
}
#line 28 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_tmp10_ = page_title;
@@ -571,14 +576,14 @@ static void publishing_authenticator_shotwell_google_web_authentication_pane_rea
#line 32 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_tmp13_ = auth_code;
#line 32 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- g_signal_emit_by_name (self, "authorized", _tmp13_);
+ g_signal_emit (self, publishing_authenticator_shotwell_google_web_authentication_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_WEB_AUTHENTICATION_PANE_AUTHORIZED_SIGNAL], 0, _tmp13_);
#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_g_free0 (auth_code);
-#line 577 "GoogleAuthenticator.c"
+#line 582 "GoogleAuthenticator.c"
}
#line 21 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_g_free0 (page_title);
-#line 581 "GoogleAuthenticator.c"
+#line 586 "GoogleAuthenticator.c"
}
@@ -586,12 +591,12 @@ static void publishing_authenticator_shotwell_google_web_authentication_pane_cla
#line 8 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
publishing_authenticator_shotwell_google_web_authentication_pane_parent_class = g_type_class_peek_parent (klass);
#line 8 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- ((ShotwellPluginsCommonWebAuthenticationPaneClass *) klass)->on_page_load = (void (*)(ShotwellPluginsCommonWebAuthenticationPane*)) publishing_authenticator_shotwell_google_web_authentication_pane_real_on_page_load;
+ ((ShotwellPluginsCommonWebAuthenticationPaneClass *) klass)->on_page_load = (void (*) (ShotwellPluginsCommonWebAuthenticationPane *)) publishing_authenticator_shotwell_google_web_authentication_pane_real_on_page_load;
#line 8 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
G_OBJECT_CLASS (klass)->finalize = publishing_authenticator_shotwell_google_web_authentication_pane_finalize;
#line 8 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- g_signal_new ("authorized", PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_WEB_AUTHENTICATION_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING);
-#line 594 "GoogleAuthenticator.c"
+ publishing_authenticator_shotwell_google_web_authentication_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_WEB_AUTHENTICATION_PANE_AUTHORIZED_SIGNAL] = g_signal_new ("authorized", PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_WEB_AUTHENTICATION_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING);
+#line 599 "GoogleAuthenticator.c"
}
@@ -599,13 +604,13 @@ static void publishing_authenticator_shotwell_google_web_authentication_pane_ins
}
-static void publishing_authenticator_shotwell_google_web_authentication_pane_finalize (GObject* obj) {
+static void publishing_authenticator_shotwell_google_web_authentication_pane_finalize (GObject * obj) {
PublishingAuthenticatorShotwellGoogleWebAuthenticationPane * self;
#line 8 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_WEB_AUTHENTICATION_PANE, PublishingAuthenticatorShotwellGoogleWebAuthenticationPane);
#line 8 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
G_OBJECT_CLASS (publishing_authenticator_shotwell_google_web_authentication_pane_parent_class)->finalize (obj);
-#line 608 "GoogleAuthenticator.c"
+#line 613 "GoogleAuthenticator.c"
}
@@ -624,7 +629,7 @@ GType publishing_authenticator_shotwell_google_web_authentication_pane_get_type
static gboolean publishing_authenticator_shotwell_google_session_real_is_authenticated (PublishingRESTSupportSession* base) {
PublishingAuthenticatorShotwellGoogleSession * self;
gboolean result = FALSE;
- const gchar* _tmp0_ = NULL;
+ const gchar* _tmp0_;
#line 42 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_SESSION, PublishingAuthenticatorShotwellGoogleSession);
#line 43 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -633,7 +638,7 @@ static gboolean publishing_authenticator_shotwell_google_session_real_is_authent
result = _tmp0_ != NULL;
#line 43 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
return result;
-#line 636 "GoogleAuthenticator.c"
+#line 641 "GoogleAuthenticator.c"
}
@@ -650,7 +655,7 @@ void publishing_authenticator_shotwell_google_session_deauthenticate (Publishing
self->refresh_token = NULL;
#line 49 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
self->expires_at = (gint64) -1;
-#line 653 "GoogleAuthenticator.c"
+#line 658 "GoogleAuthenticator.c"
}
@@ -660,14 +665,14 @@ PublishingAuthenticatorShotwellGoogleSession* publishing_authenticator_shotwell_
self = (PublishingAuthenticatorShotwellGoogleSession*) publishing_rest_support_session_construct (object_type, NULL);
#line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
return self;
-#line 663 "GoogleAuthenticator.c"
+#line 668 "GoogleAuthenticator.c"
}
PublishingAuthenticatorShotwellGoogleSession* publishing_authenticator_shotwell_google_session_new (void) {
#line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
return publishing_authenticator_shotwell_google_session_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_SESSION);
-#line 670 "GoogleAuthenticator.c"
+#line 675 "GoogleAuthenticator.c"
}
@@ -677,8 +682,8 @@ static void publishing_authenticator_shotwell_google_session_class_init (Publish
#line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
((PublishingRESTSupportSessionClass *) klass)->finalize = publishing_authenticator_shotwell_google_session_finalize;
#line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- ((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*)(PublishingRESTSupportSession*)) publishing_authenticator_shotwell_google_session_real_is_authenticated;
-#line 681 "GoogleAuthenticator.c"
+ ((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*) (PublishingRESTSupportSession *)) publishing_authenticator_shotwell_google_session_real_is_authenticated;
+#line 686 "GoogleAuthenticator.c"
}
@@ -689,11 +694,11 @@ static void publishing_authenticator_shotwell_google_session_instance_init (Publ
self->refresh_token = NULL;
#line 40 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
self->expires_at = (gint64) -1;
-#line 692 "GoogleAuthenticator.c"
+#line 697 "GoogleAuthenticator.c"
}
-static void publishing_authenticator_shotwell_google_session_finalize (PublishingRESTSupportSession* obj) {
+static void publishing_authenticator_shotwell_google_session_finalize (PublishingRESTSupportSession * obj) {
PublishingAuthenticatorShotwellGoogleSession * self;
#line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_SESSION, PublishingAuthenticatorShotwellGoogleSession);
@@ -703,7 +708,7 @@ static void publishing_authenticator_shotwell_google_session_finalize (Publishin
_g_free0 (self->refresh_token);
#line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
PUBLISHING_REST_SUPPORT_SESSION_CLASS (publishing_authenticator_shotwell_google_session_parent_class)->finalize (obj);
-#line 706 "GoogleAuthenticator.c"
+#line 711 "GoogleAuthenticator.c"
}
@@ -721,8 +726,8 @@ GType publishing_authenticator_shotwell_google_session_get_type (void) {
PublishingAuthenticatorShotwellGoogleGetAccessTokensTransaction* publishing_authenticator_shotwell_google_get_access_tokens_transaction_construct (GType object_type, PublishingAuthenticatorShotwellGoogleSession* session, const gchar* auth_code) {
PublishingAuthenticatorShotwellGoogleGetAccessTokensTransaction* self = NULL;
- PublishingAuthenticatorShotwellGoogleSession* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
+ PublishingAuthenticatorShotwellGoogleSession* _tmp0_;
+ const gchar* _tmp1_;
#line 56 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_SESSION (session), NULL);
#line 56 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -745,21 +750,21 @@ PublishingAuthenticatorShotwellGoogleGetAccessTokensTransaction* publishing_auth
publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "grant_type", "authorization_code");
#line 56 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
return self;
-#line 748 "GoogleAuthenticator.c"
+#line 753 "GoogleAuthenticator.c"
}
PublishingAuthenticatorShotwellGoogleGetAccessTokensTransaction* publishing_authenticator_shotwell_google_get_access_tokens_transaction_new (PublishingAuthenticatorShotwellGoogleSession* session, const gchar* auth_code) {
#line 56 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
return publishing_authenticator_shotwell_google_get_access_tokens_transaction_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_GET_ACCESS_TOKENS_TRANSACTION, session, auth_code);
-#line 755 "GoogleAuthenticator.c"
+#line 760 "GoogleAuthenticator.c"
}
static void publishing_authenticator_shotwell_google_get_access_tokens_transaction_class_init (PublishingAuthenticatorShotwellGoogleGetAccessTokensTransactionClass * klass) {
#line 53 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
publishing_authenticator_shotwell_google_get_access_tokens_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 762 "GoogleAuthenticator.c"
+#line 767 "GoogleAuthenticator.c"
}
@@ -781,9 +786,9 @@ GType publishing_authenticator_shotwell_google_get_access_tokens_transaction_get
PublishingAuthenticatorShotwellGoogleRefreshAccessTokenTransaction* publishing_authenticator_shotwell_google_refresh_access_token_transaction_construct (GType object_type, PublishingAuthenticatorShotwellGoogleSession* session) {
PublishingAuthenticatorShotwellGoogleRefreshAccessTokenTransaction* self = NULL;
- PublishingAuthenticatorShotwellGoogleSession* _tmp0_ = NULL;
- PublishingAuthenticatorShotwellGoogleSession* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
+ PublishingAuthenticatorShotwellGoogleSession* _tmp0_;
+ PublishingAuthenticatorShotwellGoogleSession* _tmp1_;
+ const gchar* _tmp2_;
#line 70 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_SESSION (session), NULL);
#line 71 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -804,21 +809,21 @@ PublishingAuthenticatorShotwellGoogleRefreshAccessTokenTransaction* publishing_a
publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "grant_type", "refresh_token");
#line 70 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
return self;
-#line 807 "GoogleAuthenticator.c"
+#line 812 "GoogleAuthenticator.c"
}
PublishingAuthenticatorShotwellGoogleRefreshAccessTokenTransaction* publishing_authenticator_shotwell_google_refresh_access_token_transaction_new (PublishingAuthenticatorShotwellGoogleSession* session) {
#line 70 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
return publishing_authenticator_shotwell_google_refresh_access_token_transaction_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_REFRESH_ACCESS_TOKEN_TRANSACTION, session);
-#line 814 "GoogleAuthenticator.c"
+#line 819 "GoogleAuthenticator.c"
}
static void publishing_authenticator_shotwell_google_refresh_access_token_transaction_class_init (PublishingAuthenticatorShotwellGoogleRefreshAccessTokenTransactionClass * klass) {
#line 67 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
publishing_authenticator_shotwell_google_refresh_access_token_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 821 "GoogleAuthenticator.c"
+#line 826 "GoogleAuthenticator.c"
}
@@ -840,11 +845,11 @@ GType publishing_authenticator_shotwell_google_refresh_access_token_transaction_
PublishingAuthenticatorShotwellGoogleUsernameFetchTransaction* publishing_authenticator_shotwell_google_username_fetch_transaction_construct (GType object_type, PublishingAuthenticatorShotwellGoogleSession* session) {
PublishingAuthenticatorShotwellGoogleUsernameFetchTransaction* self = NULL;
- PublishingAuthenticatorShotwellGoogleSession* _tmp0_ = NULL;
- PublishingAuthenticatorShotwellGoogleSession* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
- gchar* _tmp4_ = NULL;
+ PublishingAuthenticatorShotwellGoogleSession* _tmp0_;
+ PublishingAuthenticatorShotwellGoogleSession* _tmp1_;
+ const gchar* _tmp2_;
+ gchar* _tmp3_;
+ gchar* _tmp4_;
#line 82 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_SESSION (session), NULL);
#line 83 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -865,21 +870,21 @@ PublishingAuthenticatorShotwellGoogleUsernameFetchTransaction* publishing_authen
_g_free0 (_tmp4_);
#line 82 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
return self;
-#line 868 "GoogleAuthenticator.c"
+#line 873 "GoogleAuthenticator.c"
}
PublishingAuthenticatorShotwellGoogleUsernameFetchTransaction* publishing_authenticator_shotwell_google_username_fetch_transaction_new (PublishingAuthenticatorShotwellGoogleSession* session) {
#line 82 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
return publishing_authenticator_shotwell_google_username_fetch_transaction_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_USERNAME_FETCH_TRANSACTION, session);
-#line 875 "GoogleAuthenticator.c"
+#line 880 "GoogleAuthenticator.c"
}
static void publishing_authenticator_shotwell_google_username_fetch_transaction_class_init (PublishingAuthenticatorShotwellGoogleUsernameFetchTransactionClass * klass) {
#line 80 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
publishing_authenticator_shotwell_google_username_fetch_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 882 "GoogleAuthenticator.c"
+#line 887 "GoogleAuthenticator.c"
}
@@ -902,36 +907,36 @@ GType publishing_authenticator_shotwell_google_username_fetch_transaction_get_ty
static gpointer _g_object_ref0 (gpointer self) {
#line 99 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
return self ? g_object_ref (self) : NULL;
-#line 905 "GoogleAuthenticator.c"
+#line 910 "GoogleAuthenticator.c"
}
static void _g_free0_ (gpointer var) {
#line 100 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
var = (g_free (var), NULL);
-#line 912 "GoogleAuthenticator.c"
+#line 917 "GoogleAuthenticator.c"
}
static void _g_variant_unref0_ (gpointer var) {
#line 100 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
(var == NULL) ? NULL : (var = (g_variant_unref (var), NULL));
-#line 919 "GoogleAuthenticator.c"
+#line 924 "GoogleAuthenticator.c"
}
PublishingAuthenticatorShotwellGoogleGoogle* publishing_authenticator_shotwell_google_google_construct (GType object_type, const gchar* scope, const gchar* welcome_message, SpitPublishingPluginHost* host) {
PublishingAuthenticatorShotwellGoogleGoogle * self = NULL;
- SpitPublishingPluginHost* _tmp0_ = NULL;
- SpitPublishingPluginHost* _tmp1_ = NULL;
- GHashFunc _tmp2_ = NULL;
- GEqualFunc _tmp3_ = NULL;
- GHashTable* _tmp4_ = NULL;
- const gchar* _tmp5_ = NULL;
- gchar* _tmp6_ = NULL;
- PublishingAuthenticatorShotwellGoogleSession* _tmp7_ = NULL;
- const gchar* _tmp8_ = NULL;
- gchar* _tmp9_ = NULL;
+ SpitPublishingPluginHost* _tmp0_;
+ SpitPublishingPluginHost* _tmp1_;
+ GHashFunc _tmp2_;
+ GEqualFunc _tmp3_;
+ GHashTable* _tmp4_;
+ const gchar* _tmp5_;
+ gchar* _tmp6_;
+ PublishingAuthenticatorShotwellGoogleSession* _tmp7_;
+ const gchar* _tmp8_;
+ gchar* _tmp9_;
#line 96 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
g_return_val_if_fail (scope != NULL, NULL);
#line 96 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -982,25 +987,25 @@ PublishingAuthenticatorShotwellGoogleGoogle* publishing_authenticator_shotwell_g
self->priv->welcome_message = _tmp9_;
#line 96 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
return self;
-#line 985 "GoogleAuthenticator.c"
+#line 990 "GoogleAuthenticator.c"
}
PublishingAuthenticatorShotwellGoogleGoogle* publishing_authenticator_shotwell_google_google_new (const gchar* scope, const gchar* welcome_message, SpitPublishingPluginHost* host) {
#line 96 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
return publishing_authenticator_shotwell_google_google_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_GOOGLE, scope, welcome_message, host);
-#line 992 "GoogleAuthenticator.c"
+#line 997 "GoogleAuthenticator.c"
}
static void publishing_authenticator_shotwell_google_google_real_authenticate (SpitPublishingAuthenticator* base) {
PublishingAuthenticatorShotwellGoogleGoogle * self;
gchar* refresh_token = NULL;
- SpitPublishingPluginHost* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
+ SpitPublishingPluginHost* _tmp0_;
+ gchar* _tmp1_;
gboolean _tmp2_ = FALSE;
- const gchar* _tmp3_ = NULL;
- gboolean _tmp6_ = FALSE;
+ const gchar* _tmp3_;
+ gboolean _tmp6_;
#line 106 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_GOOGLE, PublishingAuthenticatorShotwellGoogleGoogle);
#line 107 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -1013,22 +1018,22 @@ static void publishing_authenticator_shotwell_google_google_real_authenticate (S
_tmp3_ = refresh_token;
#line 108 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
if (_tmp3_ != NULL) {
-#line 1016 "GoogleAuthenticator.c"
- const gchar* _tmp4_ = NULL;
+#line 1021 "GoogleAuthenticator.c"
+ const gchar* _tmp4_;
#line 108 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_tmp4_ = refresh_token;
#line 108 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_tmp2_ = g_strcmp0 (_tmp4_, "") != 0;
-#line 1022 "GoogleAuthenticator.c"
+#line 1027 "GoogleAuthenticator.c"
} else {
#line 108 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_tmp2_ = FALSE;
-#line 1026 "GoogleAuthenticator.c"
+#line 1031 "GoogleAuthenticator.c"
}
#line 108 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
if (_tmp2_) {
-#line 1030 "GoogleAuthenticator.c"
- const gchar* _tmp5_ = NULL;
+#line 1035 "GoogleAuthenticator.c"
+ const gchar* _tmp5_;
#line 109 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_tmp5_ = refresh_token;
#line 109 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -1039,16 +1044,15 @@ static void publishing_authenticator_shotwell_google_google_real_authenticate (S
_g_free0 (refresh_token);
#line 111 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
return;
-#line 1042 "GoogleAuthenticator.c"
+#line 1047 "GoogleAuthenticator.c"
}
#line 115 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_tmp6_ = publishing_authenticator_shotwell_google_web_authentication_pane_is_cache_dirty ();
#line 115 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
if (_tmp6_) {
-#line 1048 "GoogleAuthenticator.c"
- SpitPublishingPluginHost* _tmp7_ = NULL;
- SpitPublishingPluginHost* _tmp8_ = NULL;
- const gchar* _tmp9_ = NULL;
+#line 1053 "GoogleAuthenticator.c"
+ SpitPublishingPluginHost* _tmp7_;
+ SpitPublishingPluginHost* _tmp8_;
#line 116 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_tmp7_ = self->priv->host;
#line 116 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -1056,22 +1060,20 @@ static void publishing_authenticator_shotwell_google_google_real_authenticate (S
#line 118 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_tmp8_ = self->priv->host;
#line 118 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- _tmp9_ = _ ("You have already logged in and out of a Google service during this Sho" \
+ spit_publishing_plugin_host_install_static_message_pane (_tmp8_, _ ("You have already logged in and out of a Google service during this Sho" \
"twell session.\n" \
"\n" \
"To continue publishing to Google services, quit and restart Shotwell, " \
-"then try publishing again.");
-#line 118 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- spit_publishing_plugin_host_install_static_message_pane (_tmp8_, _tmp9_, SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
-#line 1062 "GoogleAuthenticator.c"
+"then try publishing again."), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
+#line 1064 "GoogleAuthenticator.c"
} else {
#line 120 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
publishing_authenticator_shotwell_google_google_do_show_service_welcome_pane (self);
-#line 1066 "GoogleAuthenticator.c"
+#line 1068 "GoogleAuthenticator.c"
}
#line 106 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_g_free0 (refresh_token);
-#line 1070 "GoogleAuthenticator.c"
+#line 1072 "GoogleAuthenticator.c"
}
@@ -1084,22 +1086,22 @@ static gboolean publishing_authenticator_shotwell_google_google_real_can_logout
result = TRUE;
#line 125 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
return result;
-#line 1083 "GoogleAuthenticator.c"
+#line 1085 "GoogleAuthenticator.c"
}
static gpointer _g_hash_table_ref0 (gpointer self) {
#line 129 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
return self ? g_hash_table_ref (self) : NULL;
-#line 1090 "GoogleAuthenticator.c"
+#line 1092 "GoogleAuthenticator.c"
}
static GHashTable* publishing_authenticator_shotwell_google_google_real_get_authentication_parameter (SpitPublishingAuthenticator* base) {
PublishingAuthenticatorShotwellGoogleGoogle * self;
GHashTable* result = NULL;
- GHashTable* _tmp0_ = NULL;
- GHashTable* _tmp1_ = NULL;
+ GHashTable* _tmp0_;
+ GHashTable* _tmp1_;
#line 128 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_GOOGLE, PublishingAuthenticatorShotwellGoogleGoogle);
#line 129 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -1110,14 +1112,14 @@ static GHashTable* publishing_authenticator_shotwell_google_google_real_get_auth
result = _tmp1_;
#line 129 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
return result;
-#line 1109 "GoogleAuthenticator.c"
+#line 1111 "GoogleAuthenticator.c"
}
static void publishing_authenticator_shotwell_google_google_real_logout (SpitPublishingAuthenticator* base) {
PublishingAuthenticatorShotwellGoogleGoogle * self;
- PublishingAuthenticatorShotwellGoogleSession* _tmp0_ = NULL;
- SpitPublishingPluginHost* _tmp1_ = NULL;
+ PublishingAuthenticatorShotwellGoogleSession* _tmp0_;
+ SpitPublishingPluginHost* _tmp1_;
#line 132 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_GOOGLE, PublishingAuthenticatorShotwellGoogleGoogle);
#line 133 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -1128,7 +1130,7 @@ static void publishing_authenticator_shotwell_google_google_real_logout (SpitPub
_tmp1_ = self->priv->host;
#line 134 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "refresh_token", "");
-#line 1127 "GoogleAuthenticator.c"
+#line 1129 "GoogleAuthenticator.c"
}
@@ -1136,50 +1138,50 @@ static void publishing_authenticator_shotwell_google_google_real_refresh (SpitPu
PublishingAuthenticatorShotwellGoogleGoogle * self;
#line 137 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_GOOGLE, PublishingAuthenticatorShotwellGoogleGoogle);
-#line 1135 "GoogleAuthenticator.c"
+#line 1137 "GoogleAuthenticator.c"
}
static void _publishing_authenticator_shotwell_google_google_on_web_auth_pane_authorized_publishing_authenticator_shotwell_google_web_authentication_pane_authorized (PublishingAuthenticatorShotwellGoogleWebAuthenticationPane* _sender, const gchar* auth_code, gpointer self) {
#line 155 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
publishing_authenticator_shotwell_google_google_on_web_auth_pane_authorized ((PublishingAuthenticatorShotwellGoogleGoogle*) self, auth_code);
-#line 1142 "GoogleAuthenticator.c"
+#line 1144 "GoogleAuthenticator.c"
}
static void publishing_authenticator_shotwell_google_google_do_hosted_web_authentication (PublishingAuthenticatorShotwellGoogleGoogle* self) {
gchar* user_authorization_url = NULL;
- gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
- gchar* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
- gchar* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
- gchar* _tmp6_ = NULL;
- gchar* _tmp7_ = NULL;
- const gchar* _tmp8_ = NULL;
- gchar* _tmp9_ = NULL;
- gchar* _tmp10_ = NULL;
- gchar* _tmp11_ = NULL;
- gchar* _tmp12_ = NULL;
- gchar* _tmp13_ = NULL;
- gchar* _tmp14_ = NULL;
- gchar* _tmp15_ = NULL;
- gchar* _tmp16_ = NULL;
- gchar* _tmp17_ = NULL;
- gchar* _tmp18_ = NULL;
- gchar* _tmp19_ = NULL;
- gchar* _tmp20_ = NULL;
- gchar* _tmp21_ = NULL;
- gchar* _tmp22_ = NULL;
- gchar* _tmp23_ = NULL;
- gchar* _tmp24_ = NULL;
- gchar* _tmp25_ = NULL;
- gchar* _tmp26_ = NULL;
- PublishingAuthenticatorShotwellGoogleWebAuthenticationPane* _tmp27_ = NULL;
- PublishingAuthenticatorShotwellGoogleWebAuthenticationPane* _tmp28_ = NULL;
- SpitPublishingPluginHost* _tmp29_ = NULL;
- PublishingAuthenticatorShotwellGoogleWebAuthenticationPane* _tmp30_ = NULL;
+ gchar* _tmp0_;
+ gchar* _tmp1_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
+ gchar* _tmp4_;
+ gchar* _tmp5_;
+ gchar* _tmp6_;
+ gchar* _tmp7_;
+ const gchar* _tmp8_;
+ gchar* _tmp9_;
+ gchar* _tmp10_;
+ gchar* _tmp11_;
+ gchar* _tmp12_;
+ gchar* _tmp13_;
+ gchar* _tmp14_;
+ gchar* _tmp15_;
+ gchar* _tmp16_;
+ gchar* _tmp17_;
+ gchar* _tmp18_;
+ gchar* _tmp19_;
+ gchar* _tmp20_;
+ gchar* _tmp21_;
+ gchar* _tmp22_;
+ gchar* _tmp23_;
+ gchar* _tmp24_;
+ gchar* _tmp25_;
+ gchar* _tmp26_;
+ PublishingAuthenticatorShotwellGoogleWebAuthenticationPane* _tmp27_;
+ PublishingAuthenticatorShotwellGoogleWebAuthenticationPane* _tmp28_;
+ SpitPublishingPluginHost* _tmp29_;
+ PublishingAuthenticatorShotwellGoogleWebAuthenticationPane* _tmp30_;
#line 141 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_GOOGLE (self));
#line 142 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -1283,16 +1285,16 @@ static void publishing_authenticator_shotwell_google_google_do_hosted_web_authen
spit_publishing_plugin_host_install_dialog_pane (_tmp29_, G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
#line 141 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_g_free0 (user_authorization_url);
-#line 1281 "GoogleAuthenticator.c"
+#line 1283 "GoogleAuthenticator.c"
}
static void publishing_authenticator_shotwell_google_google_on_web_auth_pane_authorized (PublishingAuthenticatorShotwellGoogleGoogle* self, const gchar* auth_code) {
- PublishingAuthenticatorShotwellGoogleWebAuthenticationPane* _tmp0_ = NULL;
- guint _tmp1_ = 0U;
- const gchar* _tmp2_ = NULL;
- const gchar* _tmp3_ = NULL;
- const gchar* _tmp4_ = NULL;
+ PublishingAuthenticatorShotwellGoogleWebAuthenticationPane* _tmp0_;
+ guint _tmp1_;
+ const gchar* _tmp2_;
+ const gchar* _tmp3_;
+ const gchar* _tmp4_;
#line 160 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_GOOGLE (self));
#line 160 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -1314,30 +1316,30 @@ static void publishing_authenticator_shotwell_google_google_on_web_auth_pane_aut
_tmp4_ = auth_code;
#line 165 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
publishing_authenticator_shotwell_google_google_do_get_access_tokens (self, _tmp4_);
-#line 1311 "GoogleAuthenticator.c"
+#line 1313 "GoogleAuthenticator.c"
}
static void _publishing_authenticator_shotwell_google_google_on_get_access_tokens_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
#line 174 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
publishing_authenticator_shotwell_google_google_on_get_access_tokens_complete ((PublishingAuthenticatorShotwellGoogleGoogle*) self, _sender);
-#line 1318 "GoogleAuthenticator.c"
+#line 1320 "GoogleAuthenticator.c"
}
static void _publishing_authenticator_shotwell_google_google_on_get_access_tokens_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
#line 175 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
publishing_authenticator_shotwell_google_google_on_get_access_tokens_error ((PublishingAuthenticatorShotwellGoogleGoogle*) self, _sender, err);
-#line 1325 "GoogleAuthenticator.c"
+#line 1327 "GoogleAuthenticator.c"
}
static void publishing_authenticator_shotwell_google_google_do_get_access_tokens (PublishingAuthenticatorShotwellGoogleGoogle* self, const gchar* auth_code) {
- SpitPublishingPluginHost* _tmp0_ = NULL;
+ SpitPublishingPluginHost* _tmp0_;
PublishingAuthenticatorShotwellGoogleGetAccessTokensTransaction* tokens_txn = NULL;
- PublishingAuthenticatorShotwellGoogleSession* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
- PublishingAuthenticatorShotwellGoogleGetAccessTokensTransaction* _tmp3_ = NULL;
+ PublishingAuthenticatorShotwellGoogleSession* _tmp1_;
+ const gchar* _tmp2_;
+ PublishingAuthenticatorShotwellGoogleGetAccessTokensTransaction* _tmp3_;
GError * _inner_error_ = NULL;
#line 168 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_GOOGLE (self));
@@ -1362,7 +1364,7 @@ static void publishing_authenticator_shotwell_google_google_do_get_access_tokens
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (tokens_txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_authenticator_shotwell_google_google_on_get_access_tokens_complete_publishing_rest_support_transaction_completed, self, 0);
#line 175 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (tokens_txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_authenticator_shotwell_google_google_on_get_access_tokens_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 1358 "GoogleAuthenticator.c"
+#line 1360 "GoogleAuthenticator.c"
{
#line 178 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (tokens_txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
@@ -1370,7 +1372,7 @@ static void publishing_authenticator_shotwell_google_google_do_get_access_tokens
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 178 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 1366 "GoogleAuthenticator.c"
+#line 1368 "GoogleAuthenticator.c"
goto __catch5_spit_publishing_publishing_error;
}
#line 178 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -1381,15 +1383,15 @@ static void publishing_authenticator_shotwell_google_google_do_get_access_tokens
g_clear_error (&_inner_error_);
#line 178 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
return;
-#line 1377 "GoogleAuthenticator.c"
+#line 1379 "GoogleAuthenticator.c"
}
}
goto __finally5;
__catch5_spit_publishing_publishing_error:
{
GError* err = NULL;
- SpitPublishingPluginHost* _tmp4_ = NULL;
- GError* _tmp5_ = NULL;
+ SpitPublishingPluginHost* _tmp4_;
+ GError* _tmp5_;
#line 177 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
err = _inner_error_;
#line 177 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -1402,7 +1404,7 @@ static void publishing_authenticator_shotwell_google_google_do_get_access_tokens
spit_publishing_plugin_host_post_error (_tmp4_, _tmp5_);
#line 177 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_g_error_free0 (err);
-#line 1398 "GoogleAuthenticator.c"
+#line 1400 "GoogleAuthenticator.c"
}
__finally5:
#line 177 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -1415,22 +1417,22 @@ static void publishing_authenticator_shotwell_google_google_do_get_access_tokens
g_clear_error (&_inner_error_);
#line 177 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
return;
-#line 1411 "GoogleAuthenticator.c"
+#line 1413 "GoogleAuthenticator.c"
}
#line 168 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_publishing_rest_support_transaction_unref0 (tokens_txn);
-#line 1415 "GoogleAuthenticator.c"
+#line 1417 "GoogleAuthenticator.c"
}
static void publishing_authenticator_shotwell_google_google_on_get_access_tokens_complete (PublishingAuthenticatorShotwellGoogleGoogle* 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 184 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_GOOGLE (self));
#line 184 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -1460,20 +1462,20 @@ static void publishing_authenticator_shotwell_google_google_on_get_access_tokens
publishing_authenticator_shotwell_google_google_do_extract_tokens (self, _tmp6_);
#line 191 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_g_free0 (_tmp6_);
-#line 1455 "GoogleAuthenticator.c"
+#line 1457 "GoogleAuthenticator.c"
}
static void publishing_authenticator_shotwell_google_google_on_get_access_tokens_error (PublishingAuthenticatorShotwellGoogleGoogle* self, PublishingRESTSupportTransaction* txn, GError* err) {
- PublishingRESTSupportTransaction* _tmp0_ = NULL;
- guint _tmp1_ = 0U;
- PublishingRESTSupportTransaction* _tmp2_ = NULL;
- guint _tmp3_ = 0U;
- PublishingRESTSupportTransaction* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
- gchar* _tmp6_ = NULL;
- SpitPublishingPluginHost* _tmp7_ = NULL;
- GError* _tmp8_ = NULL;
+ PublishingRESTSupportTransaction* _tmp0_;
+ guint _tmp1_;
+ PublishingRESTSupportTransaction* _tmp2_;
+ guint _tmp3_;
+ PublishingRESTSupportTransaction* _tmp4_;
+ gchar* _tmp5_;
+ gchar* _tmp6_;
+ SpitPublishingPluginHost* _tmp7_;
+ GError* _tmp8_;
#line 194 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_GOOGLE (self));
#line 194 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -1507,34 +1509,34 @@ static void publishing_authenticator_shotwell_google_google_on_get_access_tokens
_tmp8_ = err;
#line 202 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
spit_publishing_plugin_host_post_error (_tmp7_, _tmp8_);
-#line 1501 "GoogleAuthenticator.c"
+#line 1503 "GoogleAuthenticator.c"
}
static gpointer _json_object_ref0 (gpointer self) {
#line 218 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
return self ? json_object_ref (self) : NULL;
-#line 1508 "GoogleAuthenticator.c"
+#line 1510 "GoogleAuthenticator.c"
}
static void publishing_authenticator_shotwell_google_google_do_extract_tokens (PublishingAuthenticatorShotwellGoogleGoogle* self, const gchar* response_body) {
JsonParser* parser = NULL;
- JsonParser* _tmp0_ = NULL;
+ JsonParser* _tmp0_;
JsonObject* response_obj = NULL;
- JsonParser* _tmp10_ = NULL;
- JsonNode* _tmp11_ = NULL;
- JsonObject* _tmp12_ = NULL;
- JsonObject* _tmp13_ = NULL;
+ JsonParser* _tmp10_;
+ JsonNode* _tmp11_;
+ JsonObject* _tmp12_;
+ JsonObject* _tmp13_;
gboolean _tmp14_ = FALSE;
- JsonObject* _tmp15_ = NULL;
- gboolean _tmp16_ = FALSE;
- JsonObject* _tmp22_ = NULL;
- gboolean _tmp23_ = FALSE;
- JsonObject* _tmp29_ = NULL;
- gboolean _tmp30_ = FALSE;
- JsonObject* _tmp36_ = NULL;
- gboolean _tmp37_ = FALSE;
+ JsonObject* _tmp15_;
+ gboolean _tmp16_;
+ JsonObject* _tmp22_;
+ gboolean _tmp23_;
+ JsonObject* _tmp29_;
+ gboolean _tmp30_;
+ JsonObject* _tmp36_;
+ gboolean _tmp37_;
GError * _inner_error_ = NULL;
#line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_GOOGLE (self));
@@ -1547,10 +1549,10 @@ static void publishing_authenticator_shotwell_google_google_do_extract_tokens (P
_tmp0_ = json_parser_new ();
#line 208 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
parser = _tmp0_;
-#line 1540 "GoogleAuthenticator.c"
+#line 1542 "GoogleAuthenticator.c"
{
- JsonParser* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
+ JsonParser* _tmp1_;
+ const gchar* _tmp2_;
#line 211 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_tmp1_ = parser;
#line 211 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -1559,7 +1561,7 @@ static void publishing_authenticator_shotwell_google_google_do_extract_tokens (P
json_parser_load_from_data (_tmp1_, _tmp2_, (gssize) -1, &_inner_error_);
#line 211 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1552 "GoogleAuthenticator.c"
+#line 1554 "GoogleAuthenticator.c"
goto __catch6_g_error;
}
}
@@ -1567,13 +1569,13 @@ static void publishing_authenticator_shotwell_google_google_do_extract_tokens (P
__catch6_g_error:
{
GError* err = NULL;
- SpitPublishingPluginHost* _tmp3_ = NULL;
- GError* _tmp4_ = NULL;
- const gchar* _tmp5_ = NULL;
- gchar* _tmp6_ = NULL;
- gchar* _tmp7_ = NULL;
- GError* _tmp8_ = NULL;
- GError* _tmp9_ = NULL;
+ SpitPublishingPluginHost* _tmp3_;
+ GError* _tmp4_;
+ const gchar* _tmp5_;
+ gchar* _tmp6_;
+ gchar* _tmp7_;
+ GError* _tmp8_;
+ GError* _tmp9_;
#line 210 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
err = _inner_error_;
#line 210 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -1604,7 +1606,7 @@ static void publishing_authenticator_shotwell_google_google_do_extract_tokens (P
_g_object_unref0 (parser);
#line 215 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
return;
-#line 1597 "GoogleAuthenticator.c"
+#line 1599 "GoogleAuthenticator.c"
}
__finally6:
#line 210 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -1617,7 +1619,7 @@ static void publishing_authenticator_shotwell_google_google_do_extract_tokens (P
g_clear_error (&_inner_error_);
#line 210 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
return;
-#line 1610 "GoogleAuthenticator.c"
+#line 1612 "GoogleAuthenticator.c"
}
#line 218 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_tmp10_ = parser;
@@ -1635,27 +1637,27 @@ static void publishing_authenticator_shotwell_google_google_do_extract_tokens (P
_tmp16_ = json_object_has_member (_tmp15_, "access_token");
#line 220 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
if (!_tmp16_) {
-#line 1628 "GoogleAuthenticator.c"
- JsonObject* _tmp17_ = NULL;
- gboolean _tmp18_ = FALSE;
+#line 1630 "GoogleAuthenticator.c"
+ JsonObject* _tmp17_;
+ gboolean _tmp18_;
#line 220 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_tmp17_ = response_obj;
#line 220 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_tmp18_ = json_object_has_member (_tmp17_, "refresh_token");
#line 220 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_tmp14_ = !_tmp18_;
-#line 1637 "GoogleAuthenticator.c"
+#line 1639 "GoogleAuthenticator.c"
} else {
#line 220 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_tmp14_ = FALSE;
-#line 1641 "GoogleAuthenticator.c"
+#line 1643 "GoogleAuthenticator.c"
}
#line 220 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
if (_tmp14_) {
-#line 1645 "GoogleAuthenticator.c"
- SpitPublishingPluginHost* _tmp19_ = NULL;
- GError* _tmp20_ = NULL;
- GError* _tmp21_ = NULL;
+#line 1647 "GoogleAuthenticator.c"
+ SpitPublishingPluginHost* _tmp19_;
+ GError* _tmp20_;
+ GError* _tmp21_;
#line 221 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_tmp19_ = self->priv->host;
#line 221 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -1672,7 +1674,7 @@ static void publishing_authenticator_shotwell_google_google_do_extract_tokens (P
_g_object_unref0 (parser);
#line 223 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
return;
-#line 1665 "GoogleAuthenticator.c"
+#line 1667 "GoogleAuthenticator.c"
}
#line 226 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_tmp22_ = response_obj;
@@ -1680,14 +1682,14 @@ static void publishing_authenticator_shotwell_google_google_do_extract_tokens (P
_tmp23_ = json_object_has_member (_tmp22_, "expires_in");
#line 226 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
if (_tmp23_) {
-#line 1673 "GoogleAuthenticator.c"
+#line 1675 "GoogleAuthenticator.c"
gint64 duration = 0LL;
- JsonObject* _tmp24_ = NULL;
- gint64 _tmp25_ = 0LL;
+ JsonObject* _tmp24_;
+ gint64 _tmp25_;
gint64 abs_time = 0LL;
- gint64 _tmp26_ = 0LL;
- gint64 _tmp27_ = 0LL;
- gint64 _tmp28_ = 0LL;
+ gint64 _tmp26_;
+ gint64 _tmp27_;
+ gint64 _tmp28_;
#line 227 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_tmp24_ = response_obj;
#line 227 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -1704,7 +1706,7 @@ static void publishing_authenticator_shotwell_google_google_do_extract_tokens (P
_tmp28_ = abs_time;
#line 229 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
publishing_authenticator_shotwell_google_google_on_expiry_time_avilable (self, _tmp28_);
-#line 1697 "GoogleAuthenticator.c"
+#line 1699 "GoogleAuthenticator.c"
}
#line 232 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_tmp29_ = response_obj;
@@ -1712,12 +1714,12 @@ static void publishing_authenticator_shotwell_google_google_do_extract_tokens (P
_tmp30_ = json_object_has_member (_tmp29_, "refresh_token");
#line 232 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
if (_tmp30_) {
-#line 1705 "GoogleAuthenticator.c"
+#line 1707 "GoogleAuthenticator.c"
gchar* refresh_token = NULL;
- JsonObject* _tmp31_ = NULL;
- const gchar* _tmp32_ = NULL;
- gchar* _tmp33_ = NULL;
- const gchar* _tmp34_ = NULL;
+ JsonObject* _tmp31_;
+ const gchar* _tmp32_;
+ gchar* _tmp33_;
+ const gchar* _tmp34_;
#line 233 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_tmp31_ = response_obj;
#line 233 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -1730,17 +1732,17 @@ static void publishing_authenticator_shotwell_google_google_do_extract_tokens (P
_tmp34_ = refresh_token;
#line 235 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
if (g_strcmp0 (_tmp34_, "") != 0) {
-#line 1723 "GoogleAuthenticator.c"
- const gchar* _tmp35_ = NULL;
+#line 1725 "GoogleAuthenticator.c"
+ const gchar* _tmp35_;
#line 236 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_tmp35_ = refresh_token;
#line 236 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
publishing_authenticator_shotwell_google_google_on_refresh_token_available (self, _tmp35_);
-#line 1729 "GoogleAuthenticator.c"
+#line 1731 "GoogleAuthenticator.c"
}
#line 232 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_g_free0 (refresh_token);
-#line 1733 "GoogleAuthenticator.c"
+#line 1735 "GoogleAuthenticator.c"
}
#line 239 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_tmp36_ = response_obj;
@@ -1748,12 +1750,12 @@ static void publishing_authenticator_shotwell_google_google_do_extract_tokens (P
_tmp37_ = json_object_has_member (_tmp36_, "access_token");
#line 239 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
if (_tmp37_) {
-#line 1741 "GoogleAuthenticator.c"
+#line 1743 "GoogleAuthenticator.c"
gchar* access_token = NULL;
- JsonObject* _tmp38_ = NULL;
- const gchar* _tmp39_ = NULL;
- gchar* _tmp40_ = NULL;
- const gchar* _tmp41_ = NULL;
+ JsonObject* _tmp38_;
+ const gchar* _tmp39_;
+ gchar* _tmp40_;
+ const gchar* _tmp41_;
#line 240 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_tmp38_ = response_obj;
#line 240 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -1766,35 +1768,35 @@ static void publishing_authenticator_shotwell_google_google_do_extract_tokens (P
_tmp41_ = access_token;
#line 242 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
if (g_strcmp0 (_tmp41_, "") != 0) {
-#line 1759 "GoogleAuthenticator.c"
- const gchar* _tmp42_ = NULL;
+#line 1761 "GoogleAuthenticator.c"
+ const gchar* _tmp42_;
#line 243 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_tmp42_ = access_token;
#line 243 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
publishing_authenticator_shotwell_google_google_on_access_token_available (self, _tmp42_);
-#line 1765 "GoogleAuthenticator.c"
+#line 1767 "GoogleAuthenticator.c"
}
#line 239 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_g_free0 (access_token);
-#line 1769 "GoogleAuthenticator.c"
+#line 1771 "GoogleAuthenticator.c"
}
#line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_json_object_unref0 (response_obj);
#line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_g_object_unref0 (parser);
-#line 1775 "GoogleAuthenticator.c"
+#line 1777 "GoogleAuthenticator.c"
}
static void publishing_authenticator_shotwell_google_google_on_refresh_token_available (PublishingAuthenticatorShotwellGoogleGoogle* self, const gchar* token) {
- const gchar* _tmp0_ = NULL;
- GHashTable* _tmp1_ = NULL;
- gchar* _tmp2_ = NULL;
- const gchar* _tmp3_ = NULL;
- GVariant* _tmp4_ = NULL;
- PublishingAuthenticatorShotwellGoogleSession* _tmp5_ = NULL;
- const gchar* _tmp6_ = NULL;
- gchar* _tmp7_ = NULL;
+ const gchar* _tmp0_;
+ GHashTable* _tmp1_;
+ gchar* _tmp2_;
+ const gchar* _tmp3_;
+ GVariant* _tmp4_;
+ PublishingAuthenticatorShotwellGoogleSession* _tmp5_;
+ const gchar* _tmp6_;
+ gchar* _tmp7_;
#line 247 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_GOOGLE (self));
#line 247 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -1826,18 +1828,18 @@ static void publishing_authenticator_shotwell_google_google_on_refresh_token_ava
_g_free0 (_tmp5_->refresh_token);
#line 251 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_tmp5_->refresh_token = _tmp7_;
-#line 1818 "GoogleAuthenticator.c"
+#line 1820 "GoogleAuthenticator.c"
}
static void publishing_authenticator_shotwell_google_google_on_expiry_time_avilable (PublishingAuthenticatorShotwellGoogleGoogle* self, gint64 abs_time) {
- gint64 _tmp0_ = 0LL;
- PublishingAuthenticatorShotwellGoogleSession* _tmp1_ = NULL;
- gint64 _tmp2_ = 0LL;
- GHashTable* _tmp3_ = NULL;
- gchar* _tmp4_ = NULL;
- gint64 _tmp5_ = 0LL;
- GVariant* _tmp6_ = NULL;
+ gint64 _tmp0_;
+ PublishingAuthenticatorShotwellGoogleSession* _tmp1_;
+ gint64 _tmp2_;
+ GHashTable* _tmp3_;
+ gchar* _tmp4_;
+ gint64 _tmp5_;
+ GVariant* _tmp6_;
#line 254 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_GOOGLE (self));
#line 255 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -1862,19 +1864,19 @@ static void publishing_authenticator_shotwell_google_google_on_expiry_time_avila
g_variant_ref_sink (_tmp6_);
#line 259 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
g_hash_table_insert (_tmp3_, _tmp4_, _tmp6_);
-#line 1854 "GoogleAuthenticator.c"
+#line 1856 "GoogleAuthenticator.c"
}
static void publishing_authenticator_shotwell_google_google_on_access_token_available (PublishingAuthenticatorShotwellGoogleGoogle* self, const gchar* token) {
- const gchar* _tmp0_ = NULL;
- PublishingAuthenticatorShotwellGoogleSession* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
- GHashTable* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
- const gchar* _tmp6_ = NULL;
- GVariant* _tmp7_ = NULL;
+ const gchar* _tmp0_;
+ PublishingAuthenticatorShotwellGoogleSession* _tmp1_;
+ const gchar* _tmp2_;
+ gchar* _tmp3_;
+ GHashTable* _tmp4_;
+ gchar* _tmp5_;
+ const gchar* _tmp6_;
+ GVariant* _tmp7_;
#line 263 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_GOOGLE (self));
#line 263 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -1908,30 +1910,30 @@ static void publishing_authenticator_shotwell_google_google_on_access_token_avai
g_hash_table_insert (_tmp4_, _tmp5_, _tmp7_);
#line 269 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
publishing_authenticator_shotwell_google_google_do_fetch_username (self);
-#line 1899 "GoogleAuthenticator.c"
+#line 1901 "GoogleAuthenticator.c"
}
static void _publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
#line 279 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_completed ((PublishingAuthenticatorShotwellGoogleGoogle*) self, _sender);
-#line 1906 "GoogleAuthenticator.c"
+#line 1908 "GoogleAuthenticator.c"
}
static void _publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
#line 280 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_error ((PublishingAuthenticatorShotwellGoogleGoogle*) self, _sender, err);
-#line 1913 "GoogleAuthenticator.c"
+#line 1915 "GoogleAuthenticator.c"
}
static void publishing_authenticator_shotwell_google_google_do_fetch_username (PublishingAuthenticatorShotwellGoogleGoogle* self) {
- SpitPublishingPluginHost* _tmp0_ = NULL;
- SpitPublishingPluginHost* _tmp1_ = NULL;
+ SpitPublishingPluginHost* _tmp0_;
+ SpitPublishingPluginHost* _tmp1_;
PublishingAuthenticatorShotwellGoogleUsernameFetchTransaction* txn = NULL;
- PublishingAuthenticatorShotwellGoogleSession* _tmp2_ = NULL;
- PublishingAuthenticatorShotwellGoogleUsernameFetchTransaction* _tmp3_ = NULL;
+ PublishingAuthenticatorShotwellGoogleSession* _tmp2_;
+ PublishingAuthenticatorShotwellGoogleUsernameFetchTransaction* _tmp3_;
GError * _inner_error_ = NULL;
#line 272 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_GOOGLE (self));
@@ -1956,13 +1958,13 @@ static void publishing_authenticator_shotwell_google_google_do_fetch_username (P
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_completed_publishing_rest_support_transaction_completed, self, 0);
#line 280 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 1946 "GoogleAuthenticator.c"
+#line 1948 "GoogleAuthenticator.c"
{
#line 283 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
#line 283 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1952 "GoogleAuthenticator.c"
+#line 1954 "GoogleAuthenticator.c"
goto __catch7_g_error;
}
}
@@ -1970,8 +1972,8 @@ static void publishing_authenticator_shotwell_google_google_do_fetch_username (P
__catch7_g_error:
{
GError* err = NULL;
- SpitPublishingPluginHost* _tmp4_ = NULL;
- GError* _tmp5_ = NULL;
+ SpitPublishingPluginHost* _tmp4_;
+ GError* _tmp5_;
#line 282 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
err = _inner_error_;
#line 282 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -1984,7 +1986,7 @@ static void publishing_authenticator_shotwell_google_google_do_fetch_username (P
spit_publishing_plugin_host_post_error (_tmp4_, _tmp5_);
#line 282 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_g_error_free0 (err);
-#line 1974 "GoogleAuthenticator.c"
+#line 1976 "GoogleAuthenticator.c"
}
__finally7:
#line 282 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -1997,22 +1999,22 @@ static void publishing_authenticator_shotwell_google_google_do_fetch_username (P
g_clear_error (&_inner_error_);
#line 282 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
return;
-#line 1987 "GoogleAuthenticator.c"
+#line 1989 "GoogleAuthenticator.c"
}
#line 272 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_publishing_rest_support_transaction_unref0 (txn);
-#line 1991 "GoogleAuthenticator.c"
+#line 1993 "GoogleAuthenticator.c"
}
static void publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_completed (PublishingAuthenticatorShotwellGoogleGoogle* 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 289 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_GOOGLE (self));
#line 289 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -2042,17 +2044,17 @@ static void publishing_authenticator_shotwell_google_google_on_fetch_username_tr
publishing_authenticator_shotwell_google_google_do_extract_username (self, _tmp6_);
#line 295 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_g_free0 (_tmp6_);
-#line 2031 "GoogleAuthenticator.c"
+#line 2033 "GoogleAuthenticator.c"
}
static void publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_error (PublishingAuthenticatorShotwellGoogleGoogle* 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 298 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_GOOGLE (self));
#line 298 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -2078,27 +2080,27 @@ static void publishing_authenticator_shotwell_google_google_on_fetch_username_tr
_tmp5_ = err;
#line 305 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
spit_publishing_plugin_host_post_error (_tmp4_, _tmp5_);
-#line 2066 "GoogleAuthenticator.c"
+#line 2068 "GoogleAuthenticator.c"
}
static void publishing_authenticator_shotwell_google_google_do_extract_username (PublishingAuthenticatorShotwellGoogleGoogle* self, const gchar* response_body) {
JsonParser* parser = NULL;
- JsonParser* _tmp0_ = NULL;
+ JsonParser* _tmp0_;
JsonObject* response_obj = NULL;
- JsonParser* _tmp10_ = NULL;
- JsonNode* _tmp11_ = NULL;
- JsonObject* _tmp12_ = NULL;
- JsonObject* _tmp13_ = NULL;
- JsonObject* _tmp14_ = NULL;
- gboolean _tmp15_ = FALSE;
- JsonObject* _tmp24_ = NULL;
- gboolean _tmp25_ = FALSE;
- PublishingAuthenticatorShotwellGoogleSession* _tmp34_ = NULL;
- gboolean _tmp35_ = FALSE;
- SpitPublishingPluginHost* _tmp36_ = NULL;
- PublishingAuthenticatorShotwellGoogleSession* _tmp37_ = NULL;
- const gchar* _tmp38_ = NULL;
+ JsonParser* _tmp10_;
+ JsonNode* _tmp11_;
+ JsonObject* _tmp12_;
+ JsonObject* _tmp13_;
+ JsonObject* _tmp14_;
+ gboolean _tmp15_;
+ JsonObject* _tmp24_;
+ gboolean _tmp25_;
+ PublishingAuthenticatorShotwellGoogleSession* _tmp34_;
+ gboolean _tmp35_;
+ SpitPublishingPluginHost* _tmp36_;
+ PublishingAuthenticatorShotwellGoogleSession* _tmp37_;
+ const gchar* _tmp38_;
GError * _inner_error_ = NULL;
#line 308 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_GOOGLE (self));
@@ -2111,10 +2113,10 @@ static void publishing_authenticator_shotwell_google_google_do_extract_username
_tmp0_ = json_parser_new ();
#line 311 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
parser = _tmp0_;
-#line 2098 "GoogleAuthenticator.c"
+#line 2100 "GoogleAuthenticator.c"
{
- JsonParser* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
+ JsonParser* _tmp1_;
+ const gchar* _tmp2_;
#line 314 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_tmp1_ = parser;
#line 314 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -2123,7 +2125,7 @@ static void publishing_authenticator_shotwell_google_google_do_extract_username
json_parser_load_from_data (_tmp1_, _tmp2_, (gssize) -1, &_inner_error_);
#line 314 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2110 "GoogleAuthenticator.c"
+#line 2112 "GoogleAuthenticator.c"
goto __catch8_g_error;
}
}
@@ -2131,13 +2133,13 @@ static void publishing_authenticator_shotwell_google_google_do_extract_username
__catch8_g_error:
{
GError* err = NULL;
- SpitPublishingPluginHost* _tmp3_ = NULL;
- GError* _tmp4_ = NULL;
- const gchar* _tmp5_ = NULL;
- gchar* _tmp6_ = NULL;
- gchar* _tmp7_ = NULL;
- GError* _tmp8_ = NULL;
- GError* _tmp9_ = NULL;
+ SpitPublishingPluginHost* _tmp3_;
+ GError* _tmp4_;
+ const gchar* _tmp5_;
+ gchar* _tmp6_;
+ gchar* _tmp7_;
+ GError* _tmp8_;
+ GError* _tmp9_;
#line 313 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
err = _inner_error_;
#line 313 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -2168,7 +2170,7 @@ static void publishing_authenticator_shotwell_google_google_do_extract_username
_g_object_unref0 (parser);
#line 318 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
return;
-#line 2155 "GoogleAuthenticator.c"
+#line 2157 "GoogleAuthenticator.c"
}
__finally8:
#line 313 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -2181,7 +2183,7 @@ static void publishing_authenticator_shotwell_google_google_do_extract_username
g_clear_error (&_inner_error_);
#line 313 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
return;
-#line 2168 "GoogleAuthenticator.c"
+#line 2170 "GoogleAuthenticator.c"
}
#line 321 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_tmp10_ = parser;
@@ -2199,12 +2201,12 @@ static void publishing_authenticator_shotwell_google_google_do_extract_username
_tmp15_ = json_object_has_member (_tmp14_, "name");
#line 323 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
if (_tmp15_) {
-#line 2186 "GoogleAuthenticator.c"
+#line 2188 "GoogleAuthenticator.c"
gchar* username = NULL;
- JsonObject* _tmp16_ = NULL;
- const gchar* _tmp17_ = NULL;
- gchar* _tmp18_ = NULL;
- const gchar* _tmp19_ = NULL;
+ JsonObject* _tmp16_;
+ const gchar* _tmp17_;
+ gchar* _tmp18_;
+ const gchar* _tmp19_;
#line 324 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_tmp16_ = response_obj;
#line 324 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -2217,11 +2219,11 @@ static void publishing_authenticator_shotwell_google_google_do_extract_username
_tmp19_ = username;
#line 326 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
if (g_strcmp0 (_tmp19_, "") != 0) {
-#line 2204 "GoogleAuthenticator.c"
- GHashTable* _tmp20_ = NULL;
- gchar* _tmp21_ = NULL;
- const gchar* _tmp22_ = NULL;
- GVariant* _tmp23_ = NULL;
+#line 2206 "GoogleAuthenticator.c"
+ GHashTable* _tmp20_;
+ gchar* _tmp21_;
+ const gchar* _tmp22_;
+ GVariant* _tmp23_;
#line 327 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_tmp20_ = self->priv->params;
#line 327 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -2234,11 +2236,11 @@ static void publishing_authenticator_shotwell_google_google_do_extract_username
g_variant_ref_sink (_tmp23_);
#line 327 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
g_hash_table_insert (_tmp20_, _tmp21_, _tmp23_);
-#line 2221 "GoogleAuthenticator.c"
+#line 2223 "GoogleAuthenticator.c"
}
#line 323 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_g_free0 (username);
-#line 2225 "GoogleAuthenticator.c"
+#line 2227 "GoogleAuthenticator.c"
}
#line 330 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_tmp24_ = response_obj;
@@ -2246,12 +2248,12 @@ static void publishing_authenticator_shotwell_google_google_do_extract_username
_tmp25_ = json_object_has_member (_tmp24_, "access_token");
#line 330 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
if (_tmp25_) {
-#line 2233 "GoogleAuthenticator.c"
+#line 2235 "GoogleAuthenticator.c"
gchar* access_token = NULL;
- JsonObject* _tmp26_ = NULL;
- const gchar* _tmp27_ = NULL;
- gchar* _tmp28_ = NULL;
- const gchar* _tmp29_ = NULL;
+ JsonObject* _tmp26_;
+ const gchar* _tmp27_;
+ gchar* _tmp28_;
+ const gchar* _tmp29_;
#line 331 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_tmp26_ = response_obj;
#line 331 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -2264,11 +2266,11 @@ static void publishing_authenticator_shotwell_google_google_do_extract_username
_tmp29_ = access_token;
#line 333 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
if (g_strcmp0 (_tmp29_, "") != 0) {
-#line 2251 "GoogleAuthenticator.c"
- GHashTable* _tmp30_ = NULL;
- gchar* _tmp31_ = NULL;
- const gchar* _tmp32_ = NULL;
- GVariant* _tmp33_ = NULL;
+#line 2253 "GoogleAuthenticator.c"
+ GHashTable* _tmp30_;
+ gchar* _tmp31_;
+ const gchar* _tmp32_;
+ GVariant* _tmp33_;
#line 334 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_tmp30_ = self->priv->params;
#line 334 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -2281,11 +2283,11 @@ static void publishing_authenticator_shotwell_google_google_do_extract_username
g_variant_ref_sink (_tmp33_);
#line 334 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
g_hash_table_insert (_tmp30_, _tmp31_, _tmp33_);
-#line 2268 "GoogleAuthenticator.c"
+#line 2270 "GoogleAuthenticator.c"
}
#line 330 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_g_free0 (access_token);
-#line 2272 "GoogleAuthenticator.c"
+#line 2274 "GoogleAuthenticator.c"
}
#line 339 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_tmp34_ = self->priv->session;
@@ -2307,29 +2309,29 @@ static void publishing_authenticator_shotwell_google_google_do_extract_username
_json_object_unref0 (response_obj);
#line 308 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_g_object_unref0 (parser);
-#line 2294 "GoogleAuthenticator.c"
+#line 2296 "GoogleAuthenticator.c"
}
static void _publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
#line 353 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_completed ((PublishingAuthenticatorShotwellGoogleGoogle*) self, _sender);
-#line 2301 "GoogleAuthenticator.c"
+#line 2303 "GoogleAuthenticator.c"
}
static void _publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
#line 354 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_error ((PublishingAuthenticatorShotwellGoogleGoogle*) self, _sender, err);
-#line 2308 "GoogleAuthenticator.c"
+#line 2310 "GoogleAuthenticator.c"
}
static void publishing_authenticator_shotwell_google_google_do_exchange_refresh_token_for_access_token (PublishingAuthenticatorShotwellGoogleGoogle* self) {
- SpitPublishingPluginHost* _tmp0_ = NULL;
+ SpitPublishingPluginHost* _tmp0_;
PublishingAuthenticatorShotwellGoogleRefreshAccessTokenTransaction* txn = NULL;
- PublishingAuthenticatorShotwellGoogleSession* _tmp1_ = NULL;
- PublishingAuthenticatorShotwellGoogleRefreshAccessTokenTransaction* _tmp2_ = NULL;
+ PublishingAuthenticatorShotwellGoogleSession* _tmp1_;
+ PublishingAuthenticatorShotwellGoogleRefreshAccessTokenTransaction* _tmp2_;
GError * _inner_error_ = NULL;
#line 346 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_GOOGLE (self));
@@ -2350,7 +2352,7 @@ static void publishing_authenticator_shotwell_google_google_do_exchange_refresh_
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_completed_publishing_rest_support_transaction_completed, self, 0);
#line 354 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 2336 "GoogleAuthenticator.c"
+#line 2338 "GoogleAuthenticator.c"
{
#line 357 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
@@ -2358,7 +2360,7 @@ static void publishing_authenticator_shotwell_google_google_do_exchange_refresh_
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 357 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2344 "GoogleAuthenticator.c"
+#line 2346 "GoogleAuthenticator.c"
goto __catch9_spit_publishing_publishing_error;
}
#line 357 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -2369,15 +2371,15 @@ static void publishing_authenticator_shotwell_google_google_do_exchange_refresh_
g_clear_error (&_inner_error_);
#line 357 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
return;
-#line 2355 "GoogleAuthenticator.c"
+#line 2357 "GoogleAuthenticator.c"
}
}
goto __finally9;
__catch9_spit_publishing_publishing_error:
{
GError* err = NULL;
- SpitPublishingPluginHost* _tmp3_ = NULL;
- GError* _tmp4_ = NULL;
+ SpitPublishingPluginHost* _tmp3_;
+ GError* _tmp4_;
#line 356 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
err = _inner_error_;
#line 356 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -2390,7 +2392,7 @@ static void publishing_authenticator_shotwell_google_google_do_exchange_refresh_
spit_publishing_plugin_host_post_error (_tmp3_, _tmp4_);
#line 356 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_g_error_free0 (err);
-#line 2376 "GoogleAuthenticator.c"
+#line 2378 "GoogleAuthenticator.c"
}
__finally9:
#line 356 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -2403,24 +2405,24 @@ static void publishing_authenticator_shotwell_google_google_do_exchange_refresh_
g_clear_error (&_inner_error_);
#line 356 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
return;
-#line 2389 "GoogleAuthenticator.c"
+#line 2391 "GoogleAuthenticator.c"
}
#line 346 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_publishing_rest_support_transaction_unref0 (txn);
-#line 2393 "GoogleAuthenticator.c"
+#line 2395 "GoogleAuthenticator.c"
}
static void publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_completed (PublishingAuthenticatorShotwellGoogleGoogle* self, PublishingRESTSupportTransaction* txn) {
- PublishingRESTSupportTransaction* _tmp0_ = NULL;
- guint _tmp1_ = 0U;
- PublishingRESTSupportTransaction* _tmp2_ = NULL;
- guint _tmp3_ = 0U;
- PublishingAuthenticatorShotwellGoogleSession* _tmp4_ = NULL;
- gboolean _tmp5_ = FALSE;
- PublishingRESTSupportTransaction* _tmp6_ = NULL;
- gchar* _tmp7_ = NULL;
- gchar* _tmp8_ = NULL;
+ PublishingRESTSupportTransaction* _tmp0_;
+ guint _tmp1_;
+ PublishingRESTSupportTransaction* _tmp2_;
+ guint _tmp3_;
+ PublishingAuthenticatorShotwellGoogleSession* _tmp4_;
+ gboolean _tmp5_;
+ PublishingRESTSupportTransaction* _tmp6_;
+ gchar* _tmp7_;
+ gchar* _tmp8_;
#line 363 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_GOOGLE (self));
#line 363 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -2448,7 +2450,7 @@ static void publishing_authenticator_shotwell_google_google_on_refresh_access_to
if (_tmp5_) {
#line 371 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
return;
-#line 2433 "GoogleAuthenticator.c"
+#line 2435 "GoogleAuthenticator.c"
}
#line 373 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_tmp6_ = txn;
@@ -2460,7 +2462,7 @@ static void publishing_authenticator_shotwell_google_google_on_refresh_access_to
publishing_authenticator_shotwell_google_google_do_extract_tokens (self, _tmp8_);
#line 373 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_g_free0 (_tmp8_);
-#line 2445 "GoogleAuthenticator.c"
+#line 2447 "GoogleAuthenticator.c"
}
@@ -2472,7 +2474,7 @@ static gboolean ___lambda4_ (PublishingAuthenticatorShotwellGoogleGoogle* self)
result = FALSE;
#line 389 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
return result;
-#line 2457 "GoogleAuthenticator.c"
+#line 2459 "GoogleAuthenticator.c"
}
@@ -2481,22 +2483,22 @@ static gboolean ____lambda4__gsource_func (gpointer self) {
result = ___lambda4_ ((PublishingAuthenticatorShotwellGoogleGoogle*) self);
#line 389 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
return result;
-#line 2466 "GoogleAuthenticator.c"
+#line 2468 "GoogleAuthenticator.c"
}
static void publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_error (PublishingAuthenticatorShotwellGoogleGoogle* self, PublishingRESTSupportTransaction* txn, GError* err) {
- PublishingRESTSupportTransaction* _tmp0_ = NULL;
- guint _tmp1_ = 0U;
- PublishingRESTSupportTransaction* _tmp2_ = NULL;
- guint _tmp3_ = 0U;
- PublishingAuthenticatorShotwellGoogleSession* _tmp4_ = NULL;
- gboolean _tmp5_ = FALSE;
+ PublishingRESTSupportTransaction* _tmp0_;
+ guint _tmp1_;
+ PublishingRESTSupportTransaction* _tmp2_;
+ guint _tmp3_;
+ PublishingAuthenticatorShotwellGoogleSession* _tmp4_;
+ gboolean _tmp5_;
gboolean _tmp6_ = FALSE;
- PublishingRESTSupportTransaction* _tmp7_ = NULL;
- guint _tmp8_ = 0U;
- SpitPublishingPluginHost* _tmp12_ = NULL;
- GError* _tmp13_ = NULL;
+ PublishingRESTSupportTransaction* _tmp7_;
+ guint _tmp8_;
+ SpitPublishingPluginHost* _tmp12_;
+ GError* _tmp13_;
#line 376 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_GOOGLE (self));
#line 376 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -2524,7 +2526,7 @@ static void publishing_authenticator_shotwell_google_google_on_refresh_access_to
if (_tmp5_) {
#line 384 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
return;
-#line 2508 "GoogleAuthenticator.c"
+#line 2510 "GoogleAuthenticator.c"
}
#line 385 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_tmp7_ = txn;
@@ -2534,29 +2536,29 @@ static void publishing_authenticator_shotwell_google_google_on_refresh_access_to
if (_tmp8_ == ((guint) SOUP_STATUS_BAD_REQUEST)) {
#line 385 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_tmp6_ = TRUE;
-#line 2518 "GoogleAuthenticator.c"
+#line 2520 "GoogleAuthenticator.c"
} else {
- PublishingRESTSupportTransaction* _tmp9_ = NULL;
- guint _tmp10_ = 0U;
+ PublishingRESTSupportTransaction* _tmp9_;
+ guint _tmp10_;
#line 386 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_tmp9_ = txn;
#line 386 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_tmp10_ = publishing_rest_support_transaction_get_status_code (_tmp9_);
#line 386 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_tmp6_ = _tmp10_ == ((guint) SOUP_STATUS_UNAUTHORIZED);
-#line 2528 "GoogleAuthenticator.c"
+#line 2530 "GoogleAuthenticator.c"
}
#line 385 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
if (_tmp6_) {
-#line 2532 "GoogleAuthenticator.c"
- SpitPublishingPluginHost* _tmp11_ = NULL;
+#line 2534 "GoogleAuthenticator.c"
+ SpitPublishingPluginHost* _tmp11_;
#line 388 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_tmp11_ = self->priv->host;
#line 388 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "refresh_token", "");
#line 389 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ____lambda4__gsource_func, g_object_ref (self), g_object_unref);
-#line 2540 "GoogleAuthenticator.c"
+#line 2542 "GoogleAuthenticator.c"
}
#line 392 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
_tmp12_ = self->priv->host;
@@ -2564,20 +2566,20 @@ static void publishing_authenticator_shotwell_google_google_on_refresh_access_to
_tmp13_ = err;
#line 392 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
spit_publishing_plugin_host_post_error (_tmp12_, _tmp13_);
-#line 2548 "GoogleAuthenticator.c"
+#line 2550 "GoogleAuthenticator.c"
}
static void _publishing_authenticator_shotwell_google_google_on_service_welcome_login_spit_publishing_login_callback (gpointer self) {
#line 398 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
publishing_authenticator_shotwell_google_google_on_service_welcome_login ((PublishingAuthenticatorShotwellGoogleGoogle*) self);
-#line 2555 "GoogleAuthenticator.c"
+#line 2557 "GoogleAuthenticator.c"
}
static void publishing_authenticator_shotwell_google_google_do_show_service_welcome_pane (PublishingAuthenticatorShotwellGoogleGoogle* self) {
- SpitPublishingPluginHost* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
+ SpitPublishingPluginHost* _tmp0_;
+ const gchar* _tmp1_;
#line 395 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_GOOGLE (self));
#line 396 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -2588,7 +2590,7 @@ static void publishing_authenticator_shotwell_google_google_do_show_service_welc
_tmp1_ = self->priv->welcome_message;
#line 398 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
spit_publishing_plugin_host_install_welcome_pane (_tmp0_, _tmp1_, _publishing_authenticator_shotwell_google_google_on_service_welcome_login_spit_publishing_login_callback, self);
-#line 2572 "GoogleAuthenticator.c"
+#line 2574 "GoogleAuthenticator.c"
}
@@ -2600,7 +2602,7 @@ static void publishing_authenticator_shotwell_google_google_on_service_welcome_l
"ane.");
#line 404 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
publishing_authenticator_shotwell_google_google_do_hosted_web_authentication (self);
-#line 2583 "GoogleAuthenticator.c"
+#line 2585 "GoogleAuthenticator.c"
}
@@ -2611,7 +2613,7 @@ static void publishing_authenticator_shotwell_google_google_class_init (Publishi
g_type_class_add_private (klass, sizeof (PublishingAuthenticatorShotwellGoogleGooglePrivate));
#line 88 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
G_OBJECT_CLASS (klass)->finalize = publishing_authenticator_shotwell_google_google_finalize;
-#line 2594 "GoogleAuthenticator.c"
+#line 2596 "GoogleAuthenticator.c"
}
@@ -2619,16 +2621,16 @@ static void publishing_authenticator_shotwell_google_google_spit_publishing_auth
#line 88 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
publishing_authenticator_shotwell_google_google_spit_publishing_authenticator_parent_iface = g_type_interface_peek_parent (iface);
#line 88 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- iface->authenticate = (void (*)(SpitPublishingAuthenticator*)) publishing_authenticator_shotwell_google_google_real_authenticate;
+ iface->authenticate = (void (*) (SpitPublishingAuthenticator *)) publishing_authenticator_shotwell_google_google_real_authenticate;
#line 88 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- iface->can_logout = (gboolean (*)(SpitPublishingAuthenticator*)) publishing_authenticator_shotwell_google_google_real_can_logout;
+ iface->can_logout = (gboolean (*) (SpitPublishingAuthenticator *)) publishing_authenticator_shotwell_google_google_real_can_logout;
#line 88 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- iface->get_authentication_parameter = (GHashTable* (*)(SpitPublishingAuthenticator*)) publishing_authenticator_shotwell_google_google_real_get_authentication_parameter;
+ iface->get_authentication_parameter = (GHashTable* (*) (SpitPublishingAuthenticator *)) publishing_authenticator_shotwell_google_google_real_get_authentication_parameter;
#line 88 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- iface->logout = (void (*)(SpitPublishingAuthenticator*)) publishing_authenticator_shotwell_google_google_real_logout;
+ iface->logout = (void (*) (SpitPublishingAuthenticator *)) publishing_authenticator_shotwell_google_google_real_logout;
#line 88 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
- iface->refresh = (void (*)(SpitPublishingAuthenticator*)) publishing_authenticator_shotwell_google_google_real_refresh;
-#line 2611 "GoogleAuthenticator.c"
+ iface->refresh = (void (*) (SpitPublishingAuthenticator *)) publishing_authenticator_shotwell_google_google_real_refresh;
+#line 2613 "GoogleAuthenticator.c"
}
@@ -2647,11 +2649,11 @@ static void publishing_authenticator_shotwell_google_google_instance_init (Publi
self->priv->session = NULL;
#line 94 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
self->priv->welcome_message = NULL;
-#line 2630 "GoogleAuthenticator.c"
+#line 2632 "GoogleAuthenticator.c"
}
-static void publishing_authenticator_shotwell_google_google_finalize (GObject* obj) {
+static void publishing_authenticator_shotwell_google_google_finalize (GObject * obj) {
PublishingAuthenticatorShotwellGoogleGoogle * self;
#line 88 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_GOOGLE, PublishingAuthenticatorShotwellGoogleGoogle);
@@ -2669,7 +2671,7 @@ static void publishing_authenticator_shotwell_google_google_finalize (GObject* o
_g_free0 (self->priv->welcome_message);
#line 88 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
G_OBJECT_CLASS (publishing_authenticator_shotwell_google_google_parent_class)->finalize (obj);
-#line 2652 "GoogleAuthenticator.c"
+#line 2654 "GoogleAuthenticator.c"
}